      default:
        snprintf (buff, sizeof (buff), _("<unknown: %x>"), osabi);
        return buff;
-diff -uNr binutils-2.20.orig/config.sub binutils-2.20/config.sub
---- binutils-2.20.orig/config.sub	2009-08-17 06:10:29.000000000 +0200
-+++ binutils-2.20/config.sub	2009-11-23 13:58:30.000000000 +0100
+diff -Naur ../PRISTINE/binutils-2.20/config.sub binutils-2.20/config.sub
+--- ../PRISTINE/binutils-2.20/config.sub	2009-08-16 21:10:29.000000000 -0700
++++ binutils-2.20/config.sub	2010-01-05 13:21:03.496225000 -0800
 @@ -314,6 +314,14 @@
  	i*86 | x86_64)
  	  basic_machine=$basic_machine-pc

+#define EF_NACL_ALIGN_LIB   0x000000	/* aligned to pass either way */
+
+/* ABI version number -- increment when ABI changes are incompatible. */
+#ifdef __x86_64__
+/* Version 0 is not a stable version - it's used before we'll produce alpha
+   release of NaCl x86-64 */
+#define EF_NACL_ABIVERSION  0
+#else
+#define EF_NACL_ABIVERSION  6
+#endif
+
+#endif
diff -uNr binutils-2.20.orig/ld/Makefile.am binutils-2.20/ld/Makefile.am
--- binutils-2.20.orig/ld/Makefile.am	2009-09-01 22:56:51.000000000 +0200
+++ binutils-2.20/ld/Makefile.am	2009-11-23 13:58:30.000000000 +0100
@@ -221,6 +221,7 @@
 	eelf_i386_fbsd.o \
 	eelf_i386_ldso.o \

+  ${RELOCATING+${DISCARDED}}
+}
+EOF
diff -Naur ../PRISTINE/binutils-2.20/opcodes/i386-opc.tbl binutils-2.20/opcodes/i386-opc.tbl
--- ../PRISTINE/binutils-2.20/opcodes/i386-opc.tbl	2009-07-24 08:41:20.000000000 -0700
+++ binutils-2.20/opcodes/i386-opc.tbl	2010-01-05 13:21:03.861105000 -0800
@@ -209,6 +209,30 @@
 or, 2, 0xc, None, 1, 0, W|No_sSuf|No_ldSuf, { Imm8|Imm16|Imm32|Imm32S, Acc|Byte|Word|Dword|Qword }
 or, 2, 0x80, 0x1, 1, 0, W|Modrm|No_sSuf|No_ldSuf, { Imm8|Imm16|Imm32|Imm32S, Reg8|Reg16|Reg32|Reg64|Byte|Word|Dword|Qword|Unspecified|BaseIndex|Disp8|Disp16|Disp32|Disp32S }
