fixup musl-gcc patch, reported upstream

1 files changed, 87 insertions, 35070 deletions

diff --git a/toolchain/gcc/patches/4.7.3/musl-cross.patch b/toolchain/gcc/patches/4.7.3/musl-cross.patch
index 4a4d2673b..acbc39d36 100644
--- a/toolchain/gcc/patches/4.7.3/musl-cross.patch
+++ b/toolchain/gcc/patches/4.7.3/musl-cross.patch
@@ -1,6 +1,6 @@
 diff -Nur gcc-4.7.3.orig/config.sub gcc-4.7.3/config.sub
 --- gcc-4.7.3.orig/config.sub	2012-08-06 16:34:27.000000000 +0200
-+++ gcc-4.7.3/config.sub	2013-09-14 13:08:52.000000000 +0200
++++ gcc-4.7.3/config.sub	2013-09-14 15:51:23.000000000 +0200
 @@ -4,7 +4,7 @@
  #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
  #   2011 Free Software Foundation, Inc.
@@ -132,7 +132,7 @@ diff -Nur gcc-4.7.3.orig/config.sub gcc-4.7.3/config.sub
  	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 diff -Nur gcc-4.7.3.orig/fixincludes/mkfixinc.sh gcc-4.7.3/fixincludes/mkfixinc.sh
 --- gcc-4.7.3.orig/fixincludes/mkfixinc.sh	2011-09-22 16:00:17.000000000 +0200
-+++ gcc-4.7.3/fixincludes/mkfixinc.sh	2013-09-14 13:08:52.000000000 +0200
++++ gcc-4.7.3/fixincludes/mkfixinc.sh	2013-09-14 15:51:23.000000000 +0200
 @@ -20,7 +20,8 @@
      powerpc-*-eabi*    | \
      powerpc-*-rtems*   | \
@@ -143,46 +143,9 @@ diff -Nur gcc-4.7.3.orig/fixincludes/mkfixinc.sh gcc-4.7.3/fixincludes/mkfixinc.
  	#  IF there is no include fixing,
  	#  THEN create a no-op fixer and exit
  	(echo "#! /bin/sh" ; echo "exit 0" ) > ${target}
-diff -Nur gcc-4.7.3.orig/fixincludes/mkfixinc.sh.orig gcc-4.7.3/fixincludes/mkfixinc.sh.orig
---- gcc-4.7.3.orig/fixincludes/mkfixinc.sh.orig	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.7.3/fixincludes/mkfixinc.sh.orig	2011-09-22 16:00:17.000000000 +0200
-@@ -0,0 +1,33 @@
-+#! /bin/sh
-+
-+if [ $# -ne 1 ]
-+then
-+  echo "Usage: $0 <target-mach-triplet>"
-+  exit 1
-+fi
-+
-+machine=$1
-+target=fixinc.sh
-+
-+# Check for special fix rules for particular targets
-+case $machine in
-+    i?86-*-cygwin* | \
-+    i?86-*-mingw32* | \
-+    x86_64-*-mingw32* | \
-+    i?86-*-interix* | \
-+    *-*-vxworks* | \
-+    powerpc-*-eabisim* | \
-+    powerpc-*-eabi*    | \
-+    powerpc-*-rtems*   | \
-+    powerpcle-*-eabisim* | \
-+    powerpcle-*-eabi* )
-+	#  IF there is no include fixing,
-+	#  THEN create a no-op fixer and exit
-+	(echo "#! /bin/sh" ; echo "exit 0" ) > ${target}
-+        ;;
-+
-+    *)
-+	cat < ${srcdir}/fixinc.in > ${target} || exit 1
-+	;;
-+esac
-+chmod 755 ${target}
 diff -Nur gcc-4.7.3.orig/gcc/config/arm/linux-eabi.h gcc-4.7.3/gcc/config/arm/linux-eabi.h
 --- gcc-4.7.3.orig/gcc/config/arm/linux-eabi.h	2011-11-02 16:03:19.000000000 +0100
-+++ gcc-4.7.3/gcc/config/arm/linux-eabi.h	2013-09-14 13:08:52.000000000 +0200
++++ gcc-4.7.3/gcc/config/arm/linux-eabi.h	2013-09-14 15:51:23.000000000 +0200
 @@ -64,6 +64,23 @@
  #undef  GLIBC_DYNAMIC_LINKER
  #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3"
@@ -207,45 +170,9 @@ diff -Nur gcc-4.7.3.orig/gcc/config/arm/linux-eabi.h gcc-4.7.3/gcc/config/arm/li
  /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
     use the GNU/Linux version, not the generic BPABI version.  */
  #undef  LINK_SPEC
-diff -Nur gcc-4.7.3.orig/gcc/config/i386/linux.h gcc-4.7.3/gcc/config/i386/linux.h
---- gcc-4.7.3.orig/gcc/config/i386/linux.h	2011-06-03 20:30:39.000000000 +0200
-+++ gcc-4.7.3/gcc/config/i386/linux.h	2013-09-14 13:08:52.000000000 +0200
-@@ -22,3 +22,4 @@
- 
- #define GNU_USER_LINK_EMULATION "elf_i386"
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
-diff -Nur gcc-4.7.3.orig/gcc/config/i386/linux.h.orig gcc-4.7.3/gcc/config/i386/linux.h.orig
---- gcc-4.7.3.orig/gcc/config/i386/linux.h.orig	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.7.3/gcc/config/i386/linux.h.orig	2011-06-03 20:30:39.000000000 +0200
-@@ -0,0 +1,24 @@
-+/* 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, 2011 Free Software Foundation, Inc.
-+   Contributed by Eric Youngdale.
-+   Modified for stabs-in-ELF by H.J. Lu.
-+
-+This file is part of GCC.
-+
-+GCC is free software; you can redistribute it and/or modify
-+it under the terms of the GNU General Public License as published by
-+the Free Software Foundation; either version 3, or (at your option)
-+any later version.
-+
-+GCC is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with GCC; see the file COPYING3.  If not see
-+<http://www.gnu.org/licenses/>.  */
-+
-+#define GNU_USER_LINK_EMULATION "elf_i386"
-+#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
 diff -Nur gcc-4.7.3.orig/gcc/config/i386/linux64.h gcc-4.7.3/gcc/config/i386/linux64.h
 --- gcc-4.7.3.orig/gcc/config/i386/linux64.h	2011-07-07 17:38:34.000000000 +0200
