* Update the x32 support from the branch.

git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.7@7115 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca

3 files changed, 183 insertions, 391 deletions

diff --git a/debian/changelog b/debian/changelog
index 9c4d244..84d04cd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ gcc-4.7 (4.7.3-10) UNRELEASED; urgency=low
   * Configure --with-long-double-128 on powerpcspe. Closes: #731141.
   * Stop building the spu cross compiler, apparently newlib is now
     maintained by an ARM only maintainer. Closes: #734002.
+  * Update the x32 support from the branch.
 
   [ Aurelien Jarno ]
   * patches/note-gnu-stack.diff: restore and rebase lost parts.
diff --git a/debian/patches/hjl-x32-gcc-4_7-branch-doc.diff b/debian/patches/hjl-x32-gcc-4_7-branch-doc.diff
index 1c96d08..ef6f436 100644
--- a/debian/patches/hjl-x32-gcc-4_7-branch-doc.diff
+++ b/debian/patches/hjl-x32-gcc-4_7-branch-doc.diff
@@ -1,7 +1,5 @@
-diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
-index c1ff004..91f9593 100644
---- a/gcc/doc/invoke.texi
-+++ b/gcc/doc/invoke.texi
+--- a/src/gcc/doc/invoke.texi
++++ b/src/gcc/doc/invoke.texi
 @@ -637,7 +637,7 @@ Objective-C and Objective-C++ Dialects}.
  -mveclibabi=@var{type} -mvect8-ret-in-mem @gol
  -mpc32 -mpc64 -mpc80 -mstackrealign @gol
@@ -43,10 +41,8 @@ index c1ff004..91f9593 100644
  @end table
  
  @node i386 and x86-64 Windows Options
-diff --git a/gcc/doc/options.texi b/gcc/doc/options.texi
-index 0a54183..08b8b79 100644
---- a/gcc/doc/options.texi
-+++ b/gcc/doc/options.texi
+--- a/src/gcc/doc/options.texi
++++ b/src/gcc/doc/options.texi
 @@ -346,8 +346,6 @@ the value 1 when the option is active and 0 otherwise.  If you use @code{Var}
  to attach the option to a different variable, the associated macros are
  called @code{OPTION_MASK_@var{name}} and @code{OPTION_@var{name}} respectively.
diff --git a/debian/patches/hjl-x32-gcc-4_7-branch.diff b/debian/patches/hjl-x32-gcc-4_7-branch.diff
index cc3de77..1d084ac 100644
--- a/debian/patches/hjl-x32-gcc-4_7-branch.diff
+++ b/debian/patches/hjl-x32-gcc-4_7-branch.diff
@@ -1,18 +1,12 @@
-diff --git a/ChangeLog.x32 b/ChangeLog.x32
-new file mode 100644
-index 0000000..b633cf6
---- /dev/null
-+++ b/ChangeLog.x32
+--- a/src//dev/null
++++ b/src/ChangeLog.x32
 @@ -0,0 +1,4 @@
 +2012-05-15  H.J. Lu  <hongjiu.lu@intel.com>
 +
 +	Merge upstream change
 +	* libtool.m4 (_LT_ENABLE_LOCK): Support x32.
-diff --git a/boehm-gc/ChangeLog.x32 b/boehm-gc/ChangeLog.x32
-new file mode 100644
-index 0000000..0990077
---- /dev/null
-+++ b/boehm-gc/ChangeLog.x32
+--- a/src//dev/null
++++ b/src/boehm-gc/ChangeLog.x32
 @@ -0,0 +1,9 @@
 +2012-05-16  H.J. Lu  <hongjiu.lu@intel.com>
 +
@@ -23,10 +17,8 @@ index 0000000..0990077
 +	Merge upstream changes
 +	* include/private/gcconfig.h: (ALIGNMENT): Set to 4 for x32.
 +	(CPP_WORDSZ): Set to 32 for x32.
-diff --git a/boehm-gc/configure b/boehm-gc/configure
-index c76ea44..aa61053 100755
---- a/boehm-gc/configure
-+++ b/boehm-gc/configure
+--- a/src/boehm-gc/configure
++++ b/src/boehm-gc/configure
 @@ -6786,7 +6786,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
  	    LD="${LD-ld} -m elf_i386_fbsd"
  	    ;;
@@ -61,10 +53,8 @@ index c76ea44..aa61053 100755
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-diff --git a/boehm-gc/include/private/gcconfig.h b/boehm-gc/include/private/gcconfig.h
-index fb09cf7..0263c13 100644
---- a/boehm-gc/include/private/gcconfig.h
-+++ b/boehm-gc/include/private/gcconfig.h
+--- a/src/boehm-gc/include/private/gcconfig.h
++++ b/src/boehm-gc/include/private/gcconfig.h
 @@ -1974,8 +1974,13 @@
  
  # ifdef X86_64
@@ -81,11 +71,8 @@ index fb09cf7..0263c13 100644
  #   ifndef HBLKSIZE
  #     define HBLKSIZE 4096
  #   endif
-diff --git a/gcc/ChangeLog.pr53383 b/gcc/ChangeLog.pr53383
-new file mode 100644
-index 0000000..bcb48cc
---- /dev/null
-+++ b/gcc/ChangeLog.pr53383
+--- a/src//dev/null
++++ b/src/gcc/ChangeLog.pr53383
 @@ -0,0 +1,10 @@
 +2012-05-25  H.J. Lu  <hongjiu.lu@intel.com>
 +
@@ -97,11 +84,8 @@ index 0000000..bcb48cc
 +
 +	* config/i386/i386.h (MIN_STACK_BOUNDARY): Set to 64 for 64-bit
 +	if SSE is disenabled.
-diff --git a/gcc/ChangeLog.x32 b/gcc/ChangeLog.x32
-new file mode 100644
-index 0000000..6b8c31a
---- /dev/null
-+++ b/gcc/ChangeLog.x32
+--- a/src//dev/null
++++ b/src/gcc/ChangeLog.x32
 @@ -0,0 +1,343 @@
 +2012-08-24  H.J. Lu  <hongjiu.lu@intel.com>
 +
@@ -446,11 +430,8 @@ index 0000000..6b8c31a
 +
 +	* config/i386/i386.c (ix86_expand_prologue): Check Pmode to set
 +	adjust_stack_insn.
-diff --git a/gcc/ada/ChangeLog.x32 b/gcc/ada/ChangeLog.x32
-new file mode 100644
-index 0000000..5d5bca2
---- /dev/null
-+++ b/gcc/ada/ChangeLog.x32
+--- a/src//dev/null
++++ b/src/gcc/ada/ChangeLog.x32
 @@ -0,0 +1,10 @@
 +2012-03-03  H.J. Lu  <hongjiu.lu@intel.com>
 +
@@ -462,10 +443,8 @@ index 0000000..5d5bca2
 +	* gcc-interface/Makefile.in (arch): Set to x32 if MULTISUBDIR
 +	is /x32.
 +	Support x32.
-diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
-index 9f20f07..96fab00 100644
---- a/gcc/ada/gcc-interface/Makefile.in
-+++ b/gcc/ada/gcc-interface/Makefile.in
+--- a/src/gcc/ada/gcc-interface/Makefile.in
++++ b/src/gcc/ada/gcc-interface/Makefile.in
 @@ -350,6 +350,10 @@ GNATMAKE_OBJS = a-except.o ali.o ali-util.o aspects.o s-casuti.o alloc.o \
  ifeq ($(strip $(filter-out %x86_64, $(arch))),)
    ifeq ($(strip $(MULTISUBDIR)),/32)
