Changeset 1423

Timestamp:

May 2, 2004, 8:59:35 AM (21 years ago)

Author:

bird

Message:

#1040: fixed bug in merge (sysroot 1 not 0 for standard include).

Location:

trunk/src/gcc/gcc

Files:

• config/i386/xm-emx.h (modified) (1 diff, 1 prop)
• cppdefault.c (modified) (3 diffs, 1 prop)
• cppdefault.h (modified) (2 diffs, 1 prop)

trunk/src/gcc/gcc/config/i386/xm-emx.h

@@ -61 +61 @@
 #define STANDARD_INCLUDE_DIR            "/gcc/include/"
 #define STANDARD_INCLUDE_COMPONENT      "GCC"
+#define STANDARD_INCLUDE_SYSROOT        0
 #undef LOCAL_INCLUDE_DIR
 #undef PREFIX_INCLUDE_DIR

trunk/src/gcc/gcc/cppdefault.c

@@ -27 +27 @@
 #include "cppdefault.h"
 
+/* GCC-OS2: Added a few more configuration options so we can automagically
+   rewrite /gcc/ to whereever we're installed for all of the dirs we use. */
 const struct default_include cpp_include_defaults[]
 #ifdef INCLUDE_DEFAULTS
@@ -46 +48 @@
 #ifdef LOCAL_INCLUDE_DIR
     /* /usr/local/include comes before the fixincluded header files.  */
-    { LOCAL_INCLUDE_DIR, LOCAL_INCLUDE_COMPONENT, 0, 1, 1 }, /* bird: include LOCAL_INCLUDE_COMPONENT */
+    { LOCAL_INCLUDE_DIR, LOCAL_INCLUDE_COMPONENT, 0, 1, 1 }, 
 #endif
 #ifdef PREFIX_INCLUDE_DIR
-    { PREFIX_INCLUDE_DIR, PREFIX_INCLUDE_COMPONENT, 0, 1, 0 }, /* bird: include PREFIX_INCLUDE_COMPONENT */
+    { PREFIX_INCLUDE_DIR, PREFIX_INCLUDE_COMPONENT, 0, 1, 0 }, 
 #endif
 #ifdef GCC_INCLUDE_DIR
@@ -65 +67 @@
 #ifdef SYSTEM_INCLUDE_DIR
     /* Some systems have an extra dir of include files.  */
-    { SYSTEM_INCLUDE_DIR, SYSTEM_INCLUDE_COMPONENT, 0, 0, 1 }, /* bird: include SYSTEM_INCLUDE_COMPONENT */
+    { SYSTEM_INCLUDE_DIR, SYSTEM_INCLUDE_COMPONENT, 0, 0, SYSTEM_INCLUDE_SYSROOT }, 
 #endif
 #ifdef STANDARD_INCLUDE_DIR
     /* /usr/include comes dead last.  */
-    { STANDARD_INCLUDE_DIR, STANDARD_INCLUDE_COMPONENT, 0, 0, 1 },
+    { STANDARD_INCLUDE_DIR, STANDARD_INCLUDE_COMPONENT, 0, 0, STANDARD_INCLUDE_SYSROOT },
 #endif
     { 0, 0, 0, 0, 0 }

trunk/src/gcc/gcc/cppdefault.h

@@ -35 +35 @@
 #endif
 
+/* GCC-OS2: Additional configuration options. */
+#ifndef STANDARD_INCLUDE_SYSROOT
+#define STANDARD_INCLUDE_SYSROOT 1
+#endif 
+       
 #ifndef SYSTEM_INCLUDE_COMPONENT
 #define SYSTEM_INCLUDE_COMPONENT 0
+#endif 
+
+#ifndef SYSTEM_INCLUDE_SYSROOT
+#define SYSTEM_INCLUDE_SYSROOT 1
 #endif 
 
@@ -46 +55 @@
 #define PREFIX_INCLUDE_COMPONENT 0
 #endif 
+/* GCC-OS2: end */
 
 #if defined (CROSS_COMPILE) && !defined (TARGET_SYSTEM_ROOT)