ARM: Fix exidx ordering.

2 files changed, 5 insertions, 0 deletions

diff --git a/lib/Target/ARM/ARMEmulation.cpp b/lib/Target/ARM/ARMEmulation.cpp
index c562371c..5969f275 100644
--- a/lib/Target/ARM/ARMEmulation.cpp
+++ b/lib/Target/ARM/ARMEmulation.cpp
@@ -35,6 +35,11 @@ static bool MCLDEmulateARMELF(LinkerScript& pScript, LinkerConfig& pConfig) {
   // set up section map
   if (pConfig.options().getScriptList().empty() &&
       pConfig.codeGenType() != LinkerConfig::Object) {
+    // .ARM.exidx is associated with .text (which is always the first input
+    // text section in GNU ELF), and thus we have to do this special treatment.
+    pScript.sectionMap().insert(".ARM.exidx", ".ARM.exidx");
+    pScript.sectionMap().insert(".ARM.extab", ".ARM.extab");
+
     pScript.sectionMap().insert(".ARM.exidx*", ".ARM.exidx");
     pScript.sectionMap().insert(".ARM.extab*", ".ARM.extab");
     pScript.sectionMap().insert(".ARM.attributes*", ".ARM.attributes");
diff --git a/test/Android/Plasma/ARM/libplasma.golden.so b/test/Android/Plasma/ARM/libplasma.golden.so
index a3b5f705..f9e921c5 100755
--- a/test/Android/Plasma/ARM/libplasma.golden.so
+++ b/test/Android/Plasma/ARM/libplasma.golden.so