[llvm-commits] [llvm-gcc-4.2] r54245 - in /llvm-gcc-4.2/trunk/gcc: gsyslimits.h limitx.h limity.h

[Bill Wendling]

Author: void
Date: Thu Jul 31 02:28:59 2008
New Revision: 54245

URL: http://llvm.org/viewvc/llvm-project?rev=54245&view=rev
Log:
Grotesque hack to get the limits.h stuff working on non-Darwin platforms. This
reverts the behavior to the old way of doing things if we're not on Darwin.


Modified:
    llvm-gcc-4.2/trunk/gcc/gsyslimits.h
    llvm-gcc-4.2/trunk/gcc/limitx.h
    llvm-gcc-4.2/trunk/gcc/limity.h

Modified: llvm-gcc-4.2/trunk/gcc/gsyslimits.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/gsyslimits.h?rev=54245&r1=54244&r2=54245&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/gsyslimits.h (original)
+++ llvm-gcc-4.2/trunk/gcc/gsyslimits.h Thu Jul 31 02:28:59 2008
@@ -5,4 +5,10 @@
 
 #define _GCC_NEXT_LIMITS_H		/* tell gcc's limits.h to recurse */
 /* APPLE LOCAL begin 4401222 */
+/* LLVM LOCAL */
+#ifndef CONFIG_DARWIN_H
+#include_next <limits.h>
+#undef _GCC_NEXT_LIMITS_H
+/* LLVM LOCAL */
+#endif /* not CONFIG_DARWIN_H */
 /* APPLE LOCAL end 4401222 */

Modified: llvm-gcc-4.2/trunk/gcc/limitx.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/limitx.h?rev=54245&r1=54244&r2=54245&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/limitx.h (original)
+++ llvm-gcc-4.2/trunk/gcc/limitx.h Thu Jul 31 02:28:59 2008
@@ -2,6 +2,27 @@
    if the system has its own version of limits.h.  */
 
 /* APPLE LOCAL begin 4401222 */
+/* LLVM LOCAL */
+#ifdef CONFIG_DARWIN_H
+
+#ifndef _LIBC_LIMITS_H_
+/* Use "..." so that we find syslimits.h only in this same directory.  */
+#include "syslimits.h"
+#endif
+#ifdef _GCC_NEXT_LIMITS_H
+#include_next <limits.h>
+#undef _GCC_NEXT_LIMITS_H
+#endif
+
+/* LLVM LOCAL begin */
+#endif /* not CONFIG_DARWIN_H */
+
+/* We use _GCC_LIMITS_H_ because we want this not to match
+   any macros that the system's limits.h uses for its own purposes.  */
+/* LLVM LOCAL */
+#if !defined(_GCC_LIMITS_H_) && !defined(CONFIG_DARWIN_H)  /* Terminated in limity.h.  */
+#define _GCC_LIMITS_H_
+
 #ifndef _LIBC_LIMITS_H_
 /* Use "..." so that we find syslimits.h only in this same directory.  */
 #include "syslimits.h"
@@ -10,4 +31,5 @@
 #include_next <limits.h>
 #undef _GCC_NEXT_LIMITS_H
 #endif
+/* LLVM LOCAL end */
 /* APPLE LOCAL end 4401222 */

Modified: llvm-gcc-4.2/trunk/gcc/limity.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/limity.h?rev=54245&r1=54244&r2=54245&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/limity.h (original)
+++ llvm-gcc-4.2/trunk/gcc/limity.h Thu Jul 31 02:28:59 2008
@@ -1,2 +1,19 @@
 /* APPLE LOCAL begin 4401222 */
+
+/* This administrivia gets added to the end of limits.h
+   if the system has its own version of limits.h.  */
+
+#else /* not _GCC_LIMITS_H_ */
+
+/* LLVM LOCAL */
+#ifndef CONFIG_DARWIN_H
+
+#ifdef _GCC_NEXT_LIMITS_H
+#include_next <limits.h>/* recurse down to the real one */
+#endif
+
+/* LLVM LOCAL */
+#endif /* not CONFIG_DARWIN_H */
+
+#endif /* not _GCC_LIMITS_H_ */
 /* APPLE LOCAL end 4401222 */