* config/alpha/linux.h, config/arm/linux-elf.h, config/i370/linux.h,

        config/i386/linux-aout.h, config/i386/linux-oldld.h,
        config/i386/linux.h, config/i386/linux64.h, config/ia64/linux.h,
        config/m68k/linux-aout.h, config/m68k/linux.h, config/mips/linux.h,
        config/pa/pa-linux.h, config/pj/linux.h, config/s390/linux.h,
        config/sh/linux.h, config/sparc/linux-aout.h, config/sparc/linux.h,
        config/sparc/linux64.h, config/xtensa/linux.h (CPP_PREDEFINES):
        Define __gnu_linux__, not gnu_linux.
        * config/rs6000/sysv4.h (CPP_OS_GNU_SPEC): Likewise for gnu_hurd.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@52329 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 772c2b0..16e7a14 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,15 @@
+2002-04-15  Richard Henderson  <rth@redhat.com>
+
+       * config/alpha/linux.h, config/arm/linux-elf.h, config/i370/linux.h,
+       config/i386/linux-aout.h, config/i386/linux-oldld.h,
+       config/i386/linux.h, config/i386/linux64.h, config/ia64/linux.h,
+       config/m68k/linux-aout.h, config/m68k/linux.h, config/mips/linux.h,
+       config/pa/pa-linux.h, config/pj/linux.h, config/s390/linux.h,
+       config/sh/linux.h, config/sparc/linux-aout.h, config/sparc/linux.h,
+       config/sparc/linux64.h, config/xtensa/linux.h (CPP_PREDEFINES):
+       Define __gnu_linux__, not gnu_linux.
+       * config/rs6000/sysv4.h (CPP_OS_GNU_SPEC): Likewise for gnu_hurd.
+
 2002-04-15  Mark Mitchell  <mark@codesourcery.com>
 
        Remove Chill front end.

diff --git a/gcc/config/alpha/linux.h b/gcc/config/alpha/linux.h
index 7c4057f..21639c5 100644 (file)
--- a/gcc/config/alpha/linux.h
+++ b/gcc/config/alpha/linux.h
@@ -25,7 +25,7 @@ Boston, MA 02111-1307, USA.  */
 
 #undef CPP_PREDEFINES
 #define CPP_PREDEFINES \
-  "-Dgnu_linux -Dlinux -Dunix -Asystem=linux -D_LONGLONG -D__alpha__"
+  "-D__gnu_linux__ -Dlinux -Dunix -Asystem=linux -D_LONGLONG -D__alpha__"
 
 /* The GNU C++ standard library requires that these macros be defined.  */
 #undef CPLUSPLUS_CPP_SPEC

diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h
index 947bd9c..f1c86d2 100644 (file)
--- a/gcc/config/arm/linux-elf.h
+++ b/gcc/config/arm/linux-elf.h
@@ -91,7 +91,7 @@ Boston, MA 02111-1307, USA.  */
 
 #undef  CPP_PREDEFINES
 #define CPP_PREDEFINES \
-"-Dunix -Dgnu_linux -Dlinux -D__ELF__ \
+"-Dunix -D__gnu_linux__ -Dlinux -D__ELF__ \
 -Asystem=unix -Asystem=posix"
 
 /* Allow #sccs in preprocessor.  */

diff --git a/gcc/config/i370/linux.h b/gcc/config/i370/linux.h
index 6cc95c0..004b4f2 100644 (file)
--- a/gcc/config/i370/linux.h
+++ b/gcc/config/i370/linux.h
@@ -35,7 +35,7 @@ Boston, MA 02111-1307, USA.  */
 /* Names to predefine in the preprocessor for this target machine.  */
 
 #undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-DGCC -Dgcc -D__ELF__ -Dunix -Dgnu_linux -Dlinux -Asystem=posix -Acpu=i370 -Amachine=i370"
+#define CPP_PREDEFINES "-DGCC -Dgcc -D__ELF__ -Dunix -D__gnu_linux__ -Dlinux -Asystem=posix -Acpu=i370 -Amachine=i370"
 
 /* Options for this target machine.  */
 

diff --git a/gcc/config/i386/linux-aout.h b/gcc/config/i386/linux-aout.h
index a4ea805..84d4109 100644 (file)
--- a/gcc/config/i386/linux-aout.h
+++ b/gcc/config/i386/linux-aout.h
@@ -26,7 +26,7 @@ Boston, MA 02111-1307, USA.  */
 /* Specify predefined symbols in preprocessor.  */
 
 #undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dunix -Dgnu_linux -Dlinux -Asystem=posix"
