diff --git a/gnu/usr.bin/cc/Makefile.inc b/gnu/usr.bin/cc/Makefile.inc
index a42609a3e469..b97261a488c9 100644
--- a/gnu/usr.bin/cc/Makefile.inc
+++ b/gnu/usr.bin/cc/Makefile.inc
@@ -22,12 +22,6 @@ CFLAGS+=	-DPREFIX=\"${TOOLS_PREFIX}/usr\"
 #CFLAGS+=	-DWANT_COMPILER_INVARIANTS
 CSTD?=	gnu89
 
-# If building 64-bit longs for the i386, "_LARGE_LONG" should also be defined
-# to get the proper sizes in limits.h
-.if defined(LONG_TYPE_SIZE)
-CFLAGS+=	-DLONG_TYPE_SIZE=${LONG_TYPE_SIZE}
-.endif
-
 .if ${TARGET_ARCH} != ${MACHINE_ARCH}
 CFLAGS+=	-DCROSS_COMPILE
 .endif
diff --git a/sys/arm/include/_limits.h b/sys/arm/include/_limits.h
index 0d9e49204439..db18d8264218 100644
--- a/sys/arm/include/_limits.h
+++ b/sys/arm/include/_limits.h
@@ -59,16 +59,9 @@
 #define	__INT_MAX	0x7fffffff	/* max value for an int */
 #define	__INT_MIN	(-0x7fffffff - 1)	/* min value for an int */
 
-/* Bad hack for gcc configured to give 64-bit longs. */
-#ifdef _LARGE_LONG
-#define	__ULONG_MAX	0xffffffffffffffffUL
-#define	__LONG_MAX	0x7fffffffffffffffL
-#define	__LONG_MIN	(-0x7fffffffffffffffL - 1)
-#else
 #define	__ULONG_MAX	0xffffffffUL	/* max value for an unsigned long */
 #define	__LONG_MAX	0x7fffffffL	/* max value for a long */
 #define	__LONG_MIN	(-0x7fffffffL - 1)	/* min value for a long */
-#endif
 
 			/* max value for an unsigned long long */
 #define	__ULLONG_MAX	0xffffffffffffffffULL
@@ -87,11 +80,7 @@
 #define	__QUAD_MAX	__LLONG_MAX	/* max value for a quad_t */
 #define	__QUAD_MIN	__LLONG_MIN	/* min value for a quad_t */
 
-#ifdef _LARGE_LONG
-#define	__LONG_BIT	64
-#else
 #define	__LONG_BIT	32
-#endif
 #define	__WORD_BIT	32
 
 /* Minimum signal stack size. */
diff --git a/sys/i386/include/_limits.h b/sys/i386/include/_limits.h
index f3289511e4c8..43092dece058 100644
--- a/sys/i386/include/_limits.h
+++ b/sys/i386/include/_limits.h
@@ -59,16 +59,9 @@
 #define	__INT_MAX	0x7fffffff	/* max value for an int */
 #define	__INT_MIN	(-0x7fffffff - 1)	/* min value for an int */
 
-/* Bad hack for gcc configured to give 64-bit longs. */
-#ifdef _LARGE_LONG
-#define	__ULONG_MAX	0xffffffffffffffffUL
-#define	__LONG_MAX	0x7fffffffffffffffL
-#define	__LONG_MIN	(-0x7fffffffffffffffL - 1)
-#else
 #define	__ULONG_MAX	0xffffffffUL	/* max value for an unsigned long */
 #define	__LONG_MAX	0x7fffffffL	/* max value for a long */
 #define	__LONG_MIN	(-0x7fffffffL - 1)	/* min value for a long */
-#endif
 
 			/* max value for an unsigned long long */
 #define	__ULLONG_MAX	0xffffffffffffffffULL
@@ -87,11 +80,7 @@
 #define	__QUAD_MAX	__LLONG_MAX	/* max value for a quad_t */
 #define	__QUAD_MIN	__LLONG_MIN	/* min value for a quad_t */
 