@@ -521,10 +500,8 @@ index 9f20f07..96fab00 100644
  ifeq ($(strip $(filter-out darwin%,$(osys))),)
    SO_OPTS = -shared-libgcc
    LIBGNAT_TARGET_PAIRS = \
-diff --git a/gcc/ada/init.c b/gcc/ada/init.c
-index d8f5735..5015332 100644
---- a/gcc/ada/init.c
-+++ b/gcc/ada/init.c
+--- a/src/gcc/ada/init.c
++++ b/src/gcc/ada/init.c
 @@ -615,9 +615,13 @@ __gnat_adjust_context_for_raise (int signo ATTRIBUTE_UNUSED, void *ucontext)
    if (signo == SIGSEGV && pc && *pc == 0x00240c83)
      mcontext->gregs[REG_ESP] += 4096 + 4 * sizeof (unsigned long);
@@ -542,10 +519,8 @@ index d8f5735..5015332 100644
      mcontext->gregs[REG_RSP] += 4096 + 4 * sizeof (unsigned long);
  #elif defined (__ia64__)
    /* ??? The IA-64 unwinder doesn't compensate for signals.  */
-diff --git a/gcc/ada/link.c b/gcc/ada/link.c
-index 51ea759..5a5dabe 100644
---- a/gcc/ada/link.c
-+++ b/gcc/ada/link.c
+--- a/src/gcc/ada/link.c
++++ b/src/gcc/ada/link.c
 @@ -165,7 +165,11 @@ unsigned char __gnat_objlist_file_supported = 1;
  const char *__gnat_object_library_extension = ".a";
  unsigned char __gnat_separate_run_path_options = 0;
@@ -558,10 +533,8 @@ index 51ea759..5a5dabe 100644
  #else
  const char *__gnat_default_libgcc_subdir = "lib";
  #endif
-diff --git a/gcc/config.gcc b/gcc/config.gcc
-index 9503b96..ba45f6d 100644
---- a/gcc/config.gcc
-+++ b/gcc/config.gcc
+--- a/src/gcc/config.gcc
++++ b/src/gcc/config.gcc
 @@ -494,6 +494,10 @@ fi
  
  case ${target} in
@@ -624,10 +597,8 @@ index 9503b96..ba45f6d 100644
  		for which in arch arch_32 arch_64 cpu cpu_32 cpu_64 tune tune_32 tune_64; do
  			eval "val=\$with_$which"
  			case ${val} in
-diff --git a/gcc/config/arm/arm.opt b/gcc/config/arm/arm.opt
-index 934aa35..e03a163 100644
---- a/gcc/config/arm/arm.opt
-+++ b/gcc/config/arm/arm.opt
+--- a/src/gcc/config/arm/arm.opt
++++ b/src/gcc/config/arm/arm.opt
 @@ -59,7 +59,7 @@ Target Report Mask(ABORT_NORETURN)
  Generate a call to abort if a noreturn function returns
  
@@ -637,10 +608,8 @@ index 934aa35..e03a163 100644
  
  mapcs-float
  Target Report Mask(APCS_FLOAT)
-diff --git a/gcc/config/cris/linux.opt b/gcc/config/cris/linux.opt
-index a57c48d..e93bb53 100644
---- a/gcc/config/cris/linux.opt
-+++ b/gcc/config/cris/linux.opt
+--- a/src/gcc/config/cris/linux.opt
++++ b/src/gcc/config/cris/linux.opt
 @@ -23,7 +23,7 @@ mlinux
  Target Report RejectNegative Undocumented
  
@@ -650,10 +619,8 @@ index a57c48d..e93bb53 100644
  Together with -fpic and -fPIC, do not use GOTPLT references
  
  ; There's a small added setup cost with using GOTPLT references
-diff --git a/gcc/config/host-linux.c b/gcc/config/host-linux.c
-index 94b7a0b..b535758 100644
---- a/gcc/config/host-linux.c
-+++ b/gcc/config/host-linux.c
+--- a/src/gcc/config/host-linux.c
++++ b/src/gcc/config/host-linux.c
 @@ -68,8 +68,10 @@
  # define TRY_EMPTY_VM_SPACE	0x10000000000
  #elif defined(__ia64)
@@ -666,10 +633,8 @@ index 94b7a0b..b535758 100644
  #elif defined(__i386)
  # define TRY_EMPTY_VM_SPACE	0x60000000
  #elif defined(__powerpc__)
-diff --git a/gcc/config/i386/biarch64.h b/gcc/config/i386/biarch64.h
-index 629ec98..0c3811e 100644
---- a/gcc/config/i386/biarch64.h
-+++ b/gcc/config/i386/biarch64.h
+--- a/src/gcc/config/i386/biarch64.h
++++ b/src/gcc/config/i386/biarch64.h
 @@ -25,5 +25,5 @@ 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/>.  */
@@ -677,11 +642,8 @@ index 629ec98..0c3811e 100644
 -#define TARGET_64BIT_DEFAULT OPTION_MASK_ISA_64BIT
 +#define TARGET_64BIT_DEFAULT (OPTION_MASK_ISA_64BIT | OPTION_MASK_ABI_64)
  #define TARGET_BI_ARCH 1
-diff --git a/gcc/config/i386/biarchx32.h b/gcc/config/i386/biarchx32.h
-new file mode 100644
-index 0000000..69d6722
---- /dev/null
-+++ b/gcc/config/i386/biarchx32.h
+--- a/src//dev/null
++++ b/src/gcc/config/i386/biarchx32.h
 @@ -0,0 +1,28 @@
 +/* Make configure files to produce biarch compiler defaulting to x32 mode.
 +   This file must be included very first, while the OS specific file later
@@ -711,10 +673,8 @@ index 0000000..69d6722
 +
 +#define TARGET_64BIT_DEFAULT (OPTION_MASK_ISA_64BIT | OPTION_MASK_ABI_X32)
 +#define TARGET_BI_ARCH 2
-diff --git a/gcc/config/i386/constraints.md b/gcc/config/i386/constraints.md
-index 25327dd..a937196 100644
---- a/gcc/config/i386/constraints.md
-+++ b/gcc/config/i386/constraints.md
+--- a/src/gcc/config/i386/constraints.md
++++ b/src/gcc/config/i386/constraints.md
 @@ -18,7 +18,7 @@
  ;; <http://www.gnu.org/licenses/>.
  
@@ -741,10 +701,8 @@ index 25327dd..a937196 100644
  (define_constraint "Z"
    "32-bit unsigned integer constant, or a symbolic reference known
     to fit that range (for immediate operands in zero-extending x86-64
-diff --git a/gcc/config/i386/gnu-user64.h b/gcc/config/i386/gnu-user64.h
-index fd96df4..ba72f24 100644
---- a/gcc/config/i386/gnu-user64.h
-+++ b/gcc/config/i386/gnu-user64.h
+--- a/src/gcc/config/i386/gnu-user64.h
++++ b/src/gcc/config/i386/gnu-user64.h
 @@ -58,8 +58,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
  
  #if TARGET_64BIT_DEFAULT
@@ -778,10 +736,8 @@ index fd96df4..ba72f24 100644
 +
 +#undef WCHAR_TYPE
 +#define WCHAR_TYPE (TARGET_LP64 ? "int" : "long int")
-diff --git a/gcc/config/i386/i386-opts.h b/gcc/config/i386/i386-opts.h
-index 3cc2253..eea85fd 100644
---- a/gcc/config/i386/i386-opts.h
-+++ b/gcc/config/i386/i386-opts.h
+--- a/src/gcc/config/i386/i386-opts.h
++++ b/src/gcc/config/i386/i386-opts.h
 @@ -71,6 +71,11 @@ enum cmodel {
    CM_LARGE_PIC	/* No assumptions.  */
  };
