From 4471aff653622f322b718cce206f36e8bd50029c Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Sat, 9 Oct 2010 21:12:56 +0000 Subject: [PATCH] libgcc2.h: Use __SIZEOF_LONG_LONG__ instead of LONG_LONG_TYPE_SIZE. * libgcc2.h: Use __SIZEOF_LONG_LONG__ instead of LONG_LONG_TYPE_SIZE. * libgcc2.c: Likewise. From-SVN: r165238 --- gcc/ChangeLog | 5 +++++ gcc/libgcc2.c | 2 +- gcc/libgcc2.h | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5cb3cecba2c..08acd5091f7 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2010-10-09 Nathan Froyd + + * libgcc2.h: Use __SIZEOF_LONG_LONG__ instead of LONG_LONG_TYPE_SIZE. + * libgcc2.c: Likewise. + 2010-10-09 Richard Guenther PR lto/45956 diff --git a/gcc/libgcc2.c b/gcc/libgcc2.c index 02828e3f640..20e7bd2b6d7 100644 --- a/gcc/libgcc2.c +++ b/gcc/libgcc2.c @@ -40,7 +40,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #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)) + || (MIN_UNITS_PER_WORD > 1 && __SIZEOF_LONG_LONG__ > 4)) # define LIBGCC2_MAX_UNITS_PER_WORD 4 #else # define LIBGCC2_MAX_UNITS_PER_WORD MIN_UNITS_PER_WORD diff --git a/gcc/libgcc2.h b/gcc/libgcc2.h index 56dc9f7e4d0..f344917dad1 100644 --- a/gcc/libgcc2.h +++ b/gcc/libgcc2.h @@ -140,7 +140,7 @@ typedef unsigned int UHItype __attribute__ ((mode (HI))); /* These typedefs are usually forbidden on dsp's with UNITS_PER_WORD 1. */ typedef int SItype __attribute__ ((mode (SI))); typedef unsigned int USItype __attribute__ ((mode (SI))); -#if LONG_LONG_TYPE_SIZE > 32 +#if __SIZEOF_LONG_LONG__ > 4 /* These typedefs are usually forbidden on archs with UNITS_PER_WORD 2. */ typedef int DItype __attribute__ ((mode (DI))); typedef unsigned int UDItype __attribute__ ((mode (DI))); @@ -342,7 +342,7 @@ extern cmp_return_type __ucmpdi2 (DWtype, DWtype); #if MIN_UNITS_PER_WORD > 1 extern SItype __bswapsi2 (SItype); #endif -#if LONG_LONG_TYPE_SIZE > 32 +#if __SIZEOF_LONG_LONG__ > 4 extern DItype __bswapdi2 (DItype); #endif