  
  #include "elf32-target.h"
 +#endif
-diff -uNr binutils-2.20.orig/bfd/elf32-nacl.c binutils-2.20/bfd/elf32-nacl.c
---- binutils-2.20.orig/bfd/elf32-nacl.c	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.20/bfd/elf32-nacl.c	2009-11-23 13:58:30.000000000 +0100
+diff -Naur ../PRISTINE/binutils-2.20/bfd/elf32-nacl.c binutils-2.20/bfd/elf32-nacl.c
+--- ../PRISTINE/binutils-2.20/bfd/elf32-nacl.c	1969-12-31 16:00:00.000000000 -0800
++++ binutils-2.20/bfd/elf32-nacl.c	2010-01-05 13:21:03.426216000 -0800
 @@ -0,0 +1,2 @@
 +#define ELF32_NACL_C
 +#include "elf32-i386.c"
-diff -uNr binutils-2.20.orig/bfd/elf64-nacl.c binutils-2.20/bfd/elf64-nacl.c
---- binutils-2.20.orig/bfd/elf64-nacl.c	1970-01-01 01:00:00.000000000 +0100
-+++ binutils-2.20/bfd/elf64-nacl.c	2009-11-23 13:58:30.000000000 +0100
+diff -Naur ../PRISTINE/binutils-2.20/bfd/elf64-nacl.c binutils-2.20/bfd/elf64-nacl.c
+--- ../PRISTINE/binutils-2.20/bfd/elf64-nacl.c	1969-12-31 16:00:00.000000000 -0800
++++ binutils-2.20/bfd/elf64-nacl.c	2010-01-05 13:21:03.438223000 -0800
 @@ -0,0 +1,2 @@
 +#define ELF64_NACL_C
 +#include "elf64-x86-64.c"
-diff -uNr binutils-2.20.orig/bfd/elf64-x86-64.c binutils-2.20/bfd/elf64-x86-64.c
---- binutils-2.20.orig/bfd/elf64-x86-64.c	2009-09-10 13:47:12.000000000 +0200
-+++ binutils-2.20/bfd/elf64-x86-64.c	2009-11-23 13:58:30.000000000 +0100
+diff -Naur ../PRISTINE/binutils-2.20/bfd/elf64-x86-64.c binutils-2.20/bfd/elf64-x86-64.c
+--- ../PRISTINE/binutils-2.20/bfd/elf64-x86-64.c	2009-09-10 04:47:12.000000000 -0700
++++ binutils-2.20/bfd/elf64-x86-64.c	2010-01-05 13:21:03.449227000 -0800
 @@ -31,6 +31,10 @@
  
  #include "elf/x86-64.h"

 eelf_x86_64.c: $(srcdir)/emulparams/elf_x86_64.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 	${GENSCRIPTS} elf_x86_64 "$(tdir_elf_x86_64)"
diff -uNr binutils-2.20.orig/ld/configure.tgt binutils-2.20/ld/configure.tgt
--- binutils-2.20.orig/ld/configure.tgt	2009-08-06 19:38:03.000000000 +0200
+++ binutils-2.20/ld/configure.tgt	2009-11-23 13:58:30.000000000 +0100
@@ -230,6 +230,8 @@
 			targ_extra_ofiles="deffilep.o pe-dll.o" ;;
 i[3-7]86-*-netbsd*)	targ_emul=i386nbsd

   ptr = (fragS *) obstack_alloc (ob, SIZEOF_STRUCT_FRAG);
   obstack_alignment_mask (ob) = oalign;
   memset (ptr, 0, SIZEOF_STRUCT_FRAG);
diff -Naur ../PRISTINE/binutils-2.20/gas/frags.h binutils-2.20/gas/frags.h
--- ../PRISTINE/binutils-2.20/gas/frags.h	2007-07-03 04:01:03.000000000 -0700
+++ binutils-2.20/gas/frags.h	2010-01-05 13:21:03.680220000 -0800
@@ -77,10 +77,22 @@
   unsigned int has_code:1;
   unsigned int insn_addr:6;