-#ifdef _LARGE_LONG
-#define	__LONG_BIT	64
-#else
 #define	__LONG_BIT	32
-#endif
 #define	__WORD_BIT	32
 
 /*
diff --git a/sys/mips/include/_limits.h b/sys/mips/include/_limits.h
index e160a7f4a1d0..435a61b4a635 100644
--- a/sys/mips/include/_limits.h
+++ b/sys/mips/include/_limits.h
@@ -34,10 +34,6 @@
 #ifndef _MACHINE__LIMITS_H_
 #define	_MACHINE__LIMITS_H_
 
-#if _MIPS_SZLONG == 64
-#define	_LARGE_LONG
-#endif
-
 /*
  * According to ANSI (section 2.2.4.2), the values below must be usable by
  * #if preprocessing directives.  Additionally, the expression must have the
@@ -64,15 +60,16 @@
 #define	__INT_MAX	0x7fffffff	/* max value for an int */
 #define	__INT_MIN	(-0x7fffffff - 1)	/* min value for an int */
 
-/* Bad hack for gcc configured to give 64-bit longs. */
-#ifdef _LARGE_LONG
+#ifdef __LP64__
 #define	__ULONG_MAX	0xffffffffffffffffUL
 #define	__LONG_MAX	0x7fffffffffffffffL
 #define	__LONG_MIN	(-0x7fffffffffffffffL - 1)
+#define	__LONG_BIT	64
 #else
 #define	__ULONG_MAX	0xffffffffUL	/* max value for an unsigned long */
 #define	__LONG_MAX	0x7fffffffL	/* max value for a long */
 #define	__LONG_MIN	(-0x7fffffffL - 1)	/* min value for a long */
+#define	__LONG_BIT	32
 #endif
 
 			/* max value for an unsigned long long */
@@ -92,11 +89,6 @@
 #define	__QUAD_MAX	__LLONG_MAX	/* max value for a quad_t */
 #define	__QUAD_MIN	__LLONG_MIN	/* min value for a quad_t */
 
-#ifdef _LARGE_LONG
-#define	__LONG_BIT	64
-#else
-#define	__LONG_BIT	32
-#endif
 #define	__WORD_BIT	32
 
 #define __MINSIGSTKSZ     (512 * 4)
diff --git a/sys/powerpc/include/_limits.h b/sys/powerpc/include/_limits.h
index 015a9f73a4e8..942372f8e775 100644
--- a/sys/powerpc/include/_limits.h
+++ b/sys/powerpc/include/_limits.h
@@ -59,14 +59,16 @@
 #define	__INT_MAX	0x7fffffff	/* max value for an int */
 #define	__INT_MIN	(-0x7fffffff - 1)	/* min value for an int */
 
-#if defined(_LARGE_LONG) || defined(__LP64__)
+#ifdef __LP64__
 #define	__ULONG_MAX	0xffffffffffffffffUL
 #define	__LONG_MAX	0x7fffffffffffffffL
 #define	__LONG_MIN	(-0x7fffffffffffffffL - 1)
+#define	__LONG_BIT	64
 #else
 #define	__ULONG_MAX	0xffffffffUL	/* max value for an unsigned long */
 #define	__LONG_MAX	0x7fffffffL	/* max value for a long */
 #define	__LONG_MIN	(-0x7fffffffL - 1)	/* min value for a long */
+#define	__LONG_BIT	32
 #endif
 
 #define	__ULLONG_MAX	0xffffffffffffffffULL
@@ -89,11 +91,6 @@
 #define	__QUAD_MAX	__LLONG_MAX	/* max value for a quad_t */
 #define	__QUAD_MIN	__LLONG_MIN	/* min value for a quad_t */
 
-#if defined(_LARGE_LONG) || defined(__LP64__)
-#define	__LONG_BIT	64
-#else
-#define	__LONG_BIT	32
-#endif
 #define	__WORD_BIT	32
 
 /* Minimum signal stack size. */