From 68fa02b6579c07bbd88434f54b19f4d53c26e661 Mon Sep 17 00:00:00 2001
From: Dave Murphy <wntrmute@users.sourceforge.net>
Date: Sat, 2 Oct 2010 10:41:55 +0000
Subject: [PATCH] binutils patch for building gold

---
 dkarm-eabi/patches/binutils-2.20.1.patch | 48 ++++++++++++++++++++++++
 dkarm-eabi/patches/binutils-2.20.patch   | 14 -------
 2 files changed, 48 insertions(+), 14 deletions(-)
 create mode 100644 dkarm-eabi/patches/binutils-2.20.1.patch
 delete mode 100644 dkarm-eabi/patches/binutils-2.20.patch

diff --git a/dkarm-eabi/patches/binutils-2.20.1.patch b/dkarm-eabi/patches/binutils-2.20.1.patch
new file mode 100644
index 0000000..b5d36c5
--- /dev/null
+++ b/dkarm-eabi/patches/binutils-2.20.1.patch
@@ -0,0 +1,48 @@
+diff -Nbaur binutils-2.20.1/gold/i386.cc binutils-2.20.1-ppc/gold/i386.cc
+--- binutils-2.20.1/gold/i386.cc	2010-01-14 10:48:42.000000000 +0000
++++ binutils-2.20.1-ppc/gold/i386.cc	2010-10-01 21:06:06.000000000 +0100
+@@ -2729,7 +2729,7 @@
+       if (!object->has_no_split_stack())
+ 	object->error(_("failed to match split-stack sequence at "
+ 			"section %u offset %0zx"),
+-		      shndx, fnoffset);
++		      shndx, (size_t)fnoffset);
+       return;
+     }
+ 
+diff -Nbaur binutils-2.20.1/gold/incremental.cc binutils-2.20.1-ppc/gold/incremental.cc
+--- binutils-2.20.1/gold/incremental.cc	2009-10-16 08:42:50.000000000 +0100
++++ binutils-2.20.1-ppc/gold/incremental.cc	2010-10-01 21:06:06.000000000 +0100
+@@ -389,7 +389,7 @@
+     }
+ 
+   int size;
+-  bool big_endian;
++  bool big_endian = false;
+   std::string error;
+   if (!elfcpp::Elf_recognizer::is_valid_header(p, want, &size, &big_endian,
+                                                &error))
+diff -Nbaur binutils-2.20.1/gold/object.cc binutils-2.20.1-ppc/gold/object.cc
+--- binutils-2.20.1/gold/object.cc	2010-01-14 10:48:42.000000000 +0000
++++ binutils-2.20.1-ppc/gold/object.cc	2010-10-01 21:06:06.000000000 +0100
+@@ -2323,7 +2323,7 @@
+     *punconfigured = false;
+ 
+   std::string error;
+-  bool big_endian;
++  bool big_endian=false;
+   int size;
+   if (!elfcpp::Elf_recognizer::is_valid_header(p, bytes, &size,
+                                                &big_endian, &error))
+diff -Nbaur binutils-2.20.1/gold/x86_64.cc binutils-2.20.1-ppc/gold/x86_64.cc
+--- binutils-2.20.1/gold/x86_64.cc	2010-01-14 10:48:43.000000000 +0000
++++ binutils-2.20.1-ppc/gold/x86_64.cc	2010-10-01 21:06:07.000000000 +0100
+@@ -2718,7 +2718,7 @@
+       if (!object->has_no_split_stack())
+ 	object->error(_("failed to match split-stack sequence at "
+ 			"section %u offset %0zx"),
+-		      shndx, fnoffset);
++		      shndx, (size_t)fnoffset);
+       return;
+     }
+ 
diff --git a/dkarm-eabi/patches/binutils-2.20.patch b/dkarm-eabi/patches/binutils-2.20.patch
deleted file mode 100644
index f95607a..0000000
--- a/dkarm-eabi/patches/binutils-2.20.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nbaur binutils-2.20/gas/config/tc-arm.c binutils-2.20-arm/gas/config/tc-arm.c
---- binutils-2.20/gas/config/tc-arm.c	2009-08-29 23:10:59.000000000 +0100
-+++ binutils-2.20-arm/gas/config/tc-arm.c	2009-11-21 01:29:06.000000000 +0000
-@@ -2485,8 +2485,10 @@
-       know (frag->tc_frag_data.first_map == NULL);
-       frag->tc_frag_data.first_map = symbolP;
-     }
-+#if ENABLE_CHECKING || defined (DEBUG)
-   if (frag->tc_frag_data.last_map != NULL)
-     know (S_GET_VALUE (frag->tc_frag_data.last_map) < S_GET_VALUE (symbolP));
-+#endif
-   frag->tc_frag_data.last_map = symbolP;
- }
-