From e59dabd237f24b87814a3664e2f092c2b107facf Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 9 Dec 2010 13:27:07 +0000 Subject: [PATCH] freebsd.h (LINK_SPEC): Don't use %{!dynamic-linker:}. * config/alpha/freebsd.h (LINK_SPEC): Don't use %{!dynamic-linker:}. * config/alpha/linux-elf.h (LINK_SPEC): Likewise. * config/arm/freebsd.h (LINK_SPEC): Likewise. * config/arm/linux-elf.h (LINUX_TARGET_LINK_SPEC): Likewise. * config/bfin/linux.h (LINK_SPEC): Likewise. * config/cris/linux.h (CRIS_LINK_SUBTARGET_SPEC): Likewise. * config/frv/linux.h (LINK_SPEC): Likewise. * config/i386/freebsd.h (LINK_SPEC): Likewise. * config/i386/freebsd64.h (LINK_SPEC): Likewise. * config/i386/linux.h (LINK_SPEC): Likewise. * config/i386/linux64.h (LINK_SPEC): Likewise. * config/i386/openbsdelf.h (LINK_SPEC): Likewise. * config/ia64/freebsd.h (LINK_SPEC): Likewise. * config/ia64/linux.h (LINK_SPEC): Likewise. * config/lm32/uclinux-elf.h (LINK_SPEC): Likewise. * config/m32r/linux.h (LINK_SPEC): Likewise. * config/m68k/linux.h (LINK_SPEC): Likewise. * config/microblaze/linux.h (LINK_SPEC): Likewise. * config/mips/linux.h (LINK_SPEC): Likewise. * config/mips/linux64.h (LINK_SPEC): Likewise. * config/mips/openbsd.h (LINK_SPEC): Likewise. * config/mn10300/linux.h (LINK_SPEC): Likewise. * config/netbsd-elf.h (LINK_SPEC): Likewise. * config/pa/pa-linux.h (LINK_SPEC): Likewise. * config/rs6000/linux64.h (LINK_OS_LINUX_SPEC32, LINK_OS_LINUX_SPEC64): Likewise. * config/rs6000/sysv4.h (LINK_OS_FREEBSD_SPEC, LINK_OS_LINUX_SPEC, LINK_OS_GNU_SPEC, LINK_OS_NETBSD_SPEC): Likewise. * config/s390/linux.h (LINK_SPEC): Likewise. * config/sh/linux.h (SUBTARGET_LINK_SPEC): Likewise. * config/sparc/freebsd.h (LINK_SPEC): Likewise. * config/sparc/linux.h (LINK_SPEC): Likewise. * config/sparc/linux64.h (LINK_ARCH32_SPEC, LINK_ARCH64_SPEC, LINK_SPEC): Likewise. * config/sparc/openbsd64.h (LINK_SPEC): Likewise. * config/vax/linux.h (LINK_SPEC): Likewise. * config/xtensa/linux.h (LINK_SPEC): Likewise. From-SVN: r167634 --- gcc/ChangeLog | 42 +++++++++++++++++++++++++++++++++++ gcc/config/alpha/freebsd.h | 2 +- gcc/config/alpha/linux-elf.h | 4 ++-- gcc/config/arm/freebsd.h | 2 +- gcc/config/arm/linux-elf.h | 4 ++-- gcc/config/bfin/linux.h | 4 ++-- gcc/config/cris/linux.h | 4 ++-- gcc/config/frv/linux.h | 4 ++-- gcc/config/i386/freebsd.h | 2 +- gcc/config/i386/freebsd64.h | 4 ++-- gcc/config/i386/linux.h | 2 +- gcc/config/i386/linux64.h | 4 ++-- gcc/config/i386/openbsdelf.h | 4 ++-- gcc/config/ia64/freebsd.h | 2 +- gcc/config/ia64/linux.h | 4 ++-- gcc/config/lm32/uclinux-elf.h | 2 +- gcc/config/m32r/linux.h | 4 ++-- gcc/config/m68k/linux.h | 2 +- gcc/config/microblaze/linux.h | 2 +- gcc/config/mips/linux.h | 4 ++-- gcc/config/mips/linux64.h | 9 ++++---- gcc/config/mips/openbsd.h | 5 +++-- gcc/config/mn10300/linux.h | 2 +- gcc/config/netbsd-elf.h | 2 +- gcc/config/pa/pa-linux.h | 2 +- gcc/config/rs6000/linux64.h | 4 ++-- gcc/config/rs6000/sysv4.h | 8 +++---- gcc/config/s390/linux.h | 7 +++--- gcc/config/sh/linux.h | 4 ++-- gcc/config/sparc/freebsd.h | 2 +- gcc/config/sparc/linux.h | 2 +- gcc/config/sparc/linux64.h | 6 ++--- gcc/config/sparc/openbsd64.h | 4 ++-- gcc/config/vax/linux.h | 4 ++-- gcc/config/xtensa/linux.h | 4 ++-- 35 files changed, 104 insertions(+), 63 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e1c64a56b63..8f0417202a9 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,45 @@ +2010-12-09 Joseph Myers + + * config/alpha/freebsd.h (LINK_SPEC): Don't use + %{!dynamic-linker:}. + * config/alpha/linux-elf.h (LINK_SPEC): Likewise. + * config/arm/freebsd.h (LINK_SPEC): Likewise. + * config/arm/linux-elf.h (LINUX_TARGET_LINK_SPEC): Likewise. + * config/bfin/linux.h (LINK_SPEC): Likewise. + * config/cris/linux.h (CRIS_LINK_SUBTARGET_SPEC): Likewise. + * config/frv/linux.h (LINK_SPEC): Likewise. + * config/i386/freebsd.h (LINK_SPEC): Likewise. + * config/i386/freebsd64.h (LINK_SPEC): Likewise. + * config/i386/linux.h (LINK_SPEC): Likewise. + * config/i386/linux64.h (LINK_SPEC): Likewise. + * config/i386/openbsdelf.h (LINK_SPEC): Likewise. + * config/ia64/freebsd.h (LINK_SPEC): Likewise. + * config/ia64/linux.h (LINK_SPEC): Likewise. + * config/lm32/uclinux-elf.h (LINK_SPEC): Likewise. + * config/m32r/linux.h (LINK_SPEC): Likewise. + * config/m68k/linux.h (LINK_SPEC): Likewise. + * config/microblaze/linux.h (LINK_SPEC): Likewise. + * config/mips/linux.h (LINK_SPEC): Likewise. + * config/mips/linux64.h (LINK_SPEC): Likewise. + * config/mips/openbsd.h (LINK_SPEC): Likewise. + * config/mn10300/linux.h (LINK_SPEC): Likewise. + * config/netbsd-elf.h (LINK_SPEC): Likewise. + * config/pa/pa-linux.h (LINK_SPEC): Likewise. + * config/rs6000/linux64.h (LINK_OS_LINUX_SPEC32, + LINK_OS_LINUX_SPEC64): Likewise. + * config/rs6000/sysv4.h (LINK_OS_FREEBSD_SPEC, + LINK_OS_LINUX_SPEC, LINK_OS_GNU_SPEC, LINK_OS_NETBSD_SPEC): + Likewise. + * config/s390/linux.h (LINK_SPEC): Likewise. + * config/sh/linux.h (SUBTARGET_LINK_SPEC): Likewise. + * config/sparc/freebsd.h (LINK_SPEC): Likewise. + * config/sparc/linux.h (LINK_SPEC): Likewise. + * config/sparc/linux64.h (LINK_ARCH32_SPEC, LINK_ARCH64_SPEC, + LINK_SPEC): Likewise. + * config/sparc/openbsd64.h (LINK_SPEC): Likewise. + * config/vax/linux.h (LINK_SPEC): Likewise. + * config/xtensa/linux.h (LINK_SPEC): Likewise. + 2010-12-09 Joseph Myers * config/bfin/bfin.h (ASM_SPEC): Remove %{n} and %{T}. diff --git a/gcc/config/alpha/freebsd.h b/gcc/config/alpha/freebsd.h index 972774f8165..fbefde1fda4 100644 --- a/gcc/config/alpha/freebsd.h +++ b/gcc/config/alpha/freebsd.h @@ -37,7 +37,7 @@ along with GCC; see the file COPYING3. If not see %{!shared: \ %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker %(fbsd_dynamic_linker) }} \ + -dynamic-linker %(fbsd_dynamic_linker) } \ %{static:-Bstatic}} \ %{symbolic:-Bsymbolic}" diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h index 262404b233b..e8eac2f912c 100644 --- a/gcc/config/alpha/linux-elf.h +++ b/gcc/config/alpha/linux-elf.h @@ -1,6 +1,6 @@ /* Definitions of target machine for GNU compiler for Alpha Linux-based GNU systems using ELF. - Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2006, 2007 + Copyright (C) 1996, 1997, 1998, 2001, 2002, 2003, 2006, 2007, 2010 Free Software Foundation, Inc. Contributed by Richard Henderson. @@ -47,7 +47,7 @@ along with GCC; see the file COPYING3. If not see %{!shared: \ %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker %(elf_dynamic_linker)}} \ + -dynamic-linker %(elf_dynamic_linker)} \ %{static:-static}}" #undef LIB_SPEC diff --git a/gcc/config/arm/freebsd.h b/gcc/config/arm/freebsd.h index 20cda99defb..701bb149930 100644 --- a/gcc/config/arm/freebsd.h +++ b/gcc/config/arm/freebsd.h @@ -35,7 +35,7 @@ %{!shared: \ %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker %(fbsd_dynamic_linker) }} \ + -dynamic-linker %(fbsd_dynamic_linker) } \ %{static:-Bstatic}} \ %{symbolic:-Bsymbolic}" diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h index 9fdca414e8e..7318e3c3ce5 100644 --- a/gcc/config/arm/linux-elf.h +++ b/gcc/config/arm/linux-elf.h @@ -1,6 +1,6 @@ /* Definitions for ARM running Linux-based GNU systems using ELF Copyright (C) 1993, 1994, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008 + 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. Contributed by Philip Blundell @@ -70,7 +70,7 @@ %{shared:-shared} \ %{symbolic:-Bsymbolic} \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER " \ -X \ %{mbig-endian:-EB} %{mlittle-endian:-EL}" \ SUBTARGET_EXTRA_LINK_SPEC diff --git a/gcc/config/bfin/linux.h b/gcc/config/bfin/linux.h index 5c716cd67f7..a75074592c5 100644 --- a/gcc/config/bfin/linux.h +++ b/gcc/config/bfin/linux.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007, 2008 Free Software Foundation, Inc. +/* Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of GCC. @@ -45,7 +45,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see %{shared:-G -Bdynamic} \ %{!shared: %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0}} \ + -dynamic-linker /lib/ld-uClibc.so.0} \ %{static}} -init __init -fini __fini" #define MD_UNWIND_SUPPORT "config/bfin/linux-unwind.h" diff --git a/gcc/config/cris/linux.h b/gcc/config/cris/linux.h index 38f0a7ef8c9..3f22cd36919 100644 --- a/gcc/config/cris/linux.h +++ b/gcc/config/cris/linux.h @@ -1,5 +1,5 @@ /* Definitions for GCC. Part of the machine description for CRIS. - Copyright (C) 2001, 2002, 2003, 2005, 2006, 2007, 2008 + Copyright (C) 2001, 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. Contributed by Axis Communications. Written by Hans-Peter Nilsson. @@ -116,7 +116,7 @@ along with GCC; see the file COPYING3. If not see %{symbolic:-Bdynamic} %{shlib:-Bdynamic} %{static:-Bstatic}\ %{!shared:%{!static:\ %{rdynamic:-export-dynamic}\ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "}}}\ + -dynamic-linker " LINUX_DYNAMIC_LINKER "}}\ %{!r:%{O2|O3: --gc-sections}}" diff --git a/gcc/config/frv/linux.h b/gcc/config/frv/linux.h index 71cd094a1ba..4f11618b402 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 + Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2010 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:-dynamic-linker " LINUX_DYNAMIC_LINKER "}} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER "} \ %{static}}" /* Support for compile-time default CPU. */ diff --git a/gcc/config/i386/freebsd.h b/gcc/config/i386/freebsd.h index f23a4249e28..61592d46bb3 100644 --- a/gcc/config/i386/freebsd.h +++ b/gcc/config/i386/freebsd.h @@ -102,7 +102,7 @@ along with GCC; see the file COPYING3. If not see %{!shared: \ %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker %(fbsd_dynamic_linker) }} \ + -dynamic-linker %(fbsd_dynamic_linker) } \ %{static:-Bstatic}} \ %{symbolic:-Bsymbolic}" diff --git a/gcc/config/i386/freebsd64.h b/gcc/config/i386/freebsd64.h index 69915ea6185..67be570f355 100644 --- a/gcc/config/i386/freebsd64.h +++ b/gcc/config/i386/freebsd64.h @@ -1,5 +1,5 @@ /* Definitions for AMD x86-64 running FreeBSD with ELF format - Copyright (C) 2002, 2004, 2007 Free Software Foundation, Inc. + Copyright (C) 2002, 2004, 2007, 2010 Free Software Foundation, Inc. Contributed by David O'Brien This file is part of GCC. @@ -38,6 +38,6 @@ along with GCC; see the file COPYING3. If not see %{!shared: \ %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker %(fbsd_dynamic_linker) }} \ + -dynamic-linker %(fbsd_dynamic_linker) } \ %{static:-Bstatic}} \ %{symbolic:-Bsymbolic}" diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h index 7d6d7ebcf10..47db90f8ac0 100644 --- a/gcc/config/i386/linux.h +++ b/gcc/config/i386/linux.h @@ -109,7 +109,7 @@ along with GCC; see the file COPYING3. If not see %{!ibcs: \ %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker %(dynamic_linker)}} \ + -dynamic-linker %(dynamic_linker)} \ %{static:-static}}}" /* Similar to standard Linux, but adding -ffast-math support. */ diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h index 118128174b3..c6d8244c775 100644 --- a/gcc/config/i386/linux64.h +++ b/gcc/config/i386/linux64.h @@ -80,8 +80,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see %{!shared: \ %{!static: \ %{rdynamic:-export-dynamic} \ - %{" SPEC_32 ":%{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER32 "}} \ - %{" SPEC_64 ":%{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}} \ + %{" SPEC_32 ":-dynamic-linker " LINUX_DYNAMIC_LINKER32 "} \ + %{" SPEC_64 ":-dynamic-linker " LINUX_DYNAMIC_LINKER64 "}} \ %{static:-static}}" /* Similar to standard Linux, but adding -ffast-math support. */ diff --git a/gcc/config/i386/openbsdelf.h b/gcc/config/i386/openbsdelf.h index d3728352b58..a0c681029f3 100644 --- a/gcc/config/i386/openbsdelf.h +++ b/gcc/config/i386/openbsdelf.h @@ -1,6 +1,6 @@ /* Configuration for an OpenBSD i386 target. - Copyright (C) 2005, 2007 Free Software Foundation, Inc. + Copyright (C) 2005, 2007, 2009, 2010 Free Software Foundation, Inc. This file is part of GCC. @@ -129,6 +129,6 @@ along with GCC; see the file COPYING3. If not see %{static:-Bstatic} \ %{!static:-Bdynamic} \ %{assert*} \ - %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}" + -dynamic-linker /usr/libexec/ld.so" #define OBSD_HAS_CORRECT_SPECS diff --git a/gcc/config/ia64/freebsd.h b/gcc/config/ia64/freebsd.h index 7881ab17b4c..24e413142a7 100644 --- a/gcc/config/ia64/freebsd.h +++ b/gcc/config/ia64/freebsd.h @@ -30,7 +30,7 @@ along with GCC; see the file COPYING3. If not see %{!shared: \ %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker %(fbsd_dynamic_linker) }} \ + -dynamic-linker %(fbsd_dynamic_linker) } \ %{static:-Bstatic}}" diff --git a/gcc/config/ia64/linux.h b/gcc/config/ia64/linux.h index 587a4f44f46..dafd2d2cead 100644 --- a/gcc/config/ia64/linux.h +++ b/gcc/config/ia64/linux.h @@ -1,7 +1,7 @@ /* Definitions for ia64-linux target. Copyright (C) 2000, 2001, 2002, 2003, 2004, 2006, -2009 Free Software Foundation, Inc. +2009, 2010 Free Software Foundation, Inc. This file is part of GCC. @@ -69,7 +69,7 @@ do { \ %{!shared: \ %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "}} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER "} \ %{static:-static}}" #define CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}" diff --git a/gcc/config/lm32/uclinux-elf.h b/gcc/config/lm32/uclinux-elf.h index 5ca4c385f0a..c54ea356cd0 100644 --- a/gcc/config/lm32/uclinux-elf.h +++ b/gcc/config/lm32/uclinux-elf.h @@ -72,7 +72,7 @@ %{shared:-shared} \ %{symbolic:-Bsymbolic} \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}" + -dynamic-linker /lib/ld-linux.so.2" #define TARGET_OS_CPP_BUILTINS() LINUX_TARGET_OS_CPP_BUILTINS() diff --git a/gcc/config/m32r/linux.h b/gcc/config/m32r/linux.h index 565fdcf62fc..fd09f242ee3 100644 --- a/gcc/config/m32r/linux.h +++ b/gcc/config/m32r/linux.h @@ -55,7 +55,7 @@ %{!ibcs: \ %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "}} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER "} \ %{static:-static}}}" #else #define LINK_SPEC "%(link_cpu) -m m32relf_linux %{shared:-shared} \ @@ -63,7 +63,7 @@ %{!ibcs: \ %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "}} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER "} \ %{static:-static}}}" #endif diff --git a/gcc/config/m68k/linux.h b/gcc/config/m68k/linux.h index 4608be9790b..803e144a826 100644 --- a/gcc/config/m68k/linux.h +++ b/gcc/config/m68k/linux.h @@ -83,7 +83,7 @@ along with GCC; see the file COPYING3. If not see %{!shared: \ %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker*:-dynamic-linker " LINUX_DYNAMIC_LINKER "}} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER "} \ %{static}}" /* For compatibility with linux/a.out */ diff --git a/gcc/config/microblaze/linux.h b/gcc/config/microblaze/linux.h index adf5fcccf38..3c13fabcb3b 100644 --- a/gcc/config/microblaze/linux.h +++ b/gcc/config/microblaze/linux.h @@ -30,6 +30,6 @@ %{!shared: \ %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker %(dynamic_linker)}} \ + -dynamic-linker %(dynamic_linker)} \ %{static:-static}}" diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h index 8087e8ffd12..c72d6608d5f 100644 --- a/gcc/config/mips/linux.h +++ b/gcc/config/mips/linux.h @@ -1,6 +1,6 @@ /* Definitions for MIPS running Linux-based GNU systems with ELF format. Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008 Free Software Foundation, Inc. + 2007, 2008, 2010 Free Software Foundation, Inc. This file is part of GCC. @@ -75,7 +75,7 @@ along with GCC; see the file COPYING3. If not see %{!ibcs: \ %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "}} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER "} \ %{static:-static}}}" #undef SUBTARGET_ASM_SPEC diff --git a/gcc/config/mips/linux64.h b/gcc/config/mips/linux64.h index a68e8b4da9b..4fed7187be9 100644 --- a/gcc/config/mips/linux64.h +++ b/gcc/config/mips/linux64.h @@ -1,6 +1,6 @@ /* Definitions for MIPS running Linux-based GNU systems with ELF format using n32/64 abi. - Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008 + Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010 Free Software Foundation, Inc. This file is part of GCC. @@ -54,10 +54,9 @@ along with GCC; see the file COPYING3. If not see %{!ibcs: \ %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker: \ - %{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 " LINUX_DYNAMIC_LINKERN32 "} \ + %{mabi=64: -dynamic-linker " LINUX_DYNAMIC_LINKER64 "} \ + %{mabi=32: -dynamic-linker " LINUX_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/mips/openbsd.h b/gcc/config/mips/openbsd.h index 2cf7fbcd885..f86bb5a1143 100644 --- a/gcc/config/mips/openbsd.h +++ b/gcc/config/mips/openbsd.h @@ -1,5 +1,6 @@ /* Configuration for a MIPS ABI32 OpenBSD target. - Copyright (C) 1999, 2003, 2004, 2007, 2008 Free Software Foundation, Inc. + Copyright (C) 1999, 2003, 2004, 2007, 2008, 2009, 2010 + Free Software Foundation, Inc. This file is part of GCC. @@ -81,7 +82,7 @@ along with GCC; see the file COPYING3. If not see %{bestGnum} %{shared} %{non_shared} \ %{call_shared} %{no_archive} %{exact_version} \ %{!shared: %{!non_shared: %{!call_shared: -non_shared}}} \ - %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so} \ + -dynamic-linker /usr/libexec/ld.so \ %{!nostdlib:%{!r*:%{!e*:-e __start}}} -dc -dp \ %{static:-Bstatic} %{!static:-Bdynamic} %{assert*}" diff --git a/gcc/config/mn10300/linux.h b/gcc/config/mn10300/linux.h index 9992877e2ef..bed6ece5438 100644 --- a/gcc/config/mn10300/linux.h +++ b/gcc/config/mn10300/linux.h @@ -38,7 +38,7 @@ #define LINK_SPEC "%{mrelax:--relax} %{shared:-shared} \ %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "}} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER "} \ %{static:-static}" #undef PROCESSOR_DEFAULT diff --git a/gcc/config/netbsd-elf.h b/gcc/config/netbsd-elf.h index f98cbe87bc9..d6f90f0cb58 100644 --- a/gcc/config/netbsd-elf.h +++ b/gcc/config/netbsd-elf.h @@ -77,7 +77,7 @@ along with GCC; see the file COPYING3. If not see %{!e*:-e %(netbsd_entry_point)}}} \ %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.elf_so}} \ + -dynamic-linker /usr/libexec/ld.elf_so} \ %{static:-static}}" /* Use --as-needed -lgcc_s for eh support. */ diff --git a/gcc/config/pa/pa-linux.h b/gcc/config/pa/pa-linux.h index 16d88fe9d0d..872ba26ca27 100644 --- a/gcc/config/pa/pa-linux.h +++ b/gcc/config/pa/pa-linux.h @@ -46,7 +46,7 @@ along with GCC; see the file COPYING3. If not see %{!shared: \ %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "}} \ + -dynamic-linker " LINUX_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 0089b9dcc56..086e3de77f5 100644 --- a/gcc/config/rs6000/linux64.h +++ b/gcc/config/rs6000/linux64.h @@ -392,11 +392,11 @@ extern int dot_symbols; #define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}}" + -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}" #define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}}" + -dynamic-linker " LINUX_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 b5c25f0d583..8365a8fafcf 100644 --- a/gcc/config/rs6000/sysv4.h +++ b/gcc/config/rs6000/sysv4.h @@ -834,7 +834,7 @@ SVR4_ASM_SPEC \ %{!shared: \ %{!static: \ %{rdynamic: -export-dynamic} \ - %{!dynamic-linker:-dynamic-linker %(fbsd_dynamic_linker) }} \ + -dynamic-linker %(fbsd_dynamic_linker) } \ %{static:-Bstatic}} \ %{symbolic:-Bsymbolic}" @@ -875,7 +875,7 @@ SVR4_ASM_SPEC \ #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "}}}" + -dynamic-linker " LINUX_DYNAMIC_LINKER "}}" #if defined(HAVE_LD_EH_FRAME_HDR) # define LINK_EH_SPEC "%{!static:--eh-frame-hdr} " @@ -906,7 +906,7 @@ SVR4_ASM_SPEC \ #define LINK_OS_GNU_SPEC "-m elf32ppclinux %{!shared: %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}" + -dynamic-linker /lib/ld.so.1}}" #define CPP_OS_GNU_SPEC "-D__unix__ -D__gnu_hurd__ -D__GNU__ \ %{!undef: \ @@ -931,7 +931,7 @@ ncrtn.o%s" #define LINK_OS_NETBSD_SPEC "\ %{!shared: %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.elf_so}}}" + -dynamic-linker /usr/libexec/ld.elf_so}}" #define CPP_OS_NETBSD_SPEC "\ -D__powerpc__ -D__NetBSD__ -D__KPRINTF_ATTRIBUTE__" diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h index ddbcfa9753c..95cead119a6 100644 --- a/gcc/config/s390/linux.h +++ b/gcc/config/s390/linux.h @@ -1,5 +1,5 @@ /* Definitions for Linux for S/390. - Copyright (C) 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007 + Copyright (C) 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc. Contributed by Hartmut Penner (hpenner@de.ibm.com) and Ulrich Weigand (uweigand@de.ibm.com). @@ -83,9 +83,8 @@ along with GCC; see the file COPYING3. If not see %{static:-static} \ %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker: \ - %{m31:-dynamic-linker " LINUX_DYNAMIC_LINKER32 "} \ - %{m64:-dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}}}" + %{m31:-dynamic-linker " LINUX_DYNAMIC_LINKER32 "} \ + %{m64:-dynamic-linker " LINUX_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 d513af8824c..a090dae1cab 100644 --- a/gcc/config/sh/linux.h +++ b/gcc/config/sh/linux.h @@ -1,5 +1,5 @@ /* Definitions for SH running Linux-based GNU systems using ELF - Copyright (C) 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2007 + Copyright (C) 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2010 Free Software Foundation, Inc. Contributed by Kazumoto Kojima @@ -56,7 +56,7 @@ along with GCC; see the file COPYING3. If not see "%{shared:-shared} \ %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "}} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER "} \ %{static:-static}" /* Output assembler code to STREAM to call the profiler. */ diff --git a/gcc/config/sparc/freebsd.h b/gcc/config/sparc/freebsd.h index 541010a205e..417357f13fa 100644 --- a/gcc/config/sparc/freebsd.h +++ b/gcc/config/sparc/freebsd.h @@ -39,7 +39,7 @@ along with GCC; see the file COPYING3. If not see %{!shared: \ %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker %(fbsd_dynamic_linker) }} \ + -dynamic-linker %(fbsd_dynamic_linker) } \ %{static:-Bstatic}}" diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h index fd63c63d35a..fe02f892ecf 100644 --- a/gcc/config/sparc/linux.h +++ b/gcc/config/sparc/linux.h @@ -84,7 +84,7 @@ along with GCC; see the file COPYING3. If not see %{!ibcs: \ %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "}} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER "} \ %{static:-static}}}" /* The sun bundled assembler doesn't accept -Yd, (and neither does gas). diff --git a/gcc/config/sparc/linux64.h b/gcc/config/sparc/linux64.h index 099a46213be..a251313fc65 100644 --- a/gcc/config/sparc/linux64.h +++ b/gcc/config/sparc/linux64.h @@ -118,7 +118,7 @@ along with GCC; see the file COPYING3. If not see %{!ibcs: \ %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER32 "}} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER32 "} \ %{static:-static}}} \ " @@ -127,7 +127,7 @@ along with GCC; see the file COPYING3. If not see %{!ibcs: \ %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER64 "}} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER64 "} \ %{static:-static}}} \ " @@ -208,7 +208,7 @@ along with GCC; see the file COPYING3. If not see %{!ibcs: \ %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER64 "}} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER64 "} \ %{static:-static}}} \ %{mlittle-endian:-EL} \ %{!mno-relax:%{!r:-relax}} \ diff --git a/gcc/config/sparc/openbsd64.h b/gcc/config/sparc/openbsd64.h index 4b13d6db2c3..194c73b64a1 100644 --- a/gcc/config/sparc/openbsd64.h +++ b/gcc/config/sparc/openbsd64.h @@ -1,5 +1,5 @@ /* Configuration file for sparc64 OpenBSD target. - Copyright (C) 1999, 2005, 2007 Free Software Foundation, Inc. + Copyright (C) 1999, 2005, 2007, 2010 Free Software Foundation, Inc. This file is part of GCC. @@ -77,7 +77,7 @@ along with GCC; see the file COPYING3. If not see %{static:-Bstatic} \ %{!static:-Bdynamic} \ %{assert*} \ - %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}" + -dynamic-linker /usr/libexec/ld.so" /* As an elf system, we need crtbegin/crtend stuff. */ #undef STARTFILE_SPEC diff --git a/gcc/config/vax/linux.h b/gcc/config/vax/linux.h index dccbe9cc8ee..97e036b9d64 100644 --- a/gcc/config/vax/linux.h +++ b/gcc/config/vax/linux.h @@ -1,5 +1,5 @@ /* Definitions for VAX running Linux-based GNU systems with ELF format. - Copyright (C) 2007, 2009 Free Software Foundation, Inc. + Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc. This file is part of GCC. @@ -44,5 +44,5 @@ along with GCC; see the file COPYING3. If not see %{!shared: \ %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \ + -dynamic-linker /lib/ld.so.1} \ %{static:-static}}" diff --git a/gcc/config/xtensa/linux.h b/gcc/config/xtensa/linux.h index 69ab626b201..7ac9e027be8 100644 --- a/gcc/config/xtensa/linux.h +++ b/gcc/config/xtensa/linux.h @@ -1,6 +1,6 @@ /* Xtensa Linux configuration. Derived from the configuration for GCC for Intel i386 running Linux. - Copyright (C) 2001, 2002, 2003, 2006, 2007, 2008 + Copyright (C) 2001, 2002, 2003, 2006, 2007, 2008, 2010 Free Software Foundation, Inc. This file is part of GCC. @@ -52,7 +52,7 @@ along with GCC; see the file COPYING3. If not see %{!ibcs: \ %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "}} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER "} \ %{static:-static}}}" #undef LOCAL_LABEL_PREFIX