+#define CPP_PREDEFINES "-Dunix -D__gnu_linux__ -Dlinux -Asystem=posix"
 
 #undef CPP_SPEC
 #define CPP_SPEC "%(cpp_cpu) %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}"

diff --git a/gcc/config/i386/linux-oldld.h b/gcc/config/i386/linux-oldld.h
index a1453d9..476a9ed 100644 (file)
--- a/gcc/config/i386/linux-oldld.h
+++ b/gcc/config/i386/linux-oldld.h
@@ -26,7 +26,7 @@ Boston, MA 02111-1307, USA.  */
 /* Specify predefined symbols in preprocessor.  */
 
 #undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dunix -Dgnu_linux -Dlinux -Asystem=posix"
+#define CPP_PREDEFINES "-Dunix -D__gnu_linux__ -Dlinux -Asystem=posix"
 
 #undef CPP_SPEC
 #define CPP_SPEC "%(cpp_cpu) %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}"

diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h
index 89b661b..fd4d7a0 100644 (file)
--- a/gcc/config/i386/linux.h
+++ b/gcc/config/i386/linux.h
@@ -84,7 +84,7 @@ Boston, MA 02111-1307, USA.  */
 #define WCHAR_TYPE_SIZE BITS_PER_WORD
     
 #undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-D__ELF__ -Dunix -Dgnu_linux -Dlinux -Asystem=posix"
+#define CPP_PREDEFINES "-D__ELF__ -Dunix -D__gnu_linux__ -Dlinux -Asystem=posix"
 
 #undef CPP_SPEC
 #ifdef USE_GNULIBC_1

diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h
index 82ff36a..7d5ae8d 100644 (file)
--- a/gcc/config/i386/linux64.h
+++ b/gcc/config/i386/linux64.h
@@ -24,7 +24,7 @@ Boston, MA 02111-1307, USA.  */
 #define TARGET_VERSION fprintf (stderr, " (x86-64 Linux/ELF)");
 
 #undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-D__ELF__ -Dunix -Dgnu_linux -Dlinux -Asystem(posix)"
+#define CPP_PREDEFINES "-D__ELF__ -Dunix -D__gnu_linux__ -Dlinux -Asystem(posix)"
 
 #undef CPP_SPEC
 #define CPP_SPEC "%(cpp_cpu) %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT} %{!m32:-D__LONG_MAX__=9223372036854775807L}"

diff --git a/gcc/config/ia64/linux.h b/gcc/config/ia64/linux.h
index 7f2671a..3091852 100644 (file)
--- a/gcc/config/ia64/linux.h
+++ b/gcc/config/ia64/linux.h
@@ -11,7 +11,7 @@
 
 /* ??? Maybe this should be in sysv4.h?  */
 #define CPP_PREDEFINES "\
-  -D__gnu_linux__ -D__linux -D__linux__ -D_LONGLONG -Dgnu_linux \
+  -D__gnu_linux__ -D__linux -D__linux__ -D_LONGLONG \
   -Dlinux -Dunix -Asystem=linux"
 
 /* Need to override linux.h STARTFILE_SPEC, since it has crtbeginT.o in.  */

diff --git a/gcc/config/m68k/linux-aout.h b/gcc/config/m68k/linux-aout.h
index 7b9293a..08e2ef5 100644 (file)
--- a/gcc/config/m68k/linux-aout.h
+++ b/gcc/config/m68k/linux-aout.h
@@ -29,7 +29,7 @@ Boston, MA 02111-1307, USA.  */
 #define ASM_COMMENT_START "|"
 
 #define CPP_PREDEFINES \
-  "-Dunix -Dmc68000 -Dmc68020 -Dgnu_linux -Dlinux -Asystem=unix -Asystem=posix -Acpu=m68k -Amachine=m68k"
+  "-Dunix -Dmc68000 -Dmc68020 -D__gnu_linux__ -Dlinux -Asystem=unix -Asystem=posix -Acpu=m68k -Amachine=m68k"
 
 #undef CPP_SPEC
 #if TARGET_DEFAULT & MASK_68881

diff --git a/gcc/config/m68k/linux.h b/gcc/config/m68k/linux.h
index e5208e6..af7b928 100644 (file)
--- a/gcc/config/m68k/linux.h
+++ b/gcc/config/m68k/linux.h
@@ -113,7 +113,7 @@ Boston, MA 02111-1307, USA.  */
 #define WCHAR_TYPE_SIZE BITS_PER_WORD
 
 #define CPP_PREDEFINES \
