diff -dur gcl-2.6.8.ORIG/acconfig.h gcl-2.6.8/acconfig.h
--- gcl-2.6.8.ORIG/acconfig.h 2008-12-29 16:24:30.000000000 -0700
+++ gcl-2.6.8/acconfig.h 2008-12-29 17:58:20.000000000 -0700
@@ -142,6 +142,7 @@
/* bfd support */
#undef HAVE_LIBBFD
#undef NEED_CONST
+#undef HAVE_OUTPUT_BFD
#define HAVE_BFD_BOOLEAN
#ifdef HAVE_BFD_BOOLEAN
diff -dur gcl-2.6.8.ORIG/configure gcl-2.6.8/configure
--- gcl-2.6.8.ORIG/configure 2008-12-29 16:48:36.000000000 -0700
+++ gcl-2.6.8/configure 2008-12-29 17:58:49.000000000 -0700
@@ -683,6 +683,7 @@
LIBIBERTY
LIBBFD
BUILD_BFD
+HAVE_OUTPUT_BFD
X_EXTRA_LIBS
X_LIBS
X_PRE_LIBS
@@ -9023,6 +9024,120 @@
+#
+# Newer BFD libraries need a dummy output bfd
+#
+ { $as_echo "$as_me:$LINENO: checking for struct bfd_link_info.output_bfd" >&5
+$as_echo_n "checking for struct bfd_link_info.output_bfd... " >&6; }
+if test "${ac_cv_member_struct_bfd_link_info_output_bfd+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+#include <bfd.h>
+#include <bfdlink.h>
+
+
+int
+main ()
+{
+static struct bfd_link_info ac_aggr;
+if (ac_aggr.output_bfd)
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_member_struct_bfd_link_info_output_bfd=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+#include <bfd.h>
+#include <bfdlink.h>
+
+
+int
+main ()
+{
+static struct bfd_link_info ac_aggr;
+if (sizeof ac_aggr.output_bfd)
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_member_struct_bfd_link_info_output_bfd=yes
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_member_struct_bfd_link_info_output_bfd=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_member_struct_bfd_link_info_output_bfd" >&5
+$as_echo "$ac_cv_member_struct_bfd_link_info_output_bfd" >&6; }
+if test "x$ac_cv_member_struct_bfd_link_info_output_bfd" = x""yes; then
+ cat >>confdefs.h <<\_ACEOF
+#define HAVE_OUTPUT_BFD 1
+_ACEOF
+
+fi
+
+
#
# FIXME: Need to workaround mingw before this point -- CM
diff -dur gcl-2.6.8.ORIG/configure.in gcl-2.6.8/configure.in
--- gcl-2.6.8.ORIG/configure.in 2008-12-29 16:48:36.000000000 -0700
+++ gcl-2.6.8/configure.in 2008-12-29 17:58:20.000000000 -0700
@@ -893,6 +893,15 @@
AC_MSG_RESULT(no),
AC_MSG_RESULT(no))
+#
+# Newer BFD libraries need a dummy output bfd
+#
+ AC_CHECK_MEMBER([struct bfd_link_info.output_bfd],
+ [AC_DEFINE(HAVE_OUTPUT_BFD)], [], [
+#include <bfd.h>
+#include <bfdlink.h>
+ ])
+ AC_SUBST(HAVE_OUTPUT_BFD)
#
# FIXME: Need to workaround mingw before this point -- CM
diff -dur gcl-2.6.8.ORIG/h/gclincl.h.in gcl-2.6.8/h/gclincl.h.in
--- gcl-2.6.8.ORIG/h/gclincl.h.in 2008-12-29 16:24:30.000000000 -0700
+++ gcl-2.6.8/h/gclincl.h.in 2008-12-29 17:58:50.000000000 -0700
@@ -143,6 +143,7 @@
/* bfd support */
#undef HAVE_LIBBFD
#undef NEED_CONST
+#undef HAVE_OUTPUT_BFD
#define HAVE_BFD_BOOLEAN
#ifdef HAVE_BFD_BOOLEAN
diff -dur gcl-2.6.8.ORIG/o/sfasli.c gcl-2.6.8/o/sfasli.c
--- gcl-2.6.8.ORIG/o/sfasli.c 2005-01-15 09:26:43.000000000 -0700
+++ gcl-2.6.8/o/sfasli.c 2008-12-29 17:58:20.000000000 -0700
@@ -40,6 +40,9 @@
FEerror("I'm not an object",0);
/* if (link_info.hash) */
/* bfd_link_hash_table_free(bself,link_info.hash); */
+#ifdef HAVE_OUTPUT_BFD
+ link_info.output_bfd = bfd_openw("/dev/null", bfd_get_target(bself));
+#endif
if (!(link_info.hash = bfd_link_hash_table_create (bself)))
FEerror("Cannot make hash table",0);
if (!bfd_link_add_symbols(bself,&link_info))
diff -dur gcl-2.6.8.ORIG/o/unexelf.c gcl-2.6.8/o/unexelf.c
--- gcl-2.6.8.ORIG/o/unexelf.c 2004-05-03 15:35:58.000000000 -0600
+++ gcl-2.6.8/o/unexelf.c 2008-12-29 17:58:20.000000000 -0700
@@ -1,5 +1,13 @@
-/* Foundation; either version 2, or (at your option)
-any later version.
+/* Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992, 1999, 2000, 2001,
+ 2002, 2003, 2004, 2005, 2006, 2007, 2008
+ Free Software Foundation, Inc.
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
GNU Emacs is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -7,10 +15,9 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
+/*
In other words, you are welcome to use, share and improve this program.
You are forbidden to forbid anyone else to use, share and improve
what you give them. Help stamp out software-hoarding! */
@@ -82,224 +89,224 @@
temacs:
**** SECTION HEADER TABLE ****
-[No] Type Flags Addr Offset Size Name
- Link Info Adralgn Entsize
+ [No] Type Flags Addr Offset Size Name
+ Link Info Adralgn Entsize
-[1] 1 2 0x80480d4 0xd4 0x13 .interp
- 0 0 0x1 0
+ [1] 1 2 0x80480d4 0xd4 0x13 .interp
+ 0 0 0x1 0
-[2] 5 2 0x80480e8 0xe8 0x388 .hash
- 3 0 0x4 0x4
+ [2] 5 2 0x80480e8 0xe8 0x388 .hash
+ 3 0 0x4 0x4
-[3] 11 2 0x8048470 0x470 0x7f0 .dynsym
- 4 1 0x4 0x10
+ [3] 11 2 0x8048470 0x470 0x7f0 .dynsym
+ 4 1 0x4 0x10
-[4] 3 2 0x8048c60 0xc60 0x3ad .dynstr
- 0 0 0x1 0
+ [4] 3 2 0x8048c60 0xc60 0x3ad .dynstr
+ 0 0 0x1 0
-[5] 9 2 0x8049010 0x1010 0x338 .rel.plt
- 3 7 0x4 0x8
+ [5] 9 2 0x8049010 0x1010 0x338 .rel.plt
+ 3 7 0x4 0x8
-[6] 1 6 0x8049348 0x1348 0x3 .init
- 0 0 0x4 0
+ [6] 1 6 0x8049348 0x1348 0x3 .init
+ 0 0 0x4 0
-[7] 1 6 0x804934c 0x134c 0x680 .plt
- 0 0 0x4 0x4
+ [7] 1 6 0x804934c 0x134c 0x680 .plt
+ 0 0 0x4 0x4
-[8] 1 6 0x80499cc 0x19cc 0x3c56f .text
- 0 0 0x4 0
+ [8] 1 6 0x80499cc 0x19cc 0x3c56f .text
+ 0 0 0x4 0
-[9] 1 6 0x8085f3c 0x3df3c 0x3 .fini
- 0 0 0x4 0
+ [9] 1 6 0x8085f3c 0x3df3c 0x3 .fini
+ 0 0 0x4 0
-[10] 1 2 0x8085f40 0x3df40 0x69c .rodata
- 0 0 0x4 0
+ [10] 1 2 0x8085f40 0x3df40 0x69c .rodata
+ 0 0 0x4 0
-[11] 1 2 0x80865dc 0x3e5dc 0xd51 .rodata1
- 0 0 0x4 0
+ [11] 1 2 0x80865dc 0x3e5dc 0xd51 .rodata1
+ 0 0 0x4 0
-[12] 1 3 0x8088330 0x3f330 0x20afc .data
- 0 0 0x4 0
+ [12] 1 3 0x8088330 0x3f330 0x20afc .data
+ 0 0 0x4 0
-[13] 1 3 0x80a8e2c 0x5fe2c 0x89d .data1
- 0 0 0x4 0
+ [13] 1 3 0x80a8e2c 0x5fe2c 0x89d .data1
+ 0 0 0x4 0
-[14] 1 3 0x80a96cc 0x606cc 0x1a8 .got
- 0 0 0x4 0x4
+ [14] 1 3 0x80a96cc 0x606cc 0x1a8 .got
+ 0 0 0x4 0x4
-[15] 6 3 0x80a9874 0x60874 0x80 .dynamic
- 4 0 0x4 0x8
+ [15] 6 3 0x80a9874 0x60874 0x80 .dynamic
+ 4 0 0x4 0x8
-[16] 8 3 0x80a98f4 0x608f4 0x449c .bss
- 0 0 0x4 0
+ [16] 8 3 0x80a98f4 0x608f4 0x449c .bss
+ 0 0 0x4 0
-[17] 2 0 0 0x608f4 0x9b90 .symtab
- 18 371 0x4 0x10
+ [17] 2 0 0 0x608f4 0x9b90 .symtab
+ 18 371 0x4 0x10
-[18] 3 0 0 0x6a484 0x8526 .strtab
- 0 0 0x1 0
+ [18] 3 0 0 0x6a484 0x8526 .strtab
+ 0 0 0x1 0
-[19] 3 0 0 0x729aa 0x93 .shstrtab
- 0 0 0x1 0
+ [19] 3 0 0 0x729aa 0x93 .shstrtab
+ 0 0 0x1 0
-[20] 1 0 0 0x72a3d 0x68b7 .comment
- 0 0 0x1 0
+ [20] 1 0 0 0x72a3d 0x68b7 .comment
+ 0 0 0x1 0
-raid:/nfs/raid/src/dist-18.56/src> dump -h xemacs
+ raid:/nfs/raid/src/dist-18.56/src> dump -h xemacs
-xemacs:
+ xemacs:
- **** SECTION HEADER TABLE ****
-[No] Type Flags Addr Offset Size Name
- Link Info Adralgn Entsize
+ **** SECTION HEADER TABLE ****
+ [No] Type Flags Addr Offset Size Name
+ Link Info Adralgn Entsize
-[1] 1 2 0x80480d4 0xd4 0x13 .interp
- 0 0 0x1 0
+ [1] 1 2 0x80480d4 0xd4 0x13 .interp
+ 0 0 0x1 0
-[2] 5 2 0x80480e8 0xe8 0x388 .hash
- 3 0 0x4 0x4
+ [2] 5 2 0x80480e8 0xe8 0x388 .hash
+ 3 0 0x4 0x4
-[3] 11 2 0x8048470 0x470 0x7f0 .dynsym
- 4 1 0x4 0x10
+ [3] 11 2 0x8048470 0x470 0x7f0 .dynsym
+ 4 1 0x4 0x10
-[4] 3 2 0x8048c60 0xc60 0x3ad .dynstr
- 0 0 0x1 0
+ [4] 3 2 0x8048c60 0xc60 0x3ad .dynstr
+ 0 0 0x1 0
-[5] 9 2 0x8049010 0x1010 0x338 .rel.plt
- 3 7 0x4 0x8
+ [5] 9 2 0x8049010 0x1010 0x338 .rel.plt
+ 3 7 0x4 0x8
-[6] 1 6 0x8049348 0x1348 0x3 .init
- 0 0 0x4 0
+ [6] 1 6 0x8049348 0x1348 0x3 .init
+ 0 0 0x4 0
-[7] 1 6 0x804934c 0x134c 0x680 .plt
- 0 0 0x4 0x4
+ [7] 1 6 0x804934c 0x134c 0x680 .plt
+ 0 0 0x4 0x4
-[8] 1 6 0x80499cc 0x19cc 0x3c56f .text
- 0 0 0x4 0
+ [8] 1 6 0x80499cc 0x19cc 0x3c56f .text
+ 0 0 0x4 0
-[9] 1 6 0x8085f3c 0x3df3c 0x3 .fini
- 0 0 0x4 0
+ [9] 1 6 0x8085f3c 0x3df3c 0x3 .fini
+ 0 0 0x4 0
-[10] 1 2 0x8085f40 0x3df40 0x69c .rodata
- 0 0 0x4 0
+ [10] 1 2 0x8085f40 0x3df40 0x69c .rodata
+ 0 0 0x4 0
-[11] 1 2 0x80865dc 0x3e5dc 0xd51 .rodata1
- 0 0 0x4 0
+ [11] 1 2 0x80865dc 0x3e5dc 0xd51 .rodata1
+ 0 0 0x4 0
-[12] 1 3 0x8088330 0x3f330 0x20afc .data
- 0 0 0x4 0
+ [12] 1 3 0x8088330 0x3f330 0x20afc .data
+ 0 0 0x4 0
-[13] 1 3 0x80a8e2c 0x5fe2c 0x89d .data1
- 0 0 0x4 0
+ [13] 1 3 0x80a8e2c 0x5fe2c 0x89d .data1
+ 0 0 0x4 0
-[14] 1 3 0x80a96cc 0x606cc 0x1a8 .got
- 0 0 0x4 0x4
+ [14] 1 3 0x80a96cc 0x606cc 0x1a8 .got
+ 0 0 0x4 0x4
-[15] 6 3 0x80a9874 0x60874 0x80 .dynamic
- 4 0 0x4 0x8
+ [15] 6 3 0x80a9874 0x60874 0x80 .dynamic
+ 4 0 0x4 0x8
-[16] 8 3 0x80c6800 0x7d800 0 .bss
- 0 0 0x4 0
+ [16] 8 3 0x80c6800 0x7d800 0 .bss
+ 0 0 0x4 0
-[17] 2 0 0 0x7d800 0x9b90 .symtab
- 18 371 0x4 0x10
+ [17] 2 0 0 0x7d800 0x9b90 .symtab
+ 18 371 0x4 0x10
-[18] 3 0 0 0x87390 0x8526 .strtab
- 0 0 0x1 0
+ [18] 3 0 0 0x87390 0x8526 .strtab
+ 0 0 0x1 0
-[19] 3 0 0 0x8f8b6 0x93 .shstrtab
- 0 0 0x1 0
+ [19] 3 0 0 0x8f8b6 0x93 .shstrtab
+ 0 0 0x1 0
-[20] 1 0 0 0x8f949 0x68b7 .comment
- 0 0 0x1 0
+ [20] 1 0 0 0x8f949 0x68b7 .comment
+ 0 0 0x1 0
-[21] 1 3 0x80a98f4 0x608f4 0x1cf0c .data
- 0 0 0x4 0
+ [21] 1 3 0x80a98f4 0x608f4 0x1cf0c .data
+ 0 0 0x4 0
- * This is an example of how the file header is changed. "Shoff" is
- * the section header offset within the file. Since that table is
- * after the new .data section, it is moved. "Shnum" is the number of
- * sections, which we increment.
- *
- * "Phoff" is the file offset to the program header. "Phentsize" and
- * "Shentsz" are the program and section header entries sizes respectively.
- * These can be larger than the apparent struct sizes.
+ * This is an example of how the file header is changed. "Shoff" is
+ * the section header offset within the file. Since that table is
+ * after the new .data section, it is moved. "Shnum" is the number of
+ * sections, which we increment.
+ *
+ * "Phoff" is the file offset to the program header. "Phentsize" and
+ * "Shentsz" are the program and section header entries sizes respectively.
+ * These can be larger than the apparent struct sizes.
-raid:/nfs/raid/src/dist-18.56/src> dump -f temacs
+ raid:/nfs/raid/src/dist-18.56/src> dump -f temacs
-temacs:
+ temacs:
- **** ELF HEADER ****
-Class Data Type Machine Version
-Entry Phoff Shoff Flags Ehsize
-Phentsize Phnum Shentsz Shnum Shstrndx
+ **** ELF HEADER ****
+ Class Data Type Machine Version
+ Entry Phoff Shoff Flags Ehsize
+ Phentsize Phnum Shentsz Shnum Shstrndx
-1 1 2 3 1
-0x80499cc 0x34 0x792f4 0 0x34
-0x20 5 0x28 21 19
+ 1 1 2 3 1
+ 0x80499cc 0x34 0x792f4 0 0x34
+ 0x20 5 0x28 21 19
-raid:/nfs/raid/src/dist-18.56/src> dump -f xemacs
+ raid:/nfs/raid/src/dist-18.56/src> dump -f xemacs
-xemacs:
+ xemacs:
- **** ELF HEADER ****
-Class Data Type Machine Version
-Entry Phoff Shoff Flags Ehsize
-Phentsize Phnum Shentsz Shnum Shstrndx
+ **** ELF HEADER ****
+ Class Data Type Machine Version
+ Entry Phoff Shoff Flags Ehsize
+ Phentsize Phnum Shentsz Shnum Shstrndx
-1 1 2 3 1
-0x80499cc 0x34 0x96200 0 0x34
-0x20 5 0x28 22 19
+ 1 1 2 3 1
+ 0x80499cc 0x34 0x96200 0 0x34
+ 0x20 5 0x28 22 19
- * These are the program headers. "Offset" is the file offset to the
- * segment. "Vaddr" is the memory load address. "Filesz" is the
- * segment size as it appears in the file, and "Memsz" is the size in
- * memory. Below, the third segment is the code and the fourth is the
- * data: the difference between Filesz and Memsz is .bss
+ * These are the program headers. "Offset" is the file offset to the
+ * segment. "Vaddr" is the memory load address. "Filesz" is the
+ * segment size as it appears in the file, and "Memsz" is the size in
+ * memory. Below, the third segment is the code and the fourth is the
+ * data: the difference between Filesz and Memsz is .bss
-raid:/nfs/raid/src/dist-18.56/src> dump -o temacs
+ raid:/nfs/raid/src/dist-18.56/src> dump -o temacs
-temacs:
- ***** PROGRAM EXECUTION HEADER *****
-Type Offset Vaddr Paddr
-Filesz Memsz Flags Align
+ temacs:
+ ***** PROGRAM EXECUTION HEADER *****
+ Type Offset Vaddr Paddr
+ Filesz Memsz Flags Align
-6 0x34 0x8048034 0
-0xa0 0xa0 5 0
+ 6 0x34 0x8048034 0
+ 0xa0 0xa0 5 0
-3 0xd4 0 0
-0x13 0 4 0
+ 3 0xd4 0 0
+ 0x13 0 4 0
-1 0x34 0x8048034 0
-0x3f2f9 0x3f2f9 5 0x1000
+ 1 0x34 0x8048034 0
+ 0x3f2f9 0x3f2f9 5 0x1000
-1 0x3f330 0x8088330 0
-0x215c4 0x25a60 7 0x1000
+ 1 0x3f330 0x8088330 0
+ 0x215c4 0x25a60 7 0x1000
-2 0x60874 0x80a9874 0
-0x80 0 7 0
+ 2 0x60874 0x80a9874 0
+ 0x80 0 7 0
-raid:/nfs/raid/src/dist-18.56/src> dump -o xemacs
+ raid:/nfs/raid/src/dist-18.56/src> dump -o xemacs
-xemacs:
- ***** PROGRAM EXECUTION HEADER *****
-Type Offset Vaddr Paddr
-Filesz Memsz Flags Align
+ xemacs:
+ ***** PROGRAM EXECUTION HEADER *****
+ Type Offset Vaddr Paddr
+ Filesz Memsz Flags Align
-6 0x34 0x8048034 0
-0xa0 0xa0 5 0
+ 6 0x34 0x8048034 0
+ 0xa0 0xa0 5 0
-3 0xd4 0 0
-0x13 0 4 0
+ 3 0xd4 0 0
+ 0x13 0 4 0
-1 0x34 0x8048034 0
-0x3f2f9 0x3f2f9 5 0x1000
+ 1 0x34 0x8048034 0
+ 0x3f2f9 0x3f2f9 5 0x1000
-1 0x3f330 0x8088330 0
-0x3e4d0 0x3e4d0 7 0x1000
+ 1 0x3f330 0x8088330 0
+ 0x3e4d0 0x3e4d0 7 0x1000
-2 0x60874 0x80a9874 0
-0x80 0 7 0
+ 2 0x60874 0x80a9874 0
+ 0x80 0 7 0
*/
@@ -329,71 +336,71 @@
* The above example now should look like:
**** SECTION HEADER TABLE ****
-[No] Type Flags Addr Offset Size Name
- Link Info Adralgn Entsize
+ [No] Type Flags Addr Offset Size Name
+ Link Info Adralgn Entsize
-[1] 1 2 0x80480d4 0xd4 0x13 .interp
- 0 0 0x1 0
+ [1] 1 2 0x80480d4 0xd4 0x13 .interp
+ 0 0 0x1 0
-[2] 5 2 0x80480e8 0xe8 0x388 .hash
- 3 0 0x4 0x4
+ [2] 5 2 0x80480e8 0xe8 0x388 .hash
+ 3 0 0x4 0x4
-[3] 11 2 0x8048470 0x470 0x7f0 .dynsym
- 4 1 0x4 0x10
+ [3] 11 2 0x8048470 0x470 0x7f0 .dynsym
+ 4 1 0x4 0x10
-[4] 3 2 0x8048c60 0xc60 0x3ad .dynstr
- 0 0 0x1 0
+ [4] 3 2 0x8048c60 0xc60 0x3ad .dynstr
+ 0 0 0x1 0
-[5] 9 2 0x8049010 0x1010 0x338 .rel.plt
- 3 7 0x4 0x8
+ [5] 9 2 0x8049010 0x1010 0x338 .rel.plt
+ 3 7 0x4 0x8
-[6] 1 6 0x8049348 0x1348 0x3 .init
- 0 0 0x4 0
+ [6] 1 6 0x8049348 0x1348 0x3 .init
+ 0 0 0x4 0
-[7] 1 6 0x804934c 0x134c 0x680 .plt
- 0 0 0x4 0x4
+ [7] 1 6 0x804934c 0x134c 0x680 .plt
+ 0 0 0x4 0x4
-[8] 1 6 0x80499cc 0x19cc 0x3c56f .text
- 0 0 0x4 0
+ [8] 1 6 0x80499cc 0x19cc 0x3c56f .text
+ 0 0 0x4 0
-[9] 1 6 0x8085f3c 0x3df3c 0x3 .fini
- 0 0 0x4 0
+ [9] 1 6 0x8085f3c 0x3df3c 0x3 .fini
+ 0 0 0x4 0
-[10] 1 2 0x8085f40 0x3df40 0x69c .rodata
- 0 0 0x4 0
+ [10] 1 2 0x8085f40 0x3df40 0x69c .rodata
+ 0 0 0x4 0
-[11] 1 2 0x80865dc 0x3e5dc 0xd51 .rodata1
- 0 0 0x4 0
+ [11] 1 2 0x80865dc 0x3e5dc 0xd51 .rodata1
+ 0 0 0x4 0
-[12] 1 3 0x8088330 0x3f330 0x20afc .data
- 0 0 0x4 0
+ [12] 1 3 0x8088330 0x3f330 0x20afc .data
+ 0 0 0x4 0
-[13] 1 3 0x80a8e2c 0x5fe2c 0x89d .data1
- 0 0 0x4 0
+ [13] 1 3 0x80a8e2c 0x5fe2c 0x89d .data1
+ 0 0 0x4 0
-[14] 1 3 0x80a96cc 0x606cc 0x1a8 .got
- 0 0 0x4 0x4
+ [14] 1 3 0x80a96cc 0x606cc 0x1a8 .got
+ 0 0 0x4 0x4
-[15] 6 3 0x80a9874 0x60874 0x80 .dynamic
- 4 0 0x4 0x8
+ [15] 6 3 0x80a9874 0x60874 0x80 .dynamic
+ 4 0 0x4 0x8
-[16] 1 3 0x80a98f4 0x608f4 0x1cf0c .data
- 0 0 0x4 0
+ [16] 1 3 0x80a98f4 0x608f4 0x1cf0c .data
+ 0 0 0x4 0
-[17] 8 3 0x80c6800 0x7d800 0 .bss
- 0 0 0x4 0
+ [17] 8 3 0x80c6800 0x7d800 0 .bss
+ 0 0 0x4 0
-[18] 2 0 0 0x7d800 0x9b90 .symtab
- 19 371 0x4 0x10
+ [18] 2 0 0 0x7d800 0x9b90 .symtab
+ 19 371 0x4 0x10
-[19] 3 0 0 0x87390 0x8526 .strtab
- 0 0 0x1 0
+ [19] 3 0 0 0x87390 0x8526 .strtab
+ 0 0 0x1 0
-[20] 3 0 0 0x8f8b6 0x93 .shstrtab
- 0 0 0x1 0
+ [20] 3 0 0 0x8f8b6 0x93 .shstrtab
+ 0 0 0x1 0
-[21] 1 0 0 0x8f949 0x68b7 .comment
- 0 0 0x1 0
+ [21] 1 0 0 0x8f949 0x68b7 .comment
+ 0 0 0x1 0
*/
@@ -402,17 +409,16 @@
#ifndef emacs
#define fatal(a, b...) fprintf (stderr, a, ##b), exit (1)
+#include <string.h>
#else
#include "config.h"
-extern void fatal (char *, ...);
+extern void fatal (const char *msgid, ...);
#endif
#include <sys/types.h>
#include <stdio.h>
-#include <stdlib.h>
#include <sys/stat.h>
#include <memory.h>
-#include <string.h>
#include <errno.h>
#include <unistd.h>
#include <fcntl.h>
@@ -420,10 +426,10 @@
#include <elf.h>
#endif
#include <sys/mman.h>
-#if defined (__sony_news) && defined (_SYSTYPE_SYSV)
+#if defined (_SYSTYPE_SYSV)
#include <sys/elf_mips.h>
#include <sym.h>
-#endif /* __sony_news && _SYSTYPE_SYSV */
+#endif /* _SYSTYPE_SYSV */
#if __sgi
#include <syms.h> /* for HDRR declaration */
#endif /* __sgi */
@@ -470,7 +476,7 @@
long cbFdOffset;
long cbRfdOffset;
long cbExtOffset;
-} HDRR, *pHDRR;
+} HDRR, *pHDRR;
#define cbHDRR sizeof(HDRR)
#define hdrNil ((pHDRR)0)
#endif
@@ -479,7 +485,7 @@
/*
* NetBSD does not have normal-looking user-land ELF support.
*/
-# ifdef __alpha__
+# if defined __alpha__ || defined __sparc_v9__
# define ELFSIZE 64
# else
# define ELFSIZE 32
@@ -488,6 +494,9 @@
# ifndef PT_LOAD
# define PT_LOAD Elf_pt_load
+# if 0 /* was in pkgsrc patches for 20.7 */
+# define SHT_PROGBITS Elf_sht_progbits
+# endif
# define SHT_SYMTAB Elf_sht_symtab
# define SHT_DYNSYM Elf_sht_dynsym
# define SHT_NULL Elf_sht_null
@@ -498,13 +507,18 @@
# define SHN_UNDEF Elf_eshn_undefined
# define SHN_ABS Elf_eshn_absolute
# define SHN_COMMON Elf_eshn_common
-# endif
+# endif /* !PT_LOAD */
# ifdef __alpha__
# include <sys/exec_ecoff.h>
# define HDRR struct ecoff_symhdr
# define pHDRR HDRR *
-# endif
+# endif /* __alpha__ */
+
+#ifdef __mips__ /* was in pkgsrc patches for 20.7 */
+# define SHT_MIPS_DEBUG DT_MIPS_FLAGS
+# define HDRR struct Elf_Shdr
+#endif /* __mips__ */
#endif /* __NetBSD__ */
#ifdef __OpenBSD__
@@ -636,7 +650,7 @@
{
int new_file, old_file, new_file_size;
- /* Pointers to the base of the image of the two files. */
+ /* Pointers to the base of the image of the two files. */
caddr_t old_base, new_base;
#if MAP_ANON == 0
@@ -651,7 +665,7 @@
ElfW(Phdr) *old_program_h, *new_program_h;
ElfW(Shdr) *old_section_h, *new_section_h;
- /* Point to the section name table in the old file */
+ /* Point to the section name table in the old file. */
char *old_section_names;
ElfW(Addr) old_bss_addr, new_bss_addr;
@@ -660,7 +674,7 @@
ElfW(Addr) new_data2_addr;
int n, nn;
- int old_bss_index, old_sbss_index;
+ int old_bss_index, old_sbss_index, old_plt_index;
int old_data_index, new_data2_index;
int old_mdebug_index;
struct stat stat_buf;
@@ -710,8 +724,7 @@
old_name, old_file_h, old_section_h, 1);
/* Find the old .bss section. Figure out parameters of the new
- * data2 and bss sections.
- */
+ data2 and bss sections. */
old_bss_index = find_section (".bss", old_section_names,
old_name, old_file_h, old_section_h, 0);
@@ -719,15 +732,34 @@
old_sbss_index = find_section (".sbss", old_section_names,
old_name, old_file_h, old_section_h, 1);
if (old_sbss_index != -1)
- if (OLD_SECTION_H (old_sbss_index).sh_type == SHT_PROGBITS)
+ if (OLD_SECTION_H (old_sbss_index).sh_type != SHT_NOBITS)
old_sbss_index = -1;
- if (old_sbss_index == -1)
+ /* PowerPC64 has .plt in the BSS section. */
+ old_plt_index = find_section (".plt", old_section_names,
+ old_name, old_file_h, old_section_h, 1);
+ if (old_plt_index != -1)
+ if (OLD_SECTION_H (old_plt_index).sh_type != SHT_NOBITS)
+ old_plt_index = -1;
+
+ if (old_sbss_index == -1 && old_plt_index == -1)
{
old_bss_addr = OLD_SECTION_H (old_bss_index).sh_addr;
old_bss_size = OLD_SECTION_H (old_bss_index).sh_size;
new_data2_index = old_bss_index;
}
+ else if (old_plt_index != -1
+ && (old_sbss_index == -1
+ || (OLD_SECTION_H (old_sbss_index).sh_addr
+ > OLD_SECTION_H (old_plt_index).sh_addr)))
+ {
+ old_bss_addr = OLD_SECTION_H (old_plt_index).sh_addr;
+ old_bss_size = OLD_SECTION_H (old_bss_index).sh_size
+ + OLD_SECTION_H (old_plt_index).sh_size;
+ if (old_sbss_index != -1)
+ old_bss_size += OLD_SECTION_H (old_sbss_index).sh_size;
+ new_data2_index = old_plt_index;
+ }
else
{
old_bss_addr = OLD_SECTION_H (old_sbss_index).sh_addr;
@@ -789,8 +821,7 @@
((byte *) new_base + old_file_h->e_shoff + new_data2_size);
/* Make our new file, program and section headers as copies of the
- * originals.
- */
+ originals. */
memcpy (new_file_h, old_file_h, old_file_h->e_ehsize);
memcpy (new_program_h, old_program_h,
@@ -800,8 +831,7 @@
PATCH_INDEX (new_file_h->e_shstrndx);
/* Fix up file header. We'll add one section. Section header is
- * further away now.
- */
+ further away now. */
new_file_h->e_shoff += new_data2_size;
new_file_h->e_shnum += 1;
@@ -814,12 +844,11 @@
#endif
/* Fix up a new program header. Extend the writable data segment so
- * that the bss area is covered too. Find that segment by looking
- * for a segment that ends just before the .bss area. Make sure
- * that no segments are above the new .data2. Put a loop at the end
- * to adjust the offset and address of any segment that is above
- * data2, just in case we decide to allow this later.
- */
+ that the bss area is covered too. Find that segment by looking
+ for a segment that ends just before the .bss area. Make sure
+ that no segments are above the new .data2. Put a loop at the end
+ to adjust the offset and address of any segment that is above
+ data2, just in case we decide to allow this later. */
for (n = new_file_h->e_phnum - 1; n >= 0; n--)
{
@@ -869,11 +898,10 @@
#endif
/* Fix up section headers based on new .data2 section. Any section
- * whose offset or virtual address is after the new .data2 section
- * gets its value adjusted. .bss size becomes zero and new address
- * is set. data2 section header gets added by copying the existing
- * .data header and modifying the offset, address and size.
- */
+ whose offset or virtual address is after the new .data2 section
+ gets its value adjusted. .bss size becomes zero and new address
+ is set. data2 section header gets added by copying the existing
+ .data header and modifying the offset, address and size. */
for (old_data_index = 1; old_data_index < (int) old_file_h->e_shnum;
old_data_index++)
if (!strcmp (old_section_names + OLD_SECTION_H (old_data_index).sh_name,
@@ -916,11 +944,11 @@
memcpy (&NEW_SECTION_H (nn), &OLD_SECTION_H (n),
old_file_h->e_shentsize);
-
+
if (n == old_bss_index
/* The new bss and sbss section's size is zero, and its file offset
and virtual address should be off by NEW_DATA2_SIZE. */
- || n == old_sbss_index
+ || n == old_sbss_index || n == old_plt_index
)
{
/* NN should be `old_s?bss_index + 1' at this point. */
@@ -977,11 +1005,11 @@
if (NEW_SECTION_H (nn).sh_type != SHT_SYMTAB
&& NEW_SECTION_H (nn).sh_type != SHT_DYNSYM)
PATCH_INDEX (NEW_SECTION_H (nn).sh_info);
-
+
if (old_sbss_index != -1)
if (!strcmp (old_section_names + NEW_SECTION_H (nn).sh_name, ".sbss"))
{
- NEW_SECTION_H (nn).sh_offset =
+ NEW_SECTION_H (nn).sh_offset =
round_up (NEW_SECTION_H (nn).sh_offset,
NEW_SECTION_H (nn).sh_addralign);
NEW_SECTION_H (nn).sh_type = SHT_PROGBITS;
@@ -1002,11 +1030,35 @@
".lit4")
|| !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
".lit8")
+ /* The conditional bit below was in Oliva's original code
+ (1999-08-25) and seems to have been dropped by mistake
+ subsequently. It prevents a crash at startup under X in
+ `IRIX64 6.5 6.5.17m', whether compiled on that relase or
+ an earlier one. It causes no trouble on the other ELF
+ platforms I could test (Irix 6.5.15m, Solaris 8, Debian
+ Potato x86, Debian Woody SPARC); however, it's reported
+ to cause crashes under some version of GNU/Linux. It's
+ not yet clear what's changed in that Irix version to
+ cause the problem, or why the fix sometimes fails under
+ GNU/Linux. There's probably no good reason to have
+ something Irix-specific here, but this will have to do
+ for now. IRIX6_5 is the most specific macro we have to
+ test. -- fx 2002-10-01
+
+ The issue _looks_ as though it's gone away on 6.5.18m,
+ but maybe it's still lurking, to be triggered by some
+ change in the binary. It appears to concern the dynamic
+ loader, but I never got anywhere with an SGI support call
+ seeking clues. -- fx 2002-11-29. */
+#ifdef IRIX6_5
+ || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
+ ".got")
+#endif
|| !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
".sdata1")
|| !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
".data1")
- || !strcmp (old_section_names + NEW_SECTION_H (nn).sh_name,
+ || !strcmp ((old_section_names + NEW_SECTION_H (n).sh_name),
".sbss"))
src = (caddr_t) OLD_SECTION_H (n).sh_addr;
else
@@ -1036,12 +1088,12 @@
}
#endif /* __alpha__ */
-#if defined (__sony_news) && defined (_SYSTYPE_SYSV)
+#if defined (_SYSTYPE_SYSV)
if (NEW_SECTION_H (nn).sh_type == SHT_MIPS_DEBUG
- && old_mdebug_index != -1)
+ && old_mdebug_index != -1)
{
- int diff = NEW_SECTION_H(nn).sh_offset
- - OLD_SECTION_H(old_mdebug_index).sh_offset;
+ int diff = NEW_SECTION_H(nn).sh_offset
+ - OLD_SECTION_H(old_mdebug_index).sh_offset;
HDRR *phdr = (HDRR *)(NEW_SECTION_H (nn).sh_offset + new_base);
if (diff)
@@ -1059,10 +1111,10 @@
phdr->cbExtOffset += diff;
}
}
-#endif /* __sony_news && _SYSTYPE_SYSV */
+#endif /* _SYSTYPE_SYSV */
#if __sgi
- /* Adjust the HDRR offsets in .mdebug and copy the
+ /* Adjust the HDRR offsets in .mdebug and copy the
line data if it's in its usual 'hole' in the object.
Makes the new file debuggable with dbx.
patches up two problems: the absolute file offsets
@@ -1164,54 +1216,68 @@
for (n = new_file_h->e_shnum - 1; n; n--)
{
ElfW(Shdr) section = NEW_SECTION_H (n);
- switch (section.sh_type) {
- default:
- break;
- case SHT_REL:
- case SHT_RELA:
- /* This code handles two different size structs, but there should
- be no harm in that provided that r_offset is always the first
- member. */
- nn = section.sh_info;
- if (nn && (!strcmp (old_section_names + NEW_SECTION_H (nn).sh_name, ".data")
- || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
- ".sdata")
- || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
- ".lit4")
- || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
- ".lit8")
- || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
- ".sdata1")
- || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
- ".data1")))
- {
- ElfW(Addr) offset = NEW_SECTION_H (nn).sh_addr -
- NEW_SECTION_H (nn).sh_offset;
- caddr_t reloc = old_base + section.sh_offset, end;
- for (end = reloc + section.sh_size; reloc < end;
- reloc += section.sh_entsize)
- {
- ElfW(Addr) addr = ((ElfW(Rel) *) reloc)->r_offset - offset;
+
+ /* Cause a compilation error if anyone uses n instead of nn below. */
+ struct {int a;} n;
+ (void)n.a; /* Prevent `unused variable' warnings. */
+
+ switch (section.sh_type)
+ {
+ default:
+ break;
+ case SHT_REL:
+ case SHT_RELA:
+ /* This code handles two different size structs, but there should
+ be no harm in that provided that r_offset is always the first
+ member. */
+ nn = section.sh_info;
+ if (!strcmp (old_section_names + NEW_SECTION_H (nn).sh_name, ".data")
+ || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
+ ".sdata")
+ || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
+ ".lit4")
+ || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
+ ".lit8")
+#ifdef IRIX6_5 /* see above */
+ || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
+ ".got")
+#endif
+ || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
+ ".sdata1")
+ || !strcmp ((old_section_names + NEW_SECTION_H (nn).sh_name),
+ ".data1"))
+ {
+ ElfW(Addr) offset = (NEW_SECTION_H (nn).sh_addr
+ - NEW_SECTION_H (nn).sh_offset);
+ caddr_t reloc = old_base + section.sh_offset, end;
+ for (end = reloc + section.sh_size; reloc < end;
+ reloc += section.sh_entsize)
+ {
+ ElfW(Addr) addr = ((ElfW(Rel) *) reloc)->r_offset - offset;
#ifdef __alpha__
- /* The Alpha ELF binutils currently have a bug that
- sometimes results in relocs that contain all
- zeroes. Work around this for now... */
- if (((ElfW(Rel) *) reloc)->r_offset == 0)
+ /* The Alpha ELF binutils currently have a bug that
+ sometimes results in relocs that contain all
+ zeroes. Work around this for now... */
+ if (((ElfW(Rel) *) reloc)->r_offset == 0)
continue;
#endif
- memcpy (new_base + addr, old_base + addr, sizeof(ElfW(Addr)));
- }
- }
- break;
- }
+ memcpy (new_base + addr, old_base + addr, sizeof(ElfW(Addr)));
+ }
+ }
+ break;
+ }
}
/* Write out new_file, and free the buffers. */
if (write (new_file, new_base, new_file_size) != new_file_size)
+#ifndef emacs
+ fatal ("Didn't write %d bytes: errno %d\n",
+ new_file_size, errno);
+#else
fatal ("Didn't write %d bytes to %s: errno %d\n",
new_file_size, new_base, errno);
-
+#endif
munmap (old_base, old_file_size);
munmap (new_base, new_file_size);
@@ -1236,12 +1302,12 @@
if (chmod (new_name, stat_buf.st_mode) == -1)
fatal ("Can't chmod (%s): errno %d\n", new_name, errno);
}
-/* All of the above is from the emacs-20.7 file. This comment and the
+/* All of the above is from the emacs-22.2 file. This comment and the
following are added for gcl. Also we changed the above (near "for
gcl") we make the NEW_SECTION_H executable since it will have code
in it. NEW_SECTION_H (nn).sh_flags |= SHF_EXECINSTR;
- Partly synchronized with Emacs HEAD of 2004-04-12 by Magnus Henoch.
+ Synchronized with Emacs 22.2 on 2008-11-07 by Jerry James.
The files themselves are no longer mmap'ed, but memory is allocated
with mmap, and everything is written to the new file at the end.
*/