Only in unstableorigs/binutils-2.23.1/bfd/po: da.gmo Only in unstableorigs/binutils-2.23.1/bfd/po: es.gmo Only in unstableorigs/binutils-2.23.1/bfd/po: fi.gmo Only in unstableorigs/binutils-2.23.1/bfd/po: fr.gmo Only in unstableorigs/binutils-2.23.1/bfd/po: id.gmo Only in unstableorigs/binutils-2.23.1/bfd/po: ja.gmo Only in unstableorigs/binutils-2.23.1/bfd/po: ro.gmo Only in unstableorigs/binutils-2.23.1/bfd/po: ru.gmo Only in unstableorigs/binutils-2.23.1/bfd/po: rw.gmo Only in unstableorigs/binutils-2.23.1/bfd/po: sv.gmo Only in unstableorigs/binutils-2.23.1/bfd/po: tr.gmo Only in unstableorigs/binutils-2.23.1/bfd/po: uk.gmo Only in unstableorigs/binutils-2.23.1/bfd/po: vi.gmo Only in unstableorigs/binutils-2.23.1/bfd/po: zh_CN.gmo Only in unstableorigs/binutils-2.23.1/binutils/doc: binutils.info Only in unstableorigs/binutils-2.23.1/binutils/po: bg.gmo Only in unstableorigs/binutils-2.23.1/binutils/po: da.gmo Only in unstableorigs/binutils-2.23.1/binutils/po: es.gmo Only in unstableorigs/binutils-2.23.1/binutils/po: fi.gmo Only in unstableorigs/binutils-2.23.1/binutils/po: fr.gmo Only in unstableorigs/binutils-2.23.1/binutils/po: id.gmo Only in unstableorigs/binutils-2.23.1/binutils/po: it.gmo Only in unstableorigs/binutils-2.23.1/binutils/po: ja.gmo Only in unstableorigs/binutils-2.23.1/binutils/po: ro.gmo Only in unstableorigs/binutils-2.23.1/binutils/po: ru.gmo Only in unstableorigs/binutils-2.23.1/binutils/po: rw.gmo Only in unstableorigs/binutils-2.23.1/binutils/po: sk.gmo Only in unstableorigs/binutils-2.23.1/binutils/po: sv.gmo Only in unstableorigs/binutils-2.23.1/binutils/po: tr.gmo Only in unstableorigs/binutils-2.23.1/binutils/po: uk.gmo Only in unstableorigs/binutils-2.23.1/binutils/po: vi.gmo Only in unstableorigs/binutils-2.23.1/binutils/po: zh_CN.gmo Only in unstableorigs/binutils-2.23.1/binutils/po: zh_TW.gmo Only in unstablenew/binutils-2.23.1: builddir-sparc Only in unstablenew/binutils-2.23.1/debian: binutils-sparc diff -ur unstableorigs/binutils-2.23.1/debian/changelog unstablenew/binutils-2.23.1/debian/changelog --- unstableorigs/binutils-2.23.1/debian/changelog 2012-12-10 15:43:53.000000000 +0000 +++ unstablenew/binutils-2.23.1/debian/changelog 2012-11-26 17:10:50.000000000 +0000 @@ -1,11 +1,3 @@ -binutils (2.23.1-1~exp3) experimental; urgency=low - - * Update from the 2.23 branch (20121204). - * Add fuse-ld= for GCC linker option compatibility in ld and gold. - * gold cross builds: Search the multiarch directories too. - - -- Matthias Klose Wed, 05 Dec 2012 08:35:10 +0100 - binutils (2.23.1-1~exp2) experimental; urgency=low * Update from the 2.23 branch (20121121). diff -ur unstableorigs/binutils-2.23.1/debian/control unstablenew/binutils-2.23.1/debian/control --- unstableorigs/binutils-2.23.1/debian/control 2012-12-10 15:43:53.000000000 +0000 +++ unstablenew/binutils-2.23.1/debian/control 2013-01-03 16:35:20.000000000 +0000 @@ -8,98 +8,14 @@ Vcs-Browser: https://code.launchpad.net/~doko/binutils/pkg-2.23-debian Vcs-Bzr: http://bazaar.launchpad.net/~doko/binutils/pkg-2.23-debian -Package: binutils +Package: binutils-sparc Architecture: any -Depends: ${shlibs:Depends} -Conflicts: gas, elf-binutils, modutils (<< 2.4.19-1), ${extraConflicts}, binutils-gold (<< 2.20.51.20100415) -Replaces: binutils-gold (<< 2.20.51.20100415) -Provides: elf-binutils -Suggests: binutils-doc (>= ${source:Version}) -Description: GNU assembler, linker and binary utilities - The programs in this package are used to assemble, link and manipulate - binary and object files. They may be used in conjunction with a compiler - and various libraries to build programs. - -Package: binutils-dev -Architecture: any -Priority: extra -Depends: binutils (= ${binary:Version}) -Conflicts: libbfd-dev -Provides: libbfd-dev -Replaces: libbfd-dev, libc5-dev -Description: GNU binary utilities (BFD development files) - This package includes header files and static libraries necessary to build - programs which use the GNU BFD library, which is part of binutils. Note - that building Debian packages which depend on the shared libbfd is Not - Allowed. - -Package: binutils-multiarch -Architecture: any -Priority: extra -Depends: ${shlibs:Depends}, binutils (= ${binary:Version}) -Provides: multiarch-binutils -Description: Binary utilities that support multi-arch targets - The programs in this package are used to manipulate binary and object - files that may have been created on other architectures. This package - is primarily for multi-architecture developers and cross-compilers and - is not needed by normal users or developers. Note that a cross-assembling - version of gas is not included in this package, just the binary utilities. - NORMAL USERS SHOULD NOT INSTALL THIS PACKAGE. It's meant only for those - requiring support for reading info from binaries from other architectures. - -Package: binutils-gold -Architecture: amd64 armel armhf i386 powerpc powerpcspe ppc64 sparc sparc64 x32 +Depends: binutils, ${shlibs:Depends} +Suggests: binutils-doc (= ${Source-Version}) Priority: extra -Depends: ${shlibs:Depends}, binutils (= ${binary:Version}) -Description: GNU gold linker utility - Gold is a new linker, which is faster than the current linker included - in binutils. +Description: GNU binary utilities, for sparc target + This package provides GNU assembler, linker and binary utilities + for sparc target, for use in a cross-compilation environment. . - This package diverts the GNU linker (ld) with the gold linker. - -Package: binutils-hppa64 -Architecture: any -Depends: ${shlibs:Depends}, binutils (= ${binary:Version}) -Recommends: libc6-dev -Suggests: binutils-doc (>= ${source:Version}) -Description: GNU assembler, linker and binary utilities targeted for hppa64-linux - The programs in this package are used to assemble, link and manipulate - binary and object files. They may be used in conjunction with a compiler - and various libraries to build programs. - . - This package is needed to build an 64-bit kernel for 64-bit hppa machines. - -Package: binutils-spu -Architecture: powerpc ppc64 -Depends: ${shlibs:Depends}, binutils (= ${binary:Version}) -Recommends: libc6-dev -Conflicts: spu-binutils -Replaces: spu-binutils -Provides: spu-binutils -Suggests: binutils-doc (>= ${source:Version}) -Description: GNU assembler, linker and binary utilities targeted for spu-elf - The programs in this package are used to assemble, link and manipulate - binary and object files. They may be used in conjunction with a compiler - and various libraries to build programs. - . - This package is needed to build programs for Cell Broadband Engine SPU - processors. - -Package: binutils-doc -Section: doc -Architecture: all -Priority: optional -Depends: dpkg (>= 1.15.4) | install-info -Conflicts: binutils (<< 2.9.1.0.25-3) -Suggests: binutils (= ${binary:Version}) -Description: Documentation for the GNU assembler, linker and binary utilities - This package consists of the documentation for the GNU assembler, - linker and binary utilities in info format. - -Package: binutils-source -Architecture: all -Priority: optional -Depends: texinfo, zlib1g-dev, make, python -Description: GNU assembler, linker and binary utilities (source) - This package contains the sources and patches which are needed to - build binutils. + You don't need this package unless you plan to cross-compile programs + for sparc. diff -ur unstableorigs/binutils-2.23.1/debian/ld.gold.1 unstablenew/binutils-2.23.1/debian/ld.gold.1 --- unstableorigs/binutils-2.23.1/debian/ld.gold.1 2012-12-10 15:43:53.000000000 +0000 +++ unstablenew/binutils-2.23.1/debian/ld.gold.1 2012-12-19 02:51:14.000000000 +0000 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.12. -.TH GOLD "1" "November 2012" "gold (GNU Binutils for Debian 2.23.1) 1.11" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.13. +.TH GOLD "1" "December 2012" "gold (GNU Binutils for Debian 2.23.1) 1.11" "User Commands" .SH NAME gold \- The GNU ELF linker .SH SYNOPSIS diff -ur unstableorigs/binutils-2.23.1/debian/patches/163_multiarch_search_path.patch unstablenew/binutils-2.23.1/debian/patches/163_multiarch_search_path.patch --- unstableorigs/binutils-2.23.1/debian/patches/163_multiarch_search_path.patch 2012-12-10 15:43:53.000000000 +0000 +++ unstablenew/binutils-2.23.1/debian/patches/163_multiarch_search_path.patch 2012-11-26 17:10:50.000000000 +0000 @@ -29,7 +29,7 @@ fi -+if test x$DEB_TARGET_MULTIARCH != x; then ++if test x$target = x$host; then + multiarch=$DEB_TARGET_MULTIARCH + if test -n "$multiarch"; then + MULTIARCH_DIRNAME='-DMULTIARCH_DIRNAME=\"'$multiarch'\"' @@ -48,7 +48,7 @@ AC_CHECK_FUNCS(setlocale) AM_LC_MESSAGES -+if test x$DEB_TARGET_MULTIARCH != x; then ++if test x$target = x$host; then + multiarch=$DEB_TARGET_MULTIARCH + if test -n "$multiarch"; then + MULTIARCH_DIRNAME='-DMULTIARCH_DIRNAME=\"'$multiarch'\"' diff -ur unstableorigs/binutils-2.23.1/debian/patches/branch-updates.diff unstablenew/binutils-2.23.1/debian/patches/branch-updates.diff --- unstableorigs/binutils-2.23.1/debian/patches/branch-updates.diff 2012-12-10 15:43:53.000000000 +0000 +++ unstablenew/binutils-2.23.1/debian/patches/branch-updates.diff 2012-11-26 17:10:50.000000000 +0000 @@ -1,29 +1,13 @@ # DP: updates from the binutils-2.23 branch -# git diff 7dbb7d8db8003ff73d80956bd3271f9588437aa7 59e7756365ba4d0888d9d26b2292d4c0abf04614 +# git diff 7dbb7d8db8003ff73d80956bd3271f9588437aa7 479c4ed90ed5496b52bedc11e0329ec370285686 # exclude bfd/{configure{,.ac},Makefile.{am,in}} diff --git a/bfd/ChangeLog b/bfd/ChangeLog -index 7aa83bf..28b27d3 100644 +index 7aa83bf..59c36a7 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog -@@ -1,3 +1,33 @@ -+2012-11-29 Roland McGrath -+ -+ * elf-nacl.c (segment_eligible_for_headers): Disallow writable segments. -+ -+2012-11-26 Roland McGrath -+ -+ * elf-nacl.c (nacl_modify_segment_map): Don't crash when INFO is null. -+ -+2012-11-21 Roland McGrath -+ -+ * elf-nacl.c (segment_nonexecutable_and_has_contents): Renamed to ... -+ (segment_eligible_for_headers): ... this. Take new arguments -+ MAXPAGESIZE and SIZEOF_HEADERS. Return false if the first section's -+ start address doesn't leave space for the headers. -+ (nacl_modify_segment_map): Update caller. -+ +@@ -1,3 +1,17 @@ +2012-11-19 Joey Ye + + * elf32-arm.c (elf32_arm_final_link_relocate, @@ -41,63 +25,6 @@ 2012-11-13 Tristan Gingold * configure.in: Bump version to 2.23.1 -diff --git a/bfd/elf-nacl.c b/bfd/elf-nacl.c -index 842e367..6753c7c 100644 ---- a/bfd/elf-nacl.c -+++ b/bfd/elf-nacl.c -@@ -42,14 +42,21 @@ segment_executable (struct elf_segment_map *seg) - return FALSE; - } - -+/* Determine if this segment is eligible to receive the file and program -+ headers. It must be read-only, non-executable, and have contents. -+ Its first section must start far enough past the page boundary to -+ allow space for the headers. */ - static bfd_boolean --segment_nonexecutable_and_has_contents (struct elf_segment_map *seg) -+segment_eligible_for_headers (struct elf_segment_map *seg, -+ bfd_vma maxpagesize, bfd_vma sizeof_headers) - { - bfd_boolean any_contents = FALSE; - unsigned int i; -+ if (seg->count == 0 || seg->sections[0]->lma % maxpagesize < sizeof_headers) -+ return FALSE; - for (i = 0; i < seg->count; ++i) - { -- if (seg->sections[i]->flags & SEC_CODE) -+ if ((seg->sections[i]->flags & (SEC_CODE|SEC_READONLY)) != SEC_READONLY) - return FALSE; - if (seg->sections[i]->flags & SEC_HAS_CONTENTS) - any_contents = TRUE; -@@ -68,6 +75,8 @@ nacl_modify_segment_map (bfd *abfd, struct bfd_link_info *info) - struct elf_segment_map **first_load = NULL; - struct elf_segment_map **last_load = NULL; - bfd_boolean moved_headers = FALSE; -+ int sizeof_headers = info == NULL ? 0 : bfd_sizeof_headers (abfd, info); -+ bfd_vma maxpagesize = get_elf_backend_data (abfd)->maxpagesize; - - if (info != NULL && info->user_phdrs) - /* The linker script used PHDRS explicitly, so don't change what the -@@ -93,7 +102,8 @@ nacl_modify_segment_map (bfd *abfd, struct bfd_link_info *info) - /* Now that we've noted the first PT_LOAD, we're looking for - the first non-executable PT_LOAD with a nonempty p_filesz. */ - else if (!moved_headers -- && segment_nonexecutable_and_has_contents (seg)) -+ && segment_eligible_for_headers (seg, maxpagesize, -+ sizeof_headers)) - { - /* This is the one we were looking for! - -@@ -139,8 +149,7 @@ nacl_modify_segment_map (bfd *abfd, struct bfd_link_info *info) - proper order for the ELF rule that they must appear in ascending address - order. So find the two segments we swapped before, and swap them back. */ - bfd_boolean --nacl_modify_program_headers (bfd *abfd, -- struct bfd_link_info *info ATTRIBUTE_UNUSED) -+nacl_modify_program_headers (bfd *abfd, struct bfd_link_info *info) - { - struct elf_segment_map **m = &elf_tdata (abfd)->segment_map; - Elf_Internal_Phdr *phdr = elf_tdata (abfd)->phdr; diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c index a287fbb..01ca11b 100644 --- a/bfd/elf32-arm.c @@ -187,332 +114,15 @@ value = abs (relocation); diff --git a/bfd/version.h b/bfd/version.h -index de757c0..40aea7e 100644 +index de757c0..b6945af 100644 --- a/bfd/version.h +++ b/bfd/version.h @@ -1,4 +1,4 @@ -#define BFD_VERSION_DATE 20121113 -+#define BFD_VERSION_DATE 20121205 ++#define BFD_VERSION_DATE 20121121 #define BFD_VERSION @bfd_version@ #define BFD_VERSION_STRING @bfd_version_package@ @bfd_version_string@ #define REPORT_BUGS_TO @report_bugs_to@ -diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog -index 022524b..d7d7740 100644 ---- a/binutils/testsuite/ChangeLog -+++ b/binutils/testsuite/ChangeLog -@@ -1,3 +1,14 @@ -+2012-11-27 Roland McGrath -+ -+ * lib/binutils-common.exp (is_zlib_supported): New function. -+ * lib/utils-lib.exp (run_dump_test): If as options include -+ --compress-debug-sections and zlib is not available, report -+ the test as unsupported. -+ * binutils-all/compress.exp: Bail out if zlib is not available. -+ * binutils-all/objdump.exp (objdump compressed debug): -+ Mark unsupported if zlib is not available. -+ * binutils-all/readelf.exp (readelf_compressed_wa_test): Likewise. -+ - 2012-08-16 Ian Bolton - Laurent Desnogues - Jim MacArthur -diff --git a/binutils/testsuite/binutils-all/compress.exp b/binutils/testsuite/binutils-all/compress.exp -index 3b0b485..67b7f07 100644 ---- a/binutils/testsuite/binutils-all/compress.exp -+++ b/binutils/testsuite/binutils-all/compress.exp -@@ -1,23 +1,23 @@ --# Copyright 2010 -+# Copyright 2010, 2012 - # Free Software Foundation, Inc. - - # This program 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. --# -+# - # This program is distributed in the hope that it will be useful, - # but WITHOUT ANY WARRANTY; without even the implied warranty of - # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - # GNU General Public License for more details. --# -+# - # You should have received a copy of the GNU General Public License - # along with this program; if not, write to the Free Software - # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. - - # Test compressed .debug section. - --if { [is_remote host] || ![is_elf_format] } then { -+if { [is_remote host] || ![is_elf_format] || ![is_zlib_supported] } then { - return - } - -diff --git a/binutils/testsuite/binutils-all/objdump.exp b/binutils/testsuite/binutils-all/objdump.exp -index 14d1860..b330a32 100644 ---- a/binutils/testsuite/binutils-all/objdump.exp -+++ b/binutils/testsuite/binutils-all/objdump.exp -@@ -1,17 +1,17 @@ - # Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004, 2007, 2008, 2009, 2011 -+# 2003, 2004, 2007, 2008, 2009, 2011, 2012 - # Free Software Foundation, Inc. - - # This program 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. --# -+# - # This program is distributed in the hope that it will be useful, - # but WITHOUT ANY WARRANTY; without even the implied warranty of - # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - # GNU General Public License for more details. --# -+# - # You should have received a copy of the GNU General Public License - # along with this program; if not, write to the Free Software - # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. -@@ -160,7 +160,7 @@ if [regexp $want $got] then { - - # Test objdump -s on a file that contains a compressed .debug section - --if { ![is_elf_format] } then { -+if { ![is_elf_format] || ![is_zlib_supported] } then { - unsupported "objdump compressed debug" - } elseif { ![binutils_assemble $srcdir/$subdir/dw2-compressed.S tmpdir/dw2-compressed.o] } then { - fail "objdump compressed debug" -diff --git a/binutils/testsuite/binutils-all/readelf.exp b/binutils/testsuite/binutils-all/readelf.exp -index e611cb2..c1d7286 100644 ---- a/binutils/testsuite/binutils-all/readelf.exp -+++ b/binutils/testsuite/binutils-all/readelf.exp -@@ -5,12 +5,12 @@ - # 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. --# -+# - # This program is distributed in the hope that it will be useful, - # but WITHOUT ANY WARRANTY; without even the implied warranty of - # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - # GNU General Public License for more details. --# -+# - # You should have received a copy of the GNU General Public License - # along with this program; if not, write to the Free Software - # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. -@@ -84,7 +84,7 @@ proc readelf_test { options binary_file regexp_file xfails } { - global readelf_size - global srcdir - global subdir -- -+ - send_log "exec $READELF $READELFFLAGS $options $binary_file > readelf.out\n" - set got [remote_exec host "$READELF $READELFFLAGS $options $binary_file" "" "/dev/null" "readelf.out"] - -@@ -146,7 +146,7 @@ proc readelf_wi_test {} { - global READELFFLAGS - global srcdir - global subdir -- -+ - # Compile the second test file. - if { [target_compile $srcdir/$subdir/testprog.c tmpdir/testprog.o object debug] != "" } { - verbose "Unable to compile test file." -@@ -164,7 +164,7 @@ proc readelf_wi_test {} { - set output [remote_upload host readelf.out] - - file_on_host delete $tempfile -- -+ - # Strip any superflous warnings. - set got [prune_readelf_wi_warnings [lindex $got 1]] - -@@ -182,7 +182,7 @@ proc readelf_wi_test {} { - untested "readelf -wi" - return - } -- -+ - # Search for strings that should be in the output. - set sought { - ".*DW_TAG_compile_unit.*" -@@ -195,8 +195,8 @@ proc readelf_wi_test {} { - ".*DW_AT_name.*(main|indirect string).*" - ".*\(DW_OP_addr: 0\).*" - } -- -- foreach looked_for $sought { -+ -+ foreach looked_for $sought { - set lines [grep $output $looked_for] - if ![llength $lines] then { - fail "readelf -wi: missing: $looked_for" -@@ -206,7 +206,7 @@ proc readelf_wi_test {} { - } - - file_on_host delete $output -- -+ - # All done. - pass "readelf -wi" - } -@@ -219,7 +219,12 @@ proc readelf_compressed_wa_test {} { - global READELFFLAGS - global srcdir - global subdir -- -+ -+ if { ![is_zlib_supported] } { -+ unsupported "readelf -wa (compressed)" -+ return -+ } -+ - # Compile the compressed-debug-section test file. - if { [target_compile $srcdir/$subdir/dw2-compressed.S tmpdir/dw2-compressed.o object debug] != "" } { - verbose "Unable to compile test file." -@@ -237,7 +242,7 @@ proc readelf_compressed_wa_test {} { - set output [remote_upload host readelf.out] - - file_on_host delete $tempfile -- -+ - if { [string compare [file_contents readelf.out] [file_contents $srcdir/$subdir/readelf.wa]] != 0 } then { - fail "readelf -wa (compressed)" - verbose "output is \n[file_contents readelf.out]" 2 -@@ -255,7 +260,7 @@ proc readelf_dump_test {} { - global READELFFLAGS - global srcdir - global subdir -- -+ - # Assemble the dump test file. - if {![binutils_assemble $srcdir/$subdir/dumptest.s tmpdir/dumptest.o]} then { - unresolved "readelf -p: failed to assemble dump test file" -@@ -283,8 +288,8 @@ proc readelf_dump_test {} { - set sought { - ".*test_string.*" - } -- -- foreach looked_for $sought { -+ -+ foreach looked_for $sought { - set lines [grep $output $looked_for] - if ![llength $lines] then { - fail "readelf -p: missing: $looked_for" -@@ -293,7 +298,7 @@ proc readelf_dump_test {} { - } - } - -- file_on_host delete $tempfile -+ file_on_host delete $tempfile - file_on_host delete $output - - # All done. -diff --git a/binutils/testsuite/lib/binutils-common.exp b/binutils/testsuite/lib/binutils-common.exp -index 0054184..68efb90 100644 ---- a/binutils/testsuite/lib/binutils-common.exp -+++ b/binutils/testsuite/lib/binutils-common.exp -@@ -152,6 +152,31 @@ proc is_elf64 { binary_file } { - return 0 - } - -+# True if the build supports zlib compression. -+proc is_zlib_supported {} { -+ -+ # This replicates the AS selection logic of dejagnu's target_assemble. -+ global AS_FOR_TARGET -+ if [info exists AS_FOR_TARGET] { -+ set AS $AS_FOR_TARGET -+ } else { -+ if {![board_info target exists assembler]} { -+ set AS [find_gas] -+ } else { -+ set AS [board_info target assembler] -+ } -+ } -+ -+ set as_output [remote_exec host "$AS --help"] -+ -+ set have_zlib 0 -+ if {[string first "--compress-debug-sections" $as_output] >= 0} { -+ set have_zlib 1 -+ } -+ -+ return $have_zlib -+} -+ - # Compare two files line-by-line. FILE_1 is the actual output and FILE_2 - # is the expected output. Ignore blank lines in either file. - # -diff --git a/binutils/testsuite/lib/utils-lib.exp b/binutils/testsuite/lib/utils-lib.exp -index b96043b..3fe6c14 100644 ---- a/binutils/testsuite/lib/utils-lib.exp -+++ b/binutils/testsuite/lib/utils-lib.exp -@@ -1,16 +1,16 @@ - # Copyright 1993, 1994, 1995, 1996, 1997, 2000, 2001, 2003, 2004, 2006, 2007, --# 2009, 2010 Free Software Foundation, Inc. -+# 2009, 2010, 2012 Free Software Foundation, Inc. - - # This program 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. --# -+# - # This program is distributed in the hope that it will be useful, - # but WITHOUT ANY WARRANTY; without even the implied warranty of - # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - # GNU General Public License for more details. --# -+# - # You should have received a copy of the GNU General Public License - # along with this program; if not, write to the Free Software - # Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. -@@ -405,7 +405,7 @@ proc run_dump_test { name {extra_options {}} } { - if { $opts(not-skip) != "" } then { - set skip 1 - foreach glob $opts(not-skip) { -- if {[istarget $glob]} { -+ if {[istarget $glob]} { - set skip 0 - break - } -@@ -420,25 +420,31 @@ proc run_dump_test { name {extra_options {}} } { - } - set skip 1 - foreach glob $opts(target) { -- if {[istarget $glob]} { -+ if {[istarget $glob]} { - set skip 0 - break - } - } -- if {$skip} { -+ if {$skip} { - unsupported $testname -- return -+ return - } - } - if { $opts(not-target) != "" } then { - foreach glob $opts(not-target) { - if {[istarget $glob]} { - unsupported $testname -- return -+ return - } - } - } - -+ if { [string match "*--compress-debug-sections*" $opts(as)] \ -+ && ![is_zlib_supported] } { -+ unsupported $testname -+ return -+ } -+ - if { $opts(source) == "" } { - set srcfile ${file}.s - } else { diff --git a/gas/ChangeLog b/gas/ChangeLog index 219c27e..f4f834d 100644 --- a/gas/ChangeLog @@ -612,16 +222,10 @@ extern unsigned int arm_frag_max_var (struct frag *); diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog -index 5bc1c32..123619b 100644 +index 5bc1c32..09d654e 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog -@@ -1,3 +1,14 @@ -+2012-11-27 Roland McGrath -+ -+ * lib/gas-defs.exp (run_dump_test): If as options include -+ --compress-debug-sections and zlib is not available, report -+ the test as unsupported. -+ +@@ -1,3 +1,8 @@ +2012-11-20 Roland McGrath + + * gas/arm/macro-pld.s: New file. @@ -674,71 +278,6 @@ pushw $0x2222 + + jecxz .+2 -diff --git a/gas/testsuite/lib/gas-defs.exp b/gas/testsuite/lib/gas-defs.exp -index 234789a..cb81c18 100644 ---- a/gas/testsuite/lib/gas-defs.exp -+++ b/gas/testsuite/lib/gas-defs.exp -@@ -1,5 +1,5 @@ - # Copyright (C) 1993, 1994, 1997, 1998, 1999, 2000, 2001, 2002, 2003, --# 2004, 2005, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. -+# 2004, 2005, 2007, 2008, 2009, 2010, 2012 Free Software Foundation, Inc. - - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -71,7 +71,7 @@ proc gas_host_run { cmd redir } { - set return_contents_of "gas.stderr" - } elseif [regexp ">&.*" $redir] then { - # See PR 5322 for why the following line is used. -- regsub ">&" $redir "" output_file -+ regsub ">&" $redir "" output_file - set command "$cmd 2>&1" - } elseif [regexp "2>.*" $redir] then { - set output_file "gas.out" -@@ -582,7 +582,7 @@ proc run_dump_test { name {extra_options {}} } { - if { $opts(not-skip) != "" } then { - set skip 1 - foreach glob $opts(not-skip) { -- if {[istarget $glob]} { -+ if {[istarget $glob]} { - set skip 0 - break - } -@@ -597,25 +597,31 @@ proc run_dump_test { name {extra_options {}} } { - } - set skip 1 - foreach glob $opts(target) { -- if {[istarget $glob]} { -+ if {[istarget $glob]} { - set skip 0 - break - } - } -- if {$skip} { -+ if {$skip} { - unsupported $testname -- return -+ return - } - } - if { $opts(not-target) != "" } then { - foreach glob $opts(not-target) { - if {[istarget $glob]} { - unsupported $testname -- return -+ return - } - } - } - -+ if { [string match "*--compress-debug-sections*" $opts(as)] \ -+ && ![is_zlib_supported] } { -+ unsupported $testname -+ return -+ } -+ - - if { $opts(source) == "" } { - set sourcefile ${file}.s diff --git a/gold/ChangeLog b/gold/ChangeLog index 0d3074a..b31d11f 100644 --- a/gold/ChangeLog @@ -808,505 +347,11 @@ // The next reloc should be a PLT32 reloc against __tls_get_addr. // We can skip it. -diff --git a/ld/ChangeLog b/ld/ChangeLog -index 9f33f64..00323e0 100644 ---- a/ld/ChangeLog -+++ b/ld/ChangeLog -@@ -1,3 +1,19 @@ -+2012-11-26 Roland McGrath -+ -+ * emultempl/aarch64elf.em (gld${EMULATION_NAME}_before_parse): -+ Copy last elf32.em here too. -+ * emultempl/armelf.em (gld${EMULATION_NAME}_before_parse): Likewise. -+ * emultempl/mmixelf.em (gld${EMULATION_NAME}_before_parse): Likewise. -+ * emultempl/scoreelf.em (gld${EMULATION_NAME}_before_parse): Likewise. -+ -+2012-11-21 Roland McGrath -+ -+ * ld.h (ld_config_type): New flag member separate_code. -+ * emultempl/elf32.em -+ (gld${EMULATION_NAME}_before_parse): Set it based on $SEPARATE_CODE. -+ * ldlang.c (ldlang_override_segment_assignment): If it's set, then -+ always return TRUE when SEC_CODE differs between the sections. -+ - 2012-11-05 Alan Modra - - * configure.in: Apply 2012-09-10 change to config.in here. -diff --git a/ld/emultempl/aarch64elf.em b/ld/emultempl/aarch64elf.em -index 4c03ffd..25935d0 100644 ---- a/ld/emultempl/aarch64elf.em -+++ b/ld/emultempl/aarch64elf.em -@@ -39,6 +39,7 @@ gld${EMULATION_NAME}_before_parse (void) - #endif /* not TARGET_ */ - input_flags.dynamic = ${DYNAMIC_LINK-TRUE}; - config.has_shared = `if test -n "$GENERATE_SHLIB_SCRIPT" ; then echo TRUE ; else echo FALSE ; fi`; -+ config.separate_code = `if test "x${SEPARATE_CODE}" = xyes ; then echo TRUE ; else echo FALSE ; fi`; - } - - static void -diff --git a/ld/emultempl/armelf.em b/ld/emultempl/armelf.em -index 3b881dd..7f7d2cc 100644 ---- a/ld/emultempl/armelf.em -+++ b/ld/emultempl/armelf.em -@@ -52,6 +52,7 @@ gld${EMULATION_NAME}_before_parse (void) - #endif /* not TARGET_ */ - input_flags.dynamic = ${DYNAMIC_LINK-TRUE}; - config.has_shared = `if test -n "$GENERATE_SHLIB_SCRIPT" ; then echo TRUE ; else echo FALSE ; fi`; -+ config.separate_code = `if test "x${SEPARATE_CODE}" = xyes ; then echo TRUE ; else echo FALSE ; fi`; - } - - static void -@@ -254,19 +255,19 @@ compare_output_sec_vma (const void *a, const void *b) - asection *asec = *(asection **) a, *bsec = *(asection **) b; - asection *aout = asec->output_section, *bout = bsec->output_section; - bfd_vma avma, bvma; -- -+ - /* If there's no output section for some reason, compare equal. */ - if (!aout || !bout) - return 0; -- -+ - avma = aout->vma + asec->output_offset; - bvma = bout->vma + bsec->output_offset; -- -+ - if (avma > bvma) - return 1; - else if (avma < bvma) - return -1; -- -+ - return 0; - } - -@@ -286,10 +287,10 @@ gld${EMULATION_NAME}_after_allocation (void) - { - bfd *abfd = is->the_bfd; - asection *sec; -- -+ - if ((abfd->flags & (EXEC_P | DYNAMIC)) != 0) - continue; -- -+ - for (sec = abfd->sections; sec != NULL; sec = sec->next) - { - asection *out_sec = sec->output_section; -@@ -305,7 +306,7 @@ gld${EMULATION_NAME}_after_allocation (void) - if (sec_count == list_size) - { - list_size *= 2; -- sec_list = (asection **) -+ sec_list = (asection **) - xrealloc (sec_list, list_size * sizeof (asection *)); - } - -@@ -313,13 +314,13 @@ gld${EMULATION_NAME}_after_allocation (void) - } - } - } -- -+ - qsort (sec_list, sec_count, sizeof (asection *), &compare_output_sec_vma); -- -+ - if (elf32_arm_fix_exidx_coverage (sec_list, sec_count, &link_info, - merge_exidx_entries)) - need_laying_out = 1; -- -+ - free (sec_list); - } - -@@ -465,7 +466,7 @@ arm_elf_create_output_section_statements (void) - target2_type, fix_v4bx, use_blx, - vfp11_denorm_fix, no_enum_size_warning, - no_wchar_size_warning, -- pic_veneer, fix_cortex_a8, -+ pic_veneer, fix_cortex_a8, - fix_arm1176); - - stub_file = lang_add_input_file ("linker stubs", -@@ -480,7 +481,7 @@ arm_elf_create_output_section_statements (void) - einfo ("%X%P: can not create BFD %E\n"); - return; - } -- -+ - stub_file->the_bfd->flags |= BFD_LINKER_CREATED; - ldlang_add_file (stub_file); - -diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em -index de51050..05c64a0 100644 ---- a/ld/emultempl/elf32.em -+++ b/ld/emultempl/elf32.em -@@ -104,6 +104,7 @@ gld${EMULATION_NAME}_before_parse (void) - ldfile_set_output_arch ("${OUTPUT_ARCH}", bfd_arch_`echo ${ARCH} | sed -e 's/:.*//'`); - input_flags.dynamic = ${DYNAMIC_LINK-TRUE}; - config.has_shared = `if test -n "$GENERATE_SHLIB_SCRIPT" ; then echo TRUE ; else echo FALSE ; fi`; -+ config.separate_code = `if test "x${SEPARATE_CODE}" = xyes ; then echo TRUE ; else echo FALSE ; fi`; - } - - EOF -@@ -140,7 +141,7 @@ gld${EMULATION_NAME}_load_symbols (lang_input_statement_type *entry) - return FALSE; - - bfd_elf_set_dyn_lib_class (entry->the_bfd, -- (enum dynamic_lib_link_class) link_class); -+ (enum dynamic_lib_link_class) link_class); - - /* Continue on with normal load_symbols processing. */ - return FALSE; -@@ -1104,7 +1105,7 @@ gld${EMULATION_NAME}_after_open (void) - { - struct elf_obj_tdata *t = elf_tdata (link_info.output_bfd); - struct build_id_info *b = -- (struct build_id_info *) xmalloc (sizeof *b); -+ (struct build_id_info *) xmalloc (sizeof *b); - - b->style = link_info.emit_note_gnu_build_id; - b->sec = s; -@@ -1439,7 +1440,7 @@ if test x"$LDEMUL_BEFORE_ALLOCATION" != xgld"$EMULATION_NAME"_before_allocation; - fragment <usrdata != NULL) - { - walk_wild_section (s, -- (lang_input_statement_type *) member->usrdata, -- callback, data); -+ (lang_input_statement_type *) member->usrdata, -+ callback, data); - } - - member = bfd_openr_next_archived_file (f->the_bfd, member); -@@ -1050,7 +1050,7 @@ new_afile (const char *name, - else - { - p = (lang_input_statement_type *) -- stat_alloc (sizeof (lang_input_statement_type)); -+ stat_alloc (sizeof (lang_input_statement_type)); - p->header.type = lang_input_statement_enum; - p->header.next = NULL; - } -@@ -1148,7 +1148,7 @@ output_section_statement_newfunc (struct bfd_hash_entry *entry, - if (entry == NULL) - { - entry = (struct bfd_hash_entry *) bfd_hash_allocate (table, -- sizeof (*ret)); -+ sizeof (*ret)); - if (entry == NULL) - return entry; - } -@@ -1283,12 +1283,12 @@ lang_memory_region_lookup (const char *const name, bfd_boolean create) - for (r = lang_memory_region_list; r != NULL; r = r->next) - for (n = &r->name_list; n != NULL; n = n->next) - if (strcmp (n->name, name) == 0) -- { -- if (create) -- einfo (_("%P:%S: warning: redeclaration of memory region `%s'\n"), -- NULL, name); -- return r; -- } -+ { -+ if (create) -+ einfo (_("%P:%S: warning: redeclaration of memory region `%s'\n"), -+ NULL, name); -+ return r; -+ } - - if (!create && strcmp (name, DEFAULT_MEMORY_REGION)) - einfo (_("%P:%S: warning: memory region `%s' not declared\n"), -@@ -1334,19 +1334,19 @@ lang_memory_region_alias (const char * alias, const char * region_name) - for (r = lang_memory_region_list; r != NULL; r = r->next) - for (n = &r->name_list; n != NULL; n = n->next) - { -- if (region == NULL && strcmp (n->name, region_name) == 0) -- region = r; -- if (strcmp (n->name, alias) == 0) -- einfo (_("%F%P:%S: error: redefinition of memory region " -- "alias `%s'\n"), -- NULL, alias); -+ if (region == NULL && strcmp (n->name, region_name) == 0) -+ region = r; -+ if (strcmp (n->name, alias) == 0) -+ einfo (_("%F%P:%S: error: redefinition of memory region " -+ "alias `%s'\n"), -+ NULL, alias); - } - - /* Check if the target region exists. */ - if (region == NULL) - einfo (_("%F%P:%S: error: memory region `%s' " -- "for alias `%s' does not exist\n"), -- NULL, region_name, alias); -+ "for alias `%s' does not exist\n"), -+ NULL, region_name, alias); - - /* Add alias to region name list. */ - n = (lang_memory_region_name *) stat_alloc (sizeof (lang_memory_region_name)); -@@ -1777,7 +1777,7 @@ lang_insert_orphan (asection *s, - os_tail = ((lang_output_section_statement_type **) - lang_output_section_statement.tail); - os = lang_enter_output_section_statement (secname, address, normal_section, -- NULL, NULL, NULL, constraint); -+ NULL, NULL, NULL, constraint); - - ps = NULL; - if (config.build_constructors && *os_tail == os) -@@ -2080,14 +2080,14 @@ sort_def_symbol (struct bfd_link_hash_entry *hash_entry, - struct map_symbol_def *def; - - ud = (struct fat_user_section_struct *) -- get_userdata (hash_entry->u.def.section); -+ get_userdata (hash_entry->u.def.section); - if (! ud) - { - /* ??? What do we have to do to initialize this beforehand? */ - /* The first time we get here is bfd_abs_section... */ - init_map_userdata (0, hash_entry->u.def.section, 0); - ud = (struct fat_user_section_struct *) -- get_userdata (hash_entry->u.def.section); -+ get_userdata (hash_entry->u.def.section); - } - else if (!ud->map_symbol_def_tail) - ud->map_symbol_def_tail = &ud->map_symbol_def_head; -@@ -2125,7 +2125,7 @@ init_os (lang_output_section_statement_type *s, flagword flags) - if (!link_info.reduce_memory_overheads) - { - fat_section_userdata_type *new_userdata = (fat_section_userdata_type *) -- stat_alloc (sizeof (fat_section_userdata_type)); -+ stat_alloc (sizeof (fat_section_userdata_type)); - memset (new_userdata, 0, sizeof (fat_section_userdata_type)); - get_userdata (s->bfd_section) = new_userdata; - } -@@ -2264,7 +2264,7 @@ lang_add_section (lang_statement_list_type *ptr, - - keep = bfd_lookup_section_flags (&link_info, sflag_info, section); - if (!keep) -- return; -+ return; - } - - if (section->output_section != NULL) -@@ -4151,7 +4151,7 @@ print_all_symbols (asection *sec) - entries[i] = def->entry; - - qsort (entries, ud->map_symbol_def_count, sizeof (*entries), -- hash_entry_addr_cmp); -+ hash_entry_addr_cmp); - - /* Print the symbols. */ - for (i = 0; i < ud->map_symbol_def_count; i++) -@@ -4583,7 +4583,7 @@ insert_pad (lang_statement_union_type **ptr, - { - /* Make a new padding statement, linked into existing chain. */ - pad = (lang_statement_union_type *) -- stat_alloc (sizeof (lang_padding_statement_type)); -+ stat_alloc (sizeof (lang_padding_statement_type)); - pad->header.next = *ptr; - *ptr = pad; - pad->header.type = lang_padding_statement_enum; -@@ -5357,6 +5357,12 @@ ldlang_override_segment_assignment (struct bfd_link_info * info ATTRIBUTE_UNUSED - if (current_section == NULL || previous_section == NULL) - return new_segment; - -+ /* If this flag is set, the target never wants code and non-code -+ sections comingled in the same segment. */ -+ if (config.separate_code -+ && ((current_section->flags ^ previous_section->flags) & SEC_CODE)) -+ return TRUE; -+ - /* Find the memory regions associated with the two sections. - We call lang_output_section_find() here rather than scanning the list - of output sections looking for a matching section pointer because if -@@ -7233,7 +7239,7 @@ lang_record_phdrs (void) - { - alc *= 2; - secs = (asection **) xrealloc (secs, -- alc * sizeof (asection *)); -+ alc * sizeof (asection *)); - } - secs[c] = os->bfd_section; - ++c; -@@ -7535,7 +7541,7 @@ lang_vers_match (struct bfd_elf_version_expr_head *head, - { - e.pattern = c_sym; - expr = (struct bfd_elf_version_expr *) -- htab_find ((htab_t) head->htab, &e); -+ htab_find ((htab_t) head->htab, &e); - while (expr && strcmp (expr->pattern, c_sym) == 0) - if (expr->mask == BFD_ELF_VERSION_C_TYPE) - goto out_ret; -@@ -7548,7 +7554,7 @@ lang_vers_match (struct bfd_elf_version_expr_head *head, - { - e.pattern = cxx_sym; - expr = (struct bfd_elf_version_expr *) -- htab_find ((htab_t) head->htab, &e); -+ htab_find ((htab_t) head->htab, &e); - while (expr && strcmp (expr->pattern, cxx_sym) == 0) - if (expr->mask == BFD_ELF_VERSION_CXX_TYPE) - goto out_ret; -@@ -7561,7 +7567,7 @@ lang_vers_match (struct bfd_elf_version_expr_head *head, - { - e.pattern = java_sym; - expr = (struct bfd_elf_version_expr *) -- htab_find ((htab_t) head->htab, &e); -+ htab_find ((htab_t) head->htab, &e); - while (expr && strcmp (expr->pattern, java_sym) == 0) - if (expr->mask == BFD_ELF_VERSION_JAVA_TYPE) - goto out_ret; -@@ -7858,7 +7864,7 @@ lang_register_vers_node (const char *name, - if (t->locals.htab && e1->literal) - { - e2 = (struct bfd_elf_version_expr *) -- htab_find ((htab_t) t->locals.htab, e1); -+ htab_find ((htab_t) t->locals.htab, e1); - while (e2 && strcmp (e1->pattern, e2->pattern) == 0) - { - if (e1->mask == e2->mask) -@@ -7885,7 +7891,7 @@ lang_register_vers_node (const char *name, - if (t->globals.htab && e1->literal) - { - e2 = (struct bfd_elf_version_expr *) -- htab_find ((htab_t) t->globals.htab, e1); -+ htab_find ((htab_t) t->globals.htab, e1); - while (e2 && strcmp (e1->pattern, e2->pattern) == 0) - { - if (e1->mask == e2->mask) diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog -index ffcfa7e..af699be 100644 +index ffcfa7e..e02432f 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog -@@ -1,3 +1,32 @@ -+2012-11-30 Roland McGrath -+ -+ * ld-elf/ehdr_start.s: Put reference in .rodata section, not .data. -+ -+2012-11-27 Roland McGrath -+ -+ * ld-elf/compress.exp: Bail out if zlib is not supported. -+ * lib/ld-lib.exp (run_dump_test): If as options include -+ --compress-debug-sections and zlib is not available, report -+ the test as unsupported. -+ -+2012-11-27 Roland McGrath -+ -+ * ld-elf/flags1.d: Add *-*-nacl* to xfail list. -+ * ld-elf/orphan-region.d: Likewise. -+ -+2012-11-21 Roland McGrath -+ -+ * ld-elf/comm-data.exp: Add XFAIL for arm*-*-* targets, referring -+ to PR ld/13802. -+ +@@ -1,3 +1,11 @@ +2012-11-14 H.J. Lu + + * ld-elf/shared.exp (build_cxx_tests): Move out the commented out @@ -1318,84 +363,6 @@ 2012-10-16 Sofiane Naci * ld-aarch64/tlsle-symbol-offset.s: New file. -diff --git a/ld/testsuite/ld-elf/comm-data.exp b/ld/testsuite/ld-elf/comm-data.exp -index 1c75f55..71b856d 100644 ---- a/ld/testsuite/ld-elf/comm-data.exp -+++ b/ld/testsuite/ld-elf/comm-data.exp -@@ -59,6 +59,8 @@ if [is_elf64 "tmpdir/libcomm-data.so"] { - append AFLAGS " --defsym ELF64=1" - } - -+setup_xfail "arm*-*-*" "ld/13802" -+ - # Verify that a common symbol has been converted to an undefined - # reference to the global symbol of the same name defined above - # and that the debug reference has been dropped. -diff --git a/ld/testsuite/ld-elf/compress.exp b/ld/testsuite/ld-elf/compress.exp -index 1e13394..55269ee 100644 ---- a/ld/testsuite/ld-elf/compress.exp -+++ b/ld/testsuite/ld-elf/compress.exp -@@ -25,6 +25,10 @@ if ![is_elf_format] { - return - } - -+if ![is_zlib_supported] { -+ return -+} -+ - # The following tests require running the executable generated by ld. - if ![isnative] { - return -diff --git a/ld/testsuite/ld-elf/ehdr_start.s b/ld/testsuite/ld-elf/ehdr_start.s -index 529d510..2efe8a6 100644 ---- a/ld/testsuite/ld-elf/ehdr_start.s -+++ b/ld/testsuite/ld-elf/ehdr_start.s -@@ -3,7 +3,7 @@ - _start: - .space 16 - -- .data -+ .section .rodata,"a" - .globl foo - foo: - .weak __ehdr_start -diff --git a/ld/testsuite/ld-elf/flags1.d b/ld/testsuite/ld-elf/flags1.d -index e6bb001..ab8facc 100644 ---- a/ld/testsuite/ld-elf/flags1.d -+++ b/ld/testsuite/ld-elf/flags1.d -@@ -1,11 +1,12 @@ - #name: --set-section-flags test 1 (sections) - #ld: -Tflags1.ld --#objcopy_linked_file: --set-section-flags .post_text_reserve=contents,alloc,load,readonly,code -+#objcopy_linked_file: --set-section-flags .post_text_reserve=contents,alloc,load,readonly,code - #readelf: -l --wide - #xfail: "avr-*-*" "dlx-*-*" "h8300-*-*" "i960-*-*" "ip2k-*-*" "m32r-*-*" --#xfail: "moxie-*-*" "mt-*-*" "msp430-*-*" -+#xfail: "moxie-*-*" "mt-*-*" "msp430-*-*" "*-*-nacl*" - #xfail: "*-*-hpux*" "hppa*64*-*-*" --# Fails on the AVR, DLX, H8300, I960, IP2K, M32R, MOXIE, MT, and MSP430 -+# Fails on the AVR, DLX, H8300, I960, IP2K, M32R, MOXIE, MT, and MSP430, -+# and all NaCl targets, - # because the two sections are not merged into one segment. - # (There is no good reason why they have to be). - # Fails on HPUX systems because the .type pseudo-op behaves differently. -diff --git a/ld/testsuite/ld-elf/orphan-region.d b/ld/testsuite/ld-elf/orphan-region.d -index 9d6c90c..d63b1df 100644 ---- a/ld/testsuite/ld-elf/orphan-region.d -+++ b/ld/testsuite/ld-elf/orphan-region.d -@@ -3,9 +3,10 @@ - #readelf: -S -l --wide - #xfail: arc-*-* d30v-*-* dlx-*-* fr30-*-* frv-*-elf i860-*-* i960-*-* - #xfail: iq*-*-* mn10200-*-* moxie-*-* msp*-*-* mt-*-* or32-*-* pj*-*-* --#xfail: spu-*-* hppa*64*-*-* frv-*-* -+#xfail: spu-*-* hppa*64*-*-* frv-*-* *-*-nacl* - # if not using elf32.em, you don't get fancy orphan handling --# spu twiddles LOAD range, hppa64 adds PHDR, frv-linux adds GNU_STACK -+# spu twiddles LOAD range, hppa64 adds PHDR, frv-linux adds GNU_STACK, -+# nacl splits to two segments - - #... - \[[ 0-9]+\] \.text[ \t]+PROGBITS[ \t]+0*40000000[ \t]+.* diff --git a/ld/testsuite/ld-elf/shared.exp b/ld/testsuite/ld-elf/shared.exp index c00f3e5..c9f2056 100644 --- a/ld/testsuite/ld-elf/shared.exp @@ -1420,23 +387,10 @@ "-Wl,--no-as-needed tmpdir/libdl3c.so" "" {dl3main.cc} "dl3c" "dl3a.out" "" "c++"} diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp -index bb4cb0d..3cb8ee1 100644 +index bb4cb0d..49837dd 100644 --- a/ld/testsuite/lib/ld-lib.exp +++ b/ld/testsuite/lib/ld-lib.exp -@@ -757,6 +757,12 @@ proc run_dump_test { name {extra_options {}} } { - set dfile $srcdir/$subdir/$opts(dump) - } - -+ if { [string match "*--compress-debug-sections*" $opts(as)] \ -+ && ![is_zlib_supported] } { -+ unsupported $testname -+ return -+ } -+ - # Time to setup xfailures. - foreach targ $opts(xfail) { - setup_xfail $targ -@@ -1244,7 +1250,6 @@ proc run_ld_link_exec_tests { targets_to_xfail ldtests } { +@@ -1244,7 +1244,6 @@ proc run_ld_link_exec_tests { targets_to_xfail ldtests } { # verbose -log "ld_options is $ld_options" # verbose -log "as_options is $as_options" # verbose -log "src_files is $src_files" @@ -1444,7 +398,7 @@ # verbose -log "binfile is $binfile" # Assemble each file in the test. -@@ -1261,68 +1266,68 @@ proc run_ld_link_exec_tests { targets_to_xfail ldtests } { +@@ -1261,68 +1260,68 @@ proc run_ld_link_exec_tests { targets_to_xfail ldtests } { } else { ld_compile "$CC -c $CFLAGS $cflags" $srcdir/$subdir/$src_file $objfile } Only in unstableorigs/binutils-2.23.1/debian/patches: ld-fuse-option.diff diff -ur unstableorigs/binutils-2.23.1/debian/patches/series unstablenew/binutils-2.23.1/debian/patches/series --- unstableorigs/binutils-2.23.1/debian/patches/series 2012-12-10 15:43:53.000000000 +0000 +++ unstablenew/binutils-2.23.1/debian/patches/series 2012-11-26 17:10:50.000000000 +0000 @@ -21,4 +21,3 @@ aarch64-got-ld-prel19-reloc.diff armhf-sf-float-abi-flags.diff 164_ld_doc_remove_xref.diff -ld-fuse-option.diff diff -ur unstableorigs/binutils-2.23.1/debian/rules unstablenew/binutils-2.23.1/debian/rules --- unstableorigs/binutils-2.23.1/debian/rules 2012-12-10 15:43:53.000000000 +0000 +++ unstablenew/binutils-2.23.1/debian/rules 2013-01-03 17:12:24.000000000 +0000 @@ -53,28 +53,42 @@ DEB_HOST_GNU_TYPE ?= $(call vafilt,$(DPKG_VARS),DEB_HOST_GNU_TYPE) DEB_HOST_MULTIARCH ?= $(call vafilt,$(DPKG_VARS),DEB_HOST_MULTIARCH) -# If $(TARGET) is not set, try reading debian/target -ifeq (,$(TARGET)) +#--------------------------------------------------------------------------- +# set target +# - Debian arch or GNU triplet via DEB_TARGET_ARCH +# - Debian arch or GNU triplet via deprecated TARGET +# - Debian arch or GNU triplet in debian/target + +#Support the old TARGET variable whilst it's still used +DEB_TARGET_ARCH ?= $(TARGET) + +ifeq (,$(DEB_TARGET_ARCH)) ifneq (,$(wildcard debian/target)) - TARGET := $(shell cat debian/target 2>/dev/null) + DEB_TARGET_ARCH := $(shell cat debian/target 2>/dev/null) endif endif -ifneq (,$(TARGET)) - # Support TARGET both as Debian architecture specification (e.g. arm), +ifneq (,$(DEB_TARGET_ARCH)) + # Support DEB_TARGET_ARCH both as Debian architecture specification (e.g. arm), # and as the target name (e.g. arm-linux-gnu). - try_convert := $(shell dpkg-architecture -f -a$(TARGET) -qDEB_HOST_GNU_TYPE 2>/dev/null) + try_convert := $(shell dpkg-architecture -f -t$(DEB_TARGET_ARCH) -qDEB_HOST_ARCH 2>/dev/null) ifneq ($(try_convert),) - override TARGET := $(try_convert) + override DEB_TARGET_ARCH := $(try_convert) endif - DPKG_TARGET_VARS := $(shell dpkg-architecture -f -t$(TARGET)) + DPKG_TARGET_VARS := $(shell dpkg-architecture -f -a$(DEB_TARGET_ARCH)) DEB_TARGET_MULTIARCH = $(call vafilt,$(DPKG_TARGET_VARS),DEB_HOST_MULTIARCH) DEB_TARGET_ARCH = $(call vafilt,$(DPKG_TARGET_VARS),DEB_HOST_ARCH) + DEB_TARGET_GNU_TYPE = $(call vafilt,$(DPKG_TARGET_VARS),DEB_HOST_GNU_TYPE) else DEB_TARGET_MULTIARCH = $(DEB_HOST_MULTIARCH) DEB_TARGET_ARCH = $(DEB_HOST_ARCH) endif +ifeq ($(DEB_TARGET_ARCH),) + $(error Invalid architecure.) +endif + + ifeq (,$(DEB_HOST_MULTIARCH)) ifeq ($(DEB_HOST_ARCH),i386) DEB_HOST_MULTIARCH = i386-linux-gnu @@ -317,7 +331,7 @@ -rm -rf debian/patched debian/tmp debian/files* debian/substvars -rm -f debian/*.orig debian/*.rej -rm -rf $(d_cross) debian/files debian/substvars - -rm -rf builddir-$(TARGET) {configure,build,install}-cross-stamp + -rm -rf builddir-$(DEB_TARGET_ARCH) {configure,build,install}-cross-stamp for i in debian/*.in; do \ case "$$i" in debian/control*.in) continue; esac; \ rm -f $${i%*.in}; \ @@ -327,10 +341,10 @@ ################################################################################ -control-stamp: debian/control.in $(if $(TARGET),debian/control.cross.in) -ifneq (,$(TARGET)) +control-stamp: debian/control.in $(if $(DEB_TARGET_ARCH),debian/control.cross.in) +ifneq (,$(DEB_TARGET_ARCH)) sed "/^$$/ q" < debian/control.in > debian/control - sed -e "s/__TARGET__/$$(echo -n $(TARGET) | sed s/_/-/g)/" \ + sed -e "s/__TARGET__/$$(echo -n $(DEB_TARGET_GNU_TPYE) | sed s/_/-/g)/" \ < debian/control.cross.in >> debian/control else cp debian/control.in debian/control @@ -555,7 +569,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH),powerpc ppc64)) build_stamps += build-spu-stamp endif -ifneq (,$(TARGET)) +ifneq (,$(DEB_TARGET_ARCH)) ifneq (,$(findstring static-cross,$(DEB_BUILD_OPTIONS))) build_stamps = build-static-cross-stamp else @@ -587,7 +601,7 @@ ifneq (,$(filter $(DEB_HOST_ARCH),powerpc ppc64)) install_stamps += install-spu-stamp endif -ifneq (,$(TARGET)) +ifneq (,$(DEB_TARGET_ARCH)) ifneq (,$(findstring static-cross,$(DEB_BUILD_OPTIONS))) install_stamps = install-static-cross-stamp else @@ -855,7 +869,7 @@ rm -f debian/files debian/substvars # Cross builds do not have documentation packages -ifeq (,$(TARGET)) +ifeq (,$(DEB_TARGET_ARCH)) $(install_dir) $(d_doc)/DEBIAN @@ -921,9 +935,9 @@ $(checkdir) ifneq ($(BACKPORT),true) -# Process the following only if $(TARGET) is set -ifneq (,$(TARGET)) - test "" != "$(TARGET)" +# Process the following only if $(DEB_TARGET_ARCH) is set +ifneq (,$(DEB_TARGET_ARCH)) + test "" != "$(DEB_TARGET_ARCH)" rm -rf $(d_cross)/$(PF)/share/info $(d_cross)/$(PF)/share/man @@ -1154,7 +1168,7 @@ dpkg --build $(d_hppa64) .. endif -endif # Process the following only if $(TARGET) is set +endif # Process the following only if $(DEB_TARGET_ARCH) is set endif # ifndef BACKPORT ################################################################################ @@ -1162,10 +1176,10 @@ # cross targets # ################# -# Process the following only if $(TARGET) is set -ifneq (,$(TARGET)) +# Process the following only if $(DEB_TARGET_ARCH) is set +ifneq (,$(DEB_TARGET_ARCH)) -p_cross = $(subst _,-,binutils-$(TARGET)) +p_cross = $(subst _,-,binutils-$(DEB_TARGET_GNU_TYPE)) d_cross = debian/$(p_cross) #----------------------------------------------------------------- @@ -1189,48 +1203,48 @@ configure-cross-stamp: patch-stamp control-stamp $(checkdir) - test "" != "$(TARGET)" - rm -rf configure-cross-stamp builddir-$(TARGET) - mkdir builddir-$(TARGET) - cd builddir-$(TARGET) \ + test "" != "$(DEB_TARGET_ARCH)" + rm -rf configure-cross-stamp builddir-$(DEB_TARGET_ARCH) + mkdir builddir-$(DEB_TARGET_ARCH) + cd builddir-$(DEB_TARGET_ARCH) \ && env CC="$(CC)" CXX="$(CXX)" ../configure \ $(CONFARGS) \ - --target=$(TARGET) + --target=$(DEB_TARGET_GNU_TYPE) touch $@ build-cross-stamp: configure-cross-stamp $(checkdir) - test "" != "$(TARGET)" - $(MAKE) -C builddir-$(TARGET) $(NJOBS) CFLAGS="$(CFLAGS)" + test "" != "$(DEB_TARGET_ARCH)" + $(MAKE) -C builddir-$(DEB_TARGET_ARCH) $(NJOBS) CFLAGS="$(CFLAGS)" touch $@ install-cross-stamp: build-cross-stamp $(checkdir) - test "" != "$(TARGET)" + test "" != "$(DEB_TARGET_ARCH)" rm -rf $(d_cross) - $(MAKE) -C builddir-$(TARGET) prefix=$(pwd)/$(d_cross)/$(PF) \ + $(MAKE) -C builddir-$(DEB_TARGET_ARCH) prefix=$(pwd)/$(d_cross)/$(PF) \ mandir=$(pwd)/$(d_cross)/$(PF)/share/man install rm -rf $(d_cross)/$(PF)/lib* $(d_cross)/$(PF)/info $(d_cross)/$(PF)/share/locale - $(call strip_package, $(p_cross), $(d_cross),$(DEB_HOST_GNU_TYPE)/$(TARGET)) - chmod ugo-x $(d_cross)/$(PF)/$(DEB_HOST_GNU_TYPE)/$(TARGET)/lib/*.so + $(call strip_package, $(p_cross), $(d_cross),$(DEB_HOST_GNU_TYPE)/$(DEB_TARGET_GNU_TYPE)) + chmod ugo-x $(d_cross)/$(PF)/$(DEB_HOST_GNU_TYPE)/$(DEB_TARGET_GNU_TYPE)/lib/*.so : # Get rid of .la files since libtool obviously has no idea about transient paths - rm -f $(d_cross)/$(PF)/$(DEB_HOST_GNU_TYPE)/$(TARGET)/lib/*.la + rm -f $(d_cross)/$(PF)/$(DEB_HOST_GNU_TYPE)/$(DEB_TARGET_GNU_TYPE)/lib/*.la gzip -9 $(d_cross)/$(PF)/share/man/man1/* touch $@ configure-host-cross-stamp: configure-cross-stamp $(checkdir) - test "" != "$(TARGET)" - $(MAKE) configure-host -C builddir-$(TARGET) $(NJOBS) CFLAGS="$(CFLAGS)" + test "" != "$(DEB_TARGET_ARCH)" + $(MAKE) configure-host -C builddir-$(DEB_TARGET_ARCH) $(NJOBS) CFLAGS="$(CFLAGS)" touch $@ build-static-cross-stamp: configure-host-cross-stamp $(checkdir) - test "" != "$(TARGET)" - $(MAKE) -C builddir-$(TARGET) $(NJOBS) CFLAGS="$(CFLAGS)" LDFLAGS="-all-static" + test "" != "$(DEB_TARGET_ARCH)" + $(MAKE) -C builddir-$(DEB_TARGET_ARCH) $(NJOBS) CFLAGS="$(CFLAGS)" LDFLAGS="-all-static" touch $@ install-static-cross-stamp: build-static-cross-stamp install-cross-stamp @@ -1239,7 +1253,7 @@ @echo "Please use dpkg-buildpackage instead of calling binary-cross directly; see README.cross" @false -endif # ifneq ($(TARGET),) +endif # ifneq ($(DEB_TARGET_ARCH),) ################################################################################ Only in unstableorigs/binutils-2.23.1/etc: configure.info Only in unstableorigs/binutils-2.23.1/etc: standards.info Only in unstableorigs/binutils-2.23.1/gas/doc: as.info Only in unstableorigs/binutils-2.23.1/gas/po: es.gmo Only in unstableorigs/binutils-2.23.1/gas/po: fi.gmo Only in unstableorigs/binutils-2.23.1/gas/po: fr.gmo Only in unstableorigs/binutils-2.23.1/gas/po: id.gmo Only in unstableorigs/binutils-2.23.1/gas/po: ja.gmo Only in unstableorigs/binutils-2.23.1/gas/po: ru.gmo Only in unstableorigs/binutils-2.23.1/gas/po: rw.gmo Only in unstableorigs/binutils-2.23.1/gas/po: tr.gmo Only in unstableorigs/binutils-2.23.1/gold/po: es.gmo Only in unstableorigs/binutils-2.23.1/gold/po: fi.gmo Only in unstableorigs/binutils-2.23.1/gold/po: id.gmo Only in unstableorigs/binutils-2.23.1/gold/po: it.gmo Only in unstableorigs/binutils-2.23.1/gold/po: vi.gmo Only in unstableorigs/binutils-2.23.1/gprof: gprof.info Only in unstableorigs/binutils-2.23.1/gprof/po: bg.gmo Only in unstableorigs/binutils-2.23.1/gprof/po: da.gmo Only in unstableorigs/binutils-2.23.1/gprof/po: de.gmo Only in unstableorigs/binutils-2.23.1/gprof/po: eo.gmo Only in unstableorigs/binutils-2.23.1/gprof/po: es.gmo Only in unstableorigs/binutils-2.23.1/gprof/po: fi.gmo Only in unstableorigs/binutils-2.23.1/gprof/po: fr.gmo Only in unstableorigs/binutils-2.23.1/gprof/po: ga.gmo Only in unstableorigs/binutils-2.23.1/gprof/po: id.gmo Only in unstableorigs/binutils-2.23.1/gprof/po: it.gmo Only in unstableorigs/binutils-2.23.1/gprof/po: ja.gmo Only in unstableorigs/binutils-2.23.1/gprof/po: ms.gmo Only in unstableorigs/binutils-2.23.1/gprof/po: nl.gmo Only in unstableorigs/binutils-2.23.1/gprof/po: pt_BR.gmo Only in unstableorigs/binutils-2.23.1/gprof/po: ro.gmo Only in unstableorigs/binutils-2.23.1/gprof/po: ru.gmo Only in unstableorigs/binutils-2.23.1/gprof/po: rw.gmo Only in unstableorigs/binutils-2.23.1/gprof/po: sr.gmo Only in unstableorigs/binutils-2.23.1/gprof/po: sv.gmo Only in unstableorigs/binutils-2.23.1/gprof/po: tr.gmo Only in unstableorigs/binutils-2.23.1/gprof/po: uk.gmo Only in unstableorigs/binutils-2.23.1/gprof/po: vi.gmo Only in unstableorigs/binutils-2.23.1/ld: ld.info Only in unstableorigs/binutils-2.23.1/ld/po: bg.gmo Only in unstableorigs/binutils-2.23.1/ld/po: da.gmo Only in unstableorigs/binutils-2.23.1/ld/po: es.gmo Only in unstableorigs/binutils-2.23.1/ld/po: fi.gmo Only in unstableorigs/binutils-2.23.1/ld/po: fr.gmo Only in unstableorigs/binutils-2.23.1/ld/po: ga.gmo Only in unstableorigs/binutils-2.23.1/ld/po: id.gmo Only in unstableorigs/binutils-2.23.1/ld/po: it.gmo Only in unstableorigs/binutils-2.23.1/ld/po: ja.gmo Only in unstableorigs/binutils-2.23.1/ld/po: sv.gmo Only in unstableorigs/binutils-2.23.1/ld/po: tr.gmo Only in unstableorigs/binutils-2.23.1/ld/po: uk.gmo Only in unstableorigs/binutils-2.23.1/ld/po: vi.gmo Only in unstableorigs/binutils-2.23.1/ld/po: zh_CN.gmo Only in unstableorigs/binutils-2.23.1/ld/po: zh_TW.gmo Only in unstableorigs/binutils-2.23.1/opcodes/po: da.gmo Only in unstableorigs/binutils-2.23.1/opcodes/po: de.gmo Only in unstableorigs/binutils-2.23.1/opcodes/po: es.gmo Only in unstableorigs/binutils-2.23.1/opcodes/po: fi.gmo Only in unstableorigs/binutils-2.23.1/opcodes/po: fr.gmo Only in unstableorigs/binutils-2.23.1/opcodes/po: ga.gmo Only in unstableorigs/binutils-2.23.1/opcodes/po: id.gmo Only in unstableorigs/binutils-2.23.1/opcodes/po: it.gmo Only in unstableorigs/binutils-2.23.1/opcodes/po: nl.gmo Only in unstableorigs/binutils-2.23.1/opcodes/po: pt_BR.gmo Only in unstableorigs/binutils-2.23.1/opcodes/po: ro.gmo Only in unstableorigs/binutils-2.23.1/opcodes/po: sv.gmo Only in unstableorigs/binutils-2.23.1/opcodes/po: tr.gmo Only in unstableorigs/binutils-2.23.1/opcodes/po: uk.gmo Only in unstableorigs/binutils-2.23.1/opcodes/po: vi.gmo Only in unstableorigs/binutils-2.23.1/opcodes/po: zh_CN.gmo