linux-elf.h (LINUX_DYNAMIC_LINKER): Rename to GNU_USER_DYNAMIC_LINKER.
authorJoseph Myers <joseph@codesourcery.com>
Mon, 11 Apr 2011 18:46:05 +0000 (19:46 +0100)
committerJoseph Myers <jsm28@gcc.gnu.org>
Mon, 11 Apr 2011 18:46:05 +0000 (19:46 +0100)
* config/alpha/linux-elf.h (LINUX_DYNAMIC_LINKER): Rename to
GNU_USER_DYNAMIC_LINKER.
* config/arm/linux-eabi.h (TARGET_OS_CPP_BUILTINS): Change
LINUX_TARGET_OS_CPP_BUILTINS to GNU_USER_TARGET_OS_CPP_BUILTINS.
* config/arm/linux-elf.h (LINUX_TARGET_LINK_SPEC): Change
LINUX_DYNAMIC_LINKER to GNU_USER_DYNAMIC_LINKER.
(TARGET_OS_CPP_BUILTINS): Change LINUX_TARGET_OS_CPP_BUILTINS to
GNU_USER_TARGET_OS_CPP_BUILTINS.
* config/bfin/linux.h (TARGET_OS_CPP_BUILTINS): Change
LINUX_TARGET_OS_CPP_BUILTINS to GNU_USER_TARGET_OS_CPP_BUILTINS.
* config/bfin/uclinux.h (TARGET_OS_CPP_BUILTINS): Change
LINUX_TARGET_OS_CPP_BUILTINS to GNU_USER_TARGET_OS_CPP_BUILTINS.
* config/cris/linux.h (CRIS_LINK_SUBTARGET_SPEC): Change
LINUX_DYNAMIC_LINKER to GNU_USER_DYNAMIC_LINKER.
(TARGET_OS_CPP_BUILTINS): Change LINUX_TARGET_OS_CPP_BUILTINS to
GNU_USER_TARGET_OS_CPP_BUILTINS.
* config/frv/linux.h (LINK_SPEC): Change LINUX_DYNAMIC_LINKER to
GNU_USER_DYNAMIC_LINKER.
* config/gnu.h (LINUX_TARGET_OS_CPP_BUILTINS): Rename to
GNU_USER_TARGET_OS_CPP_BUILTINS.
* config/i386/gnu-user.h (TARGET_OS_CPP_BUILTINS): Change
LINUX_TARGET_OS_CPP_BUILTINS to GNU_USER_TARGET_OS_CPP_BUILTINS.
* config/i386/gnu-user64.h (TARGET_OS_CPP_BUILTINS): Change
LINUX_TARGET_OS_CPP_BUILTINS to GNU_USER_TARGET_OS_CPP_BUILTINS.
* config/i386/linux.h (GNU_USER_DYNAMIC_LINKER): Remove.
* config/i386/linux64.h (GNU_USER_DYNAMIC_LINKER32,
GNU_USER_DYNAMIC_LINKER64): Remove.
* config/ia64/linux.h (TARGET_OS_CPP_BUILTINS): Change
LINUX_TARGET_OS_CPP_BUILTINS to GNU_USER_TARGET_OS_CPP_BUILTINS.
(LINK_SPEC): Change LINUX_DYNAMIC_LINKER to
GNU_USER_DYNAMIC_LINKER.
* config/kfreebsd-gnu.h (LINUX_TARGET_OS_CPP_BUILTINS): Rename to
GNU_USER_TARGET_OS_CPP_BUILTINS.
* config/knetbsd-gnu.h (LINUX_TARGET_OS_CPP_BUILTINS): Rename to
GNU_USER_TARGET_OS_CPP_BUILTINS.
* config/kopensolaris-gnu.h (LINUX_TARGET_OS_CPP_BUILTINS): Rename
to GNU_USER_TARGET_OS_CPP_BUILTINS.
* config/linux.h (LINUX_TARGET_OS_CPP_BUILTINS): Rename to
GNU_USER_TARGET_OS_CPP_BUILTINS.
(LINUX_DYNAMIC_LINKER): Rename to GNU_USER_DYNAMIC_LINKER.
(LINUX_DYNAMIC_LINKER32): Rename to GNU_USER_DYNAMIC_LINKER32.
(LINUX_DYNAMIC_LINKER64): Rename to GNU_USER_DYNAMIC_LINKER64.
* config/lm32/uclinux-elf.h (TARGET_OS_CPP_BUILTINS): Change
LINUX_TARGET_OS_CPP_BUILTINS to GNU_USER_TARGET_OS_CPP_BUILTINS.
* config/m32r/linux.h (LINK_SPEC): Change LINUX_DYNAMIC_LINKER to
GNU_USER_DYNAMIC_LINKER.
(TARGET_OS_CPP_BUILTINS): Change LINUX_TARGET_OS_CPP_BUILTINS to
GNU_USER_TARGET_OS_CPP_BUILTINS.
* config/m68k/linux.h (TARGET_OS_CPP_BUILTINS): Change
LINUX_TARGET_OS_CPP_BUILTINS to GNU_USER_TARGET_OS_CPP_BUILTINS.
(LINK_SPEC): Change LINUX_DYNAMIC_LINKER to
GNU_USER_DYNAMIC_LINKER.
* config/m68k/uclinux.h (TARGET_OS_CPP_BUILTINS): Change
LINUX_TARGET_OS_CPP_BUILTINS to GNU_USER_TARGET_OS_CPP_BUILTINS.
* config/mips/linux.h (TARGET_OS_CPP_BUILTINS): Change
LINUX_TARGET_OS_CPP_BUILTINS to GNU_USER_TARGET_OS_CPP_BUILTINS.
(LINK_SPEC): Change LINUX_DYNAMIC_LINKER to
GNU_USER_DYNAMIC_LINKER.
* config/mips/linux64.h (LINUX_DYNAMIC_LINKERN32): Rename to
GNU_USER_DYNAMIC_LINKERN32.
(LINK_SPEC): Change LINUX_DYNAMIC_LINKERN32 to
GNU_USER_DYNAMIC_LINKERN32.  Change LINUX_DYNAMIC_LINKER64 to
GNU_USER_DYNAMIC_LINKER64.  Change LINUX_DYNAMIC_LINKER32 to
GNU_USER_DYNAMIC_LINKER32.
* config/mn10300/linux.h (TARGET_OS_CPP_BUILTINS): Change
LINUX_TARGET_OS_CPP_BUILTINS to GNU_USER_TARGET_OS_CPP_BUILTINS.
(LINK_SPEC): Change LINUX_DYNAMIC_LINKER to
GNU_USER_DYNAMIC_LINKER.
* config/moxie/uclinux.h (TARGET_OS_CPP_BUILTINS): Change
LINUX_TARGET_OS_CPP_BUILTINS to GNU_USER_TARGET_OS_CPP_BUILTINS.
* config/pa/pa-linux.h (TARGET_OS_CPP_BUILTINS): Change
LINUX_TARGET_OS_CPP_BUILTINS to GNU_USER_TARGET_OS_CPP_BUILTINS.
(LINK_SPEC): Change LINUX_DYNAMIC_LINKER to
GNU_USER_DYNAMIC_LINKER.
* config/rs6000/linux64.h (LINUX_DYNAMIC_LINKER32): Rename to
GNU_USER_DYNAMIC_LINKER32.
(LINUX_DYNAMIC_LINKER64): Rename to GNU_USER_DYNAMIC_LINKER64.
* config/rs6000/sysv4.h (LINUX_DYNAMIC_LINKER): Rename to
GNU_USER_DYNAMIC_LINKER.
* config/s390/linux.h (TARGET_OS_CPP_BUILTINS): Change
LINUX_TARGET_OS_CPP_BUILTINS to GNU_USER_TARGET_OS_CPP_BUILTINS.
(LINK_SPEC): Change LINUX_DYNAMIC_LINKER32 to
GNU_USER_DYNAMIC_LINKER32.  Change LINUX_DYNAMIC_LINKER64 to
GNU_USER_DYNAMIC_LINKER64.
* config/sh/linux.h (TARGET_OS_CPP_BUILTINS): Change
LINUX_TARGET_OS_CPP_BUILTINS to GNU_USER_TARGET_OS_CPP_BUILTINS.
(SUBTARGET_LINK_SPEC): Change LINUX_DYNAMIC_LINKER to
GNU_USER_DYNAMIC_LINKER.
* config/sparc/linux.h (TARGET_OS_CPP_BUILTINS): Change
LINUX_TARGET_OS_CPP_BUILTINS to GNU_USER_TARGET_OS_CPP_BUILTINS.
(LINK_SPEC): Change LINUX_DYNAMIC_LINKER to
GNU_USER_DYNAMIC_LINKER.
* config/sparc/linux64.h (TARGET_OS_CPP_BUILTINS): Change
LINUX_TARGET_OS_CPP_BUILTINS to GNU_USER_TARGET_OS_CPP_BUILTINS.
(LINK_ARCH32_SPEC): Change LINUX_DYNAMIC_LINKER32 to
GNU_USER_DYNAMIC_LINKER32.
(LINK_ARCH64_SPEC): Change LINUX_DYNAMIC_LINKER64 to
GNU_USER_DYNAMIC_LINKER64.
(LINK_SPEC): Change LINUX_DYNAMIC_LINKER64 to
GNU_USER_DYNAMIC_LINKER64.
* config/vax/linux.h (TARGET_OS_CPP_BUILTINS): Change
LINUX_TARGET_OS_CPP_BUILTINS to GNU_USER_TARGET_OS_CPP_BUILTINS.
* config/xtensa/linux.h (TARGET_OS_CPP_BUILTINS): Change
LINUX_TARGET_OS_CPP_BUILTINS to GNU_USER_TARGET_OS_CPP_BUILTINS.
(LINK_SPEC): Change LINUX_DYNAMIC_LINKER to
GNU_USER_DYNAMIC_LINKER.

