Re: [Axiom-developer] Re: [Gcl-devel] changes in binutils break gcl

[Camm Maguire]

Greetings!

The change was that three files are to be patched 

(o/sfaslbfd.c,binuntils/bfd/bfd-in.h,binutils/bfd/bfd-in2.h)

instead of just one (o/sfaslbfd.c).

Am including the patch here again.  If you left out the bfd*h patches,
gcl would not build with --enable-locbfd.  With the whole patch, gcl
should build against the local bfd, current Debian unstable bfd, and
the newer Suse/Mandrake/Fedora bfd.

Please keep me posted.

Take care,


=============================================================================
=============================================================================
Index: o/sfaslbfd.c
===================================================================
RCS file: /cvsroot/gcl/gcl/o/sfaslbfd.c,v
retrieving revision 1.18
diff -u -r1.18 sfaslbfd.c
--- o/sfaslbfd.c        23 Aug 2004 23:09:23 -0000      1.18
+++ o/sfaslbfd.c        24 Nov 2004 16:00:09 -0000
@@ -256,7 +256,7 @@
 
     current=round_up(current,1<<s->alignment_power);
 
-    current+=s->_raw_size;
+    current+=bfd_section_size(b,s);
 
   }
   curr_size=(unsigned long)current;
@@ -281,7 +281,7 @@
 
     m=round_up(m,1<<s->alignment_power);
     s->output_section->vma=(unsigned long)m;
-    m+=s->_raw_size;
+    m+=bfd_section_size(b,s);
             
   }
 
@@ -346,7 +346,7 @@
                                             v,0,q)) 
        FEerror("Cannot get relocated section contents\n",0);
 
-     memcpy((void *)(unsigned long)s->output_section->vma,v,s->_raw_size);
+     memcpy((void *)(unsigned 
long)s->output_section->vma,v,bfd_section_size(b,s));
      
    }
  }
Index: binutils/bfd/bfd-in.h
===================================================================
RCS file: /cvsroot/gcl/gcl/binutils/bfd/bfd-in.h,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 bfd-in.h
--- binutils/bfd/bfd-in.h       9 Aug 2002 05:34:46 -0000       1.1.1.1
+++ binutils/bfd/bfd-in.h       24 Nov 2004 18:45:08 -0000
@@ -337,7 +337,8 @@
 #define bfd_get_section_lma(bfd, ptr) ((ptr)->lma + 0)
 #define bfd_get_section_alignment(bfd, ptr) ((ptr)->alignment_power + 0)
 #define bfd_section_name(bfd, ptr) ((ptr)->name)
-#define bfd_section_size(bfd, ptr) (bfd_get_section_size_before_reloc(ptr))
+#define bfd_section_size(bfd, ptr) ((ptr)->_raw_size)
+/* #define bfd_section_size(bfd, ptr) (bfd_get_section_size_before_reloc(ptr)) 
*/
 #define bfd_section_vma(bfd, ptr) ((ptr)->vma)
 #define bfd_section_lma(bfd, ptr) ((ptr)->lma)
 #define bfd_section_alignment(bfd, ptr) ((ptr)->alignment_power)
Index: binutils/bfd/bfd-in2.h
===================================================================
RCS file: /cvsroot/gcl/gcl/binutils/bfd/bfd-in2.h,v
retrieving revision 1.3
diff -u -r1.3 bfd-in2.h
--- binutils/bfd/bfd-in2.h      22 Feb 2004 11:05:18 -0000      1.3
+++ binutils/bfd/bfd-in2.h      24 Nov 2004 18:45:08 -0000
@@ -342,7 +342,8 @@
 #define bfd_get_section_lma(bfd, ptr) ((ptr)->lma + 0)
 #define bfd_get_section_alignment(bfd, ptr) ((ptr)->alignment_power + 0)
 #define bfd_section_name(bfd, ptr) ((ptr)->name)
-#define bfd_section_size(bfd, ptr) (bfd_get_section_size_before_reloc(ptr))
+#define bfd_section_size(bfd, ptr) ((ptr)->_raw_size)
+/*#define bfd_section_size(bfd, ptr) (bfd_get_section_size_before_reloc(ptr))*/
 #define bfd_section_vma(bfd, ptr) ((ptr)->vma)
 #define bfd_section_lma(bfd, ptr) ((ptr)->lma)
 #define bfd_section_alignment(bfd, ptr) ((ptr)->alignment_power)
=============================================================================
=============================================================================
root <address@hidden> writes:

> Camm,
> 
> As far as I can see they are the same patch.
> What has changed?
> 
> Note that I applied the patch and now the saved image will not execute:
> 
> 
> make[3]: *** [/tmp/axiom/obj/linux/bin/bootsys] Error 134
> make[3]: Leaving directory `/tmp/axiom/src/boot'
> make[2]: *** [bootdir] Error 2
> make[2]: Leaving directory `/tmp/axiom/src'
> make[1]: *** [srcdir] Error 2
> make[1]: Leaving directory `/tmp/axiom'
> make: *** [all] Error 2
> 
> Tim
> 
> 
> 
> 

-- 
Camm Maguire                                            address@hidden
==========================================================================
"The earth is but one country, and mankind its citizens."  --  Baha'u'llah