From 107fd1c1e967019a04400acba9efb1f41c470ee9 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Mon, 11 Apr 2011 19:46:05 +0100 Subject: [PATCH] linux-elf.h (LINUX_DYNAMIC_LINKER): Rename to GNU_USER_DYNAMIC_LINKER. * 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 --- gcc/ChangeLog | 109 ++++++++++++++++++++++++++++++++++ gcc/config/alpha/linux-elf.h | 4 +- gcc/config/arm/linux-eabi.h | 2 +- gcc/config/arm/linux-elf.h | 4 +- gcc/config/bfin/linux.h | 4 +- gcc/config/bfin/uclinux.h | 4 +- gcc/config/cris/linux.h | 4 +- gcc/config/frv/linux.h | 4 +- gcc/config/gnu.h | 4 +- gcc/config/i386/gnu-user.h | 2 +- gcc/config/i386/gnu-user64.h | 2 +- gcc/config/i386/linux.h | 2 - gcc/config/i386/linux64.h | 3 - gcc/config/ia64/linux.h | 4 +- gcc/config/kfreebsd-gnu.h | 4 +- gcc/config/knetbsd-gnu.h | 4 +- gcc/config/kopensolaris-gnu.h | 4 +- gcc/config/linux.h | 8 +-- gcc/config/lm32/uclinux-elf.h | 2 +- gcc/config/m32r/linux.h | 6 +- gcc/config/m68k/linux.h | 4 +- gcc/config/m68k/uclinux.h | 2 +- gcc/config/mips/linux.h | 4 +- gcc/config/mips/linux64.h | 8 +-- gcc/config/mn10300/linux.h | 4 +- gcc/config/moxie/uclinux.h | 4 +- gcc/config/pa/pa-linux.h | 4 +- gcc/config/rs6000/linux64.h | 8 +-- gcc/config/rs6000/sysv4.h | 4 +- gcc/config/s390/linux.h | 6 +- gcc/config/sh/linux.h | 4 +- gcc/config/sparc/linux.h | 4 +- gcc/config/sparc/linux64.h | 8 +-- gcc/config/vax/linux.h | 2 +- gcc/config/xtensa/linux.h | 4 +- 35 files changed, 177 insertions(+), 73 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 70dfcf8ba7c..dc17dddd52f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,112 @@ +2011-04-11 Joseph Myers + + * 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 * config/i386/gnu-user.h: Copy from linux.h. Update comments. diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h index f4f5a40b5cc..f578ecb31ad 100644 --- a/gcc/config/alpha/linux-elf.h +++ b/gcc/config/alpha/linux-elf.h @@ -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} \ diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h index 8330052844f..921af3d7f0c 100644 --- a/gcc/config/arm/linux-eabi.h +++ b/gcc/config/arm/linux-eabi.h @@ -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) diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h index bfaf8c59b6a..270e12bc55c 100644 --- a/gcc/config/arm/linux-elf.h +++ b/gcc/config/arm/linux-elf.h @@ -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) diff --git a/gcc/config/bfin/linux.h b/gcc/config/bfin/linux.h index a75074592c5..cd15f48ed72 100644 --- a/gcc/config/bfin/linux.h +++ b/gcc/config/bfin/linux.h @@ -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 \ diff --git a/gcc/config/bfin/uclinux.h b/gcc/config/bfin/uclinux.h index 6001b23645b..6428b063477 100644 --- a/gcc/config/bfin/uclinux.h +++ b/gcc/config/bfin/uclinux.h @@ -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" diff --git a/gcc/config/cris/linux.h b/gcc/config/cris/linux.h index bf2f5f9c954..df10721e812 100644 --- a/gcc/config/cris/linux.h +++ b/gcc/config/cris/linux.h @@ -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__"); \ } \ diff --git a/gcc/config/frv/linux.h b/gcc/config/frv/linux.h index 4f11618b402..98477125726 100644 --- a/gcc/config/frv/linux.h +++ b/gcc/config/frv/linux.h @@ -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. */ diff --git a/gcc/config/gnu.h b/gcc/config/gnu.h index fcf6ebcd7ce..8b1d079ee89 100644 --- a/gcc/config/gnu.h +++ b/gcc/config/gnu.h @@ -32,8 +32,8 @@ along with GCC. If not, see . #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__"); \ diff --git a/gcc/config/i386/gnu-user.h b/gcc/config/i386/gnu-user.h index 76a18acfe78..b6e152e935d 100644 --- a/gcc/config/i386/gnu-user.h +++ b/gcc/config/i386/gnu-user.h @@ -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) diff --git a/gcc/config/i386/gnu-user64.h b/gcc/config/i386/gnu-user64.h index 61481823faa..8850b813e40 100644 --- a/gcc/config/i386/gnu-user64.h +++ b/gcc/config/i386/gnu-user64.h @@ -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) diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h index 40a35ac835e..292071f209d 100644 --- a/gcc/config/i386/linux.h +++ b/gcc/config/i386/linux.h @@ -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 diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h index 467ddbe7f42..089ada75b9e 100644 --- a/gcc/config/i386/linux64.h +++ b/gcc/config/i386/linux64.h @@ -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 diff --git a/gcc/config/ia64/linux.h b/gcc/config/ia64/linux.h index d88c820b702..2d75376ed1f 100644 --- a/gcc/config/ia64/linux.h +++ b/gcc/config/ia64/linux.h @@ -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}" diff --git a/gcc/config/kfreebsd-gnu.h b/gcc/config/kfreebsd-gnu.h index 48da6a00793..4cc1dc290a8 100644 --- a/gcc/config/kfreebsd-gnu.h +++ b/gcc/config/kfreebsd-gnu.h @@ -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 . */ -#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__"); \ diff --git a/gcc/config/knetbsd-gnu.h b/gcc/config/knetbsd-gnu.h index dfb09e9bc15..30fa99a5ec1 100644 --- a/gcc/config/knetbsd-gnu.h +++ b/gcc/config/knetbsd-gnu.h @@ -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 . */ -#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__"); \ diff --git a/gcc/config/kopensolaris-gnu.h b/gcc/config/kopensolaris-gnu.h index 99da2c16645..ba6bdc5cd9a 100644 --- a/gcc/config/kopensolaris-gnu.h +++ b/gcc/config/kopensolaris-gnu.h @@ -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 . */ -#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__"); \ diff --git a/gcc/config/linux.h b/gcc/config/linux.h index 00b4f1c1cd5..8eaa74eb6b7 100644 --- a/gcc/config/linux.h +++ b/gcc/config/linux.h @@ -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) diff --git a/gcc/config/lm32/uclinux-elf.h b/gcc/config/lm32/uclinux-elf.h index bd4701d7ab1..2b22214c16f 100644 --- a/gcc/config/lm32/uclinux-elf.h +++ b/gcc/config/lm32/uclinux-elf.h @@ -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}" diff --git a/gcc/config/m32r/linux.h b/gcc/config/m32r/linux.h index e561e540fb1..bc7802b2d32 100644 --- a/gcc/config/m32r/linux.h +++ b/gcc/config/m32r/linux.h @@ -46,14 +46,14 @@ %{!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 diff --git a/gcc/config/m68k/linux.h b/gcc/config/m68k/linux.h index 952bcceb642..6c07e261a6c 100644 --- a/gcc/config/m68k/linux.h +++ b/gcc/config/m68k/linux.h @@ -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 */ diff --git a/gcc/config/m68k/uclinux.h b/gcc/config/m68k/uclinux.h index 547cd206d06..cccfb002f21 100644 --- a/gcc/config/m68k/uclinux.h +++ b/gcc/config/m68k/uclinux.h @@ -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) \ { \ diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h index 43fbf92d59b..9c33590df66 100644 --- a/gcc/config/mips/linux.h +++ b/gcc/config/mips/linux.h @@ -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 diff --git a/gcc/config/mips/linux64.h b/gcc/config/mips/linux64.h index 987a9915cf7..cde17c5dfb7 100644 --- a/gcc/config/mips/linux64.h +++ b/gcc/config/mips/linux64.h @@ -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} \ diff --git a/gcc/config/mn10300/linux.h b/gcc/config/mn10300/linux.h index 3a3593d52f0..d63b95ad1eb 100644 --- a/gcc/config/mn10300/linux.h +++ b/gcc/config/mn10300/linux.h @@ -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 diff --git a/gcc/config/moxie/uclinux.h b/gcc/config/moxie/uclinux.h index 0e5ee3d6b6b..45ba382da4c 100644 --- a/gcc/config/moxie/uclinux.h +++ b/gcc/config/moxie/uclinux.h @@ -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. */ diff --git a/gcc/config/pa/pa-linux.h b/gcc/config/pa/pa-linux.h index 64626e6fc41..02a43eb316a 100644 --- a/gcc/config/pa/pa-linux.h +++ b/gcc/config/pa/pa-linux.h @@ -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. */ diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h index 8d9c8fb7380..f5a5634b563 100644 --- a/gcc/config/rs6000/linux64.h +++ b/gcc/config/rs6000/linux64.h @@ -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 \ diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h index 7d374c3395a..1978629e55c 100644 --- a/gcc/config/rs6000/sysv4.h +++ b/gcc/config/rs6000/sysv4.h @@ -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} " diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h index ab5e5363c75..7bd90d9d3ac 100644 --- a/gcc/config/s390/linux.h +++ b/gcc/config/s390/linux.h @@ -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}" diff --git a/gcc/config/sh/linux.h b/gcc/config/sh/linux.h index adadc0c8687..fc954fe9863 100644 --- a/gcc/config/sh/linux.h +++ b/gcc/config/sh/linux.h @@ -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. */ diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h index e2dc8c53645..81f0de89e02 100644 --- a/gcc/config/sparc/linux.h +++ b/gcc/config/sparc/linux.h @@ -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. */ diff --git a/gcc/config/sparc/linux64.h b/gcc/config/sparc/linux64.h index 31ad3ecfa6c..5db05c1a4a8 100644 --- a/gcc/config/sparc/linux64.h +++ b/gcc/config/sparc/linux64.h @@ -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}} \ diff --git a/gcc/config/vax/linux.h b/gcc/config/vax/linux.h index 2f098489709..880067cbffa 100644 --- a/gcc/config/vax/linux.h +++ b/gcc/config/vax/linux.h @@ -18,7 +18,7 @@ along with GCC; see the file COPYING3. If not see . */ -#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 diff --git a/gcc/config/xtensa/linux.h b/gcc/config/xtensa/linux.h index 601b0a85fe4..d058d16015d 100644 --- a/gcc/config/xtensa/linux.h +++ b/gcc/config/xtensa/linux.h @@ -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 . */ -#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 -- 2.30.2