From: Alan Modra Date: Sat, 27 Apr 2002 12:51:27 +0000 (+0000) Subject: Merge from mainline X-Git-Tag: binutils-2_12_1~37 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=db7b17adcb2e8ec3024458e85f2351b9677f3439;p=thirdparty%2Fbinutils-gdb.git Merge from mainline 2002-04-08 Alan Modra * ldlang.c (lang_size_sections): Don't complain about SEC_NEVER_LOAD sections having no memory region specified. * ld.texinfo (Format Commands ): Typo fix. 2002-04-07 matthew green * ld/configure.host (*-*-netbsd*): Add support for NetBSD/ELF. 2002-02-19 Martin Schwidefsky * emulparams/elf64_s390.sh (ARCH): Change to "s390:64-bit". * emulparams/elf_s390.sh (ARCH): Change to "s390:31-bit". --- diff --git a/ld/ChangeLog b/ld/ChangeLog index 0848b492005..346d5325c01 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,18 @@ +2002-04-27 Alan Modra + + Merge from mainline + 2002-04-08 Alan Modra + * ldlang.c (lang_size_sections): Don't complain about + SEC_NEVER_LOAD sections having no memory region specified. + * ld.texinfo (Format Commands ): Typo fix. + + 2002-04-07 matthew green + * ld/configure.host (*-*-netbsd*): Add support for NetBSD/ELF. + + 2002-02-19 Martin Schwidefsky + * emulparams/elf64_s390.sh (ARCH): Change to "s390:64-bit". + * emulparams/elf_s390.sh (ARCH): Change to "s390:31-bit". + 2002-04-04 Alan Modra * dep-in.sed: Cope with absolute paths. diff --git a/ld/configure.host b/ld/configure.host index 56a950c6bcf..65c2fc7a21e 100644 --- a/ld/configure.host +++ b/ld/configure.host @@ -223,6 +223,13 @@ x86_64-*-linux-gnu*) *-*-linux*) ;; +*-*-netbsd*) + NATIVE_LIB_DIRS=/usr/lib + # NetBSD typically does not use the GCC crtstuff, so ignore it. + HOSTING_CRT0='-dynamic-linker /usr/libexec/ld.elf_so /usr/lib/crt0.o /usr/lib/crtbegin.o' + HOSTING_LIBS='`if [ -f ../gcc/libgcc.a ] ; then echo ../gcc/libgcc.a ; else ${CC} -print-libgcc-file-name; fi` -lc `if [ -f ../gcc/libgcc.a ] ; then echo ../gcc/libgcc.a ; else ${CC} -print-libgcc-file-name; fi` /usr/lib/crtend.o' + ;; + alpha*-*-*) HOSTING_CRT0=/usr/ccs/lib/crt0.o NATIVE_LIB_DIRS=/usr/ccs/lib diff --git a/ld/emulparams/elf64_s390.sh b/ld/emulparams/elf64_s390.sh index 08cf4ccb6f2..8416c89e11f 100644 --- a/ld/emulparams/elf64_s390.sh +++ b/ld/emulparams/elf64_s390.sh @@ -4,7 +4,7 @@ OUTPUT_FORMAT="elf64-s390" TEXT_START_ADDR=0x80000000 MAXPAGESIZE=0x1000 NONPAGED_TEXT_START_ADDR=0x80000000 -ARCH="s390:esame" +ARCH="s390:64-bit" MACHINE= NOP=0x07070707 TEMPLATE_NAME=elf32 diff --git a/ld/emulparams/elf_s390.sh b/ld/emulparams/elf_s390.sh index 811add47516..2804aceeb9b 100644 --- a/ld/emulparams/elf_s390.sh +++ b/ld/emulparams/elf_s390.sh @@ -3,7 +3,7 @@ OUTPUT_FORMAT="elf32-s390" TEXT_START_ADDR=0x00400000 MAXPAGESIZE=0x1000 NONPAGED_TEXT_START_ADDR=0x00400000 -ARCH=s390 +ARCH="s390:31-bit" MACHINE= NOP=0x07070707 TEMPLATE_NAME=elf32 diff --git a/ld/ld.texinfo b/ld/ld.texinfo index 936bf39fb33..dee9874cc7d 100644 --- a/ld/ld.texinfo +++ b/ld/ld.texinfo @@ -2277,7 +2277,7 @@ A couple of linker script commands deal with object file formats. @cindex output file format in linker script The @code{OUTPUT_FORMAT} command names the BFD format to use for the output file (@pxref{BFD}). Using @code{OUTPUT_FORMAT(@var{bfdname})} is -exactly like using @samp{-oformat @var{bfdname}} on the command line +exactly like using @samp{--oformat @var{bfdname}} on the command line (@pxref{Options,,Command Line Options}). If both are used, the command line option takes precedence. diff --git a/ld/ldlang.c b/ld/ldlang.c index 5257547b952..414a0340818 100644 --- a/ld/ldlang.c +++ b/ld/ldlang.c @@ -2914,6 +2914,8 @@ lang_size_sections (s, output_section_statement, prev, fill, dot, relax) defined, issue a warning. */ if ((bfd_get_section_flags (output_bfd, os->bfd_section) & (SEC_ALLOC | SEC_LOAD)) != 0 + && (bfd_get_section_flags (output_bfd, os->bfd_section) + & SEC_NEVER_LOAD) == 0 && ! link_info.relocateable && strcmp (os->region->name, "*default*") == 0 && lang_memory_region_list != NULL