From-SVN: r172273

35 files changed:
gcc/ChangeLog
gcc/config/alpha/linux-elf.h
gcc/config/arm/linux-eabi.h
gcc/config/arm/linux-elf.h
gcc/config/bfin/linux.h
gcc/config/bfin/uclinux.h
gcc/config/cris/linux.h
gcc/config/frv/linux.h
gcc/config/gnu.h
gcc/config/i386/gnu-user.h
gcc/config/i386/gnu-user64.h
gcc/config/i386/linux.h
gcc/config/i386/linux64.h
gcc/config/ia64/linux.h
gcc/config/kfreebsd-gnu.h
gcc/config/knetbsd-gnu.h
gcc/config/kopensolaris-gnu.h
gcc/config/linux.h
gcc/config/lm32/uclinux-elf.h
gcc/config/m32r/linux.h
gcc/config/m68k/linux.h
gcc/config/m68k/uclinux.h
gcc/config/mips/linux.h
gcc/config/mips/linux64.h
gcc/config/mn10300/linux.h
gcc/config/moxie/uclinux.h
gcc/config/pa/pa-linux.h
gcc/config/rs6000/linux64.h
gcc/config/rs6000/sysv4.h
gcc/config/s390/linux.h
gcc/config/sh/linux.h
gcc/config/sparc/linux.h
gcc/config/sparc/linux64.h
gcc/config/vax/linux.h
gcc/config/xtensa/linux.h

index 70dfcf8..dc17ddd 100644 (file)
@@ -1,5 +1,114 @@
 2011-04-11  Joseph Myers  <joseph@codesourcery.com>
 
