dcavalca / rpms / qemu

Forked from rpms/qemu a year ago
Clone

Blame 0020-PPC-Fix-linker-scripts-on-ppc-hosts.patch

Justin M. Forbes 45e84a
From fbcf305e5adc310e6383d4ec5e844f3f8d072116 Mon Sep 17 00:00:00 2001
Justin M. Forbes 45e84a
From: Alexander Graf <agraf@suse.de>
Justin M. Forbes 45e84a
Date: Mon, 12 Dec 2011 22:36:01 +0100
Justin M. Forbes 45e84a
Subject: [PATCH 20/25] PPC: Fix linker scripts on ppc hosts
Justin M. Forbes 45e84a
Justin M. Forbes 45e84a
When compiling qemu statically with multilib on PPC, we hit the
Justin M. Forbes 45e84a
same issue that commit 845f2c2812d9ed24b36c02a3d06ee83aeafe8b49
Justin M. Forbes 45e84a
is fixing. Do the same here.
Justin M. Forbes 45e84a
Justin M. Forbes 45e84a
Signed-off-by: Alexander Graf <agraf@suse.de>
Justin M. Forbes 45e84a
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Justin M. Forbes 45e84a
(cherry picked from commit 665a04ae1cbfa8004a38cf0fe99ba799c978a1fe)
Justin M. Forbes 45e84a
---
Justin M. Forbes 45e84a
 ppc.ld   |   16 ++++++++++++++--
Justin M. Forbes 45e84a
 ppc64.ld |   16 ++++++++++++++--
Justin M. Forbes 45e84a
 2 files changed, 28 insertions(+), 4 deletions(-)
Justin M. Forbes 45e84a
Justin M. Forbes 45e84a
diff --git a/ppc.ld b/ppc.ld
Justin M. Forbes 45e84a
index 69aa3f2..2a0dcad 100644
Justin M. Forbes 45e84a
--- a/ppc.ld
Justin M. Forbes 45e84a
+++ b/ppc.ld
Justin M. Forbes 45e84a
@@ -49,8 +49,20 @@ SECTIONS
Justin M. Forbes 45e84a
   .rela.sbss2     : { *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) }
Justin M. Forbes 45e84a
   .rel.bss        : { *(.rel.bss .rel.bss.* .rel.gnu.linkonce.b.*) }
Justin M. Forbes 45e84a
   .rela.bss       : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) }
Justin M. Forbes 45e84a
-  .rel.plt        : { *(.rel.plt) }
Justin M. Forbes 45e84a
-  .rela.plt       : { *(.rela.plt) }
Justin M. Forbes 45e84a
+  .rel.plt      :
Justin M. Forbes 45e84a
+  {
Justin M. Forbes 45e84a
+    *(.rel.plt)
Justin M. Forbes 45e84a
+    PROVIDE (__rel_iplt_start = .);
Justin M. Forbes 45e84a
+    *(.rel.iplt)
Justin M. Forbes 45e84a
+    PROVIDE (__rel_iplt_end = .);
Justin M. Forbes 45e84a
+  }
Justin M. Forbes 45e84a
+  .rela.plt       :
Justin M. Forbes 45e84a
+  {
Justin M. Forbes 45e84a
+    *(.rela.plt)
Justin M. Forbes 45e84a
+    PROVIDE (__rela_iplt_start = .);
Justin M. Forbes 45e84a
+    *(.rela.iplt)
Justin M. Forbes 45e84a
+    PROVIDE (__rela_iplt_end = .);
Justin M. Forbes 45e84a
+  }
Justin M. Forbes 45e84a
   .init           :
Justin M. Forbes 45e84a
   {
Justin M. Forbes 45e84a
     KEEP (*(.init))
Justin M. Forbes 45e84a
diff --git a/ppc64.ld b/ppc64.ld
Justin M. Forbes 45e84a
index 0a7c0dd..e2dafa0 100644
Justin M. Forbes 45e84a
--- a/ppc64.ld
Justin M. Forbes 45e84a
+++ b/ppc64.ld
Justin M. Forbes 45e84a
@@ -54,8 +54,20 @@ SECTIONS
Justin M. Forbes 45e84a
       *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*)
Justin M. Forbes 45e84a
       *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*)
Justin M. Forbes 45e84a
     }
Justin M. Forbes 45e84a
-  .rel.plt        : { *(.rel.plt) }
Justin M. Forbes 45e84a
-  .rela.plt       : { *(.rela.plt) }
Justin M. Forbes 45e84a
+  .rel.plt      :
Justin M. Forbes 45e84a
+  {
Justin M. Forbes 45e84a
+    *(.rel.plt)
Justin M. Forbes 45e84a
+    PROVIDE (__rel_iplt_start = .);
Justin M. Forbes 45e84a
+    *(.rel.iplt)
Justin M. Forbes 45e84a
+    PROVIDE (__rel_iplt_end = .);
Justin M. Forbes 45e84a
+  }
Justin M. Forbes 45e84a
+  .rela.plt       :
Justin M. Forbes 45e84a
+  {
Justin M. Forbes 45e84a
+    *(.rela.plt)
Justin M. Forbes 45e84a
+    PROVIDE (__rela_iplt_start = .);
Justin M. Forbes 45e84a
+    *(.rela.iplt)
Justin M. Forbes 45e84a
+    PROVIDE (__rela_iplt_end = .);
Justin M. Forbes 45e84a
+  }
Justin M. Forbes 45e84a
   .rela.tocbss	  : { *(.rela.tocbss) }
Justin M. Forbes 45e84a
   .init           :
Justin M. Forbes 45e84a
   {
Justin M. Forbes 45e84a
-- 
Justin M. Forbes 45e84a
1.7.7.5
Justin M. Forbes 45e84a