@@ -794,10 +750,8 @@ index 3cc2253..eea85fd 100644
  enum asm_dialect {
    ASM_ATT,
    ASM_INTEL
-diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
-index 63622ab..cb07c9f 100644
---- a/gcc/config/i386/i386.c
-+++ b/gcc/config/i386/i386.c
+--- a/src/gcc/config/i386/i386.c
++++ b/src/gcc/config/i386/i386.c
 @@ -2448,6 +2448,8 @@ static rtx (*ix86_gen_andsp) (rtx, rtx, rtx);
  static rtx (*ix86_gen_allocate_stack_worker) (rtx, rtx);
  static rtx (*ix86_gen_adjust_stack_and_probe) (rtx, rtx, rtx);
@@ -1506,10 +1460,8 @@ index 63622ab..cb07c9f 100644
      }
  
    nregs = ix86_function_regparm (type, function);
-diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h
-index 835ea10..0a9a77a 100644
---- a/gcc/config/i386/i386.h
-+++ b/gcc/config/i386/i386.h
+--- a/src/gcc/config/i386/i386.h
++++ b/src/gcc/config/i386/i386.h
 @@ -42,7 +42,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
  /* Redefines for option macros.  */
  
@@ -1546,10 +1498,8 @@ index 835ea10..0a9a77a 100644
  
  /* A C expression whose value is zero if pointers that need to be extended
     from being `POINTER_SIZE' bits wide to `Pmode' are sign-extended and
-diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
-index f85f17a..c23f9c6 100644
---- a/gcc/config/i386/i386.md
-+++ b/gcc/config/i386/i386.md
+--- a/src/gcc/config/i386/i386.md
++++ b/src/gcc/config/i386/i386.md
 @@ -61,7 +61,9 @@
  ;; Y -- print condition for XOP pcom* instruction.
  ;; + -- print a branch hint as 'cs' or 'ds' prefix
@@ -2323,10 +2273,8 @@ index f85f17a..c23f9c6 100644
  	  ? gen_lwp_slwpcbdi
  	  : gen_lwp_slwpcbsi);
  
-diff --git a/gcc/config/i386/i386.opt b/gcc/config/i386/i386.opt
-index 6c516e7..97130e1 100644
---- a/gcc/config/i386/i386.opt
-+++ b/gcc/config/i386/i386.opt
+--- a/src/gcc/config/i386/i386.opt
++++ b/src/gcc/config/i386/i386.opt
 @@ -159,6 +159,20 @@ Enum(cmodel) String(32) Value(CM_32)
  EnumValue
  Enum(cmodel) String(kernel) Value(CM_KERNEL)
@@ -2385,10 +2333,8 @@ index 6c516e7..97130e1 100644
  Do not support SSE4.1 and SSE4.2 built-in functions and code generation
  
  msse5
-diff --git a/gcc/config/i386/predicates.md b/gcc/config/i386/predicates.md
-index 9e31291..3cafdb9 100644
---- a/gcc/config/i386/predicates.md
-+++ b/gcc/config/i386/predicates.md
+--- a/src/gcc/config/i386/predicates.md
++++ b/src/gcc/config/i386/predicates.md
 @@ -1,5 +1,5 @@
  ;; Predicate definitions for IA-32 and x86-64.
 -;; Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
@@ -2458,10 +2404,8 @@ index 9e31291..3cafdb9 100644
         (match_operand 0 "register_no_elim_operand")))
  
  ;; Match exactly zero.
-diff --git a/gcc/config/i386/sse.md b/gcc/config/i386/sse.md
-index 6e3ec00..81a0bd54 100644
---- a/gcc/config/i386/sse.md
-+++ b/gcc/config/i386/sse.md
+--- a/src/gcc/config/i386/sse.md
++++ b/src/gcc/config/i386/sse.md
 @@ -8083,8 +8083,8 @@
    "monitor\t%0, %1, %2"
    [(set_attr "length" "3")])
@@ -2473,10 +2417,8 @@ index 6e3ec00..81a0bd54 100644
  		     (match_operand:SI 1 "register_operand" "c")
  		     (match_operand:SI 2 "register_operand" "d")]
  		    UNSPECV_MONITOR)]
-diff --git a/gcc/config/m68k/m68k.opt b/gcc/config/m68k/m68k.opt
-index 14428fc..00bc2d5 100644
---- a/gcc/config/m68k/m68k.opt
-+++ b/gcc/config/m68k/m68k.opt
+--- a/src/gcc/config/m68k/m68k.opt
++++ b/src/gcc/config/m68k/m68k.opt
 @@ -136,7 +136,7 @@ Target RejectNegative
  Generate code for a Fido A
  
@@ -2486,10 +2428,8 @@ index 14428fc..00bc2d5 100644
  Generate code which uses hardware floating point instructions
  
  mid-shared-library
-diff --git a/gcc/config/mep/mep.opt b/gcc/config/mep/mep.opt
-index 38b8f80..0ea19e6 100644
---- a/gcc/config/mep/mep.opt
-+++ b/gcc/config/mep/mep.opt
+--- a/src/gcc/config/mep/mep.opt
++++ b/src/gcc/config/mep/mep.opt
 @@ -55,7 +55,7 @@ Target Mask(COP)
  Enable MeP Coprocessor
  
@@ -2499,10 +2439,8 @@ index 38b8f80..0ea19e6 100644
  Enable MeP Coprocessor with 32-bit registers
  
  mcop64
-diff --git a/gcc/config/pa/pa-hpux.opt b/gcc/config/pa/pa-hpux.opt
-index ed5d6a4..b709b83 100644
---- a/gcc/config/pa/pa-hpux.opt
-+++ b/gcc/config/pa/pa-hpux.opt
+--- a/src/gcc/config/pa/pa-hpux.opt
++++ b/src/gcc/config/pa/pa-hpux.opt
 @@ -23,7 +23,7 @@ Variable
  int flag_pa_unix = TARGET_HPUX_11_31 ? 2003 : TARGET_HPUX_11_11 ? 1998 : TARGET_HPUX_10_10 ? 1995 : 1993
  
@@ -2512,10 +2450,8 @@ index ed5d6a4..b709b83 100644
  Generate cpp defines for server IO
  
  munix=93
-diff --git a/gcc/config/pa/pa64-hpux.opt b/gcc/config/pa/pa64-hpux.opt
-index 36b1c61..56ca35e 100644
---- a/gcc/config/pa/pa64-hpux.opt
-+++ b/gcc/config/pa/pa64-hpux.opt
+--- a/src/gcc/config/pa/pa64-hpux.opt
++++ b/src/gcc/config/pa/pa64-hpux.opt
 @@ -19,7 +19,7 @@
  ; <http://www.gnu.org/licenses/>.
  
@@ -2525,20 +2461,16 @@ index 36b1c61..56ca35e 100644
  Assume code will be linked by GNU ld
  
  mhp-ld
-diff --git a/gcc/config/picochip/picochip.opt b/gcc/config/picochip/picochip.opt
-index 4726f49..a4b25e5 100644
---- a/gcc/config/picochip/picochip.opt
-+++ b/gcc/config/picochip/picochip.opt
+--- a/src/gcc/config/picochip/picochip.opt
++++ b/src/gcc/config/picochip/picochip.opt
 @@ -43,4 +43,4 @@ Target Mask(INEFFICIENT_WARNINGS)
  Generate warnings when inefficient code is known to be generated.
  
  minefficient
 -Target Mask(INEFFICIENT_WARNINGS) MaskExists Undocumented
 +Target Mask(INEFFICIENT_WARNINGS) Undocumented
-diff --git a/gcc/config/rs6000/sysv4.opt b/gcc/config/rs6000/sysv4.opt
-index 0d8d955..474203d 100644
---- a/gcc/config/rs6000/sysv4.opt
-+++ b/gcc/config/rs6000/sysv4.opt
+--- a/src/gcc/config/rs6000/sysv4.opt
++++ b/src/gcc/config/rs6000/sysv4.opt
 @@ -66,7 +66,7 @@ Target Report RejectNegative Mask(LITTLE_ENDIAN)
  Produce little endian code
  
@@ -2548,10 +2480,8 @@ index 0d8d955..474203d 100644
  Produce little endian code
  
  mbig-endian
-diff --git a/gcc/config/sh/sh.opt b/gcc/config/sh/sh.opt
-index 0389fce..969bff0 100644
---- a/gcc/config/sh/sh.opt
-+++ b/gcc/config/sh/sh.opt
+--- a/src/gcc/config/sh/sh.opt
++++ b/src/gcc/config/sh/sh.opt
 @@ -320,7 +320,7 @@ Target Report RejectNegative Mask(RELAX)
  Shorten address references during linking
  
@@ -2561,10 +2491,8 @@ index 0389fce..969bff0 100644
  Follow Renesas (formerly Hitachi) / SuperH calling conventions
  
  msoft-atomic
-diff --git a/gcc/config/sparc/long-double-switch.opt b/gcc/config/sparc/long-double-switch.opt
-index eb3c1a0..8ad32bd 100644
---- a/gcc/config/sparc/long-double-switch.opt
-+++ b/gcc/config/sparc/long-double-switch.opt
+--- a/src/gcc/config/sparc/long-double-switch.opt
++++ b/src/gcc/config/sparc/long-double-switch.opt
 @@ -19,7 +19,7 @@
  ; <http://www.gnu.org/licenses/>.
  
@@ -2574,10 +2502,8 @@ index eb3c1a0..8ad32bd 100644
  Use 128-bit long double
  
  mlong-double-64
-diff --git a/gcc/config/sparc/sparc.opt b/gcc/config/sparc/sparc.opt
-index 01f3d43..58ba6b7 100644
---- a/gcc/config/sparc/sparc.opt
-+++ b/gcc/config/sparc/sparc.opt
+--- a/src/gcc/config/sparc/sparc.opt
++++ b/src/gcc/config/sparc/sparc.opt
 @@ -30,7 +30,7 @@ Target Report Mask(FPU)
  Use hardware FP
  
@@ -2587,10 +2513,8 @@ index 01f3d43..58ba6b7 100644
  Use hardware FP
  
  msoft-float
-diff --git a/gcc/config/v850/v850.opt b/gcc/config/v850/v850.opt
-index 12b0937..8fe244b 100644
---- a/gcc/config/v850/v850.opt
-+++ b/gcc/config/v850/v850.opt
+--- a/src/gcc/config/v850/v850.opt
++++ b/src/gcc/config/v850/v850.opt
 @@ -102,7 +102,7 @@ Target RejectNegative Mask(V850E1)
  Compile for the v850e1 processor
  
@@ -2600,10 +2524,8 @@ index 12b0937..8fe244b 100644
  Compile for the v850es variant of the v850e1
  
  mv850e2
-diff --git a/gcc/config/vax/vax.opt b/gcc/config/vax/vax.opt
-index 82d6dee..83527ad 100644
---- a/gcc/config/vax/vax.opt
-+++ b/gcc/config/vax/vax.opt
+--- a/src/gcc/config/vax/vax.opt
++++ b/src/gcc/config/vax/vax.opt
 @@ -31,7 +31,7 @@ Target RejectNegative Mask(G_FLOAT)
  Generate GFLOAT double precision code
  
@@ -2613,10 +2535,8 @@ index 82d6dee..83527ad 100644
  Generate GFLOAT double precision code
  
  mgnu
-diff --git a/gcc/configure b/gcc/configure
-index 896e677..fe7b692 100755
---- a/gcc/configure
-+++ b/gcc/configure
+--- a/src/gcc/configure
++++ b/src/gcc/configure
 @@ -13832,7 +13832,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
  	    LD="${LD-ld} -m elf_i386_fbsd"
  	    ;;
@@ -2651,10 +2571,8 @@ index 896e677..fe7b692 100755
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
-index b99e45b..7c4f796 100644
---- a/gcc/dwarf2out.c
-+++ b/gcc/dwarf2out.c
+--- a/src/gcc/dwarf2out.c
++++ b/src/gcc/dwarf2out.c
 @@ -10183,7 +10183,9 @@ dbx_reg_number (const_rtx rtl)
      }
  #endif
@@ -2686,10 +2604,8 @@ index b99e45b..7c4f796 100644
  	  && GET_MODE_CLASS (mode) == MODE_INT)
  	mem_loc_result = based_loc_descr (XEXP (rtl, 0),
  					  INTVAL (XEXP (rtl, 1)),
-diff --git a/gcc/emit-rtl.c b/gcc/emit-rtl.c
-index 9d877a7..90a2491 100644
---- a/gcc/emit-rtl.c
-+++ b/gcc/emit-rtl.c
+--- a/src/gcc/emit-rtl.c
++++ b/src/gcc/emit-rtl.c
 @@ -964,6 +964,22 @@ void
  set_reg_attrs_from_value (rtx reg, rtx x)
  {
@@ -2730,10 +2646,8 @@ index 9d877a7..90a2491 100644
  	mark_reg_pointer (reg, REGNO_POINTER_ALIGN (REGNO (x)));
      }
  }
-diff --git a/gcc/opth-gen.awk b/gcc/opth-gen.awk
-index 541bc3e..9a7b6c3 100644
---- a/gcc/opth-gen.awk
-+++ b/gcc/opth-gen.awk
+--- a/src/gcc/opth-gen.awk
++++ b/src/gcc/opth-gen.awk
 @@ -298,16 +298,25 @@ print "";
  
  for (i = 0; i < n_opts; i++) {
@@ -2803,10 +2717,8 @@ index 541bc3e..9a7b6c3 100644
  }
  for (i = 0; i < n_extra_masks; i++) {
  	print "#define TARGET_" extra_masks[i] \
-diff --git a/gcc/reginfo.c b/gcc/reginfo.c
-index 6353126..f3a08f5 100644
---- a/gcc/reginfo.c
-+++ b/gcc/reginfo.c
+--- a/src/gcc/reginfo.c
++++ b/src/gcc/reginfo.c
 @@ -1222,17 +1222,7 @@ reg_scan_mark_refs (rtx x, rtx insn)
        /* If this is setting a register from a register or from a simple
  	 conversion of a register, propagate REG_EXPR.  */