+       * config/alpha/linux-elf.h (LINUX_DYNAMIC_LINKER): Rename to
+       GNU_USER_DYNAMIC_LINKER.
+       * config/arm/linux-eabi.h (TARGET_OS_CPP_BUILTINS): Change
+       LINUX_TARGET_OS_CPP_BUILTINS to GNU_USER_TARGET_OS_CPP_BUILTINS.
+       * config/arm/linux-elf.h (LINUX_TARGET_LINK_SPEC): Change
+       LINUX_DYNAMIC_LINKER to GNU_USER_DYNAMIC_LINKER.
+       (TARGET_OS_CPP_BUILTINS): Change LINUX_TARGET_OS_CPP_BUILTINS to
+       GNU_USER_TARGET_OS_CPP_BUILTINS.
+       * config/bfin/linux.h (TARGET_OS_CPP_BUILTINS): Change
+       LINUX_TARGET_OS_CPP_BUILTINS to GNU_USER_TARGET_OS_CPP_BUILTINS.
+       * config/bfin/uclinux.h (TARGET_OS_CPP_BUILTINS): Change
+       LINUX_TARGET_OS_CPP_BUILTINS to GNU_USER_TARGET_OS_CPP_BUILTINS.
+       * config/cris/linux.h (CRIS_LINK_SUBTARGET_SPEC): Change
+       LINUX_DYNAMIC_LINKER to GNU_USER_DYNAMIC_LINKER.
+       (TARGET_OS_CPP_BUILTINS): Change LINUX_TARGET_OS_CPP_BUILTINS to
+       GNU_USER_TARGET_OS_CPP_BUILTINS.
+       * config/frv/linux.h (LINK_SPEC): Change LINUX_DYNAMIC_LINKER to
+       GNU_USER_DYNAMIC_LINKER.
+       * config/gnu.h (LINUX_TARGET_OS_CPP_BUILTINS): Rename to
+       GNU_USER_TARGET_OS_CPP_BUILTINS.
+       * config/i386/gnu-user.h (TARGET_OS_CPP_BUILTINS): Change
+       LINUX_TARGET_OS_CPP_BUILTINS to GNU_USER_TARGET_OS_CPP_BUILTINS.
+       * config/i386/gnu-user64.h (TARGET_OS_CPP_BUILTINS): Change
+       LINUX_TARGET_OS_CPP_BUILTINS to GNU_USER_TARGET_OS_CPP_BUILTINS.
+       * config/i386/linux.h (GNU_USER_DYNAMIC_LINKER): Remove.
+       * config/i386/linux64.h (GNU_USER_DYNAMIC_LINKER32,
+       GNU_USER_DYNAMIC_LINKER64): Remove.
+       * config/ia64/linux.h (TARGET_OS_CPP_BUILTINS): Change
+       LINUX_TARGET_OS_CPP_BUILTINS to GNU_USER_TARGET_OS_CPP_BUILTINS.
+       (LINK_SPEC): Change LINUX_DYNAMIC_LINKER to
+       GNU_USER_DYNAMIC_LINKER.
+       * config/kfreebsd-gnu.h (LINUX_TARGET_OS_CPP_BUILTINS): Rename to
+       GNU_USER_TARGET_OS_CPP_BUILTINS.
+       * config/knetbsd-gnu.h (LINUX_TARGET_OS_CPP_BUILTINS): Rename to
+       GNU_USER_TARGET_OS_CPP_BUILTINS.
+       * config/kopensolaris-gnu.h (LINUX_TARGET_OS_CPP_BUILTINS): Rename
+       to GNU_USER_TARGET_OS_CPP_BUILTINS.
+       * config/linux.h (LINUX_TARGET_OS_CPP_BUILTINS): Rename to
+       GNU_USER_TARGET_OS_CPP_BUILTINS.
+       (LINUX_DYNAMIC_LINKER): Rename to GNU_USER_DYNAMIC_LINKER.
+       (LINUX_DYNAMIC_LINKER32): Rename to GNU_USER_DYNAMIC_LINKER32.
+       (LINUX_DYNAMIC_LINKER64): Rename to GNU_USER_DYNAMIC_LINKER64.
+       * config/lm32/uclinux-elf.h (TARGET_OS_CPP_BUILTINS): Change
+       LINUX_TARGET_OS_CPP_BUILTINS to GNU_USER_TARGET_OS_CPP_BUILTINS.
+       * config/m32r/linux.h (LINK_SPEC): Change LINUX_DYNAMIC_LINKER to
+       GNU_USER_DYNAMIC_LINKER.
+       (TARGET_OS_CPP_BUILTINS): Change LINUX_TARGET_OS_CPP_BUILTINS to
+       GNU_USER_TARGET_OS_CPP_BUILTINS.
+       * config/m68k/linux.h (TARGET_OS_CPP_BUILTINS): Change
+       LINUX_TARGET_OS_CPP_BUILTINS to GNU_USER_TARGET_OS_CPP_BUILTINS.
+       (LINK_SPEC): Change LINUX_DYNAMIC_LINKER to
+       GNU_USER_DYNAMIC_LINKER.
+       * config/m68k/uclinux.h (TARGET_OS_CPP_BUILTINS): Change
+       LINUX_TARGET_OS_CPP_BUILTINS to GNU_USER_TARGET_OS_CPP_BUILTINS.
+       * config/mips/linux.h (TARGET_OS_CPP_BUILTINS): Change
+       LINUX_TARGET_OS_CPP_BUILTINS to GNU_USER_TARGET_OS_CPP_BUILTINS.
+       (LINK_SPEC): Change LINUX_DYNAMIC_LINKER to
+       GNU_USER_DYNAMIC_LINKER.
+       * config/mips/linux64.h (LINUX_DYNAMIC_LINKERN32): Rename to
+       GNU_USER_DYNAMIC_LINKERN32.
+       (LINK_SPEC): Change LINUX_DYNAMIC_LINKERN32 to
+       GNU_USER_DYNAMIC_LINKERN32.  Change LINUX_DYNAMIC_LINKER64 to
+       GNU_USER_DYNAMIC_LINKER64.  Change LINUX_DYNAMIC_LINKER32 to
+       GNU_USER_DYNAMIC_LINKER32.
+       * config/mn10300/linux.h (TARGET_OS_CPP_BUILTINS): Change
+       LINUX_TARGET_OS_CPP_BUILTINS to GNU_USER_TARGET_OS_CPP_BUILTINS.
+       (LINK_SPEC): Change LINUX_DYNAMIC_LINKER to
+       GNU_USER_DYNAMIC_LINKER.
+       * config/moxie/uclinux.h (TARGET_OS_CPP_BUILTINS): Change
+       LINUX_TARGET_OS_CPP_BUILTINS to GNU_USER_TARGET_OS_CPP_BUILTINS.
+       * config/pa/pa-linux.h (TARGET_OS_CPP_BUILTINS): Change
+       LINUX_TARGET_OS_CPP_BUILTINS to GNU_USER_TARGET_OS_CPP_BUILTINS.
+       (LINK_SPEC): Change LINUX_DYNAMIC_LINKER to
+       GNU_USER_DYNAMIC_LINKER.
+       * config/rs6000/linux64.h (LINUX_DYNAMIC_LINKER32): Rename to
+       GNU_USER_DYNAMIC_LINKER32.
+       (LINUX_DYNAMIC_LINKER64): Rename to GNU_USER_DYNAMIC_LINKER64.
+       * config/rs6000/sysv4.h (LINUX_DYNAMIC_LINKER): Rename to
+       GNU_USER_DYNAMIC_LINKER.
+       * config/s390/linux.h (TARGET_OS_CPP_BUILTINS): Change
+       LINUX_TARGET_OS_CPP_BUILTINS to GNU_USER_TARGET_OS_CPP_BUILTINS.
+       (LINK_SPEC): Change LINUX_DYNAMIC_LINKER32 to
+       GNU_USER_DYNAMIC_LINKER32.  Change LINUX_DYNAMIC_LINKER64 to
+       GNU_USER_DYNAMIC_LINKER64.
+       * config/sh/linux.h (TARGET_OS_CPP_BUILTINS): Change
+       LINUX_TARGET_OS_CPP_BUILTINS to GNU_USER_TARGET_OS_CPP_BUILTINS.
+       (SUBTARGET_LINK_SPEC): Change LINUX_DYNAMIC_LINKER to
+       GNU_USER_DYNAMIC_LINKER.
+       * config/sparc/linux.h (TARGET_OS_CPP_BUILTINS): Change
+       LINUX_TARGET_OS_CPP_BUILTINS to GNU_USER_TARGET_OS_CPP_BUILTINS.
+       (LINK_SPEC): Change LINUX_DYNAMIC_LINKER to
+       GNU_USER_DYNAMIC_LINKER.
+       * config/sparc/linux64.h (TARGET_OS_CPP_BUILTINS): Change
+       LINUX_TARGET_OS_CPP_BUILTINS to GNU_USER_TARGET_OS_CPP_BUILTINS.
+       (LINK_ARCH32_SPEC): Change LINUX_DYNAMIC_LINKER32 to
+       GNU_USER_DYNAMIC_LINKER32.
+       (LINK_ARCH64_SPEC): Change LINUX_DYNAMIC_LINKER64 to
+       GNU_USER_DYNAMIC_LINKER64.
+       (LINK_SPEC): Change LINUX_DYNAMIC_LINKER64 to
+       GNU_USER_DYNAMIC_LINKER64.
+       * config/vax/linux.h (TARGET_OS_CPP_BUILTINS): Change
+       LINUX_TARGET_OS_CPP_BUILTINS to GNU_USER_TARGET_OS_CPP_BUILTINS.
+       * config/xtensa/linux.h (TARGET_OS_CPP_BUILTINS): Change
+       LINUX_TARGET_OS_CPP_BUILTINS to GNU_USER_TARGET_OS_CPP_BUILTINS.
+       (LINK_SPEC): Change LINUX_DYNAMIC_LINKER to
+       GNU_USER_DYNAMIC_LINKER.
+
+2011-04-11  Joseph Myers  <joseph@codesourcery.com>
+
        * config/i386/gnu-user.h: Copy from linux.h.  Update comments.
        (LINK_EMULATION, GLIBC_DYNAMIC_LINKER): Remove.
        (SUBTARGET_EXTRA_SPECS): Use GNU_USER_LINK_EMULATION and
