+2011-06-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * elf64-x86-64.c (elf_backend_post_process_headers): Defined
+       for x32.
+
 2011-06-16  H.J. Lu  <hongjiu.lu@intel.com>
 
        * elf64-x86-64.c: Include <stdarg.h> and CORE_HEADER if
 
 #define elf_backend_size_info \
   _bfd_elf32_size_info
 
+#undef  elf_backend_post_process_headers
+#define elf_backend_post_process_headers  _bfd_elf_set_osabi
+
 #include "elf32-target.h"
 
+2011-06-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * binutils-all/elfedit-1.d: Updated for x32.
+
 2011-05-18  Nick Clifton  <nickc@redhat.com>
 
        PR binutils/12753
 
 
 #...
 ELF Header:
-  Magic:   7f 45 4c 46 02 01 01 00 00 00 00 00 00 00 00 00 
-  Class:                             ELF64
+  Magic:   7f 45 4c 46 0(1|2) 01 01 00 00 00 00 00 00 00 00 00 
+  Class:                             ELF(32|64)
   Data:                              2's complement, little endian
   Version:                           1 \(current\)
 #...
 
+2011-06-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * configure.tgt: Support x32.
+
 2011-06-15  Nick Clifton  <nickc@redhat.com>
 
        * NEWS: Mention addition of TILEPRO and TIKE-Gx support.
 
   sparclite*)          cpu_type=sparc arch=sparclite ;;
   sparc*)              cpu_type=sparc arch=sparclite ;; # ??? See tc-sparc.c.
   v850*)               cpu_type=v850 ;;
-  x86_64*)             cpu_type=i386 arch=x86_64;;
+  x86_64*)
+    cpu_type=i386
+    if [ x"$vendor" = xx32 ]; then
+      arch=x86_64:32
+    else
+      arch=x86_64
+    fi
+    ;;
   xtensa*)             cpu_type=xtensa arch=xtensa ;;
   *)                   cpu_type=${cpu} ;;
 esac
 
+2011-06-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * configure.tgt: Support x32.
+
 2011-06-15  Nick Clifton  <nickc@redhat.com>
 
        * NEWS: Mention addition of TILEPRO and TIKE-Gx support.
 
                        targ64_extra_libpath=elf_x86_64
                        targ_extra_libpath=elf32_x86_64
                        tdir_i386linux=${targ_alias}aout ;;
+x86_64-x32-linux-*)    targ_emul=elf32_x86_64
+                       targ_extra_emuls="elf_x86_64 elf_i386 i386linux elf_l1om"
+                       targ_extra_libpath="elf_i386 elf_x86_64 elf_l1om"
+                       tdir_i386linux=`echo ${targ_alias}aout | sed -e 's/x86_64/i386/'`
+                       tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/'` ;;
 x86_64-*-linux-*)      targ_emul=elf_x86_64
                        targ_extra_emuls="elf32_x86_64 elf_i386 i386linux elf_l1om"
                        targ_extra_libpath="elf_i386 elf32_x86_64 elf_l1om"
 
+2011-06-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * ld-elf/eh1.d: Skip x32.
+       * ld-elf/eh2.d: Likewise.
+       * ld-elf/eh3.d: Likewise.
+       * ld-elf/eh4.d: Likewise.
+
+       * ld-elfvsb/elfvsb.exp: Only xfail 64bit x86_64-*-linux*.
+       * ld-shared/shared.exp: Likewise. 
+
+       * ld-ifunc/ifunc-1-local-x86.d: Support x32.
+       * ld-ifunc/ifunc-1-x86.d: Likewise.
+       * ld-ifunc/ifunc-3a-x86.d: Likewise.
+       * ld-x86-64/pcrel16.d: Likewise.
+
+       * ld-x86-64/x86-64.exp (x86_64tests): Add missing -melf_x86_64.
+
 2011-06-16  Alan Modra  <amodra@gmail.com>
 
        * ld-elfvers/vers2.ver: Don't assume any particular index for
 
 #source: eh1a.s
 #ld:
 #readelf: -wf
+#notarget: x86_64-x32-*
 #target: x86_64-*-*
 
 Contents of the .eh_frame section:
 
 #source: eh2a.s
 #ld:
 #readelf: -wf
+#notarget: x86_64-x32-*
 #target: x86_64-*-*
 
 Contents of the .eh_frame section:
 
 #source: eh3a.s
 #ld:
 #readelf: -wf
