From 943e5a87e9cd66a40ff649b1fe9638448548d067 Mon Sep 17 00:00:00 2001 From: rsandifo Date: Tue, 23 May 2006 19:29:36 +0000 Subject: [PATCH] * libgcc2.c (LIBGCC2_MAX_UNITS_PER_WORD): New macro. (LIBGCC2_UNITS_PER_WORD): Use LIBGCC2_MAX_UNITS_PER_WORD rather than MIN_UNITS_PER_WORD to set the default. Also use it in the guard. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@114022 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 6 ++++++ gcc/libgcc2.c | 23 ++++++++++++++--------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d7c58a1d3f4..36612a34cd9 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2006-05-23 Richard Sandiford + + * libgcc2.c (LIBGCC2_MAX_UNITS_PER_WORD): New macro. + (LIBGCC2_UNITS_PER_WORD): Use LIBGCC2_MAX_UNITS_PER_WORD rather than + MIN_UNITS_PER_WORD to set the default. Also use it in the guard. + 2006-05-23 Joseph Myers * expr.c (undefined_operand_subword_p): New. diff --git a/gcc/libgcc2.c b/gcc/libgcc2.c index 3fce731ef60..d093616fe50 100644 --- a/gcc/libgcc2.c +++ b/gcc/libgcc2.c @@ -44,18 +44,23 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA #define MIN_UNITS_PER_WORD UNITS_PER_WORD #endif +/* Work out the largest "word" size that we can deal with on this target. */ +#if MIN_UNITS_PER_WORD > 4 +# define LIBGCC2_MAX_UNITS_PER_WORD 8 +#elif (MIN_UNITS_PER_WORD > 2 \ + || (MIN_UNITS_PER_WORD > 1 && LONG_LONG_TYPE_SIZE > 32)) +# define LIBGCC2_MAX_UNITS_PER_WORD 4 +#else +# define LIBGCC2_MAX_UNITS_PER_WORD MIN_UNITS_PER_WORD +#endif + +/* Work out what word size we are using for this compilation. + The value can be set on the command line. */ #ifndef LIBGCC2_UNITS_PER_WORD -# if MIN_UNITS_PER_WORD > 4 -# define LIBGCC2_UNITS_PER_WORD 8 -# elif (MIN_UNITS_PER_WORD > 2 \ - || (MIN_UNITS_PER_WORD > 1 && LONG_LONG_TYPE_SIZE > 32)) -# define LIBGCC2_UNITS_PER_WORD 4 -# else -# define LIBGCC2_UNITS_PER_WORD MIN_UNITS_PER_WORD -# endif +#define LIBGCC2_UNITS_PER_WORD LIBGCC2_MAX_UNITS_PER_WORD #endif -#if LIBGCC2_UNITS_PER_WORD <= MIN_UNITS_PER_WORD +#if LIBGCC2_UNITS_PER_WORD <= LIBGCC2_MAX_UNITS_PER_WORD #include "libgcc2.h" -- 2.11.0