@@ -2826,11 +2738,8 @@ index 6353126..f3a08f5 100644
  
        /* ... fall through ...  */
  
-diff --git a/gcc/testsuite/ChangeLog.x32 b/gcc/testsuite/ChangeLog.x32
-new file mode 100644
-index 0000000..a80ca37
---- /dev/null
-+++ b/gcc/testsuite/ChangeLog.x32
+--- a/src//dev/null
++++ b/src/gcc/testsuite/ChangeLog.x32
 @@ -0,0 +1,50 @@
 +2012-12-09  H.J. Lu  <hjl.tools@gmail.com>
 +
@@ -2882,11 +2791,8 @@ index 0000000..a80ca37
 +
 +	PR target/52146
 +	* gcc.target/i386/pr52146.c: Update final-scan to allow $-18874240.
-diff --git a/gcc/testsuite/gcc.dg/torture/pr52530.c b/gcc/testsuite/gcc.dg/torture/pr52530.c
-new file mode 100644
-index 0000000..d32ea82
---- /dev/null
-+++ b/gcc/testsuite/gcc.dg/torture/pr52530.c
+--- a/src//dev/null
++++ b/src/gcc/testsuite/gcc.dg/torture/pr52530.c
 @@ -0,0 +1,30 @@
 +/* { dg-do run } */
 +