-  "-D__ELF__ -Dunix -Dmc68000 -Dmc68020 -Dgnu_linux -Dlinux -Asystem=unix -Asystem=posix -Acpu=m68k -Amachine=m68k"
+  "-D__ELF__ -Dunix -Dmc68000 -Dmc68020 -D__gnu_linux__ -Dlinux -Asystem=unix -Asystem=posix -Acpu=m68k -Amachine=m68k"
 
 #undef CPP_SPEC
 #ifdef USE_GNULIBC_1

diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h
index 738e1f6..f1ff69e 100644 (file)
--- a/gcc/config/mips/linux.h
+++ b/gcc/config/mips/linux.h
@@ -134,11 +134,11 @@ void FN ()                                                        \
 #undef CPP_PREDEFINES
 #if TARGET_ENDIAN_DEFAULT == 0
 #define CPP_PREDEFINES "-DMIPSEL -D_MIPSEL -Dunix -Dmips -D_mips \
--DR3000 -D_R3000 -Dgnu_linux -Dlinux -Asystem=posix -Acpu=mips \
+-DR3000 -D_R3000 -D__gnu_linux__ -Dlinux -Asystem=posix -Acpu=mips \
 -Amachine=mips -D__ELF__ -D__PIC__ -D__pic__"
 #else
 #define CPP_PREDEFINES "-DMIPSEB -D_MIPSEB -Dunix -Dmips -D_mips \
--DR3000 -D_R3000 -Dgnu_linux -Dlinux -Asystem=posix -Acpu=mips \
+-DR3000 -D_R3000 -D__gnu_linux__ -Dlinux -Asystem=posix -Acpu=mips \
 -Amachine=mips -D__ELF__ -D__PIC__ -D__pic__"
 #endif
 

diff --git a/gcc/config/pa/pa-linux.h b/gcc/config/pa/pa-linux.h
index ffae14d..30d3d7c 100644 (file)
--- a/gcc/config/pa/pa-linux.h
+++ b/gcc/config/pa/pa-linux.h
@@ -58,7 +58,7 @@ Boston, MA 02111-1307, USA.  */
     } while (0)
 
 #undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-D__ELF__ -Dunix -D__hppa__ -Dgnu_linux -Dlinux -Asystem=unix -Asystem=posix -Acpu=hppa -Amachine=hppa -Amachine=bigendian"
+#define CPP_PREDEFINES "-D__ELF__ -Dunix -D__hppa__ -D__gnu_linux__ -Dlinux -Asystem=unix -Asystem=posix -Acpu=hppa -Amachine=hppa -Amachine=bigendian"
 
 #undef LIB_SPEC
 #define LIB_SPEC \

diff --git a/gcc/config/pj/linux.h b/gcc/config/pj/linux.h
index 1404a55..a073c7a 100644 (file)
--- a/gcc/config/pj/linux.h
+++ b/gcc/config/pj/linux.h
@@ -26,7 +26,7 @@ Boston, MA 02111-1307, USA.  */
 #undef STARTFILE_SPEC
 #undef ENDFILE_SPEC
 
-#define CPP_PREDEFINES "-D__ELF__ -Dunix -D__pj__ -Dgnu_linux -Dlinux -Asystem=posix"
+#define CPP_PREDEFINES "-D__ELF__ -Dunix -D__pj__ -D__gnu_linux__ -Dlinux -Asystem=posix"
 #define STARTFILE_SPEC "crt1.o%s crti.o%s crtbegin.o%s"
 #define ENDFILE_SPEC   "crtend.o%s crtn.o%s"
 

diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
index 6b97d77..95c7e8b 100644 (file)
--- a/gcc/config/rs6000/sysv4.h
+++ b/gcc/config/rs6000/sysv4.h
@@ -1256,7 +1256,7 @@ do {                                              \
   %{rdynamic:-export-dynamic} \
   %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}"
 
-#define CPP_OS_GNU_SPEC "-D__unix__ -Dgnu_hurd -D__GNU__       \
+#define CPP_OS_GNU_SPEC "-D__unix__ -D__gnu_hurd__ -D__GNU__   \
 %{!undef:                                                      \
   %{!ansi: -Dunix -D__unix}}                                   \
 -Asystem=gnu -Asystem=unix -Asystem=posix %{pthread:-D_REENTRANT}"

diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h
index 3659714..a0336bf 100644 (file)
--- a/gcc/config/s390/linux.h
+++ b/gcc/config/s390/linux.h
@@ -54,7 +54,7 @@ Boston, MA 02111-1307, USA.  */
 #define NO_BUILTIN_PTRDIFF_TYPE
 
 #define CPP_PREDEFINES \
-  "-Dunix -Asystem(unix) -Dgnu_linux -Dlinux -Asystem(linux) -D__ELF__ \
+  "-Dunix -Asystem(unix) -D__gnu_linux__ -Dlinux -Asystem(linux) -D__ELF__ \
    -Acpu(s390) -Amachine(s390) -D__s390__"
 
 #define CPP_ARCH31_SPEC \

diff --git a/gcc/config/sh/linux.h b/gcc/config/sh/linux.h
index a6f94b6..999c684 100644 (file)
--- a/gcc/config/sh/linux.h
+++ b/gcc/config/sh/linux.h
@@ -41,7 +41,7 @@ Boston, MA 02111-1307, USA.  */
 
 
 #undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-D__ELF__ -Dunix -D__sh__ -Dgnu_linux -Dlinux -Asystem=posix"
+#define CPP_PREDEFINES "-D__ELF__ -Dunix -D__sh__ -D__gnu_linux__ -Dlinux -Asystem=posix"
 
 #undef SUBTARGET_ASM_ENDIAN_SPEC
 #define SUBTARGET_ASM_ENDIAN_SPEC "%{!mb:-little}"

diff --git a/gcc/config/sparc/linux-aout.h b/gcc/config/sparc/linux-aout.h
index b5930d9..41d3877 100644 (file)
--- a/gcc/config/sparc/linux-aout.h
+++ b/gcc/config/sparc/linux-aout.h
@@ -60,7 +60,7 @@ Boston, MA 02111-1307, USA.  */
 #define WCHAR_TYPE_SIZE 32
 
 #undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dunix -Dsparc -Dgnu_linux -Dlinux -Asystem=unix -Asystem=posix"
+#define CPP_PREDEFINES "-Dunix -Dsparc -D__gnu_linux__ -Dlinux -Asystem=unix -Asystem=posix"
 
 #undef CPP_SUBTARGET_SPEC
 #define CPP_SUBTARGET_SPEC \

diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h
index 119fe34..69b7618 100644 (file)
--- a/gcc/config/sparc/linux.h
+++ b/gcc/config/sparc/linux.h
@@ -101,7 +101,7 @@ Boston, MA 02111-1307, USA.  */
 #define WCHAR_TYPE_SIZE 32
 
 #undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-D__ELF__ -Dunix -D__sparc__ -Dgnu_linux -Dlinux -Asystem=unix -Asystem=posix"
+#define CPP_PREDEFINES "-D__ELF__ -Dunix -D__sparc__ -D__gnu_linux__ -Dlinux -Asystem=unix -Asystem=posix"
 
 #undef CPP_SUBTARGET_SPEC
 #ifdef USE_GNULIBC_1

diff --git a/gcc/config/sparc/linux64.h b/gcc/config/sparc/linux64.h
index 13bd25c..796bc2c 100644 (file)
--- a/gcc/config/sparc/linux64.h
+++ b/gcc/config/sparc/linux64.h
@@ -169,7 +169,7 @@ ENDFILE_SPEC_COMMON
 #endif
 
 #undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-D__ELF__ -Dunix -D_LONGLONG -D__sparc__ -Dgnu_linux -Dlinux -Asystem=unix -Asystem=posix"
+#define CPP_PREDEFINES "-D__ELF__ -Dunix -D_LONGLONG -D__sparc__ -D__gnu_linux__ -Dlinux -Asystem=unix -Asystem=posix"
 
 #undef CPP_SUBTARGET_SPEC
 #define CPP_SUBTARGET_SPEC "\

diff --git a/gcc/config/xtensa/linux.h b/gcc/config/xtensa/linux.h
index afe35dd..9f63b70 100644 (file)
--- a/gcc/config/xtensa/linux.h
+++ b/gcc/config/xtensa/linux.h
@@ -52,7 +52,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #undef CPP_PREDEFINES
 #define CPP_PREDEFINES \
  "-D__XTENSA__ -D__ELF__ -Acpu=xtensa -Amachine=xtensa \
-  -Dunix -Dgnu_linux -Dlinux -Asystem=posix"
+  -Dunix -D__gnu_linux__ -Dlinux -Asystem=posix"
 
 #undef LOCAL_LABEL_PREFIX
 #define LOCAL_LABEL_PREFIX     "."