index f4f5a40..f578ecb 100644 (file)
@@ -33,10 +33,10 @@ along with GCC; see the file COPYING3.  If not see
 #else
 #error "Unsupported DEFAULT_LIBC"
 #endif
-#define LINUX_DYNAMIC_LINKER \
+#define GNU_USER_DYNAMIC_LINKER \
   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
 
-#define ELF_DYNAMIC_LINKER     LINUX_DYNAMIC_LINKER
+#define ELF_DYNAMIC_LINKER     GNU_USER_DYNAMIC_LINKER
 
 #define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax}         \
   %{O*:-O3} %{!O*:-O1}                                         \
index 8330052..921af3d 100644 (file)
@@ -26,7 +26,7 @@
   do                                           \
     {                                          \
       TARGET_BPABI_CPP_BUILTINS();             \
-      LINUX_TARGET_OS_CPP_BUILTINS();          \
+      GNU_USER_TARGET_OS_CPP_BUILTINS();       \
       ANDROID_TARGET_OS_CPP_BUILTINS();                \
     }                                          \
   while (false)
index bfaf8c5..270e12b 100644 (file)
@@ -66,7 +66,7 @@
    %{shared:-shared} \
    %{symbolic:-Bsymbolic} \
    %{rdynamic:-export-dynamic} \
-   -dynamic-linker " LINUX_DYNAMIC_LINKER " \
+   -dynamic-linker " GNU_USER_DYNAMIC_LINKER " \
    -X \
    %{mbig-endian:-EB} %{mlittle-endian:-EL}" \
    SUBTARGET_EXTRA_LINK_SPEC
@@ -77,7 +77,7 @@
 #define TARGET_OS_CPP_BUILTINS()               \
   do                                           \
     {                                          \
-       LINUX_TARGET_OS_CPP_BUILTINS();         \
+       GNU_USER_TARGET_OS_CPP_BUILTINS();      \
     }                                          \
   while (0)
 