+#notarget: x86_64-x32-*
 #target: x86_64-*-*
 
 Contents of the .eh_frame section:
 
 #source: eh4a.s
 #ld: -shared
 #readelf: -wf
+#notarget: x86_64-x32-*
 #target: x86_64-*-*
 
 Contents of the .eh_frame section:
 
                    setup_xfail "sparc*-*-linux*"
                }
            }
-           setup_xfail "x86_64-*-linux*"
+           if { [is_elf64 $tmpdir/mainnp.o] } {
+               setup_xfail "x86_64-*-linux*"
+           }
            if { ![istarget hppa*64*-*-linux*] } {
                setup_xfail "hppa*-*-linux*"
            }
                setup_xfail "alpha*-*-linux*"
                setup_xfail "mips*-*-linux*"
            }
-           setup_xfail "x86_64-*-linux*"
+           if { [is_elf64 $tmpdir/mainnp.o] } {
+               setup_xfail "x86_64-*-linux*"
+           }
            if { ![istarget hppa*64*-*-linux*] } {
                setup_xfail "hppa*-*-linux*"
            }
                        setup_xfail "sparc*-*-linux*"
                    }
                }
-               setup_xfail "x86_64-*-linux*"
+               if { [is_elf64 $tmpdir/mainp.o] } {
+                   setup_xfail "x86_64-*-linux*"
+               }
                if { ![istarget hppa*64*-*-linux*] } {
                    setup_xfail "hppa*-*-linux*"
                }
 
 #target: x86_64-*-* i?86-*-*
 
 #...
-[ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-fq]+<\*ABS\*(\+0x200|)@plt>
+[ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-fq]+<\*ABS\*(\+0x16c|\+0x200|)@plt>
 #pass
 
 #target: x86_64-*-* i?86-*-*
 
 #...
-[ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-fq]+<\*ABS\*(\+0x220|)@plt>
+[ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-fq]+<\*ABS\*(\+0x184|\+0x220|)@plt>
 #pass
 
 #target: x86_64-*-* i?86-*-*
 
 #...
-[ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-fq]+<\*ABS\*(\+0x258|)@plt>
+[ \t0-9a-f]+:[ \t0-9a-f]+call[ \t0-9a-fq]+<\*ABS\*(\+0x1a8|\+0x258|)@plt>
 #pass
 
        if { [istarget sparc*-*-linux*] && [is_elf64 $tmpdir/mainnp.o] } {
            setup_xfail "sparc*-*-linux*"
        }
-       setup_xfail "x86_64-*-linux*"
+       if { [is_elf64 $tmpdir/mainnp.o] } {
+           setup_xfail "x86_64-*-linux*"
+       }
        setup_xfail "s390x-*-linux*"
        if [ string match $shared_needs_pic "yes" ] {
            setup_xfail "arm*-*-linux*"
        if { [istarget sparc*-*-linux*] && [is_elf64 $tmpdir/mainnp.o] } {
            setup_xfail "sparc*-*-linux*"
        }
-       setup_xfail "x86_64-*-linux*"
+       if { [is_elf64 $tmpdir/mainnp.o] } {
+           setup_xfail "x86_64-*-linux*"
+       }
        setup_xfail "s390x-*-linux*"
        if [ string match $shared_needs_pic "yes" ] {
            setup_xfail "arm*-*-linux*"
            if { [istarget sparc*-*-linux*] && [is_elf64 $tmpdir/mainp.o] } {
                setup_xfail "sparc*-*-linux*"
            }
-           setup_xfail "x86_64-*-linux*"
+           if { [is_elf64 $tmpdir/mainp.o] } {
+               setup_xfail "x86_64-*-linux*"
+           }
            setup_xfail "s390x-*-linux*"
            if [ string match $shared_needs_pic "yes" ] {
                setup_xfail "arm*-*-linux*"
 
 #ld: -Ttext 0x0
 #objdump: -drj.text -m i8086
 
-.*: +file format elf64-x86-64
+.*: +file format elf.*-x86-64
 
 Disassembly of section .text:
 
 
      "--64" {mixed2a.s} {} "libmixe2a.o"}
     {"Helper 32bit object 2" "-r -melf_i386"
      "--32" {mixed2b.s} {} "libmixe2b.o"}
-    {"Split by file with 'l' flag on section." "-split-by-file -r"
+    {"Split by file with 'l' flag on section." "-split-by-file -r -melf_x86_64"
      "--64" {split-by-file1.s split-by-file2.s}
      {{readelf -SW split-by-file.rd}} "split-by-file.o"}
     {"TLS X32 IE->LE transition" "-melf32_x86_64"