@@ -2918,21 +2824,16 @@ index 0000000..d32ea82
 +
 +  return 0;
 +}
-diff --git a/gcc/testsuite/gcc.target/i386/pr52146.c b/gcc/testsuite/gcc.target/i386/pr52146.c
-index a4804e6..4eb91c0 100644
---- a/gcc/testsuite/gcc.target/i386/pr52146.c
-+++ b/gcc/testsuite/gcc.target/i386/pr52146.c
+--- a/src/gcc/testsuite/gcc.target/i386/pr52146.c
++++ b/src/gcc/testsuite/gcc.target/i386/pr52146.c
 @@ -15,4 +15,4 @@ test2 (void)
    *apic_tpr_addr = 0;
  }
  
 -/* { dg-final { scan-assembler-not "-18874240" } } */
 +/* { dg-final { scan-assembler-not "\[,\\t \]+-18874240" } } */
-diff --git a/gcc/testsuite/gcc.target/i386/pr52857-1.c b/gcc/testsuite/gcc.target/i386/pr52857-1.c
-new file mode 100644
-index 0000000..16fd78f
---- /dev/null
-+++ b/gcc/testsuite/gcc.target/i386/pr52857-1.c
+--- a/src//dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/pr52857-1.c
 @@ -0,0 +1,10 @@
 +/* { dg-do compile { target { ! { ia32 } } } } */
 +/* { dg-options "-g -O -mx32 -maddress-mode=long" } */
@@ -2944,11 +2845,8 @@ index 0000000..16fd78f
 +  int res;
 +  get_BID128 (&res);
 +}
-diff --git a/gcc/testsuite/gcc.target/i386/pr52857-2.c b/gcc/testsuite/gcc.target/i386/pr52857-2.c
-new file mode 100644
-index 0000000..879240a
---- /dev/null
-+++ b/gcc/testsuite/gcc.target/i386/pr52857-2.c
+--- a/src//dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/pr52857-2.c
 @@ -0,0 +1,8 @@
 +/* { dg-do compile { target { ! { ia32 } } } } */
 +/* { dg-options "-g -O -mx32 -maddress-mode=long" } */
@@ -2958,11 +2856,8 @@ index 0000000..879240a
 +{
 +  uw_init_context_1 (__builtin_dwarf_cfa ());
 +}
-diff --git a/gcc/testsuite/gcc.target/i386/pr52876.c b/gcc/testsuite/gcc.target/i386/pr52876.c
-new file mode 100644
-index 0000000..6d5e47a
---- /dev/null
-+++ b/gcc/testsuite/gcc.target/i386/pr52876.c
+--- a/src//dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/pr52876.c
 @@ -0,0 +1,25 @@
 +/* { dg-do run { target { x32 } } } */
 +/* { dg-options "-O2 -mx32 -maddress-mode=long" } */
@@ -2989,11 +2884,8 @@ index 0000000..6d5e47a
 +
 +  return 0;
 +}
-diff --git a/gcc/testsuite/gcc.target/i386/pr52882.c b/gcc/testsuite/gcc.target/i386/pr52882.c
-new file mode 100644
-index 0000000..5f0f12a
---- /dev/null
-+++ b/gcc/testsuite/gcc.target/i386/pr52882.c
+--- a/src//dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/pr52882.c
 @@ -0,0 +1,19 @@
 +/* { dg-do compile } */
 +/* { dg-options "-O" } */
@@ -3014,11 +2906,8 @@ index 0000000..5f0f12a
 +  for (; a.f1;) {
 +  }
 +}
-diff --git a/gcc/testsuite/gcc.target/i386/pr52883.c b/gcc/testsuite/gcc.target/i386/pr52883.c
-new file mode 100644
-index 0000000..766e87e
---- /dev/null
-+++ b/gcc/testsuite/gcc.target/i386/pr52883.c
+--- a/src//dev/null
++++ b/src/gcc/testsuite/gcc.target/i386/pr52883.c
 @@ -0,0 +1,25 @@
 +/* { dg-do compile } */
 +/* { dg-options "-O" } */
@@ -3045,10 +2934,8 @@ index 0000000..766e87e
 +    } else
 +      i = g[c];
 +}
-diff --git a/gcc/testsuite/gcc.target/i386/pr54157.c b/gcc/testsuite/gcc.target/i386/pr54157.c
-index 59fcd79..b5c4528 100644
---- a/gcc/testsuite/gcc.target/i386/pr54157.c
-+++ b/gcc/testsuite/gcc.target/i386/pr54157.c
+--- a/src/gcc/testsuite/gcc.target/i386/pr54157.c
++++ b/src/gcc/testsuite/gcc.target/i386/pr54157.c
 @@ -1,5 +1,5 @@
  /* { dg-do compile { target { ! { ia32 } } } } */
 -/* { dg-options "-O2 -mx32 -ftree-vectorize" } */