index a750745..cd15f48 100644 (file)
@@ -1,4 +1,4 @@
-/* Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+/* Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -26,7 +26,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
   "%{!mno-fdpic:-mfdpic} -micplb",
 
 #undef TARGET_OS_CPP_BUILTINS
-#define TARGET_OS_CPP_BUILTINS() LINUX_TARGET_OS_CPP_BUILTINS()
+#define TARGET_OS_CPP_BUILTINS() GNU_USER_TARGET_OS_CPP_BUILTINS()
 
 #undef STARTFILE_SPEC
 #define STARTFILE_SPEC \
index 6001b23..6428b06 100644 (file)
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
+/* Copyright (C) 2005, 2006, 2007, 2009, 2011 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -25,7 +25,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #define STARTFILE_SPEC \
   "%{!shared: crt1%O%s} crti%O%s crtbegin%O%s crtlibid%O%s"
 
-#define TARGET_OS_CPP_BUILTINS() LINUX_TARGET_OS_CPP_BUILTINS()
+#define TARGET_OS_CPP_BUILTINS() GNU_USER_TARGET_OS_CPP_BUILTINS()
 
 #define MD_UNWIND_SUPPORT "config/bfin/linux-unwind.h"
 
index bf2f5f9..df10721 100644 (file)
@@ -112,7 +112,7 @@ along with GCC; see the file COPYING3.  If not see
   %{symbolic:-Bdynamic} %{static:-Bstatic}\
   %{!shared:%{!static:\
               %{rdynamic:-export-dynamic}\
-              -dynamic-linker " LINUX_DYNAMIC_LINKER "}}\
+              -dynamic-linker " GNU_USER_DYNAMIC_LINKER "}}\
   %{!r:%{O2|O3: --gc-sections}}"
 
 
@@ -123,7 +123,7 @@ along with GCC; see the file COPYING3.  If not see
 #define TARGET_OS_CPP_BUILTINS()               \
   do                                           \
     {                                          \
-      LINUX_TARGET_OS_CPP_BUILTINS();          \
+      GNU_USER_TARGET_OS_CPP_BUILTINS();       \
       if (flag_leading_underscore <= 0)                \
        builtin_define ("__NO_UNDERSCORES__");  \
     }                                          \
index 4f11618..9847712 100644 (file)
@@ -1,5 +1,5 @@
 /* Target macros for the FRV Linux port of GCC.
-   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2010
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2010, 2011
    Free Software Foundation, Inc.
    Contributed by Red Hat Inc.
 
@@ -42,7 +42,7 @@
   %{mfdpic: -m elf32frvfd -z text} %{shared} %{pie} \
   %{!shared: %{!static: \
    %{rdynamic:-export-dynamic} \
-   -dynamic-linker " LINUX_DYNAMIC_LINKER "} \
+   -dynamic-linker " GNU_USER_DYNAMIC_LINKER "} \
    %{static}}"
 
 /* Support for compile-time default CPU.  */
index fcf6ebc..8b1d079 100644 (file)
@@ -32,8 +32,8 @@ along with GCC.  If not, see <http://www.gnu.org/licenses/>.
 #undef STANDARD_INCLUDE_DIR
 #define STANDARD_INCLUDE_DIR "/include"
 