-+++ gcc-4.7.3/gcc/config/i386/linux64.h	2013-09-14 13:08:52.000000000 +0200
++++ gcc-4.7.3/gcc/config/i386/linux64.h	2013-09-14 15:51:23.000000000 +0200
 @@ -31,3 +31,7 @@
  #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
  #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
@@ -254,46 +181,17 @@ diff -Nur gcc-4.7.3.orig/gcc/config/i386/linux64.h gcc-4.7.3/gcc/config/i386/lin
 +#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
 +#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1"
 +#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1"
-diff -Nur gcc-4.7.3.orig/gcc/config/i386/linux64.h.orig gcc-4.7.3/gcc/config/i386/linux64.h.orig
---- gcc-4.7.3.orig/gcc/config/i386/linux64.h.orig	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.7.3/gcc/config/i386/linux64.h.orig	2011-07-07 17:38:34.000000000 +0200
-@@ -0,0 +1,33 @@
-+/* Definitions for AMD x86-64 running Linux-based GNU systems with ELF format.
-+   Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-+   Free Software Foundation, Inc.
-+   Contributed by Jan Hubicka <jh@suse.cz>, based on linux.h.
-+
-+This file is part of GCC.
-+
-+GCC is free software; you can redistribute it and/or modify
-+it under the terms of the GNU General Public License as published by
-+the Free Software Foundation; either version 3, or (at your option)
-+any later version.
-+
-+GCC is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
-+
-+Under Section 7 of GPL version 3, you are granted additional
-+permissions described in the GCC Runtime Library Exception, version
-+3.1, as published by the Free Software Foundation.
-+
-+You should have received a copy of the GNU General Public License and
-+a copy of the GCC Runtime Library Exception along with this program;
-+see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-+<http://www.gnu.org/licenses/>.  */
-+
-+#define GNU_USER_LINK_EMULATION32 "elf_i386"
-+#define GNU_USER_LINK_EMULATION64 "elf_x86_64"
-+#define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
-+
-+#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
+diff -Nur gcc-4.7.3.orig/gcc/config/i386/linux.h gcc-4.7.3/gcc/config/i386/linux.h
+--- gcc-4.7.3.orig/gcc/config/i386/linux.h	2011-06-03 20:30:39.000000000 +0200
++++ gcc-4.7.3/gcc/config/i386/linux.h	2013-09-14 15:51:23.000000000 +0200
+@@ -22,3 +22,4 @@
+ 
+ #define GNU_USER_LINK_EMULATION "elf_i386"
+ #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
 diff -Nur gcc-4.7.3.orig/gcc/config/linux.h gcc-4.7.3/gcc/config/linux.h
 --- gcc-4.7.3.orig/gcc/config/linux.h	2012-08-14 15:59:04.000000000 +0200
-+++ gcc-4.7.3/gcc/config/linux.h	2013-09-14 13:08:52.000000000 +0200
++++ gcc-4.7.3/gcc/config/linux.h	2013-09-14 15:51:23.000000000 +0200
 @@ -33,10 +33,12 @@
  #define OPTION_GLIBC  (DEFAULT_LIBC == LIBC_GLIBC)
  #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC)
@@ -441,7 +339,7 @@ diff -Nur gcc-4.7.3.orig/gcc/config/linux.h gcc-4.7.3/gcc/config/linux.h
 +#endif
 diff -Nur gcc-4.7.3.orig/gcc/config/linux.opt gcc-4.7.3/gcc/config/linux.opt
 --- gcc-4.7.3.orig/gcc/config/linux.opt	2010-09-29 16:51:52.000000000 +0200
-+++ gcc-4.7.3/gcc/config/linux.opt	2013-09-14 13:08:52.000000000 +0200
++++ gcc-4.7.3/gcc/config/linux.opt	2013-09-14 15:51:23.000000000 +0200
 @@ -30,3 +30,7 @@
  muclibc
  Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic)
@@ -452,41 +350,16 @@ diff -Nur gcc-4.7.3.orig/gcc/config/linux.opt gcc-4.7.3/gcc/config/linux.opt
 +Use musl C library
 diff -Nur gcc-4.7.3.orig/gcc/config/mips/linux.h gcc-4.7.3/gcc/config/mips/linux.h
 --- gcc-4.7.3.orig/gcc/config/mips/linux.h	2011-07-19 20:00:27.000000000 +0200
-+++ gcc-4.7.3/gcc/config/mips/linux.h	2013-09-14 13:08:52.000000000 +0200
++++ gcc-4.7.3/gcc/config/mips/linux.h	2013-09-14 15:51:23.000000000 +0200
 @@ -19,3 +19,5 @@
  <http://www.gnu.org/licenses/>.  */
  
  #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
 +
 +#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips.so.1"
-diff -Nur gcc-4.7.3.orig/gcc/config/mips/linux.h.orig gcc-4.7.3/gcc/config/mips/linux.h.orig
---- gcc-4.7.3.orig/gcc/config/mips/linux.h.orig	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.7.3/gcc/config/mips/linux.h.orig	2011-07-19 20:00:27.000000000 +0200
-@@ -0,0 +1,21 @@
-+/* 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, 2011 Free Software Foundation, Inc.
-+
-+This file is part of GCC.
-+
-+GCC is free software; you can redistribute it and/or modify
-+it under the terms of the GNU General Public License as published by
-+the Free Software Foundation; either version 3, or (at your option)
-+any later version.
-+
-+GCC is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with GCC; see the file COPYING3.  If not see
-+<http://www.gnu.org/licenses/>.  */
-+
-+#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
 diff -Nur gcc-4.7.3.orig/gcc/config/rs6000/linux64.h gcc-4.7.3/gcc/config/rs6000/linux64.h
 --- gcc-4.7.3.orig/gcc/config/rs6000/linux64.h	2012-03-12 17:16:51.000000000 +0100
