Add gold fixes for arm32 vs rodso.ld
The local fix for HIDDEN script syntax is now upstream, so
use the upstream git version of the patch. My fix for arm32
vs PHDRS in linker scripts is also in upstream, so include that.
Change-Id: I391f57eb4766861c10fb0651e0c8326aeb1c6e1a
diff --git a/patches/binutils-patch.txt b/patches/binutils-patch.txt
index 3d44351..648ef13 100644
--- a/patches/binutils-patch.txt
+++ b/patches/binutils-patch.txt
@@ -21,12 +21,18 @@
MACHINE=
-gold/
-2016-08-06 Roland McGrath <roland@hack.frob.com>
+commit 37bb4d970f17d7f33d0621f7b81b623456b1d183
+Author: Roland McGrath <mcgrathr@google.com>
+Date: Fri Aug 12 09:50:49 2016 -0700
- * yyscript.y (HIDDEN): New %token.
- (assignment): Handle HIDDEN(string = expr) syntax.
- * script.cc (script_keyword_parsecodes): Add HIDDEN.
+ [gold] Implement HIDDEN syntax in linker scripts
+
+ gold/
+ * yyscript.y (HIDDEN): New %token.
+ (assignment): Handle HIDDEN(string = expr) syntax.
+ * script.cc (script_keyword_parsecodes): Add HIDDEN.
+
+ (cherry picked from commit f300578f78f5ecddc9cfb28c02d032a0acffdf70)
diff --git a/gold/script.cc b/gold/script.cc
index d6aa7b2..bb8b437 100644
@@ -61,3 +67,29 @@
| PROVIDE '(' string '=' parse_exp ')'
{ script_set_symbol(closure, $3.value, $3.length, $5, 1, 0); }
| PROVIDE_HIDDEN '(' string '=' parse_exp ')'
+
+commit 9dfbd0e7d0765a35dce7423d79a975d7c5bad3ae
+Author: Roland McGrath <mcgrathr@google.com>
+Date: Fri Aug 12 09:55:25 2016 -0700
+
+ PR gold/20462: Fix bogus layout on ARM with linker script using PHDRS clause
+
+ gold/
+ PR gold/20462
+ * script-sections.cc (Script_sections::release_segments):
+ Reset this->segments_created_.
+
+ (cherry picked from commit 3785f51aa2454dba199db8aafa80019795d536ec)
+
+diff --git a/gold/script-sections.cc b/gold/script-sections.cc
+index 96c68de..bf25391 100644
+--- a/gold/script-sections.cc
++++ b/gold/script-sections.cc
+@@ -4459,6 +4459,7 @@ Script_sections::release_segments()
+ ++p)
+ (*p)->release_segment();
+ }
++ this->segments_created_ = false;
+ }
+
+ // Print the SECTIONS clause to F for debugging.