-#undef LINUX_TARGET_OS_CPP_BUILTINS
-#define LINUX_TARGET_OS_CPP_BUILTINS()         \
+#undef GNU_USER_TARGET_OS_CPP_BUILTINS
+#define GNU_USER_TARGET_OS_CPP_BUILTINS()              \
     do {                                       \
        builtin_define ("__gnu_hurd__");        \
        builtin_define ("__GNU__");             \
index 76a18ac..b6e152e 100644 (file)
@@ -70,7 +70,7 @@ along with GCC; see the file COPYING3.  If not see
 #define TARGET_OS_CPP_BUILTINS()               \
   do                                           \
     {                                          \
-       LINUX_TARGET_OS_CPP_BUILTINS();         \
+       GNU_USER_TARGET_OS_CPP_BUILTINS();      \
     }                                          \
   while (0)
 
index 6148182..8850b81 100644 (file)
@@ -27,7 +27,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #define TARGET_OS_CPP_BUILTINS()                               \
   do                                                           \
     {                                                          \
-       LINUX_TARGET_OS_CPP_BUILTINS();                         \
+       GNU_USER_TARGET_OS_CPP_BUILTINS();                      \
     }                                                          \
   while (0)
 
index 40a35ac..292071f 100644 (file)
@@ -23,8 +23,6 @@ along with GCC; see the file COPYING3.  If not see
 #define GNU_USER_LINK_EMULATION "elf_i386"
 #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
 
-#define GNU_USER_DYNAMIC_LINKER LINUX_DYNAMIC_LINKER
-
 #define MD_UNWIND_SUPPORT "config/i386/linux-unwind.h"
 
 #define REG_NAME(reg) reg
index 467ddbe..089ada7 100644 (file)
@@ -27,9 +27,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
 #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
 
-#define GNU_USER_DYNAMIC_LINKER32 LINUX_DYNAMIC_LINKER32
-#define GNU_USER_DYNAMIC_LINKER64 LINUX_DYNAMIC_LINKER64
-
 #define MD_UNWIND_SUPPORT "config/i386/linux-unwind.h"
 
 #define REG_NAME(reg) reg
index d88c820..2d75376 100644 (file)
@@ -31,7 +31,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 /* Target OS builtins.  */
 #define TARGET_OS_CPP_BUILTINS()               \
 do {                                           \
-       LINUX_TARGET_OS_CPP_BUILTINS();         \
+       GNU_USER_TARGET_OS_CPP_BUILTINS();      \
        builtin_define("_LONGLONG");            \
 } while (0)
 
@@ -64,7 +64,7 @@ do {                                          \
   %{!shared: \
     %{!static: \
       %{rdynamic:-export-dynamic} \
-      -dynamic-linker " LINUX_DYNAMIC_LINKER "} \
+      -dynamic-linker " GNU_USER_DYNAMIC_LINKER "} \
       %{static:-static}}"
 
 #define CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}"
index 48da6a0..4cc1dc2 100644 (file)
@@ -19,8 +19,8 @@ You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  */
 
-#undef LINUX_TARGET_OS_CPP_BUILTINS    
-#define LINUX_TARGET_OS_CPP_BUILTINS()         \
+#undef GNU_USER_TARGET_OS_CPP_BUILTINS    
+#define GNU_USER_TARGET_OS_CPP_BUILTINS()              \
   do                                           \
     {                                          \
        builtin_define ("__FreeBSD_kernel__");  \
index dfb09e9..30fa99a 100644 (file)
@@ -19,8 +19,8 @@ You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  */
 
-#undef LINUX_TARGET_OS_CPP_BUILTINS    
-#define LINUX_TARGET_OS_CPP_BUILTINS()         \
+#undef GNU_USER_TARGET_OS_CPP_BUILTINS    
+#define GNU_USER_TARGET_OS_CPP_BUILTINS()              \
   do                                           \
     {                                          \
        builtin_define ("__NetBSD_kernel__");   \
index 99da2c1..ba6bdc5 100644 (file)
@@ -19,8 +19,8 @@ You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  */
 
-#undef LINUX_TARGET_OS_CPP_BUILTINS    
-#define LINUX_TARGET_OS_CPP_BUILTINS()         \
+#undef GNU_USER_TARGET_OS_CPP_BUILTINS    
+#define GNU_USER_TARGET_OS_CPP_BUILTINS()              \
   do                                           \
     {                                          \
        builtin_define ("__OpenSolaris_kernel__");      \
index 00b4f1c..8eaa74e 100644 (file)
@@ -39,7 +39,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #define OPTION_BIONIC (linux_libc == LIBC_BIONIC)
 #endif
 
-#define LINUX_TARGET_OS_CPP_BUILTINS()                         \
+#define GNU_USER_TARGET_OS_CPP_BUILTINS()                      \
     do {                                                       \
        if (OPTION_GLIBC)                                       \
          builtin_define ("__gnu_linux__");                     \
@@ -81,13 +81,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker"
 #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64"
 
-#define LINUX_DYNAMIC_LINKER                                           \
+#define GNU_USER_DYNAMIC_LINKER                                                \
   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER,  \
                         BIONIC_DYNAMIC_LINKER)
-#define LINUX_DYNAMIC_LINKER32                                         \
+#define GNU_USER_DYNAMIC_LINKER32                                      \
   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \
                         BIONIC_DYNAMIC_LINKER32)
-#define LINUX_DYNAMIC_LINKER64                                         \
+#define GNU_USER_DYNAMIC_LINKER64                                      \
   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \
                         BIONIC_DYNAMIC_LINKER64)
 
index bd4701d..2b22214 100644 (file)
@@ -70,7 +70,7 @@
    %{rdynamic:-export-dynamic} \
    -dynamic-linker /lib/ld-linux.so.2"
 
-#define TARGET_OS_CPP_BUILTINS() LINUX_TARGET_OS_CPP_BUILTINS()
+#define TARGET_OS_CPP_BUILTINS() GNU_USER_TARGET_OS_CPP_BUILTINS()
 
 #define LINK_GCC_C_SEQUENCE_SPEC \
   "%{static:--start-group} %G %L %{static:--end-group}%{!static:%G}"
index e561e54..bc7802b 100644 (file)
   %{!shared: \
     %{!static: \
       %{rdynamic:-export-dynamic} \
-      -dynamic-linker " LINUX_DYNAMIC_LINKER "} \
+      -dynamic-linker " GNU_USER_DYNAMIC_LINKER "} \
       %{static:-static}}"
 #else
 #define LINK_SPEC "%(link_cpu) -m m32relf_linux %{shared:-shared} \
   %{!shared: \
     %{!static: \
       %{rdynamic:-export-dynamic} \
-      -dynamic-linker " LINUX_DYNAMIC_LINKER "} \
+      -dynamic-linker " GNU_USER_DYNAMIC_LINKER "} \
       %{static:-static}}"
 #endif
 
@@ -87,6 +87,6 @@
    %{pthread:-D_REENTRANT -D_PTHREADS} \
 "
                                                                                 
-#define TARGET_OS_CPP_BUILTINS() LINUX_TARGET_OS_CPP_BUILTINS()
+#define TARGET_OS_CPP_BUILTINS() GNU_USER_TARGET_OS_CPP_BUILTINS()
 
 #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
index 952bcce..6c07e26 100644 (file)
@@ -59,7 +59,7 @@ along with GCC; see the file COPYING3.  If not see
 #define ASM_COMMENT_START "|"
 
 /* Target OS builtins.  */
-#define TARGET_OS_CPP_BUILTINS() LINUX_TARGET_OS_CPP_BUILTINS()
+#define TARGET_OS_CPP_BUILTINS() GNU_USER_TARGET_OS_CPP_BUILTINS()
 
 #undef CPP_SPEC
 #define CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}"
@@ -79,7 +79,7 @@ along with GCC; see the file COPYING3.  If not see
   %{!shared: \
     %{!static: \
       %{rdynamic:-export-dynamic} \
-      -dynamic-linker " LINUX_DYNAMIC_LINKER "} \
+      -dynamic-linker " GNU_USER_DYNAMIC_LINKER "} \
     %{static}}"
 
 /* For compatibility with linux/a.out */