@@ -3056,10 +2943,8 @@ index 59fcd79..b5c4528 100644
  
  struct s2{
    int n[24 -1][24 -1][24 -1];
-diff --git a/gcc/testsuite/gcc.target/i386/pr55142-1.c b/gcc/testsuite/gcc.target/i386/pr55142-1.c
-index 28375b5..e6b5f12 100644
---- a/gcc/testsuite/gcc.target/i386/pr55142-1.c
-+++ b/gcc/testsuite/gcc.target/i386/pr55142-1.c
+--- a/src/gcc/testsuite/gcc.target/i386/pr55142-1.c
++++ b/src/gcc/testsuite/gcc.target/i386/pr55142-1.c
 @@ -1,6 +1,7 @@
  /* { dg-do compile { target { ! { ia32 } } } } */
 +/* { dg-require-effective-target maybe_x32 } */
@@ -3069,10 +2954,8 @@ index 28375b5..e6b5f12 100644
  
  typedef int int32_t;
  typedef unsigned int uint32_t;
-diff --git a/gcc/testsuite/gcc.target/i386/pr55142-2.c b/gcc/testsuite/gcc.target/i386/pr55142-2.c
-index 9daae9d..34f4687 100644
---- a/gcc/testsuite/gcc.target/i386/pr55142-2.c
-+++ b/gcc/testsuite/gcc.target/i386/pr55142-2.c
+--- a/src/gcc/testsuite/gcc.target/i386/pr55142-2.c
++++ b/src/gcc/testsuite/gcc.target/i386/pr55142-2.c
 @@ -1,6 +1,7 @@
  /* { dg-do compile { target { ! { ia32 } } } } */
 +/* { dg-require-effective-target maybe_x32 } */
@@ -3082,10 +2965,8 @@ index 9daae9d..34f4687 100644
  /* { dg-final { scan-assembler-not "movl\[\\t \]*%.*,\[\\t \]*-1073742592\\(%r(.x|.i|.p|\[1-9\]*)\\)" } } */
  
  typedef int int32_t;
-diff --git a/gcc/testsuite/gcc.target/i386/pr55597.c b/gcc/testsuite/gcc.target/i386/pr55597.c
-index cafe194..0ed7a3a 100644
---- a/gcc/testsuite/gcc.target/i386/pr55597.c
-+++ b/gcc/testsuite/gcc.target/i386/pr55597.c
+--- a/src/gcc/testsuite/gcc.target/i386/pr55597.c
++++ b/src/gcc/testsuite/gcc.target/i386/pr55597.c
 @@ -1,6 +1,6 @@
  /* { dg-do compile { target { ! { ia32 } } } } */
  /* { dg-require-effective-target fpic } */
@@ -3094,10 +2975,8 @@ index cafe194..0ed7a3a 100644
  
  struct initial_sp
  {
-diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
-index d3898d6..16b2d59 100644
---- a/gcc/testsuite/lib/target-supports.exp
-+++ b/gcc/testsuite/lib/target-supports.exp
+--- a/src/gcc/testsuite/lib/target-supports.exp
++++ b/src/gcc/testsuite/lib/target-supports.exp
 @@ -4458,6 +4458,14 @@ proc check_effective_target_lto { } {
      return [info exists ENABLE_LTO]
  }
@@ -3113,11 +2992,8 @@ index d3898d6..16b2d59 100644
  # Return 1 if this target supports the -fsplit-stack option, 0
  # otherwise.
  
-diff --git a/libffi/ChangeLog.x32 b/libffi/ChangeLog.x32
-new file mode 100644
-index 0000000..2cbed64
---- /dev/null
-+++ b/libffi/ChangeLog.x32
+--- a/src//dev/null
++++ b/src/libffi/ChangeLog.x32
 @@ -0,0 +1,27 @@
 +2012-07-18  H.J. Lu  <hongjiu.lu@intel.com>
 +
@@ -3146,10 +3022,8 @@ index 0000000..2cbed64
 +2012-05-16  H.J. Lu  <hongjiu.lu@intel.com>
 +
 +	* configure: Regenerated.
-diff --git a/libffi/configure b/libffi/configure
-index 1591495..28ed513 100755
---- a/libffi/configure
-+++ b/libffi/configure
+--- a/src/libffi/configure
++++ b/src/libffi/configure
 @@ -6282,7 +6282,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
  	    LD="${LD-ld} -m elf_i386_fbsd"
  	    ;;
@@ -3184,10 +3058,8 @@ index 1591495..28ed513 100755
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-diff --git a/libffi/src/x86/ffi64.c b/libffi/src/x86/ffi64.c
-index bd907d7..41c4e77 100644
---- a/libffi/src/x86/ffi64.c
-+++ b/libffi/src/x86/ffi64.c
+--- a/src/libffi/src/x86/ffi64.c
++++ b/src/libffi/src/x86/ffi64.c
 @@ -426,7 +426,7 @@ ffi_call (ffi_cif *cif, void (*fn)(void), void *rvalue, void **avalue)
    /* If the return value is passed in memory, add the pointer as the
       first integer argument.  */
@@ -3220,10 +3092,8 @@ index bd907d7..41c4e77 100644
  	  /* We don't have to do anything in asm for the return.  */
  	  ret = FFI_TYPE_VOID;
  	}
-diff --git a/libffi/src/x86/ffitarget.h b/libffi/src/x86/ffitarget.h
-index dfecd1b..f9548c6 100644
---- a/libffi/src/x86/ffitarget.h
-+++ b/libffi/src/x86/ffitarget.h
+--- a/src/libffi/src/x86/ffitarget.h
++++ b/src/libffi/src/x86/ffitarget.h
 @@ -53,9 +53,16 @@ typedef unsigned long long     ffi_arg;
  typedef long long              ffi_sarg;
  #endif
@@ -3241,11 +3111,8 @@ index dfecd1b..f9548c6 100644
  
  typedef enum ffi_abi {
    FFI_FIRST_ABI = 0,
-diff --git a/libgcc/ChangeLog.x32 b/libgcc/ChangeLog.x32
-new file mode 100644
-index 0000000..8b6d4a2
---- /dev/null
-+++ b/libgcc/ChangeLog.x32
+--- a/src//dev/null
++++ b/src/libgcc/ChangeLog.x32
 @@ -0,0 +1,9 @@
 +2012-03-29  H.J. Lu  <hongjiu.lu@intel.com>
 +
@@ -3256,10 +3123,8 @@ index 0000000..8b6d4a2
 +
 +	* unwind-dw2.c (_Unwind_SetGRValue): Assert DWARF register size
 +	<= saved reg size.
-diff --git a/libgcc/config/i386/linux-unwind.h b/libgcc/config/i386/linux-unwind.h
-index cd9a9a1..02b1897 100644
---- a/libgcc/config/i386/linux-unwind.h
-+++ b/libgcc/config/i386/linux-unwind.h
+--- a/src/libgcc/config/i386/linux-unwind.h
++++ b/src/libgcc/config/i386/linux-unwind.h
 @@ -29,11 +29,17 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
  
  #ifndef inhibit_libc
@@ -3303,10 +3168,8 @@ index cd9a9a1..02b1897 100644
  #endif /* ifdef __x86_64__  */
 +#endif /* not glibc 2.0 */
  #endif /* ifdef inhibit_libc  */
-diff --git a/libgcc/unwind-dw2.c b/libgcc/unwind-dw2.c
-index 475ad00..d1c62ee 100644
---- a/libgcc/unwind-dw2.c
-+++ b/libgcc/unwind-dw2.c
+--- a/src/libgcc/unwind-dw2.c
++++ b/src/libgcc/unwind-dw2.c
 @@ -294,7 +294,8 @@ _Unwind_SetGRValue (struct _Unwind_Context *context, int index,
  {
    index = DWARF_REG_TO_UNWIND_COLUMN (index);
@@ -3317,19 +3180,14 @@ index 475ad00..d1c62ee 100644
  
    context->by_value[index] = 1;
    context->reg[index] = _Unwind_Get_Unwind_Context_Reg_Val (val);
-diff --git a/libgfortran/ChangeLog.x32 b/libgfortran/ChangeLog.x32
-new file mode 100644
-index 0000000..9a0c1eb
---- /dev/null
-+++ b/libgfortran/ChangeLog.x32
+--- a/src//dev/null
++++ b/src/libgfortran/ChangeLog.x32
 @@ -0,0 +1,3 @@
 +2012-05-16  H.J. Lu  <hongjiu.lu@intel.com>
 +
 +	* configure: Regenerated.
-diff --git a/libgfortran/configure b/libgfortran/configure
-index 227f556..bd8e10b 100755
---- a/libgfortran/configure
-+++ b/libgfortran/configure
+--- a/src/libgfortran/configure
++++ b/src/libgfortran/configure
 @@ -8071,7 +8071,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
  	    LD="${LD-ld} -m elf_i386_fbsd"
  	    ;;
@@ -3364,11 +3222,8 @@ index 227f556..bd8e10b 100755
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-diff --git a/libgomp/ChangeLog.x32 b/libgomp/ChangeLog.x32
-new file mode 100644
-index 0000000..36444bb
---- /dev/null
-+++ b/libgomp/ChangeLog.x32
+--- a/src//dev/null
++++ b/src/libgomp/ChangeLog.x32
 @@ -0,0 +1,8 @@
 +2012-03-31  H.J. Lu  <hongjiu.lu@intel.com>
 +
@@ -3378,10 +3233,8 @@ index 0000000..36444bb
 +2012-05-16  H.J. Lu  <hongjiu.lu@intel.com>
 +
 +	* configure: Regenerated.
-diff --git a/libgomp/configure b/libgomp/configure
-index 8ed841a..418c471 100755
---- a/libgomp/configure
-+++ b/libgomp/configure
+--- a/src/libgomp/configure
++++ b/src/libgomp/configure
 @@ -6596,7 +6596,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
  	    LD="${LD-ld} -m elf_i386_fbsd"
  	    ;;
@@ -3416,10 +3269,8 @@ index 8ed841a..418c471 100755
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-diff --git a/libgomp/configure.tgt b/libgomp/configure.tgt
-index 210dd5d..853e3fa 100644
---- a/libgomp/configure.tgt
-+++ b/libgomp/configure.tgt
+--- a/src/libgomp/configure.tgt
++++ b/src/libgomp/configure.tgt
 @@ -59,7 +59,7 @@ if test $enable_linux_futex = yes; then
      i[456]86-*-linux*)
  	config_path="linux/x86 linux posix"
@@ -3429,11 +3280,8 @@ index 210dd5d..853e3fa 100644
  	    ;;
  	  *)
  	    if test -z "$with_arch"; then
-diff --git a/libitm/ChangeLog.x32 b/libitm/ChangeLog.x32
-new file mode 100644
-index 0000000..36444bb
---- /dev/null
-+++ b/libitm/ChangeLog.x32
+--- a/src//dev/null
++++ b/src/libitm/ChangeLog.x32
 @@ -0,0 +1,8 @@
 +2012-03-31  H.J. Lu  <hongjiu.lu@intel.com>
 +
@@ -3443,10 +3291,8 @@ index 0000000..36444bb
 +2012-05-16  H.J. Lu  <hongjiu.lu@intel.com>
 +
 +	* configure: Regenerated.
-diff --git a/libitm/configure b/libitm/configure
-index 30d2f73..9f89ebc 100644
---- a/libitm/configure
-+++ b/libitm/configure
+--- a/src/libitm/configure
++++ b/src/libitm/configure
 @@ -7286,7 +7286,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
  	    LD="${LD-ld} -m elf_i386_fbsd"
  	    ;;
@@ -3481,10 +3327,8 @@ index 30d2f73..9f89ebc 100644
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-diff --git a/libitm/configure.tgt b/libitm/configure.tgt
-index b68c86b..333bdff 100644
---- a/libitm/configure.tgt
-+++ b/libitm/configure.tgt
+--- a/src/libitm/configure.tgt
++++ b/src/libitm/configure.tgt
 @@ -53,7 +53,7 @@ case "${target_cpu}" in
  
    i[3456]86)
@@ -3494,11 +3338,8 @@ index b68c86b..333bdff 100644
  	    ;;
  	  *)
  	    if test -z "$with_arch"; then