-+++ gcc-4.7.3/gcc/config/rs6000/linux64.h	2013-09-14 13:08:52.000000000 +0200
++++ gcc-4.7.3/gcc/config/rs6000/linux64.h	2013-09-14 15:51:23.000000000 +0200
 @@ -362,17 +362,21 @@
  #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
  #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
@@ -513,563 +386,9 @@ diff -Nur gcc-4.7.3.orig/gcc/config/rs6000/linux64.h gcc-4.7.3/gcc/config/rs6000
  
  
  #define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
-diff -Nur gcc-4.7.3.orig/gcc/config/rs6000/linux64.h.orig gcc-4.7.3/gcc/config/rs6000/linux64.h.orig
---- gcc-4.7.3.orig/gcc/config/rs6000/linux64.h.orig	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.7.3/gcc/config/rs6000/linux64.h.orig	2012-03-12 17:16:51.000000000 +0100
-@@ -0,0 +1,550 @@
-+/* Definitions of target machine for GNU compiler,
-+   for 64 bit PowerPC linux.
-+   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-+   2009, 2010, 2011  Free Software Foundation, Inc.
-+
-+   This file is part of GCC.
-+
-+   GCC is free software; you can redistribute it and/or modify it
-+   under the terms of the GNU General Public License as published
-+   by the Free Software Foundation; either version 3, or (at your
-+   option) any later version.
-+
-+   GCC is distributed in the hope that it will be useful, but WITHOUT
-+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-+   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-+   License for more details.
-+
-+   Under Section 7 of GPL version 3, you are granted additional
-+   permissions described in the GCC Runtime Library Exception, version
-+   3.1, as published by the Free Software Foundation.
-+
-+   You should have received a copy of the GNU General Public License and
-+   a copy of the GCC Runtime Library Exception along with this program;
-+   see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-+   <http://www.gnu.org/licenses/>.  */
-+
-+#ifndef RS6000_BI_ARCH
-+
-+#undef	DEFAULT_ABI
-+#define	DEFAULT_ABI ABI_AIX
-+
-+#undef	TARGET_64BIT
-+#define	TARGET_64BIT 1
-+
-+#define	DEFAULT_ARCH64_P 1
-+#define	RS6000_BI_ARCH_P 0
-+
-+#else
-+
-+#define	DEFAULT_ARCH64_P (TARGET_DEFAULT & MASK_64BIT)
-+#define	RS6000_BI_ARCH_P 1
-+
-+#endif
-+
-+#ifdef IN_LIBGCC2
-+#undef TARGET_64BIT
-+#ifdef __powerpc64__
-+#define TARGET_64BIT 1
-+#else
-+#define TARGET_64BIT 0
-+#endif
-+#endif
-+
-+#undef	TARGET_AIX
-+#define	TARGET_AIX TARGET_64BIT
-+
-+#ifdef HAVE_LD_NO_DOT_SYMS
-+/* New ABI uses a local sym for the function entry point.  */
-+extern int dot_symbols;
-+#undef DOT_SYMBOLS
-+#define DOT_SYMBOLS dot_symbols
-+#endif
-+
-+#define TARGET_PROFILE_KERNEL profile_kernel
-+
-+#define TARGET_USES_LINUX64_OPT 1
-+#ifdef HAVE_LD_LARGE_TOC
-+#undef TARGET_CMODEL
-+#define TARGET_CMODEL rs6000_current_cmodel
-+#define SET_CMODEL(opt) rs6000_current_cmodel = opt
-+#else
-+#define SET_CMODEL(opt) do {} while (0)
-+#endif
-+
-+#undef  PROCESSOR_DEFAULT
-+#define PROCESSOR_DEFAULT PROCESSOR_POWER7
-+#undef  PROCESSOR_DEFAULT64
-+#define PROCESSOR_DEFAULT64 PROCESSOR_POWER7
-+
-+/* We don't need to generate entries in .fixup, except when
-+   -mrelocatable or -mrelocatable-lib is given.  */
-+#undef RELOCATABLE_NEEDS_FIXUP
-+#define RELOCATABLE_NEEDS_FIXUP \
-+  (target_flags & target_flags_explicit & MASK_RELOCATABLE)
-+
-+#undef	RS6000_ABI_NAME
-+#define	RS6000_ABI_NAME "linux"
-+
-+#define INVALID_64BIT "-m%s not supported in this configuration"
-+#define INVALID_32BIT INVALID_64BIT
-+
-+#undef	SUBSUBTARGET_OVERRIDE_OPTIONS
-+#define	SUBSUBTARGET_OVERRIDE_OPTIONS				\
-+  do								\
-+    {								\
-+      if (!global_options_set.x_rs6000_alignment_flags)		\
-+	rs6000_alignment_flags = MASK_ALIGN_NATURAL;		\
-+      if (TARGET_64BIT)						\
-+	{							\
-+	  if (DEFAULT_ABI != ABI_AIX)				\
-+	    {							\
-+	      rs6000_current_abi = ABI_AIX;			\
-+	      error (INVALID_64BIT, "call");			\
-+	    }							\
-+	  dot_symbols = !strcmp (rs6000_abi_name, "aixdesc");	\
-+	  if (target_flags & MASK_RELOCATABLE)			\
-+	    {							\
-+	      target_flags &= ~MASK_RELOCATABLE;		\
-+	      error (INVALID_64BIT, "relocatable");		\
-+	    }							\
-+	  if (target_flags & MASK_EABI)				\
-+	    {							\
-+	      target_flags &= ~MASK_EABI;			\
-+	      error (INVALID_64BIT, "eabi");			\
-+	    }							\
-+	  if (TARGET_PROTOTYPE)					\
-+	    {							\
-+	      target_prototype = 0;				\
-+	      error (INVALID_64BIT, "prototype");		\
-+	    }							\
-+	  if ((target_flags & MASK_POWERPC64) == 0)		\
-+	    {							\
-+	      target_flags |= MASK_POWERPC64;			\
-+	      error ("-m64 requires a PowerPC64 cpu");		\
-+	    }							\
-+	  if ((target_flags_explicit & MASK_MINIMAL_TOC) != 0)	\
-+	    {							\
-+	      if (global_options_set.x_rs6000_current_cmodel	\
-+		  && rs6000_current_cmodel != CMODEL_SMALL)	\
-+		error ("-mcmodel incompatible with other toc options"); \
-+	      SET_CMODEL (CMODEL_SMALL);			\
-+	    }							\
-+	  else							\
-+	    {							\
-+	      if (!global_options_set.x_rs6000_current_cmodel)	\
-+		SET_CMODEL (CMODEL_MEDIUM);			\
-+	      if (rs6000_current_cmodel != CMODEL_SMALL)	\
-+		{						\
-+		  TARGET_NO_FP_IN_TOC = 0;			\
-+		  TARGET_NO_SUM_IN_TOC = 0;			\
-+		}						\
-+	    }							\
-+	}							\
-+      else							\
-+	{							\
-+	  if (!RS6000_BI_ARCH_P)				\
-+	    error (INVALID_32BIT, "32");			\
-+	  if (TARGET_PROFILE_KERNEL)				\
-+	    {							\
-+	      TARGET_PROFILE_KERNEL = 0;			\
-+	      error (INVALID_32BIT, "profile-kernel");		\
-+	    }							\
-+	  if (global_options_set.x_rs6000_current_cmodel)	\
-+	    {							\
-+	      SET_CMODEL (CMODEL_SMALL);			\
-+	      error (INVALID_32BIT, "cmodel");			\
-+	    }							\
-+	}							\
-+    }								\
-+  while (0)
-+
-+#undef	ASM_DEFAULT_SPEC
-+#undef	ASM_SPEC
-+#undef	LINK_OS_LINUX_SPEC
-+
-+#ifndef	RS6000_BI_ARCH
-+#define	ASM_DEFAULT_SPEC "-mppc64"
-+#define	ASM_SPEC	 "%(asm_spec64) %(asm_spec_common)"
-+#define	LINK_OS_LINUX_SPEC "%(link_os_linux_spec64)"
-+#else
-+#if DEFAULT_ARCH64_P
-+#define	ASM_DEFAULT_SPEC "-mppc%{!m32:64}"
-+#define	ASM_SPEC	 "%{m32:%(asm_spec32)}%{!m32:%(asm_spec64)} %(asm_spec_common)"
-+#define	LINK_OS_LINUX_SPEC "%{m32:%(link_os_linux_spec32)}%{!m32:%(link_os_linux_spec64)}"
-+#else
-+#define	ASM_DEFAULT_SPEC "-mppc%{m64:64}"
-+#define	ASM_SPEC	 "%{!m64:%(asm_spec32)}%{m64:%(asm_spec64)} %(asm_spec_common)"
-+#define	LINK_OS_LINUX_SPEC "%{!m64:%(link_os_linux_spec32)}%{m64:%(link_os_linux_spec64)}"
-+#endif
-+#endif
-+
-+#define ASM_SPEC32 "-a32 \
-+%{mrelocatable} %{mrelocatable-lib} %{fpic:-K PIC} %{fPIC:-K PIC} \
-+%{memb} %{!memb: %{msdata=eabi: -memb}} \
-+%{!mlittle: %{!mlittle-endian: %{!mbig: %{!mbig-endian: \
-+    %{mcall-freebsd: -mbig} \
-+    %{mcall-i960-old: -mlittle} \
-+    %{mcall-linux: -mbig} \
-+    %{mcall-netbsd: -mbig} \
-+}}}}"
-+
-+#define ASM_SPEC64 "-a64"
-+
-+#define ASM_SPEC_COMMON "%(asm_cpu) \
-+%{,assembler|,assembler-with-cpp: %{mregnames} %{mno-regnames}} \
-+%{mlittle} %{mlittle-endian} %{mbig} %{mbig-endian}"
-+
-+#undef	SUBSUBTARGET_EXTRA_SPECS
-+#define SUBSUBTARGET_EXTRA_SPECS \
-+  { "asm_spec_common",		ASM_SPEC_COMMON },			\
-+  { "asm_spec32",		ASM_SPEC32 },				\
-+  { "asm_spec64",		ASM_SPEC64 },				\
-+  { "link_os_linux_spec32",	LINK_OS_LINUX_SPEC32 },			\
-+  { "link_os_linux_spec64",	LINK_OS_LINUX_SPEC64 },
-+
-+#undef	MULTILIB_DEFAULTS
-+#if DEFAULT_ARCH64_P
-+#define MULTILIB_DEFAULTS { "m64" }
-+#else
-+#define MULTILIB_DEFAULTS { "m32" }
-+#endif
-+
-+#ifndef RS6000_BI_ARCH
-+
-+/* 64-bit PowerPC Linux is always big-endian.  */
-+#undef	TARGET_LITTLE_ENDIAN
-+#define TARGET_LITTLE_ENDIAN	0
-+
-+/* 64-bit PowerPC Linux always has a TOC.  */
-+#undef  TARGET_TOC
-+#define	TARGET_TOC		1
-+
-+/* Some things from sysv4.h we don't do when 64 bit.  */
-+#undef	TARGET_RELOCATABLE
-+#define	TARGET_RELOCATABLE	0
-+#undef	TARGET_EABI
-+#define	TARGET_EABI		0
-+#undef	TARGET_PROTOTYPE
-+#define	TARGET_PROTOTYPE	0
-+#undef RELOCATABLE_NEEDS_FIXUP
-+#define RELOCATABLE_NEEDS_FIXUP 0
-+
-+#endif
-+
-+/* We use glibc _mcount for profiling.  */
-+#define NO_PROFILE_COUNTERS 1
-+#define PROFILE_HOOK(LABEL) \
-+  do { if (TARGET_64BIT) output_profile_hook (LABEL); } while (0)
-+
-+/* PowerPC64 Linux word-aligns FP doubles when -malign-power is given.  */
-+#undef  ADJUST_FIELD_ALIGN
-+#define ADJUST_FIELD_ALIGN(FIELD, COMPUTED) \
-+  ((TARGET_ALTIVEC && TREE_CODE (TREE_TYPE (FIELD)) == VECTOR_TYPE)	\
-+   ? 128								\
-+   : (TARGET_64BIT							\
-+      && TARGET_ALIGN_NATURAL == 0					\
-+      && TYPE_MODE (strip_array_types (TREE_TYPE (FIELD))) == DFmode)	\
-+   ? MIN ((COMPUTED), 32)						\
-+   : (COMPUTED))
-+
-+/* PowerPC64 Linux increases natural record alignment to doubleword if
-+   the first field is an FP double, only if in power alignment mode.  */
-+#undef  ROUND_TYPE_ALIGN
-+#define ROUND_TYPE_ALIGN(STRUCT, COMPUTED, SPECIFIED)			\
-+  ((TARGET_64BIT							\
-+    && (TREE_CODE (STRUCT) == RECORD_TYPE				\
-+	|| TREE_CODE (STRUCT) == UNION_TYPE				\
-+	|| TREE_CODE (STRUCT) == QUAL_UNION_TYPE)			\
-+    && TARGET_ALIGN_NATURAL == 0)					\
-+   ? rs6000_special_round_type_align (STRUCT, COMPUTED, SPECIFIED)	\
-+   : MAX ((COMPUTED), (SPECIFIED)))
-+
-+/* Use the default for compiling target libs.  */
-+#ifdef IN_TARGET_LIBS
-+#undef TARGET_ALIGN_NATURAL
-+#define TARGET_ALIGN_NATURAL 1
-+#endif
-+
-+/* Indicate that jump tables go in the text section.  */
-+#undef  JUMP_TABLES_IN_TEXT_SECTION
-+#define JUMP_TABLES_IN_TEXT_SECTION TARGET_64BIT
-+
-+/* The linux ppc64 ABI isn't explicit on whether aggregates smaller
-+   than a doubleword should be padded upward or downward.  You could
-+   reasonably assume that they follow the normal rules for structure
-+   layout treating the parameter area as any other block of memory,
-+   then map the reg param area to registers.  i.e. pad upward.
-+   Setting both of the following defines results in this behavior.
-+   Setting just the first one will result in aggregates that fit in a
-+   doubleword being padded downward, and others being padded upward.
-+   Not a bad idea as this results in struct { int x; } being passed
-+   the same way as an int.  */
-+#define AGGREGATE_PADDING_FIXED TARGET_64BIT
-+#define AGGREGATES_PAD_UPWARD_ALWAYS 0
-+
-+/* Specify padding for the last element of a block move between
-+   registers and memory.  FIRST is nonzero if this is the only
-+   element.  */
-+#define BLOCK_REG_PADDING(MODE, TYPE, FIRST) \
-+  (!(FIRST) ? upward : FUNCTION_ARG_PADDING (MODE, TYPE))
-+
-+/* Linux doesn't support saving and restoring 64-bit regs in a 32-bit
-+   process.  */
-+#define OS_MISSING_POWERPC64 !TARGET_64BIT
-+
-+#ifdef SINGLE_LIBC
-+#define OPTION_GLIBC  (DEFAULT_LIBC == LIBC_GLIBC)
-+#else
-+#define OPTION_GLIBC  (linux_libc == LIBC_GLIBC)
-+#endif
-+
-+/* glibc has float and long double forms of math functions.  */
-+#undef  TARGET_C99_FUNCTIONS
-+#define TARGET_C99_FUNCTIONS (OPTION_GLIBC)
-+
-+/* Whether we have sincos that follows the GNU extension.  */
-+#undef  TARGET_HAS_SINCOS
-+#define TARGET_HAS_SINCOS (OPTION_GLIBC)
-+
-+#undef  TARGET_OS_CPP_BUILTINS
-+#define TARGET_OS_CPP_BUILTINS()			\
-+  do							\
-+    {							\
-+      if (TARGET_64BIT)					\
-+	{						\
-+	  builtin_define ("__PPC__");			\
-+	  builtin_define ("__PPC64__");			\
-+	  builtin_define ("__powerpc__");		\
-+	  builtin_define ("__powerpc64__");		\
-+	  builtin_assert ("cpu=powerpc64");		\
-+	  builtin_assert ("machine=powerpc64");		\
-+	}						\
-+      else						\
-+	{						\
-+	  builtin_define_std ("PPC");			\
-+	  builtin_define_std ("powerpc");		\
-+	  builtin_assert ("cpu=powerpc");		\
-+	  builtin_assert ("machine=powerpc");		\
-+	  TARGET_OS_SYSV_CPP_BUILTINS ();		\
-+	}						\
-+    }							\
-+  while (0)
-+
-+#undef  CPP_OS_DEFAULT_SPEC
-+#define CPP_OS_DEFAULT_SPEC "%(cpp_os_linux)"
-+
-+/* The GNU C++ standard library currently requires _GNU_SOURCE being
-+   defined on glibc-based systems. This temporary hack accomplishes this,
-+   it should go away as soon as libstdc++-v3 has a real fix.  */
-+#undef  CPLUSPLUS_CPP_SPEC
-+#define CPLUSPLUS_CPP_SPEC "-D_GNU_SOURCE %(cpp)"
-+
-+#undef  LINK_SHLIB_SPEC
-+#define LINK_SHLIB_SPEC "%{shared:-shared} %{!shared: %{static:-static}}"
-+
-+#undef  LIB_DEFAULT_SPEC
-+#define LIB_DEFAULT_SPEC "%(lib_linux)"
-+
-+#undef  STARTFILE_DEFAULT_SPEC
-+#define STARTFILE_DEFAULT_SPEC "%(startfile_linux)"
-+
-+#undef	ENDFILE_DEFAULT_SPEC
-+#define ENDFILE_DEFAULT_SPEC "%(endfile_linux)"
-+
-+#undef	LINK_START_DEFAULT_SPEC
-+#define LINK_START_DEFAULT_SPEC "%(link_start_linux)"
-+
-+#undef	LINK_OS_DEFAULT_SPEC
-+#define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
-+
-+#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
-+#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
-+#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
-+#if DEFAULT_LIBC == LIBC_UCLIBC
-+#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
-+#elif DEFAULT_LIBC == LIBC_GLIBC
-+#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}"
-+#else
-+#error "Unsupported DEFAULT_LIBC"
-+#endif
-+#define GNU_USER_DYNAMIC_LINKER32 \
-+  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32)
-+#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 " GNU_USER_DYNAMIC_LINKER32 "}}"
-+
-+#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \
-+  %{rdynamic:-export-dynamic} \
-+  -dynamic-linker " GNU_USER_DYNAMIC_LINKER64 "}}"
-+
-+#undef  TOC_SECTION_ASM_OP
-+#define TOC_SECTION_ASM_OP \
-+  (TARGET_64BIT						\
-+   ? "\t.section\t\".toc\",\"aw\""			\
-+   : "\t.section\t\".got\",\"aw\"")
-+
-+#undef  MINIMAL_TOC_SECTION_ASM_OP
-+#define MINIMAL_TOC_SECTION_ASM_OP \
-+  (TARGET_64BIT						\
-+   ? "\t.section\t\".toc1\",\"aw\""			\
-+   : ((TARGET_RELOCATABLE || flag_pic)			\
-+      ? "\t.section\t\".got2\",\"aw\""			\
-+      : "\t.section\t\".got1\",\"aw\""))
-+
-+/* Must be at least as big as our pointer type.  */
-+#undef	SIZE_TYPE
-+#define	SIZE_TYPE (TARGET_64BIT ? "long unsigned int" : "unsigned int")
-+
-+#undef	PTRDIFF_TYPE
-+#define	PTRDIFF_TYPE (TARGET_64BIT ? "long int" : "int")
-+
-+#undef	WCHAR_TYPE
-+#define	WCHAR_TYPE (TARGET_64BIT ? "int" : "long int")
-+#undef  WCHAR_TYPE_SIZE
-+#define WCHAR_TYPE_SIZE 32
-+
-+/* Override rs6000.h definition.  */
-+#undef  ASM_APP_ON
-+#define ASM_APP_ON "#APP\n"
-+
-+/* Override rs6000.h definition.  */
-+#undef  ASM_APP_OFF
-+#define ASM_APP_OFF "#NO_APP\n"
-+
-+/* PowerPC no-op instruction.  */
-+#undef  RS6000_CALL_GLUE
-+#define RS6000_CALL_GLUE (TARGET_64BIT ? "nop" : "cror 31,31,31")
-+
-+#undef  RS6000_MCOUNT
-+#define RS6000_MCOUNT "_mcount"
-+
-+#ifdef __powerpc64__
-+/* _init and _fini functions are built from bits spread across many
-+   object files, each potentially with a different TOC pointer.  For
-+   that reason, place a nop after the call so that the linker can
-+   restore the TOC pointer if a TOC adjusting call stub is needed.  */
-+#if DOT_SYMBOLS
-+#define CRT_CALL_STATIC_FUNCTION(SECTION_OP, FUNC)	\
-+  asm (SECTION_OP "\n"					\
-+"	bl ." #FUNC "\n"				\
-+"	nop\n"						\
-+"	.previous");
-+#else
-+#define CRT_CALL_STATIC_FUNCTION(SECTION_OP, FUNC)	\
-+  asm (SECTION_OP "\n"					\
-+"	bl " #FUNC "\n"					\
-+"	nop\n"						\
-+"	.previous");
-+#endif
-+#endif
-+
-+/* FP save and restore routines.  */
-+#undef  SAVE_FP_PREFIX
-+#define SAVE_FP_PREFIX (TARGET_64BIT ? "._savef" : "_savefpr_")
-+#undef  SAVE_FP_SUFFIX
-+#define SAVE_FP_SUFFIX ""
-+#undef  RESTORE_FP_PREFIX
-+#define RESTORE_FP_PREFIX (TARGET_64BIT ? "._restf" : "_restfpr_")
-+#undef  RESTORE_FP_SUFFIX
-+#define RESTORE_FP_SUFFIX ""
-+
-+/* Dwarf2 debugging.  */
-+#undef  PREFERRED_DEBUGGING_TYPE
-+#define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG
-+
-+/* This is how to declare the size of a function.  */
-+#undef	ASM_DECLARE_FUNCTION_SIZE
-+#define	ASM_DECLARE_FUNCTION_SIZE(FILE, FNAME, DECL)			\
-+  do									\
-+    {									\
-+      if (!flag_inhibit_size_directive)					\
-+	{								\
-+	  fputs ("\t.size\t", (FILE));					\
-+	  if (TARGET_64BIT && DOT_SYMBOLS)				\
-+	    putc ('.', (FILE));						\
-+	  assemble_name ((FILE), (FNAME));				\
-+	  fputs (",.-", (FILE));					\
-+	  rs6000_output_function_entry (FILE, FNAME);			\
-+	  putc ('\n', (FILE));						\
-+	}								\
-+    }									\
-+  while (0)
-+
-+/* Return nonzero if this entry is to be written into the constant
-+   pool in a special way.  We do so if this is a SYMBOL_REF, LABEL_REF
-+   or a CONST containing one of them.  If -mfp-in-toc (the default),
-+   we also do this for floating-point constants.  We actually can only
-+   do this if the FP formats of the target and host machines are the
-+   same, but we can't check that since not every file that uses
-+   the macros includes real.h.  We also do this when we can write the
-+   entry into the TOC and the entry is not larger than a TOC entry.  */
-+
-+#undef  ASM_OUTPUT_SPECIAL_POOL_ENTRY_P
-+#define ASM_OUTPUT_SPECIAL_POOL_ENTRY_P(X, MODE)			\
-+  (TARGET_TOC								\
-+   && (GET_CODE (X) == SYMBOL_REF					\
-+       || (GET_CODE (X) == CONST && GET_CODE (XEXP (X, 0)) == PLUS	\
-+	   && GET_CODE (XEXP (XEXP (X, 0), 0)) == SYMBOL_REF)		\
-+       || GET_CODE (X) == LABEL_REF					\
-+       || (GET_CODE (X) == CONST_INT 					\
-+	   && GET_MODE_BITSIZE (MODE) <= GET_MODE_BITSIZE (Pmode))	\
-+       || (GET_CODE (X) == CONST_DOUBLE					\
-+	   && ((TARGET_64BIT						\
-+		&& (TARGET_MINIMAL_TOC					\
-+		    || (SCALAR_FLOAT_MODE_P (GET_MODE (X))		\
-+			&& ! TARGET_NO_FP_IN_TOC)))			\
-+	       || (!TARGET_64BIT					\
-+		   && !TARGET_NO_FP_IN_TOC				\
-+		   && !TARGET_RELOCATABLE				\
-+		   && SCALAR_FLOAT_MODE_P (GET_MODE (X))		\
-+		   && BITS_PER_WORD == HOST_BITS_PER_INT)))))
-+
-+/* Select a format to encode pointers in exception handling data.  CODE
-+   is 0 for data, 1 for code labels, 2 for function pointers.  GLOBAL is
-+   true if the symbol may be affected by dynamic relocations.  */
-+#undef	ASM_PREFERRED_EH_DATA_FORMAT
-+#define	ASM_PREFERRED_EH_DATA_FORMAT(CODE, GLOBAL) \
-+  ((TARGET_64BIT || flag_pic || TARGET_RELOCATABLE)			\
-+   ? (((GLOBAL) ? DW_EH_PE_indirect : 0) | DW_EH_PE_pcrel		\
-+      | (TARGET_64BIT ? DW_EH_PE_udata8 : DW_EH_PE_sdata4))		\
-+   : DW_EH_PE_absptr)
-+
-+/* For backward compatibility, we must continue to use the AIX
-+   structure return convention.  */
-+#undef DRAFT_V4_STRUCT_RET
-+#define DRAFT_V4_STRUCT_RET (!TARGET_64BIT)
-+
-+#define TARGET_POSIX_IO
-+
-+#define LINK_GCC_C_SEQUENCE_SPEC \
-+  "%{static:--start-group} %G %L %{static:--end-group}%{!static:%G}"
-+
-+/* Use --as-needed -lgcc_s for eh support.  */
-+#ifdef HAVE_LD_AS_NEEDED
-+#define USE_LD_AS_NEEDED 1
-+#endif
-+
-+#ifdef TARGET_LIBC_PROVIDES_SSP
-+/* ppc32 glibc provides __stack_chk_guard in -0x7008(2),
-+   ppc64 glibc provides it at -0x7010(13).  */
-+#define TARGET_THREAD_SSP_OFFSET	(TARGET_64BIT ? -0x7010 : -0x7008)
-+#endif
-+
-+#define POWERPC_LINUX
-+
-+/* ppc{32,64} linux has 128-bit long double support in glibc 2.4 and later.  */
-+#ifdef TARGET_DEFAULT_LONG_DOUBLE_128
-+#define RS6000_DEFAULT_LONG_DOUBLE_SIZE 128
-+#endif
-+
-+/* Static stack checking is supported by means of probes.  */
-+#define STACK_CHECK_STATIC_BUILTIN 1
-+
-+/* The default value isn't sufficient in 64-bit mode.  */
-+#define STACK_CHECK_PROTECT (TARGET_64BIT ? 16 * 1024 : 12 * 1024)
 diff -Nur gcc-4.7.3.orig/gcc/config/rs6000/secureplt.h gcc-4.7.3/gcc/config/rs6000/secureplt.h
 --- gcc-4.7.3.orig/gcc/config/rs6000/secureplt.h	2007-08-02 12:49:31.000000000 +0200
