Merge patches sent by Robert P. J. Day <rpjday@mindspring.com>.
Warning: the buildroot folks purposedly removed the skip-comment patch but didn't really said why. Keeping it for the sake of having it in svn just in case (removing it will be easier thant not having it at all).
1 --- binutils/ld/emulparams/elf_i386_glibc21.sh.jj Sat Aug 3 17:04:41 2002
2 +++ binutils/ld/emulparams/elf_i386_glibc21.sh Sat Aug 3 17:04:41 2002
5 +OUTPUT_FORMAT="elf32-i386"
6 +TEXT_START_ADDR=0x08048000
8 +NONPAGED_TEXT_START_ADDR=0x08048000
13 +GENERATE_SHLIB_SCRIPT=yes
14 +LIB_PATH=/usr/i386-glibc21-linux/lib:/usr/local/lib
15 --- binutils/ld/configure.tgt.jj Thu Aug 1 20:49:32 2002
16 +++ binutils/ld/configure.tgt Sat Aug 3 17:06:18 2002
17 @@ -143,7 +143,8 @@ i[3456]86-*-linux*aout*) targ_emul=i386l
19 i[3456]86-*-linux*oldld) targ_emul=i386linux; targ_extra_emuls=elf_i386 ;;
20 i[3456]86-*-linux-gnu*) targ_emul=elf_i386
21 - targ_extra_emuls=i386linux
22 + targ_extra_emuls="i386linux elf_i386_glibc21"
23 + targ_extra_libpath=elf_i386_glibc21
24 if test x${want64} = xtrue; then
25 targ_extra_emuls="$targ_extra_emuls elf_x86_64"
27 --- binutils/ld/Makefile.am.jj Thu Aug 1 20:49:32 2002
28 +++ binutils/ld/Makefile.am Sat Aug 3 17:04:41 2002
29 @@ -181,6 +181,7 @@ ALL_EMULATIONS = \
33 + eelf_i386_glibc21.o \
37 @@ -718,6 +719,9 @@ eelf_i386_be.c: $(srcdir)/emulparams/elf
38 eelf_i386_chaos.c: $(srcdir)/emulparams/elf_i386_chaos.sh \
39 $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf_chaos.sc ${GEN_DEPENDS}
40 ${GENSCRIPTS} elf_i386_chaos "$(tdir_elf_i386_chaos)"
41 +eelf_i386_glibc21.c: $(srcdir)/emulparams/elf_i386_glibc21.sh \
42 + $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
43 + ${GENSCRIPTS} elf_i386_glibc21 "$(tdir_elf_i386_glibc21)"
44 eelf_i386_fbsd.c: $(srcdir)/emulparams/elf_i386_fbsd.sh \
45 $(srcdir)/emulparams/elf_i386.sh \
46 $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
47 --- binutils/ld/Makefile.in.jj Thu Aug 1 20:49:32 2002
48 +++ binutils/ld/Makefile.in Sat Aug 3 17:07:34 2002
49 @@ -1197,6 +1197,9 @@ eelf_i386_be.c: $(srcdir)/emulparams/elf
50 eelf_i386_chaos.c: $(srcdir)/emulparams/elf_i386_chaos.sh \
51 $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf_chaos.sc ${GEN_DEPENDS}
52 ${GENSCRIPTS} elf_i386_chaos "$(tdir_elf_i386_chaos)"
53 +eelf_i386_glibc21.c: $(srcdir)/emulparams/elf_i386_glibc21.sh \
54 + $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
55 + ${GENSCRIPTS} elf_i386_glibc21 "$(tdir_elf_i386_glibc21)"
56 eelf_i386_fbsd.c: $(srcdir)/emulparams/elf_i386_fbsd.sh \
57 $(srcdir)/emulparams/elf_i386.sh \
58 $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}