index 547cd20..cccfb00 100644 (file)
@@ -45,7 +45,7 @@ along with GCC; see the file COPYING3.  If not see
 #define TARGET_OS_CPP_BUILTINS()                               \
   do                                                           \
     {                                                          \
-      LINUX_TARGET_OS_CPP_BUILTINS ();                         \
+      GNU_USER_TARGET_OS_CPP_BUILTINS ();                      \
       builtin_define ("__uClinux__");                          \
       if (TARGET_ID_SHARED_LIBRARY)                            \
        {                                                       \
index 43fbf92..9c33590 100644 (file)
@@ -33,7 +33,7 @@ along with GCC; see the file COPYING3.  If not see
 
 #define TARGET_OS_CPP_BUILTINS()                               \
   do {                                                         \
-    LINUX_TARGET_OS_CPP_BUILTINS();                            \
+    GNU_USER_TARGET_OS_CPP_BUILTINS();                         \
     /* The GNU C++ standard library requires this.  */         \
     if (c_dialect_cxx ())                                      \
       builtin_define ("_GNU_SOURCE");                          \
@@ -64,7 +64,7 @@ along with GCC; see the file COPYING3.  If not see
   %{!shared: \
     %{!static: \
       %{rdynamic:-export-dynamic} \
-      -dynamic-linker " LINUX_DYNAMIC_LINKER "} \
+      -dynamic-linker " GNU_USER_DYNAMIC_LINKER "} \
       %{static:-static}}"
 
 #undef SUBTARGET_ASM_SPEC
index 987a991..cde17c5 100644 (file)
@@ -40,7 +40,7 @@ along with GCC; see the file COPYING3.  If not see
 #define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
 #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
 #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
-#define LINUX_DYNAMIC_LINKERN32 \
+#define GNU_USER_DYNAMIC_LINKERN32 \
   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
                         BIONIC_DYNAMIC_LINKERN32)
 
@@ -52,9 +52,9 @@ along with GCC; see the file COPYING3.  If not see
   %{!shared: \
     %{!static: \
       %{rdynamic:-export-dynamic} \
-      %{mabi=n32: -dynamic-linker " LINUX_DYNAMIC_LINKERN32 "} \
-      %{mabi=64: -dynamic-linker " LINUX_DYNAMIC_LINKER64 "} \
-      %{mabi=32: -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}} \
+      %{mabi=n32: -dynamic-linker " GNU_USER_DYNAMIC_LINKERN32 "} \
+      %{mabi=64: -dynamic-linker " GNU_USER_DYNAMIC_LINKER64 "} \
+      %{mabi=32: -dynamic-linker " GNU_USER_DYNAMIC_LINKER32 "}} \
     %{static:-static}} \
 %{mabi=n32:-melf32%{EB:b}%{EL:l}tsmipn32} \
 %{mabi=64:-melf64%{EB:b}%{EL:l}tsmip} \
index 3a3593d..d63b95a 100644 (file)
@@ -23,7 +23,7 @@
 #undef  PREFERRED_DEBUGGING_TYPE
 #define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
 
-#define TARGET_OS_CPP_BUILTINS() LINUX_TARGET_OS_CPP_BUILTINS()
+#define TARGET_OS_CPP_BUILTINS() GNU_USER_TARGET_OS_CPP_BUILTINS()
 
 #undef  CPP_SPEC
 #define CPP_SPEC "%{mam33:-D__AM33__} %{!mam33:-D__AM33__=2 -D__AM33_2__} \
@@ -39,7 +39,7 @@
 #define LINK_SPEC "%{mrelax:--relax} %{shared:-shared} \
    %{!static: \
      %{rdynamic:-export-dynamic} \
-     -dynamic-linker " LINUX_DYNAMIC_LINKER "} \
+     -dynamic-linker " GNU_USER_DYNAMIC_LINKER "} \
    %{static:-static}"
 
 #undef  PROCESSOR_DEFAULT
index 0e5ee3d..45ba382 100644 (file)
@@ -1,4 +1,4 @@
-/* Copyright (C) 2009 Free Software Foundation, Inc.
+/* Copyright (C) 2009, 2011 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -28,7 +28,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #undef LINK_SPEC
 #define LINK_SPEC "-elf2flt"
 
-#define TARGET_OS_CPP_BUILTINS() LINUX_TARGET_OS_CPP_BUILTINS()
+#define TARGET_OS_CPP_BUILTINS() GNU_USER_TARGET_OS_CPP_BUILTINS()
 
 /* Like the definition in gcc.c, but for purposes of uClinux, every link is
    static.  */
index 64626e6..02a43eb 100644 (file)
@@ -24,7 +24,7 @@ along with GCC; see the file COPYING3.  If not see
 #define TARGET_OS_CPP_BUILTINS()               \
   do                                           \
     {                                          \
-       LINUX_TARGET_OS_CPP_BUILTINS();         \
+       GNU_USER_TARGET_OS_CPP_BUILTINS();      \
        builtin_assert ("machine=bigendian");   \
     }                                          \
   while (0)
@@ -47,7 +47,7 @@ along with GCC; see the file COPYING3.  If not see
   %{!shared: \
     %{!static: \
       %{rdynamic:-export-dynamic} \
-      -dynamic-linker " LINUX_DYNAMIC_LINKER "} \
+      -dynamic-linker " GNU_USER_DYNAMIC_LINKER "} \
       %{static:-static}}"
 
 /* glibc's profiling functions don't need gcc to allocate counters.  */
index 8d9c8fb..f5a5634 100644 (file)
@@ -378,19 +378,19 @@ extern int dot_symbols;
 #else
 #error "Unsupported DEFAULT_LIBC"
 #endif
-#define LINUX_DYNAMIC_LINKER32 \
+#define GNU_USER_DYNAMIC_LINKER32 \
   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32)
-#define LINUX_DYNAMIC_LINKER64 \
+#define GNU_USER_DYNAMIC_LINKER64 \
   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
 
 
 #define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
   %{rdynamic:-export-dynamic} \
-  -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}"
+  -dynamic-linker " GNU_USER_DYNAMIC_LINKER32 "}}"
 
 #define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \
   %{rdynamic:-export-dynamic} \
-  -dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}"
+  -dynamic-linker " GNU_USER_DYNAMIC_LINKER64 "}}"
 
 #undef  TOC_SECTION_ASM_OP
 #define TOC_SECTION_ASM_OP \
index 7d374c3..1978629 100644 (file)
@@ -812,12 +812,12 @@ extern int fixuplabelno;
 #else
 #error "Unsupported DEFAULT_LIBC"
 #endif
-#define LINUX_DYNAMIC_LINKER \
+#define GNU_USER_DYNAMIC_LINKER \
   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
 
 #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
   %{rdynamic:-export-dynamic} \
-  -dynamic-linker " LINUX_DYNAMIC_LINKER "}}"
+  -dynamic-linker " GNU_USER_DYNAMIC_LINKER "}}"
 
 #if defined(HAVE_LD_EH_FRAME_HDR)
 # define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