-diff --git a/libjava/ChangeLog.x32 b/libjava/ChangeLog.x32
-new file mode 100644
-index 0000000..43e8f70
---- /dev/null
-+++ b/libjava/ChangeLog.x32
+--- a/src//dev/null
++++ b/src/libjava/ChangeLog.x32
 @@ -0,0 +1,12 @@
 +2012-07-18  H.J. Lu  <hongjiu.lu@intel.com>
 +
@@ -3512,19 +3353,14 @@ index 0000000..43e8f70
 +2012-05-16  H.J. Lu  <hongjiu.lu@intel.com>
 +
 +	* configure: Regenerated.
-diff --git a/libjava/classpath/ChangeLog.x32 b/libjava/classpath/ChangeLog.x32
-new file mode 100644
-index 0000000..9a0c1eb
---- /dev/null
-+++ b/libjava/classpath/ChangeLog.x32
+--- a/src//dev/null
++++ b/src/libjava/classpath/ChangeLog.x32
 @@ -0,0 +1,3 @@
 +2012-05-16  H.J. Lu  <hongjiu.lu@intel.com>
 +
 +	* configure: Regenerated.
-diff --git a/libjava/classpath/configure b/libjava/classpath/configure
-index a25f5f7..b6692b6 100755
---- a/libjava/classpath/configure
-+++ b/libjava/classpath/configure
+--- a/src/libjava/classpath/configure
++++ b/src/libjava/classpath/configure
 @@ -7592,7 +7592,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
  	    LD="${LD-ld} -m elf_i386_fbsd"
  	    ;;
@@ -3595,10 +3431,8 @@ index a25f5f7..b6692b6 100755
    public class Test
    {
      public static void main(String args)
-diff --git a/libjava/configure b/libjava/configure
-index d8a408d..be98354 100755
---- a/libjava/configure
-+++ b/libjava/configure
+--- a/src/libjava/configure
++++ b/src/libjava/configure
 @@ -8843,7 +8843,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
  	    LD="${LD-ld} -m elf_i386_fbsd"
  	    ;;
@@ -3642,10 +3476,8 @@ index d8a408d..be98354 100755
  struct S { ~S(); };
  void bar();
  void foo()
-diff --git a/libjava/include/x86_64-signal.h b/libjava/include/x86_64-signal.h
-index 4bd8a36..d03b914 100644
---- a/libjava/include/x86_64-signal.h
-+++ b/libjava/include/x86_64-signal.h
+--- a/src/libjava/include/x86_64-signal.h
++++ b/src/libjava/include/x86_64-signal.h
 @@ -47,6 +47,10 @@ do									\
  									\
    bool _is_64_bit = false;						\
@@ -3670,19 +3502,14 @@ index 4bd8a36..d03b914 100644
  	}								\
  									\
        if (_min_value_dividend)						\
