From: Tristan Gingold Date: Fri, 1 Apr 2011 12:04:29 +0000 (+0000) Subject: Backport. X-Git-Tag: binutils-2_21_1~122 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=51e6105a616084f32a70bcc53c1f837bd93caa63;p=thirdparty%2Fbinutils-gdb.git Backport. Modified files: gas : ChangeLog configure.tgt gas/config : tc-i386.c bfd : ChangeLog config.bfd configure configure.in libbfd.h ld : ChangeLog configure.host configure.tgt ldlex.l Added files: gas/config : te-dragonfly.h Log message: Add support for DragonFlyBSD target. --- diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 5b32cddbd60..5e038001673 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2011-03-26 John Marino + + * config.bfd: Add x86_64-*-dragonfly*, fix i386-*-dragonfly*. + * configure.in: Delete unused bfd_elf32_i386_dragonfly_vec. + * configure: Regenerate. + 2011-03-24 Alan Modra * elf32-ppc.c (ppc_elf_tls_optimize): Catch more cases where diff --git a/bfd/config.bfd b/bfd/config.bfd index 2de94a45b0b..fbf77ade74f 100644 --- a/bfd/config.bfd +++ b/bfd/config.bfd @@ -551,13 +551,17 @@ case "${targ}" in targ_defvec=i386bsd_vec targ_underscore=yes ;; + i[3-7]86-*-dragonfly*) + targ_defvec=bfd_elf32_i386_vec + targ64_selvecs="bfd_elf64_x86_64_vec bfd_elf64_l1om_vec" + ;; i[3-7]86-*-freebsdaout* | i[3-7]86-*-freebsd[12].* | \ i[3-7]86-*-freebsd[12]) targ_defvec=i386freebsd_vec targ_selvecs=i386bsd_vec targ_underscore=yes ;; - i[3-7]86-*-freebsd* | i[3-7]86-*-kfreebsd*-gnu | i[3-7]86-*-dragonfly*) + i[3-7]86-*-freebsd* | i[3-7]86-*-kfreebsd*-gnu) targ_defvec=bfd_elf32_i386_freebsd_vec targ_selvecs="bfd_elf32_i386_vec i386pei_vec i386coff_vec" targ64_selvecs="bfd_elf64_x86_64_freebsd_vec bfd_elf64_x86_64_vec x86_64pei_vec bfd_elf64_l1om_vec bfd_elf64_l1om_freebsd_vec" @@ -617,6 +621,11 @@ case "${targ}" in targ_selvecs="bfd_elf32_i386_vec bfd_elf64_l1om_vec i386coff_vec" want64=true ;; + x86_64-*-dragonfly*) + targ_defvec=bfd_elf64_x86_64_vec + targ_selvecs="bfd_elf32_i386_vec bfd_elf64_l1om_vec" + want64=true + ;; x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu) targ_defvec=bfd_elf64_x86_64_freebsd_vec targ_selvecs="bfd_elf32_i386_freebsd_vec i386coff_vec i386pei_vec x86_64pei_vec bfd_elf32_i386_vec bfd_elf64_x86_64_vec bfd_elf64_l1om_vec bfd_elf64_l1om_freebsd_vec" diff --git a/bfd/configure b/bfd/configure index c8d48fd2e63..301def925a6 100755 --- a/bfd/configure +++ b/bfd/configure @@ -15068,8 +15068,6 @@ do bfd_elf32_hppa_nbsd_vec) tb="$tb elf32-hppa.lo elf32.lo $elf" ;; bfd_elf32_hppa_vec) tb="$tb elf32-hppa.lo elf32.lo $elf" ;; bfd_elf32_i370_vec) tb="$tb elf32-i370.lo elf32.lo $elf" ;; - bfd_elf32_i386_dragonfly_vec) - tb="$tb elf32-i386.lo elf-ifunc.lo elf-vxworks.lo elf32.lo $elf" ;; bfd_elf32_i386_sol2_vec) tb="$tb elf32-i386.lo elf-ifunc.lo elf-vxworks.lo elf32.lo $elf" ;; bfd_elf32_i386_freebsd_vec) tb="$tb elf32-i386.lo elf-ifunc.lo elf-vxworks.lo elf32.lo $elf" ;; bfd_elf32_i386_vxworks_vec) tb="$tb elf32-i386.lo elf-ifunc.lo elf-vxworks.lo elf32.lo $elf" ;; diff --git a/bfd/configure.in b/bfd/configure.in index d758a51fd0a..4076c6ef0a6 100644 --- a/bfd/configure.in +++ b/bfd/configure.in @@ -703,8 +703,6 @@ do bfd_elf32_hppa_nbsd_vec) tb="$tb elf32-hppa.lo elf32.lo $elf" ;; bfd_elf32_hppa_vec) tb="$tb elf32-hppa.lo elf32.lo $elf" ;; bfd_elf32_i370_vec) tb="$tb elf32-i370.lo elf32.lo $elf" ;; - bfd_elf32_i386_dragonfly_vec) - tb="$tb elf32-i386.lo elf-ifunc.lo elf-vxworks.lo elf32.lo $elf" ;; bfd_elf32_i386_sol2_vec) tb="$tb elf32-i386.lo elf-ifunc.lo elf-vxworks.lo elf32.lo $elf" ;; bfd_elf32_i386_freebsd_vec) tb="$tb elf32-i386.lo elf-ifunc.lo elf-vxworks.lo elf32.lo $elf" ;; bfd_elf32_i386_vxworks_vec) tb="$tb elf32-i386.lo elf-ifunc.lo elf-vxworks.lo elf32.lo $elf" ;; diff --git a/gas/ChangeLog b/gas/ChangeLog index 15e23bcb63e..127efed585e 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2011-03-26 John Marino + + * configure.tgt: Fix support for *-*-dragonfly*. + * config/tc-i386.c: define SVR4_COMMENT_CHARS for dragonfly. + * config/te-dragonfly.h: New file. + 2010-11-25 Andreas Krebbel * config/tc-s390.c (current_cpu): Initialize with latest CPU. diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c index ba769ad695b..b513bb3158d 100644 --- a/gas/config/tc-i386.c +++ b/gas/config/tc-i386.c @@ -303,6 +303,7 @@ const char extra_symbol_chars[] = "*%-([" && !defined (TE_LINUX) \ && !defined (TE_NETWARE) \ && !defined (TE_FreeBSD) \ + && !defined (TE_DragonFly) \ && !defined (TE_NetBSD))) /* This array holds the chars that always start a comment. If the pre-processor is disabled, these aren't very useful. The option diff --git a/gas/configure.tgt b/gas/configure.tgt index c05a64a2382..aa12fbb955f 100644 --- a/gas/configure.tgt +++ b/gas/configure.tgt @@ -205,8 +205,8 @@ case ${generic_target} in i386-*-freebsdaout*) fmt=aout em=386bsd ;; i386-*-freebsd[12].*) fmt=aout em=386bsd ;; i386-*-freebsd[12]) fmt=aout em=386bsd ;; - i386-*-freebsd* | i386-*-kfreebsd*-gnu | i386-*-dragonfly*) - fmt=elf em=freebsd ;; + i386-*-freebsd* \ + | i386-*-kfreebsd*-gnu) fmt=elf em=freebsd ;; i386-*-sysv*) fmt=coff ;; i386-*-sco3.2v5*coff) fmt=coff ;; i386-*-isc*) fmt=coff ;; @@ -419,6 +419,7 @@ case ${generic_target} in z8k-*-coff | z8k-*-sim) fmt=coff ;; *-*-aout | *-*-scout) fmt=aout ;; + *-*-dragonfly*) fmt=elf em=dragonfly ;; *-*-freebsd* | *-*-kfreebsd*-gnu) fmt=elf em=freebsd ;; *-*-bsd*) fmt=aout em=sun3 ;; *-*-generic) fmt=generic ;; diff --git a/ld/ChangeLog b/ld/ChangeLog index a6b952ec671..6bcac06b0fe 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2011-03-26 John Marino + + * configure.host: Update *-*-dragonfly* host entry. + * configure.tgt: Update *-*-dragonfly* target entry. + * ldlex.l: Prevent redefinition of YY_NO_UNPUT. + 2011-03-13 John David Anglin Backport from mainline: diff --git a/ld/configure.host b/ld/configure.host index f2dffe67bc5..f47b961176f 100644 --- a/ld/configure.host +++ b/ld/configure.host @@ -18,7 +18,12 @@ HOSTING_LIBS='`if [ -f ../gcc/libgcc.a ]; then libgcc=../gcc/libgcc.a; else libg case "${host}" in -*-*-freebsd* | *-*-kfreebsd*-gnu | *-*-dragonfly*) +*-*-dragonfly*) + HOSTING_CRT0='-dynamic-linker `[ -f \`${CC} --print-prog-name=ld-elf.so.2\` ] || echo /usr/libexec/``${CC} --print-prog-name=ld-elf.so.2` `${CC} --print-file-name=crt1.o` `${CC} --print-file-name=crti.o` `${CC} --print-file-name=crtbegin.o`' + HOSTING_LIBS='-L`dirname \`${CC} --print-file-name=libc.so\`` '"$HOSTING_LIBS"' `if [ -f ../gcc/crtend.o ]; then echo ../gcc/crtend.o; else ${CC} --print-file-name=crtend.o; fi` `${CC} --print-file-name=crtn.o`' + ;; + +*-*-freebsd* | *-*-kfreebsd*-gnu) HOSTING_CRT0='-dynamic-linker `[ -f \`${CC} --print-prog-name=ld-elf.so.1\` ] || echo /usr/libexec/``${CC} --print-prog-name=ld-elf.so.1` `${CC} --print-file-name=crt1.o` `${CC} --print-file-name=crti.o` `${CC} --print-file-name=crtbegin.o`' HOSTING_LIBS='-L`dirname \`${CC} --print-file-name=libc.so\`` '"$HOSTING_LIBS"' `if [ -f ../gcc/crtend.o ]; then echo ../gcc/crtend.o; else ${CC} --print-file-name=crtend.o; fi` `${CC} --print-file-name=crtn.o`' ;; @@ -200,7 +205,10 @@ sparc64-*-solaris2* | sparcv9-*-solaris2*) HOSTING_LIBS="$HOSTING_LIBS"' `if [ -f ../gcc/crtend.o ]; then echo ../gcc/crtend.o; else ${CC} -print-file-name=crtend.o; fi` `if [ -f ../gcc/crtn.o ]; then echo ../gcc/crtn.o; else ${CC} -print-file-name=crtn.o; fi`' ;; -*-*-freebsd* | *-*-kfreebsd*-gnu | *-*-dragonfly*) +*-*-dragonfly*) + ;; + +*-*-freebsd* | *-*-kfreebsd*-gnu) ;; *-*-linux* | *-*-gnu*) diff --git a/ld/configure.tgt b/ld/configure.tgt index 4e90739679e..90d74616f5d 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt @@ -248,7 +248,11 @@ x86_64-*-elf*) targ_emul=elf_x86_64 i[3-7]86-*-kaos*) targ_emul=elf_i386 ;; i[3-7]86-*-freebsdaout* | i[3-7]86-*-freebsd[12].* | i[3-7]86-*-freebsd[12]) targ_emul=i386bsd ;; -i[3-7]86-*-freebsd* | i[3-7]86-*-kfreebsd*-gnu | i[3-7]86-*-dragonfly*) +i[3-7]86-*-dragonfly*) targ_emul=elf_i386 + targ_extra_emuls="i386bsd" ;; +x86_64-*-dragonfly*) targ_emul=elf_x86_64 + targ_extra_emuls="elf_i386 elf_l1om" ;; +i[3-7]86-*-freebsd* | i[3-7]86-*-kfreebsd*-gnu) targ_emul=elf_i386_fbsd targ_extra_emuls="elf_i386 i386bsd" ;; x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu) @@ -666,7 +670,11 @@ esac NATIVE_LIB_DIRS='/usr/local/lib /lib /usr/lib' case "${target}" in -*-*-freebsd* | *-*-dragonfly*) +*-*-dragonfly*) + NATIVE_LIB_DIRS='/usr/lib /usr/pkg/lib /usr/local/lib' + ;; + +*-*-freebsd*) NATIVE_LIB_DIRS='/lib /usr/lib /usr/local/lib' ;; @@ -706,9 +714,6 @@ i[03-9x]86-*-cygwin*) *-*-linux*) ;; -*-*-freebsd* | *-*-dragonfly*) - ;; - *-*-netbsd*) ;; diff --git a/ld/ldlex.l b/ld/ldlex.l index bb09bd92340..3213cf7c050 100644 --- a/ld/ldlex.l +++ b/ld/ldlex.l @@ -60,7 +60,9 @@ const char *lex_string = NULL; #undef YY_INPUT #define YY_INPUT(buf,result,max_size) result = yy_input (buf, max_size) +#ifndef YY_NO_UNPUT #define YY_NO_UNPUT +#endif #define MAX_INCLUDE_DEPTH 10 static YY_BUFFER_STATE include_stack[MAX_INCLUDE_DEPTH];