index ab5e536..7bd90d9 100644 (file)
@@ -42,7 +42,7 @@ along with GCC; see the file COPYING3.  If not see
 #define TARGET_OS_CPP_BUILTINS()               \
   do                                           \
     {                                          \
-      LINUX_TARGET_OS_CPP_BUILTINS();          \
+      GNU_USER_TARGET_OS_CPP_BUILTINS();       \
     }                                          \
   while (0)
 
@@ -72,8 +72,8 @@ along with GCC; see the file COPYING3.  If not see
       %{static:-static} \
       %{!static: \
        %{rdynamic:-export-dynamic} \
-       %{m31:-dynamic-linker " LINUX_DYNAMIC_LINKER32 "} \
-       %{m64:-dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}}"
+       %{m31:-dynamic-linker " GNU_USER_DYNAMIC_LINKER32 "} \
+       %{m64:-dynamic-linker " GNU_USER_DYNAMIC_LINKER64 "}}}"
 
 #define CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}"
 
index adadc0c..fc954fe 100644 (file)
@@ -34,7 +34,7 @@ along with GCC; see the file COPYING3.  If not see
 #define TARGET_OS_CPP_BUILTINS() \
   do                                           \
     {                                          \
-      LINUX_TARGET_OS_CPP_BUILTINS();          \
+      GNU_USER_TARGET_OS_CPP_BUILTINS();       \
     }                                          \
   while (0)
 
@@ -54,7 +54,7 @@ along with GCC; see the file COPYING3.  If not see
   "%{shared:-shared} \
    %{!static: \
      %{rdynamic:-export-dynamic} \
-     -dynamic-linker " LINUX_DYNAMIC_LINKER "} \
+     -dynamic-linker " GNU_USER_DYNAMIC_LINKER "} \
    %{static:-static}"
 
 /* Output assembler code to STREAM to call the profiler.  */
index e2dc8c5..81f0de8 100644 (file)
@@ -22,7 +22,7 @@ along with GCC; see the file COPYING3.  If not see
 #define TARGET_OS_CPP_BUILTINS()               \
   do                                           \
     {                                          \
-      LINUX_TARGET_OS_CPP_BUILTINS();          \
+      GNU_USER_TARGET_OS_CPP_BUILTINS();       \
       if (TARGET_LONG_DOUBLE_128)              \
        builtin_define ("__LONG_DOUBLE_128__"); \
     }                                          \
@@ -76,7 +76,7 @@ along with GCC; see the file COPYING3.  If not see
   %{!shared: \
     %{!static: \
       %{rdynamic:-export-dynamic} \
-      -dynamic-linker " LINUX_DYNAMIC_LINKER "} \
+      -dynamic-linker " GNU_USER_DYNAMIC_LINKER "} \
       %{static:-static}}"
 
 /* It's safe to pass -s always, even if -g is not used.  */
index 31ad3ec..5db05c1 100644 (file)
@@ -22,7 +22,7 @@ along with GCC; see the file COPYING3.  If not see
 #define TARGET_OS_CPP_BUILTINS()               \
   do                                           \
     {                                          \
-      LINUX_TARGET_OS_CPP_BUILTINS();          \
+      GNU_USER_TARGET_OS_CPP_BUILTINS();       \
       if (TARGET_ARCH64)                       \
         builtin_define ("_LONGLONG");          \
       if (TARGET_ARCH32                                \
@@ -114,7 +114,7 @@ along with GCC; see the file COPYING3.  If not see
   %{!shared: \
     %{!static: \
       %{rdynamic:-export-dynamic} \
-      -dynamic-linker " LINUX_DYNAMIC_LINKER32 "} \
+      -dynamic-linker " GNU_USER_DYNAMIC_LINKER32 "} \
       %{static:-static}} \
 "
 
@@ -122,7 +122,7 @@ along with GCC; see the file COPYING3.  If not see
   %{!shared: \
     %{!static: \
       %{rdynamic:-export-dynamic} \
-      -dynamic-linker " LINUX_DYNAMIC_LINKER64 "} \
+      -dynamic-linker " GNU_USER_DYNAMIC_LINKER64 "} \
       %{static:-static}} \
 "
 
@@ -194,7 +194,7 @@ along with GCC; see the file COPYING3.  If not see
   %{!shared: \
     %{!static: \
       %{rdynamic:-export-dynamic} \
-      -dynamic-linker " LINUX_DYNAMIC_LINKER64 "} \
+      -dynamic-linker " GNU_USER_DYNAMIC_LINKER64 "} \
     %{static:-static}} \
 %{mlittle-endian:-EL} \
 %{!mno-relax:%{!r:-relax}} \
index 2f09848..880067c 100644 (file)
@@ -18,7 +18,7 @@ along with GCC; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  */
 
 
-#define TARGET_OS_CPP_BUILTINS() LINUX_TARGET_OS_CPP_BUILTINS()
+#define TARGET_OS_CPP_BUILTINS() GNU_USER_TARGET_OS_CPP_BUILTINS()
 
 /* We use GAS, G-float double and want new DI patterns.  */
 #undef TARGET_DEFAULT
index 601b0a8..d058d16 100644 (file)
@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING3.  If not see
 <http://www.gnu.org/licenses/>.  */
 
-#define TARGET_OS_CPP_BUILTINS() LINUX_TARGET_OS_CPP_BUILTINS()
+#define TARGET_OS_CPP_BUILTINS() GNU_USER_TARGET_OS_CPP_BUILTINS()
 
 #undef SUBTARGET_CPP_SPEC
 #define SUBTARGET_CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}"
@@ -53,7 +53,7 @@ along with GCC; see the file COPYING3.  If not see
   %{!shared: \
     %{!static: \
       %{rdynamic:-export-dynamic} \
-      -dynamic-linker " LINUX_DYNAMIC_LINKER "} \
+      -dynamic-linker " GNU_USER_DYNAMIC_LINKER "} \
     %{static:-static}}"
 
 #undef LOCAL_LABEL_PREFIX