-+++ gcc-4.7.3/gcc/config/rs6000/secureplt.h	2013-09-14 13:08:52.000000000 +0200
++++ gcc-4.7.3/gcc/config/rs6000/secureplt.h	2013-09-14 15:51:23.000000000 +0200
 @@ -18,3 +18,4 @@
  <http://www.gnu.org/licenses/>.  */
  
@@ -1077,7 +396,7 @@ diff -Nur gcc-4.7.3.orig/gcc/config/rs6000/secureplt.h gcc-4.7.3/gcc/config/rs60
 +#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt"
 diff -Nur gcc-4.7.3.orig/gcc/config/rs6000/sysv4.h gcc-4.7.3/gcc/config/rs6000/sysv4.h
 --- gcc-4.7.3.orig/gcc/config/rs6000/sysv4.h	2012-04-30 19:39:01.000000000 +0200
-+++ gcc-4.7.3/gcc/config/rs6000/sysv4.h	2013-09-14 13:08:52.000000000 +0200
++++ gcc-4.7.3/gcc/config/rs6000/sysv4.h	2013-09-14 15:51:23.000000000 +0200
 @@ -566,6 +566,9 @@
  #ifndef CC1_SECURE_PLT_DEFAULT_SPEC
  #define CC1_SECURE_PLT_DEFAULT_SPEC ""