-diff --git a/libmudflap/ChangeLog.x32 b/libmudflap/ChangeLog.x32
-new file mode 100644
-index 0000000..9a0c1eb
---- /dev/null
-+++ b/libmudflap/ChangeLog.x32
+--- a/src//dev/null
++++ b/src/libmudflap/ChangeLog.x32
 @@ -0,0 +1,3 @@
 +2012-05-16  H.J. Lu  <hongjiu.lu@intel.com>
 +
 +	* configure: Regenerated.
-diff --git a/libmudflap/configure b/libmudflap/configure
-index f1c74a1..1a76202 100755
---- a/libmudflap/configure
-+++ b/libmudflap/configure
+--- a/src/libmudflap/configure
++++ b/src/libmudflap/configure
 @@ -6393,7 +6393,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
  	    LD="${LD-ld} -m elf_i386_fbsd"
  	    ;;
@@ -3717,19 +3544,14 @@ index f1c74a1..1a76202 100755
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-diff --git a/libobjc/ChangeLog.x32 b/libobjc/ChangeLog.x32
-new file mode 100644
-index 0000000..9a0c1eb
---- /dev/null
-+++ b/libobjc/ChangeLog.x32
+--- a/src//dev/null
++++ b/src/libobjc/ChangeLog.x32
 @@ -0,0 +1,3 @@
 +2012-05-16  H.J. Lu  <hongjiu.lu@intel.com>
 +
 +	* configure: Regenerated.
-diff --git a/libobjc/configure b/libobjc/configure
-index 8c07356..376f25e 100755
---- a/libobjc/configure
-+++ b/libobjc/configure
+--- a/src/libobjc/configure
++++ b/src/libobjc/configure
 @@ -6079,7 +6079,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
  	    LD="${LD-ld} -m elf_i386_fbsd"
  	    ;;
@@ -3746,19 +3568,14 @@ index 8c07356..376f25e 100755
  	    ;;
  	  ppc64-*linux*|powerpc64-*linux*)
  	    LD="${LD-ld} -m elf32ppclinux"
-diff --git a/libquadmath/ChangeLog.x32 b/libquadmath/ChangeLog.x32
-new file mode 100644
-index 0000000..9a0c1eb
---- /dev/null
-+++ b/libquadmath/ChangeLog.x32
+--- a/src//dev/null
++++ b/src/libquadmath/ChangeLog.x32
 @@ -0,0 +1,3 @@
 +2012-05-16  H.J. Lu  <hongjiu.lu@intel.com>
 +
 +	* configure: Regenerated.
-diff --git a/libquadmath/configure b/libquadmath/configure
-index 82065c7..8beb1a6 100755
---- a/libquadmath/configure
-+++ b/libquadmath/configure
+--- a/src/libquadmath/configure
++++ b/src/libquadmath/configure
 @@ -6264,7 +6264,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
  	    LD="${LD-ld} -m elf_i386_fbsd"
  	    ;;
@@ -3793,19 +3610,14 @@ index 82065c7..8beb1a6 100755
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-diff --git a/libssp/ChangeLog.x32 b/libssp/ChangeLog.x32
-new file mode 100644
-index 0000000..9a0c1eb
---- /dev/null
-+++ b/libssp/ChangeLog.x32
+--- a/src//dev/null
++++ b/src/libssp/ChangeLog.x32
 @@ -0,0 +1,3 @@
 +2012-05-16  H.J. Lu  <hongjiu.lu@intel.com>
 +
 +	* configure: Regenerated.
-diff --git a/libssp/configure b/libssp/configure
-index 78abc70..84b3712 100755
---- a/libssp/configure
-+++ b/libssp/configure
+--- a/src/libssp/configure
++++ b/src/libssp/configure
 @@ -6401,7 +6401,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
  	    LD="${LD-ld} -m elf_i386_fbsd"
  	    ;;
@@ -3840,19 +3652,14 @@ index 78abc70..84b3712 100755
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-diff --git a/libstdc++-v3/ChangeLog.x32 b/libstdc++-v3/ChangeLog.x32
-new file mode 100644
-index 0000000..9a0c1eb
---- /dev/null
-+++ b/libstdc++-v3/ChangeLog.x32
+--- a/src//dev/null
++++ b/src/libstdc++-v3/ChangeLog.x32
 @@ -0,0 +1,3 @@
 +2012-05-16  H.J. Lu  <hongjiu.lu@intel.com>
 +
 +	* configure: Regenerated.
-diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
-index b642495..3e3e9ca 100755
---- a/libstdc++-v3/configure
-+++ b/libstdc++-v3/configure
+--- a/src/libstdc++-v3/configure
++++ b/src/libstdc++-v3/configure
 @@ -7122,7 +7122,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
  	    LD="${LD-ld} -m elf_i386_fbsd"
  	    ;;
@@ -3959,10 +3766,8 @@ index b642495..3e3e9ca 100755
  template<typename T1, typename T2>
    struct same
    { typedef T2 type; };
-diff --git a/libtool.m4 b/libtool.m4
-index 67321a7..a7f99ac 100644
---- a/libtool.m4
-+++ b/libtool.m4
+--- a/src/libtool.m4
++++ b/src/libtool.m4
 @@ -1232,7 +1232,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
  	    LD="${LD-ld} -m elf_i386_fbsd"
  	    ;;
@@ -3979,19 +3784,14 @@ index 67321a7..a7f99ac 100644
  	    ;;
  	  ppc64-*linux*|powerpc64-*linux*)
  	    LD="${LD-ld} -m elf32ppclinux"
-diff --git a/lto-plugin/ChangeLog.x32 b/lto-plugin/ChangeLog.x32
-new file mode 100644
-index 0000000..9a0c1eb
---- /dev/null
-+++ b/lto-plugin/ChangeLog.x32
+--- a/src//dev/null
++++ b/src/lto-plugin/ChangeLog.x32
 @@ -0,0 +1,3 @@
 +2012-05-16  H.J. Lu  <hongjiu.lu@intel.com>
 +
 +	* configure: Regenerated.
-diff --git a/lto-plugin/configure b/lto-plugin/configure
-index 7f1ade1..bd7e75e 100755
---- a/lto-plugin/configure
-+++ b/lto-plugin/configure
+--- a/src/lto-plugin/configure
++++ b/src/lto-plugin/configure
 @@ -6060,7 +6060,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
  	    LD="${LD-ld} -m elf_i386_fbsd"
  	    ;;
@@ -4026,19 +3826,14 @@ index 7f1ade1..bd7e75e 100755
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-diff --git a/zlib/ChangeLog.x32 b/zlib/ChangeLog.x32
-new file mode 100644
-index 0000000..9a0c1eb
---- /dev/null
-+++ b/zlib/ChangeLog.x32
+--- a/src//dev/null
++++ b/src/zlib/ChangeLog.x32
 @@ -0,0 +1,3 @@
 +2012-05-16  H.J. Lu  <hongjiu.lu@intel.com>
 +
 +	* configure: Regenerated.
-diff --git a/zlib/configure b/zlib/configure
-index f7fe2b7..478bef3 100755
---- a/zlib/configure
-+++ b/zlib/configure
+--- a/src/zlib/configure
++++ b/src/zlib/configure
 @@ -5869,7 +5869,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
  	    LD="${LD-ld} -m elf_i386_fbsd"
  	    ;;