Re: Fix gnu-efi for gcc 3.3

[Matthew Wilcox <willy@debian.org>]

On Fri, Sep 26, 2003 at 08:54:16PM +0200, Andreas Schwab wrote:
> gcc 3.3 may generate sections named .data.rel and .data.rel.local, but the
> linker script included in gnu-efi 3.0a didn't account for them.

Confirmed.  Bdale, can you apply this patch to the Debian gnu-efi package
and then get rid of the gcc-3.2 dependency in elilo?  Thanks.

diff -u gnu-efi-3.0a/debian/changelog gnu-efi-3.0a/debian/changelog
--- gnu-efi-3.0a/debian/changelog
+++ gnu-efi-3.0a/debian/changelog
@@ -1,3 +1,9 @@
+gnu-efi (3.0a-1.1) unstable; urgency=low
+
+  * Add patches to linker scripts so GCC 3.3 can build gnu-efi again.
+
+ -- Matthew Wilcox <willy@debian.org>  Fri, 26 Sep 2003 15:53:15 -0400
+
 gnu-efi (3.0a-1) unstable; urgency=low
 
   * new upstream version.  fixes linker scripts to work with recent compilers,
only in patch2:
unchanged:
--- gnu-efi-3.0a.orig/gnuefi/elf_ia32_efi.lds
+++ gnu-efi-3.0a/gnuefi/elf_ia32_efi.lds
@@ -15,8 +15,7 @@
   .data :
   {
    *(.rodata*)
-   *(.data)
-   *(.data1)
+   *(.data*)
    *(.sdata)
    *(.got.plt)
    *(.got)
@@ -33,7 +32,7 @@
   . = ALIGN(4096);
   .rel :
   {
-    *(.rel.data)
+    *(.rel.data*)
     *(.rel.got)
     *(.rel.stab)
   }
only in patch2:
unchanged:
--- gnu-efi-3.0a.orig/gnuefi/elf_ia64_efi.lds
+++ gnu-efi-3.0a/gnuefi/elf_ia64_efi.lds
@@ -28,8 +28,7 @@
   {
    *(.rodata*)
    *(.ctors)
-   *(.data)
-   *(.data1)
+   *(.data*)
    *(.gnu.linkonce.d*)
    *(.plabel)	/* data whose relocs we want to ignore */
    *(.IA_64.unwind)
@@ -48,7 +47,7 @@
   .rela :
   {
     *(.rela.text)
-    *(.rela.data)
+    *(.rela.data*)
     *(.rela.sdata)
     *(.rela.got)
     *(.rela.gnu.linkonce.d*)

-- 
"It's not Hollywood.  War is real, war is primarily not about defeat or
victory, it is about death.  I've seen thousands and thousands of dead bodies.
Do you think I want to have an academic debate on this subject?" -- Robert Fisk