@@ -1128,1005 +447,9 @@ diff -Nur gcc-4.7.3.orig/gcc/config/rs6000/sysv4.h gcc-4.7.3/gcc/config/rs6000/s
    { "cpp_os_ads",		CPP_OS_ADS_SPEC },			\
    { "cpp_os_yellowknife",	CPP_OS_YELLOWKNIFE_SPEC },		\
    { "cpp_os_mvme",		CPP_OS_MVME_SPEC },			\
-diff -Nur gcc-4.7.3.orig/gcc/config/rs6000/sysv4.h.orig gcc-4.7.3/gcc/config/rs6000/sysv4.h.orig
---- gcc-4.7.3.orig/gcc/config/rs6000/sysv4.h.orig	1970-01-01 01:00:00.000000000 +0100
-+++ gcc-4.7.3/gcc/config/rs6000/sysv4.h.orig	2012-04-30 19:39:01.000000000 +0200
-@@ -0,0 +1,992 @@
-+/* Target definitions for GNU compiler for PowerPC running System V.4
-+   Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-+   2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
-+   Free Software Foundation, Inc.
-+   Contributed by Cygnus Support.
-+
-+   This file is part of GCC.
-+
-+   GCC is free software; you can redistribute it and/or modify it
-+   under the terms of the GNU General Public License as published
-+   by the Free Software Foundation; either version 3, or (at your
-+   option) any later version.
-+
-+   GCC is distributed in the hope that it will be useful, but WITHOUT
-+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-+   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-+   License for more details.
-+
-+   Under Section 7 of GPL version 3, you are granted additional
-+   permissions described in the GCC Runtime Library Exception, version
-+   3.1, as published by the Free Software Foundation.
-+
-+   You should have received a copy of the GNU General Public License and
-+   a copy of the GCC Runtime Library Exception along with this program;
-+   see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
-+   <http://www.gnu.org/licenses/>.  */
-+
-+/* Header files should be C++ aware in general.  */
-+#undef  NO_IMPLICIT_EXTERN_C
-+#define NO_IMPLICIT_EXTERN_C
-+
-+/* Yes!  We are ELF.  */
-+#define	TARGET_OBJECT_FORMAT OBJECT_ELF
-+
-+/* Default ABI to compile code for.  */
-+#define DEFAULT_ABI rs6000_current_abi
-+
-+/* Default ABI to use.  */
-+#define RS6000_ABI_NAME "sysv"
-+
-+/* Override rs6000.h definition.  */
-+#undef	ASM_DEFAULT_SPEC
-+#define	ASM_DEFAULT_SPEC "-mppc"
-+
-+#define	TARGET_TOC		((target_flags & MASK_64BIT)		\
-+				 || ((target_flags & (MASK_RELOCATABLE	\
-+						      | MASK_MINIMAL_TOC)) \
-+				     && flag_pic > 1)			\
-+				 || DEFAULT_ABI == ABI_AIX)
-+
-+#define	TARGET_BITFIELD_TYPE	(! TARGET_NO_BITFIELD_TYPE)
-+#define	TARGET_BIG_ENDIAN	(! TARGET_LITTLE_ENDIAN)
-+#define	TARGET_PROTOTYPE	target_prototype
-+#define	TARGET_NO_PROTOTYPE	(! TARGET_PROTOTYPE)
-+#define	TARGET_NO_TOC		(! TARGET_TOC)
-+#define	TARGET_NO_EABI		(! TARGET_EABI)
-+#define	TARGET_REGNAMES		rs6000_regnames
-+
-+#ifdef HAVE_AS_REL16
-+#undef TARGET_SECURE_PLT
-+#define TARGET_SECURE_PLT	secure_plt
-+#endif
-+
-+#define SDATA_DEFAULT_SIZE 8
-+
-+/* The macro SUBTARGET_OVERRIDE_OPTIONS is provided for subtargets, to
-+   get control in TARGET_OPTION_OVERRIDE.  */
-+
-+#define SUBTARGET_OVERRIDE_OPTIONS					\
-+do {									\
-+  if (!global_options_set.x_g_switch_value)				\
-+    g_switch_value = SDATA_DEFAULT_SIZE;				\
-+									\
-+  if (rs6000_abi_name == NULL)						\
-+    rs6000_abi_name = RS6000_ABI_NAME;					\
-+									\
-+  if (!strcmp (rs6000_abi_name, "sysv"))				\
-+    rs6000_current_abi = ABI_V4;					\
-+  else if (!strcmp (rs6000_abi_name, "sysv-noeabi"))			\
-+    {									\
-+      rs6000_current_abi = ABI_V4;					\
-+      target_flags &= ~ MASK_EABI;					\
-+    }									\
-+  else if (!strcmp (rs6000_abi_name, "sysv-eabi")			\
-+	   || !strcmp (rs6000_abi_name, "eabi"))			\
-+    {									\
-+      rs6000_current_abi = ABI_V4;					\
-+      target_flags |= MASK_EABI;					\
-+    }									\
-+  else if (!strcmp (rs6000_abi_name, "aixdesc"))			\
-+    rs6000_current_abi = ABI_AIX;					\
-+  else if (!strcmp (rs6000_abi_name, "freebsd")				\
-+	   || !strcmp (rs6000_abi_name, "linux"))			\
-+    {									\
-+      if (TARGET_64BIT)							\
-+	rs6000_current_abi = ABI_AIX;					\
-+      else								\
-+	rs6000_current_abi = ABI_V4;					\
-+    }									\
-+  else if (!strcmp (rs6000_abi_name, "netbsd"))				\
-+    rs6000_current_abi = ABI_V4;					\
-+  else if (!strcmp (rs6000_abi_name, "openbsd"))			\
-+    rs6000_current_abi = ABI_V4;					\
-+  else if (!strcmp (rs6000_abi_name, "i960-old"))			\
-+    {									\
-+      rs6000_current_abi = ABI_V4;					\
-+      target_flags |= (MASK_LITTLE_ENDIAN | MASK_EABI);			\
-+      target_flags &= ~MASK_STRICT_ALIGN;				\
-+      TARGET_NO_BITFIELD_WORD = 1;					\
-+    }									\
-+  else									\
-+    {									\
-+      rs6000_current_abi = ABI_V4;					\
-+      error ("bad value for -mcall-%s", rs6000_abi_name);		\
-+    }									\
-+									\
-+  if (rs6000_sdata_name)						\
-+    {									\
-+      if (!strcmp (rs6000_sdata_name, "none"))				\
-+	rs6000_sdata = SDATA_NONE;					\
-+      else if (!strcmp (rs6000_sdata_name, "data"))			\
-+	rs6000_sdata = SDATA_DATA;					\
-+      else if (!strcmp (rs6000_sdata_name, "default"))			\
-+	rs6000_sdata = (TARGET_EABI) ? SDATA_EABI : SDATA_SYSV;		\
-+      else if (!strcmp (rs6000_sdata_name, "sysv"))			\
-+	rs6000_sdata = SDATA_SYSV;					\
-+      else if (!strcmp (rs6000_sdata_name, "eabi"))			\
-+	rs6000_sdata = SDATA_EABI;					\
-+      else								\
-+	error ("bad value for -msdata=%s", rs6000_sdata_name);		\
-+    }									\
-+  else if (DEFAULT_ABI == ABI_V4)					\
-+    {									\
-+      rs6000_sdata = SDATA_DATA;					\
-+      rs6000_sdata_name = "data";					\
-+    }									\
-+  else									\
-+    {									\
-+      rs6000_sdata = SDATA_NONE;					\
-+      rs6000_sdata_name = "none";					\
-+    }									\
-+									\
-+  if (TARGET_RELOCATABLE &&						\
-+      (rs6000_sdata == SDATA_EABI || rs6000_sdata == SDATA_SYSV))	\
-+    {									\
-+      rs6000_sdata = SDATA_DATA;					\
-+      error ("-mrelocatable and -msdata=%s are incompatible",		\
-+	     rs6000_sdata_name);					\