This patch, relative to a tree with <http://gcc.gnu.org/ml/gcc-patches/2011-04/msg00276.html> (pending review) applied, further cleans up the handling of GNU-userspace targets by renaming LINUX_TARGET_OS_CPP_BUILTINS (a macro also defined in headers such as kfreebsd-gnu.h) to GNU_USER_TARGET_OS_CPP_BUILTINS and LINUX_DYNAMIC_LINKER* to GNU_USER_DYNAMIC_LINKER* (so removing a layer of indirection in the latter case). The idea is that <arch>/gnu-user*.h headers will reference these macros (as may config/gnu-user.h; for example, most of the GNU-userspace LINK_SPEC ought to be shared, referencing a separate spec for the dynamic linker), while the headers for particular operating systems with GNU userspace will define them appropriately for the particular OS.
Bootstrapped with no regressions on x86_64-unknown-linux-gnu. OK to commit (both this and the previous patch)? 2011-04-06 Joseph Myers <jos...@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. diff -rupN --exclude=.svn gcc-mainline-0/gcc/config/alpha/linux-elf.h gcc-mainline/gcc/config/alpha/linux-elf.h --- gcc-mainline-0/gcc/config/alpha/linux-elf.h 2011-03-30 16:51:14.000000000 -0700 +++ gcc-mainline/gcc/config/alpha/linux-elf.h 2011-04-06 06:42:13.000000000 -0700 @@ -33,10 +33,10 @@ along with GCC; see the file COPYING3. #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 -rupN --exclude=.svn gcc-mainline-0/gcc/config/arm/linux-eabi.h gcc-mainline/gcc/config/arm/linux-eabi.h --- gcc-mainline-0/gcc/config/arm/linux-eabi.h 2011-01-26 16:28:20.000000000 -0800 +++ gcc-mainline/gcc/config/arm/linux-eabi.h 2011-04-06 06:44:18.000000000 -0700 @@ -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 -rupN --exclude=.svn gcc-mainline-0/gcc/config/arm/linux-elf.h gcc-mainline/gcc/config/arm/linux-elf.h --- gcc-mainline-0/gcc/config/arm/linux-elf.h 2011-03-30 16:54:29.000000000 -0700 +++ gcc-mainline/gcc/config/arm/linux-elf.h 2011-04-06 06:44:36.000000000 -0700 @@ -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 -rupN --exclude=.svn gcc-mainline-0/gcc/config/bfin/linux.h gcc-mainline/gcc/config/bfin/linux.h --- gcc-mainline-0/gcc/config/bfin/linux.h 2010-12-09 05:38:58.000000000 -0800 +++ gcc-mainline/gcc/config/bfin/linux.h 2011-04-06 06:41:02.000000000 -0700 @@ -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.RUNTI "%{!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 -rupN --exclude=.svn gcc-mainline-0/gcc/config/bfin/uclinux.h gcc-mainline/gcc/config/bfin/uclinux.h --- gcc-mainline-0/gcc/config/bfin/uclinux.h 2009-10-07 09:35:30.000000000 -0700 +++ gcc-mainline/gcc/config/bfin/uclinux.h 2011-04-06 06:41:23.000000000 -0700 @@ -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.RUNTI #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 -rupN --exclude=.svn gcc-mainline-0/gcc/config/cris/linux.h gcc-mainline/gcc/config/cris/linux.h --- gcc-mainline-0/gcc/config/cris/linux.h 2011-01-26 16:28:19.000000000 -0800 +++ gcc-mainline/gcc/config/cris/linux.h 2011-04-06 06:44:53.000000000 -0700 @@ -112,7 +112,7 @@ along with GCC; see the file COPYING3. %{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. #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 -rupN --exclude=.svn gcc-mainline-0/gcc/config/frv/linux.h gcc-mainline/gcc/config/frv/linux.h --- gcc-mainline-0/gcc/config/frv/linux.h 2010-12-09 05:38:48.000000000 -0800 +++ gcc-mainline/gcc/config/frv/linux.h 2011-04-06 06:42:29.000000000 -0700 @@ -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 -rupN --exclude=.svn gcc-mainline-0/gcc/config/gnu.h gcc-mainline/gcc/config/gnu.h --- gcc-mainline-0/gcc/config/gnu.h 2011-02-08 12:45:23.000000000 -0800 +++ gcc-mainline/gcc/config/gnu.h 2011-04-06 06:40:44.000000000 -0700 @@ -32,8 +32,8 @@ along with GCC. If not, see <http://www #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 -rupN --exclude=.svn gcc-mainline-0/gcc/config/i386/gnu-user.h gcc-mainline/gcc/config/i386/gnu-user.h --- gcc-mainline-0/gcc/config/i386/gnu-user.h 2011-04-06 06:38:52.000000000 -0700 +++ gcc-mainline/gcc/config/i386/gnu-user.h 2011-04-06 06:43:53.000000000 -0700 @@ -70,7 +70,7 @@ along with GCC; see the file COPYING3. #define TARGET_OS_CPP_BUILTINS() \ do \ { \ - LINUX_TARGET_OS_CPP_BUILTINS(); \ + GNU_USER_TARGET_OS_CPP_BUILTINS(); \ } \ while (0) diff -rupN --exclude=.svn gcc-mainline-0/gcc/config/i386/gnu-user64.h gcc-mainline/gcc/config/i386/gnu-user64.h --- gcc-mainline-0/gcc/config/i386/gnu-user64.h 2011-04-06 06:38:52.000000000 -0700 +++ gcc-mainline/gcc/config/i386/gnu-user64.h 2011-04-06 06:44:04.000000000 -0700 @@ -27,7 +27,7 @@ see the files COPYING3 and COPYING.RUNTI #define TARGET_OS_CPP_BUILTINS() \ do \ { \ - LINUX_TARGET_OS_CPP_BUILTINS(); \ + GNU_USER_TARGET_OS_CPP_BUILTINS(); \ } \ while (0) diff -rupN --exclude=.svn gcc-mainline-0/gcc/config/i386/linux.h gcc-mainline/gcc/config/i386/linux.h --- gcc-mainline-0/gcc/config/i386/linux.h 2011-04-06 06:38:52.000000000 -0700 +++ gcc-mainline/gcc/config/i386/linux.h 2011-04-06 06:42:59.000000000 -0700 @@ -23,8 +23,6 @@ along with GCC; see the file COPYING3. #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 -rupN --exclude=.svn gcc-mainline-0/gcc/config/i386/linux64.h gcc-mainline/gcc/config/i386/linux64.h --- gcc-mainline-0/gcc/config/i386/linux64.h 2011-04-06 06:38:52.000000000 -0700 +++ gcc-mainline/gcc/config/i386/linux64.h 2011-04-06 06:43:05.000000000 -0700 @@ -27,9 +27,6 @@ see the files COPYING3 and COPYING.RUNTI #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 -rupN --exclude=.svn gcc-mainline-0/gcc/config/ia64/linux.h gcc-mainline/gcc/config/ia64/linux.h --- gcc-mainline-0/gcc/config/ia64/linux.h 2011-03-30 17:05:20.000000000 -0700 +++ gcc-mainline/gcc/config/ia64/linux.h 2011-04-06 06:45:02.000000000 -0700 @@ -31,7 +31,7 @@ see the files COPYING3 and COPYING.RUNTI /* 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 -rupN --exclude=.svn gcc-mainline-0/gcc/config/kfreebsd-gnu.h gcc-mainline/gcc/config/kfreebsd-gnu.h --- gcc-mainline-0/gcc/config/kfreebsd-gnu.h 2011-04-06 06:38:52.000000000 -0700 +++ gcc-mainline/gcc/config/kfreebsd-gnu.h 2011-04-06 06:40:44.000000000 -0700 @@ -19,8 +19,8 @@ You should have received a copy of the G 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__"); \ diff -rupN --exclude=.svn gcc-mainline-0/gcc/config/knetbsd-gnu.h gcc-mainline/gcc/config/knetbsd-gnu.h --- gcc-mainline-0/gcc/config/knetbsd-gnu.h 2011-04-06 06:38:52.000000000 -0700 +++ gcc-mainline/gcc/config/knetbsd-gnu.h 2011-04-06 06:40:44.000000000 -0700 @@ -19,8 +19,8 @@ You should have received a copy of the G 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__"); \ diff -rupN --exclude=.svn gcc-mainline-0/gcc/config/kopensolaris-gnu.h gcc-mainline/gcc/config/kopensolaris-gnu.h --- gcc-mainline-0/gcc/config/kopensolaris-gnu.h 2011-04-06 06:38:52.000000000 -0700 +++ gcc-mainline/gcc/config/kopensolaris-gnu.h 2011-04-06 06:40:44.000000000 -0700 @@ -19,8 +19,8 @@ You should have received a copy of the G 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__"); \ diff -rupN --exclude=.svn gcc-mainline-0/gcc/config/linux.h gcc-mainline/gcc/config/linux.h --- gcc-mainline-0/gcc/config/linux.h 2011-01-26 16:28:20.000000000 -0800 +++ gcc-mainline/gcc/config/linux.h 2011-04-06 06:49:26.000000000 -0700 @@ -39,7 +39,7 @@ see the files COPYING3 and COPYING.RUNTI #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.RUNTI #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 -rupN --exclude=.svn gcc-mainline-0/gcc/config/lm32/uclinux-elf.h gcc-mainline/gcc/config/lm32/uclinux-elf.h --- gcc-mainline-0/gcc/config/lm32/uclinux-elf.h 2011-03-30 17:07:58.000000000 -0700 +++ gcc-mainline/gcc/config/lm32/uclinux-elf.h 2011-04-06 06:40:44.000000000 -0700 @@ -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 -rupN --exclude=.svn gcc-mainline-0/gcc/config/m32r/linux.h gcc-mainline/gcc/config/m32r/linux.h --- gcc-mainline-0/gcc/config/m32r/linux.h 2011-03-30 17:09:09.000000000 -0700 +++ gcc-mainline/gcc/config/m32r/linux.h 2011-04-06 06:42:13.000000000 -0700 @@ -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 -rupN --exclude=.svn gcc-mainline-0/gcc/config/m68k/linux.h gcc-mainline/gcc/config/m68k/linux.h --- gcc-mainline-0/gcc/config/m68k/linux.h 2011-03-30 17:09:37.000000000 -0700 +++ gcc-mainline/gcc/config/m68k/linux.h 2011-04-06 06:42:13.000000000 -0700 @@ -59,7 +59,7 @@ along with GCC; see the file COPYING3. #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. %{!shared: \ %{!static: \ %{rdynamic:-export-dynamic} \ - -dynamic-linker " LINUX_DYNAMIC_LINKER "} \ + -dynamic-linker " GNU_USER_DYNAMIC_LINKER "} \ %{static}}" /* For compatibility with linux/a.out */ diff -rupN --exclude=.svn gcc-mainline-0/gcc/config/m68k/uclinux.h gcc-mainline/gcc/config/m68k/uclinux.h --- gcc-mainline-0/gcc/config/m68k/uclinux.h 2011-03-30 17:10:41.000000000 -0700 +++ gcc-mainline/gcc/config/m68k/uclinux.h 2011-04-06 06:45:22.000000000 -0700 @@ -45,7 +45,7 @@ along with GCC; see the file COPYING3. #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 -rupN --exclude=.svn gcc-mainline-0/gcc/config/mips/linux.h gcc-mainline/gcc/config/mips/linux.h --- gcc-mainline-0/gcc/config/mips/linux.h 2011-03-30 17:12:30.000000000 -0700 +++ gcc-mainline/gcc/config/mips/linux.h 2011-04-06 06:42:13.000000000 -0700 @@ -33,7 +33,7 @@ along with GCC; see the file COPYING3. #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. %{!shared: \ %{!static: \ %{rdynamic:-export-dynamic} \ - -dynamic-linker " LINUX_DYNAMIC_LINKER "} \ + -dynamic-linker " GNU_USER_DYNAMIC_LINKER "} \ %{static:-static}}" #undef SUBTARGET_ASM_SPEC diff -rupN --exclude=.svn gcc-mainline-0/gcc/config/mips/linux64.h gcc-mainline/gcc/config/mips/linux64.h --- gcc-mainline-0/gcc/config/mips/linux64.h 2011-01-26 16:28:20.000000000 -0800 +++ gcc-mainline/gcc/config/mips/linux64.h 2011-04-06 06:42:13.000000000 -0700 @@ -40,7 +40,7 @@ along with GCC; see the file COPYING3. #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. %{!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 -rupN --exclude=.svn gcc-mainline-0/gcc/config/mn10300/linux.h gcc-mainline/gcc/config/mn10300/linux.h --- gcc-mainline-0/gcc/config/mn10300/linux.h 2011-03-30 17:15:24.000000000 -0700 +++ gcc-mainline/gcc/config/mn10300/linux.h 2011-04-06 06:42:13.000000000 -0700 @@ -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 -rupN --exclude=.svn gcc-mainline-0/gcc/config/moxie/uclinux.h gcc-mainline/gcc/config/moxie/uclinux.h --- gcc-mainline-0/gcc/config/moxie/uclinux.h 2009-10-07 09:35:29.000000000 -0700 +++ gcc-mainline/gcc/config/moxie/uclinux.h 2011-04-06 06:41:40.000000000 -0700 @@ -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.RUNTI #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 -rupN --exclude=.svn gcc-mainline-0/gcc/config/pa/pa-linux.h gcc-mainline/gcc/config/pa/pa-linux.h --- gcc-mainline-0/gcc/config/pa/pa-linux.h 2011-01-26 16:28:20.000000000 -0800 +++ gcc-mainline/gcc/config/pa/pa-linux.h 2011-04-06 06:45:48.000000000 -0700 @@ -24,7 +24,7 @@ along with GCC; see the file COPYING3. #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. %{!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 -rupN --exclude=.svn gcc-mainline-0/gcc/config/rs6000/linux64.h gcc-mainline/gcc/config/rs6000/linux64.h --- gcc-mainline-0/gcc/config/rs6000/linux64.h 2011-03-30 17:18:44.000000000 -0700 +++ gcc-mainline/gcc/config/rs6000/linux64.h 2011-04-06 06:42:14.000000000 -0700 @@ -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 -rupN --exclude=.svn gcc-mainline-0/gcc/config/rs6000/sysv4.h gcc-mainline/gcc/config/rs6000/sysv4.h --- gcc-mainline-0/gcc/config/rs6000/sysv4.h 2011-03-30 17:20:01.000000000 -0700 +++ gcc-mainline/gcc/config/rs6000/sysv4.h 2011-04-06 06:42:14.000000000 -0700 @@ -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 -rupN --exclude=.svn gcc-mainline-0/gcc/config/s390/linux.h gcc-mainline/gcc/config/s390/linux.h --- gcc-mainline-0/gcc/config/s390/linux.h 2011-03-30 17:22:09.000000000 -0700 +++ gcc-mainline/gcc/config/s390/linux.h 2011-04-06 06:45:57.000000000 -0700 @@ -42,7 +42,7 @@ along with GCC; see the file COPYING3. #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. %{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 -rupN --exclude=.svn gcc-mainline-0/gcc/config/sh/linux.h gcc-mainline/gcc/config/sh/linux.h --- gcc-mainline-0/gcc/config/sh/linux.h 2011-03-30 17:23:55.000000000 -0700 +++ gcc-mainline/gcc/config/sh/linux.h 2011-04-06 06:46:05.000000000 -0700 @@ -34,7 +34,7 @@ along with GCC; see the file COPYING3. #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. "%{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 -rupN --exclude=.svn gcc-mainline-0/gcc/config/sparc/linux.h gcc-mainline/gcc/config/sparc/linux.h --- gcc-mainline-0/gcc/config/sparc/linux.h 2011-03-30 17:26:23.000000000 -0700 +++ gcc-mainline/gcc/config/sparc/linux.h 2011-04-06 06:46:13.000000000 -0700 @@ -22,7 +22,7 @@ along with GCC; see the file COPYING3. #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. %{!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 -rupN --exclude=.svn gcc-mainline-0/gcc/config/sparc/linux64.h gcc-mainline/gcc/config/sparc/linux64.h --- gcc-mainline-0/gcc/config/sparc/linux64.h 2011-03-30 17:26:30.000000000 -0700 +++ gcc-mainline/gcc/config/sparc/linux64.h 2011-04-06 06:46:19.000000000 -0700 @@ -22,7 +22,7 @@ along with GCC; see the file COPYING3. #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. %{!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. %{!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. %{!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 -rupN --exclude=.svn gcc-mainline-0/gcc/config/vax/linux.h gcc-mainline/gcc/config/vax/linux.h --- gcc-mainline-0/gcc/config/vax/linux.h 2011-03-30 17:29:08.000000000 -0700 +++ gcc-mainline/gcc/config/vax/linux.h 2011-04-06 06:40:45.000000000 -0700 @@ -18,7 +18,7 @@ along with GCC; see the file COPYING3. <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 diff -rupN --exclude=.svn gcc-mainline-0/gcc/config/xtensa/linux.h gcc-mainline/gcc/config/xtensa/linux.h --- gcc-mainline-0/gcc/config/xtensa/linux.h 2011-03-30 17:29:48.000000000 -0700 +++ gcc-mainline/gcc/config/xtensa/linux.h 2011-04-06 06:42:14.000000000 -0700 @@ -19,7 +19,7 @@ You should have received a copy of the G 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. %{!shared: \ %{!static: \ %{rdynamic:-export-dynamic} \ - -dynamic-linker " LINUX_DYNAMIC_LINKER "} \ + -dynamic-linker " GNU_USER_DYNAMIC_LINKER "} \ %{static:-static}}" #undef LOCAL_LABEL_PREFIX -- Joseph S. Myers jos...@codesourcery.com