From dabadc52a9d0c0403f8a4adaa642b11f991f39fe Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 14 Jan 2011 18:45:06 +0000 Subject: linux.h (LINK_SPEC): Don't use %{!ibcs:} conditional. * config/i386/linux.h (LINK_SPEC): Don't use %{!ibcs:} conditional. * config/m32r/linux.h (LINK_SPEC): Likewise. * config/mips/linux.h (LINK_SPEC): Likewise. * config/mips/linux64.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/xtensa/linux.h (LINK_SPEC): Likewise. From-SVN: r168802 --- gcc/config/i386/linux.h | 11 +++++------ gcc/config/m32r/linux.h | 21 ++++++++++----------- gcc/config/mips/linux.h | 11 +++++------ gcc/config/mips/linux64.h | 15 +++++++-------- gcc/config/sparc/linux.h | 11 +++++------ gcc/config/sparc/linux64.h | 29 +++++++++++++---------------- gcc/config/xtensa/linux.h | 11 +++++------ 7 files changed, 50 insertions(+), 59 deletions(-) (limited to 'gcc/config') diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h index d1e7f73..edfd8e5 100644 --- a/gcc/config/i386/linux.h +++ b/gcc/config/i386/linux.h @@ -1,6 +1,6 @@ /* Definitions for Intel 386 running Linux-based GNU systems with ELF format. Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2004, 2005, - 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. Contributed by Eric Youngdale. Modified for stabs-in-ELF by H.J. Lu. @@ -106,11 +106,10 @@ along with GCC; see the file COPYING3. If not see #undef LINK_SPEC #define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \ %{!shared: \ - %{!ibcs: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ - -dynamic-linker %(dynamic_linker)} \ - %{static:-static}}}" + %{!static: \ + %{rdynamic:-export-dynamic} \ + -dynamic-linker %(dynamic_linker)} \ + %{static:-static}}" /* Similar to standard Linux, but adding -ffast-math support. */ #undef ENDFILE_SPEC diff --git a/gcc/config/m32r/linux.h b/gcc/config/m32r/linux.h index fd09f24..55f6619 100644 --- a/gcc/config/m32r/linux.h +++ b/gcc/config/m32r/linux.h @@ -1,5 +1,6 @@ /* Definitions for Renesas M32R running Linux-based GNU systems using ELF. - Copyright (C) 2003, 2004, 2006, 2007, 2010 Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2006, 2007, 2010, 2011 + Free Software Foundation, Inc. This file is part of GCC. @@ -52,19 +53,17 @@ #if TARGET_LITTLE_ENDIAN #define LINK_SPEC "%(link_cpu) -m m32rlelf_linux %{shared:-shared} \ %{!shared: \ - %{!ibcs: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ - -dynamic-linker " LINUX_DYNAMIC_LINKER "} \ - %{static:-static}}}" + %{!static: \ + %{rdynamic:-export-dynamic} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER "} \ + %{static:-static}}" #else #define LINK_SPEC "%(link_cpu) -m m32relf_linux %{shared:-shared} \ %{!shared: \ - %{!ibcs: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ - -dynamic-linker " LINUX_DYNAMIC_LINKER "} \ - %{static:-static}}}" + %{!static: \ + %{rdynamic:-export-dynamic} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER "} \ + %{static:-static}}" #endif #undef LIB_SPEC diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h index 4f649d5..c69fab1 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, 2010 Free Software Foundation, Inc. + 2007, 2008, 2010, 2011 Free Software Foundation, Inc. This file is part of GCC. @@ -69,11 +69,10 @@ along with GCC; see the file COPYING3. If not see "%(endian_spec) \ %{shared:-shared} \ %{!shared: \ - %{!ibcs: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ - -dynamic-linker " LINUX_DYNAMIC_LINKER "} \ - %{static:-static}}}" + %{!static: \ + %{rdynamic:-export-dynamic} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER "} \ + %{static:-static}}" #undef SUBTARGET_ASM_SPEC #define SUBTARGET_ASM_SPEC \ diff --git a/gcc/config/mips/linux64.h b/gcc/config/mips/linux64.h index 4fed718..8d03569 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, 2010 + Copyright 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010, 2011 Free Software Foundation, Inc. This file is part of GCC. @@ -51,13 +51,12 @@ along with GCC; see the file COPYING3. If not see %{call_shared} %{no_archive} %{exact_version} \ %(endian_spec) \ %{!shared: \ - %{!ibcs: \ - %{!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 "}} \ - %{static:-static}}} \ + %{!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 "}} \ + %{static:-static}} \ %{mabi=n32:-melf32%{EB:b}%{EL:l}tsmipn32} \ %{mabi=64:-melf64%{EB:b}%{EL:l}tsmip} \ %{mabi=32:-melf32%{EB:b}%{EL:l}tsmip}" diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h index fe02f89..261a9ee 100644 --- a/gcc/config/sparc/linux.h +++ b/gcc/config/sparc/linux.h @@ -1,6 +1,6 @@ /* Definitions for SPARC running Linux-based GNU systems with ELF. Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004, 2005, 2006, - 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. Contributed by Eddie C. Dost (ecd@skynet.be) This file is part of GCC. @@ -81,11 +81,10 @@ along with GCC; see the file COPYING3. If not see #define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \ %{!mno-relax:%{!r:-relax}} \ %{!shared: \ - %{!ibcs: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ - -dynamic-linker " LINUX_DYNAMIC_LINKER "} \ - %{static:-static}}}" + %{!static: \ + %{rdynamic:-export-dynamic} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER "} \ + %{static:-static}}" /* The sun bundled assembler doesn't accept -Yd, (and neither does gas). 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 a251313..b254a92 100644 --- a/gcc/config/sparc/linux64.h +++ b/gcc/config/sparc/linux64.h @@ -1,6 +1,6 @@ /* Definitions for 64-bit SPARC running Linux-based GNU systems with ELF. Copyright 1996, 1997, 1998, 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2008, - 2009, 2010 Free Software Foundation, Inc. + 2009, 2010, 2011 Free Software Foundation, Inc. Contributed by David S. Miller (davem@caip.rutgers.edu) This file is part of GCC. @@ -115,20 +115,18 @@ along with GCC; see the file COPYING3. If not see #define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \ %{!shared: \ - %{!ibcs: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ - -dynamic-linker " LINUX_DYNAMIC_LINKER32 "} \ - %{static:-static}}} \ + %{!static: \ + %{rdynamic:-export-dynamic} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER32 "} \ + %{static:-static}} \ " #define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ %{!shared: \ - %{!ibcs: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ - -dynamic-linker " LINUX_DYNAMIC_LINKER64 "} \ - %{static:-static}}} \ + %{!static: \ + %{rdynamic:-export-dynamic} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER64 "} \ + %{static:-static}} \ " #define LINK_ARCH_SPEC "\ @@ -205,11 +203,10 @@ along with GCC; see the file COPYING3. If not see #undef LINK_SPEC #define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ %{!shared: \ - %{!ibcs: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ - -dynamic-linker " LINUX_DYNAMIC_LINKER64 "} \ - %{static:-static}}} \ + %{!static: \ + %{rdynamic:-export-dynamic} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER64 "} \ + %{static:-static}} \ %{mlittle-endian:-EL} \ %{!mno-relax:%{!r:-relax}} \ " diff --git a/gcc/config/xtensa/linux.h b/gcc/config/xtensa/linux.h index 46ec343..83d2a976 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, 2010 + Copyright (C) 2001, 2002, 2003, 2006, 2007, 2008, 2010, 2011 Free Software Foundation, Inc. This file is part of GCC. @@ -54,11 +54,10 @@ along with GCC; see the file COPYING3. If not see #define LINK_SPEC \ "%{shared:-shared} \ %{!shared: \ - %{!ibcs: \ - %{!static: \ - %{rdynamic:-export-dynamic} \ - -dynamic-linker " LINUX_DYNAMIC_LINKER "} \ - %{static:-static}}}" + %{!static: \ + %{rdynamic:-export-dynamic} \ + -dynamic-linker " LINUX_DYNAMIC_LINKER "} \ + %{static:-static}}" #undef LOCAL_LABEL_PREFIX #define LOCAL_LABEL_PREFIX "." -- cgit v1.1