diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5cb3cecba2c1ea6e4b62088ce47564a0d25a9cb9..08acd5091f712ae879e01aee59116d79f7069102 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-09  Nathan Froyd  <froydnj@codesourcery.com>
+
+	* libgcc2.h: Use __SIZEOF_LONG_LONG__ instead of LONG_LONG_TYPE_SIZE.
+	* libgcc2.c: Likewise.
+
 2010-10-09  Richard Guenther  <rguenther@suse.de>
 
 	PR lto/45956
diff --git a/gcc/libgcc2.c b/gcc/libgcc2.c
index 02828e3f640908c656becc02eda4e975e0d8528d..20e7bd2b6d794592e2d60866b53a3b7f2289ceb2 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 56dc9f7e4d07ce0e4e5b1c4131df9bf0a3217978..f344917dad1ac4ee2874dc596d78f1a2ee760c4d 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