--- binutils-2.20.1.orig/debian/binutils.postinst +++ binutils-2.20.1/debian/binutils.postinst @@ -0,0 +1,7 @@ +#! /bin/sh + +set -e + +if [ "$1" = "configure" ]; then + ldconfig +fi --- binutils-2.20.1.orig/debian/binutils-hppa64.postinst +++ binutils-2.20.1/debian/binutils-hppa64.postinst @@ -0,0 +1,7 @@ +#! /bin/sh + +set -e + +if [ "$1" = "configure" ]; then + ldconfig +fi --- binutils-2.20.1.orig/debian/README.cross +++ binutils-2.20.1/debian/README.cross @@ -0,0 +1,22 @@ +Cross-binutils debian packages can be built directly from the binutils +source package. + +To build a cross-binutils package: + + o Download and unpack the binutils source package: + + apt-get source binutils + + o Ensure you have the binutils build-dependencies installed: + + apt-get build-dep binutils + + o Then build the cross-binutils package: + + TARGET= fakeroot debian/rules binary-cross + + (substitute your target name, e.g. "arm" or "m68k", instead of + "") + +--- +Nikita Youshchenko --- binutils-2.20.1.orig/debian/binutils-multiarch.shlibs +++ binutils-2.20.1/debian/binutils-multiarch.shlibs @@ -0,0 +1,2 @@ +libbfd 2.20.1-multiarch.20100303 binutils-multiarch (>= 2.20.1), binutils-multiarch (<< 2.20.2) +libopcodes 2.20.1-multiarch.20100303 binutils-multiarch (>= 2.20.1), binutils-multiarch (<< 2.20.2) --- binutils-2.20.1.orig/debian/rules +++ binutils-2.20.1/debian/rules @@ -0,0 +1,992 @@ +#!/usr/bin/make -f +# debian/rules file - for binutils (2.20) +# Based on sample debian/rules file - for GNU Hello (1.3). +# Copyright 1994,1995 by Ian Jackson. +# Copyright 1998-2007 James Troup. +# Portions Copyright 2008-2009 Canonical Ltd. +# Portions Copyright 2008-2009 Matthias Klose. +# I hereby give you perpetual unlimited permission to copy, +# modify and relicense this file, provided that you do not remove +# my name from the file itself. (I assert my moral right of +# paternity under the Copyright, Designs and Patents Act 1988.) +# This file may have to be extensively modified + +################################################################################ + +include /usr/share/dpatch/dpatch.make + +################################################################################ + +p_bin = binutils +p_dev = $(p_bin)-dev +p_mul = $(p_bin)-multiarch +p_gold = $(p_bin)-gold +p_doc = $(p_bin)-doc +p_hppa64 = $(p_bin)-hppa64 +p_spu = $(p_bin)-spu +p_src = $(p_bin)-source + +pwd := $(shell pwd) +d = debian/tmp +d_bin = $(d) +d_dev = debian/$(p_dev) +d_mul = debian/$(p_mul) +d_gold = debian/$(p_gold) +d_doc = debian/$(p_doc) +d_hppa64 = debian/$(p_hppa64) +d_spu = debian/$(p_spu) +d_src = debian/$(p_src) + +install_dir = install -d -m 755 +install_file = install -m 644 +install_script = install -m 755 +install_binary = install -m 755 -s + +DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) +DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) + +SHELL = /bin/bash + +ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386 powerpc sparc)) + with_gold = yes +endif + +with_multiarch := yes + +CC = gcc +CXX = g++ +CFLAGS = -g -O2 +STRIP = strip --remove-section=.comment --remove-section=.note +ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) + CC = $(DEB_HOST_GNU_TYPE)-gcc + CXX = $(DEB_HOST_GNU_TYPE)-g++ +endif + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS = -g -O0 +endif + +# see LP: #446478, would only fix the testcases +#ifeq ($(DEB_HOST_ARCH),armel) +# CFLAGS += -fno-section-anchors +#endif + +VERSION = $(shell sed -n 's/^ *VERSION=\(.*\)/\1/p' bfd/configure | head -1) +SINGLE_VERSION= $(VERSION)-system +MULTI_VERSION = $(VERSION)-multiarch +HPPA64_VERSION= $(VERSION)-hppa64 +SPU_VERSION = $(VERSION)-spu + +DISTRIBUTION := $(shell lsb_release -is) +NJOBS = +# Support parallel= in DEB_BUILD_OPTIONS (see #209008) +SPACE = $(EMPTY) $(EMPTY) +COMMA = , +ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS)))) + NJOBS := -j $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS)))) +endif +ifneq (,$(findstring nogold,$(DEB_BUILD_OPTIONS))) + with_gold = disabled in DEB_BUILD_OPTIONS +endif +ifneq (,$(findstring nomult,$(DEB_BUILD_OPTIONS))) + with_multiarch = disabled in DEB_BUILD_OPTIONS +endif + +######################################## + +CONFARGS = \ + --enable-shared \ + --enable-plugins \ + --prefix=/usr \ + --build=$(DEB_BUILD_GNU_TYPE) \ + --host=$(DEB_HOST_GNU_TYPE) \ + --with-pkgversion="GNU Binutils for $(DISTRIBUTION)" + +ifeq ($(DEB_HOST_ARCH),sparc) + CONFARGS += --enable-targets=sparc64-linux-gnu + CONFLICTS = -VextraConflicts="libc6-dev-sparc64 (<< 2.2.5-7)" +endif +ifeq ($(DEB_HOST_ARCH),sparc64) + CONFARGS += --enable-targets=sparc-linux-gnu + CONFLICTS = -VextraConflicts="libc6-dev-sparc64 (<< 2.2.5-7)" +endif +ifeq ($(DEB_HOST_ARCH),powerpc) + CONFARGS += --enable-targets=powerpc64-linux-gnu,spu +endif +ifeq ($(DEB_HOST_ARCH),ppc64) + CONFARGS += --enable-targets=powerpc-linux-gnu,spu +endif +ifeq ($(DEB_HOST_ARCH),s390) + CONFARGS += --enable-targets=s390x-linux-gnu +endif +ifeq ($(DEB_HOST_ARCH),i386) + CONFARGS += --enable-targets=x86_64-linux-gnu +endif +ifeq ($(DEB_HOST_ARCH),kfreebsd-i386) + CONFARGS += --enable-targets=x86_64-kfreebsd-gnu +endif +ifeq ($(DEB_HOST_ARCH),mips) + CONFARGS += --enable-targets=mips64-linux-gnu +endif +ifeq ($(DEB_HOST_ARCH),mipsel) + CONFARGS += --enable-targets=mips64el-linux-gnu +endif +ifeq ($(DEB_HOST_ARCH),ia64) + CONFARGS += --disable-werror +endif + +with_check := yes +ifneq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) + with_check := disabled through DEB_BUILD_OPTIONS +endif +with_strip := yes +ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + with_strip := disabled through DEB_BUILD_OPTIONS +endif +#ifneq (,$(filter $(DEB_HOST_ARCH),mips mipsel)) +# with_check := disabled for architecture $(DEB_HOST_ARCH) +#endif +ifneq (,$(filter $(DEB_HOST_ARCH),mips mipsel sparc)) + ignore_regressions := regressions ignored on architecture $(DEB_HOST_ARCH) +endif + +source_files = $(addprefix $(shell basename $(pwd))/, \ + $(filter-out %-stamp CVS debian builddir-% test-summary, $(wildcard *))) + +################################################################################ + +################ +# clean target # +################ + +clean: unpatch + $(checkdir) + -rm -fr builddir-multi builddir-single builddir-hppa64 builddir-spu + -find . -name \*.gmo -o -name \*~ -o -name \*.info ! -name sysroff.info | xargs rm -f + -rm -f $(pwd)/test-summary* + -rm -fr $(d_bin) $(d_dev) $(d_mul) $(d_doc) $(d_hppa64) $(d_src) $(d_spu) $(d_gold) + -rm -rf debian/patched debian/tmp debian/files* debian/substvars + -rm -f debian/*.orig debian/*.rej + chmod 644 debian/patches/*.dpatch + -rm -f *-stamp + +################################################################################ + +####################### +# single-arch targets # +####################### + +SINGLE_CONFARGS = $(CONFARGS) +ifeq ($(with_gold),yes) + SINGLE_CONFARGS += --enable-gold=both +endif + +configure-single-stamp: patch-stamp + $(checkdir) + +ifeq ($(with_check),yes) + @if echo "spawn true" | /usr/bin/expect -f - >/dev/null; then \ + : ; \ + else \ + echo "expect is failing on your system with the above error, which means the"; \ + echo "testsuite will fail. Please resolve the above issues and retry the build."; \ + echo "-----------------------------------------------------------------------------"; \ + exit 1; \ + fi +endif + + rm -rf configure-single-stamp \ + builddir-single + mkdir builddir-single + cd builddir-single && env CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" \ + ../configure $(SINGLE_CONFARGS) + $(MAKE) -C builddir-single configure-host + touch configure-single-stamp + +build-single-stamp: configure-single-stamp + $(checkdir) + env MAKE="$(MAKE) VERSION=$(SINGLE_VERSION)" \ + $(MAKE) -C builddir-single/bfd headers + env MAKE="$(MAKE) VERSION=$(SINGLE_VERSION)" \ + $(MAKE) $(NJOBS) -C builddir-single +ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) +ifeq ($(with_check),yes) + -env MAKE="$(MAKE) VERSION=$(SINGLE_VERSION)" \ + $(MAKE) -C builddir-single -k check + cat builddir-single/binutils/binutils.sum \ + builddir-single/gas/testsuite/gas.sum \ + builddir-single/ld/ld.sum >> $(pwd)/test-summary + set -e; \ + if [ ! -f /usr/share/doc/binutils/test-summary.gz ]; then \ + echo "No test results available for the installed binutils version"; \ + elif [ -x /usr/bin/python ]; then \ + echo "Test results, compared with installed binutils:"; \ + zcat /usr/share/doc/binutils/test-summary.gz > test-summary-installed; \ + if python debian/test-suite-compare.py test-summary-installed test-summary; then \ + : ; \ + elif [ -n "$(ignore_regressions)" ]; then \ + echo "$(ignore_regressions)"; \ + else \ + false; \ + fi; \ + else \ + echo "python not installed, not comparing test results."; \ + fi +endif +endif + touch build-single-stamp + +################################################################################ + +##################### +# multiarch targets # +##################### + +multiarch_targets = \ + alpha-linux-gnu \ + arm-linux-gnu \ + armel-linux-gnu \ + hppa-linux-gnu \ + i486-linux-gnu \ + ia64-linux-gnu \ + m68k-linux-gnu \ + m68k-rtems \ + mips-linux-gnu \ + mipsel-linux-gnu \ + mips64-linux-gnu \ + mips64el-linux-gnu \ + powerpc-linux-gnu \ + powerpc64-linux-gnu \ + s390-linux-gnu \ + s390x-linux-gnu \ + sh-linux-gnu \ + sh64-linux-gnu \ + sparc-linux-gnu \ + sparc64-linux-gnu \ + x86_64-linux-gnu \ + m32r-linux-gnu \ + spu + +configure-multi-stamp: patch-stamp + $(checkdir) + rm -rf configure-multi-stamp \ + builddir-multi + mkdir builddir-multi + cd builddir-multi \ + && env CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" ../configure $(CONFARGS) \ + --enable-targets=$(subst $(SPACE),$(COMMA),$(multiarch_targets)) + $(MAKE) -C builddir-multi configure-host + touch configure-multi-stamp + +build-multi-stamp: configure-multi-stamp + $(checkdir) + $(MAKE) -C builddir-multi/bfd headers + env MAKE="$(MAKE) VERSION=$(MULTI_VERSION)" \ + $(MAKE) $(NJOBS) -C builddir-multi + touch build-multi-stamp + +################################################################################ + +################# +# static target # +################# + +configure-static-stamp: patch-stamp + $(checkdir) + rm -rf configure-static-stamp \ + builddir-static + mkdir builddir-static + cd builddir-static \ + && env CC="$(CC)" CXX="$(CXX)" CFLAGS="-g0 -Os" ../configure \ + --prefix=/usr \ + --build=$(DEB_BUILD_GNU_TYPE) \ + --host=$(DEB_HOST_GNU_TYPE) \ + --with-pkgversion="GNU Binutils for $(DISTRIBUTION)" + $(MAKE) -C builddir-static configure-bfd + $(MAKE) -C builddir-static configure-ld + touch configure-static-stamp + +build-static-stamp: configure-static-stamp + $(checkdir) + $(MAKE) $(NJOBS) -C builddir-static/libiberty CCLD='$(CC) -all-static' + $(MAKE) $(NJOBS) -C builddir-static/bfd CCLD='$(CC) -all-static' + $(MAKE) $(NJOBS) -C builddir-static/ld CCLD='$(CC) -all-static' + touch build-static-stamp + +################################################################################ + +################# +# hppa64 target # +################# + +configure-hppa64-stamp: patch-stamp + $(checkdir) + rm -rf configure-hppa64-stamp \ + builddir-hppa64 + mkdir builddir-hppa64 + cd builddir-hppa64 \ + && env CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" ../configure \ + --enable-shared \ + --prefix=/usr \ + --build=$(DEB_BUILD_GNU_TYPE) \ + --host=$(DEB_BUILD_GNU_TYPE) \ + --target=hppa64-linux-gnu + $(MAKE) -C builddir-hppa64 configure-host + touch configure-hppa64-stamp + +build-hppa64-stamp: configure-hppa64-stamp + $(checkdir) + $(MAKE) -C builddir-hppa64/bfd headers + env MAKE="$(MAKE) VERSION=$(HPPA64_VERSION)" \ + $(MAKE) $(NJOBS) -C builddir-hppa64 + touch build-hppa64-stamp + +################################################################################ + +############## +# spu target # +############## + +configure-spu-stamp: patch-stamp + $(checkdir) + rm -rf configure-spu-stamp \ + builddir-spu + mkdir builddir-spu + cd builddir-spu \ + && env CC="$(CC)" CFLAGS="$(CFLAGS)" ../configure \ + --enable-shared \ + --prefix=/usr \ + --program-prefix=spu- \ + --build=$(DEB_BUILD_GNU_TYPE) \ + --host=$(DEB_BUILD_GNU_TYPE) \ + --target=spu-elf + $(MAKE) -C builddir-spu configure-host + touch configure-spu-stamp + +build-spu-stamp: configure-spu-stamp + $(checkdir) + $(MAKE) -C builddir-spu/bfd headers + env MAKE="$(MAKE) VERSION=$(SPU_VERSION)" \ + $(MAKE) $(NJOBS) -C builddir-spu + touch build-spu-stamp + +################################################################################ + +pre-build: +#ifneq (,$(filter $(DEB_HOST_ARCH), armel powerpc)) +# @echo Build it ... +#else +# @echo Explicitely fail the build for architecture $(DEB_HOST_ARCH) +# false +#endif + +build_stamps = build-single-stamp +ifeq ($(with_multiarch),yes) + build_stamps += build-multi-stamp +endif +ifeq ($(DEB_HOST_ARCH),hppa) + build_stamps += build-hppa64-stamp +endif +ifneq (,$(filter $(DEB_HOST_ARCH),powerpc ppc64)) + build_stamps += build-spu-stamp +endif +build: pre-build build-stamp +build-stamp: $(build_stamps) + touch build-stamp + +################################################################################ + +################## +# install target # +################## + +install_stamps = install-stamp +ifeq ($(DEB_HOST_ARCH),hppa) + install_stamps += install-hppa64-stamp +endif +ifneq (,$(filter $(DEB_HOST_ARCH),powerpc ppc64)) + install_stamps += install-spu-stamp +endif +install: $(install_stamps) +install-stamp: checkroot build-stamp + $(checkdir) + + rm -fr $(d_bin) $(d_dev) $(d_mul) $(d_doc) $(d_src) + $(install_dir) $(d_bin) $(d_dev) $(d_mul) $(d_doc) $(d_src) + + : # install binutils and -dev stuff + env MAKE="$(MAKE) VERSION=$(SINGLE_VERSION)" \ + $(MAKE) -C builddir-single \ + CFLAGS="$(CFLAGS)" prefix=$(pwd)/$(d_bin)/usr \ + mandir=$(pwd)/$(d_bin)/usr/share/man \ + infodir=$(pwd)/$(d_doc)/usr/share/info install + +ifeq ($(with_multiarch),yes) + : # now install binutils-multiarch stuff + env MAKE="$(MAKE) VERSION=$(MULTI_VERSION)" \ + $(MAKE) -C builddir-multi \ + CFLAGS="$(CFLAGS)" \ + prefix=$(pwd)/$(d_mul)/usr \ + mandir=$(pwd)/$(d_mul)/usr/share/man \ + infodir=$(pwd)/$(d_doc)/usr/share/info install +endif + + : # copy libiberty.h ... not too keen on this, but it was requested + cp -f include/libiberty.h $(d_bin)/usr/include + + : # copy demangle.h ... not too keen on this, but it was requested + cp -f include/demangle.h $(d_bin)/usr/include + + : # We don't need to distribute everything in binutils and -dev + rm -rf $(d_bin)/usr/include/obstack.h + rm -f $(d_bin)/usr/man/man1/configure.1 + rm -f $(d_doc)/usr/share/info/configure.* $(d_doc)/usr/share/info/standards.* + : # *sigh*, bugs.debian.org/213524 + rm -f $(d_doc)/usr/share/info/dir* + +ifeq ($(with_multiarch),yes) + : # Now get rid of just about everything in binutils-multiarch + rm -rf $(d_mul)/usr/man $(d_mul)/usr/info $(d_mul)/usr/include + rm -rf $(d_mul)/usr/share/man $(d_mul)/usr/share/info $(d_mul)/usr/share/locale + + : # Get rid of ld for the time being since it's suddenly unhappy when + : # linking kernels. Also get rid of the ldscripts for good measure. + rm -f $(d_mul)/usr/bin/as $(d_mul)/usr/bin/gasp $(d_mul)/usr/bin/c++filt \ + $(d_mul)/usr/bin/ld + rm -rf $(d_mul)/usr/lib/ldscripts + ifneq (,$(filter $(DEB_HOST_ARCH),powerpc ppc64)) + rm -f $(d_mul)/usr/bin/embedspu + endif +endif + + $(install_dir) $(d_dev)/usr/include/ $(d_dev)/usr/lib/ + mv $(d_bin)/usr/include/* $(d_dev)/usr/include/ + mv $(d_bin)/usr/lib/*.a $(d_bin)/usr/lib/libbfd.so $(d_bin)/usr/lib/libopcodes.so \ + $(d_dev)/usr/lib/ + +ifeq ($(with_multiarch),yes) + rm -f $(d_mul)/usr/lib/libbfd.so $(d_mul)/usr/lib/libopcodes.so + rm -f $(d_mul)/usr/lib/*.la $(d_mul)/usr/lib/*.a + rm -f $(d_mul)/usr/lib*/libiberty* +endif + + : # Get rid of .la files since libtool obviously has no idea about transient paths + rm -f $(d_bin)/usr/lib/*.la + +ifeq ($(with_strip),yes) + : # Strip shared libraries + $(STRIP) --strip-unneeded $(d_bin)/usr/lib/libbfd-*so + $(STRIP) --strip-unneeded $(d_bin)/usr/lib/libopcodes-*so + + chmod ugo-x $(d_bin)/usr/lib/*.so + + $(STRIP) $$(file $(d_bin)/usr/bin/* |awk -F: '$$0 !~ /script/ {print $$1}') + + ifeq ($(with_multiarch),yes) + $(STRIP) --strip-unneeded $(d_mul)/usr/lib/libbfd-*so + $(STRIP) --strip-unneeded $(d_mul)/usr/lib/libopcodes-*so + + chmod ugo-x $(d_mul)/usr/lib/*.so + + $(STRIP) $$(file $(d_mul)/usr/bin/* |awk -F: '$$0 !~ /script/ {print $$1}') + endif +endif + + : # Don't want /usr/-linux to exist in any package + rm -rf $(d_bin)/usr/$(DEB_HOST_GNU_TYPE) + + : # Remove windres manpages + rm -f $(d_bin)/usr/share/man/man1/windres.1 + +ifeq ($(with_multiarch),yes) + rm -rf $(d_mul)/usr/$(DEB_HOST_GNU_TYPE) + rm -f $(d_mul)/usr/share/man/man1/windres.1 +endif + +ifeq ($(with_gold),yes) + rm -f $(d_bin)/usr/bin/ld + ln -s ld.bfd $(d_bin)/usr/bin/ld + ln -s ld.gold $(d_bin)/usr/bin/gold + mv $(d_bin)/usr/share/man/man1/ld.1 \ + $(d_bin)/usr/share/man/man1/ld.bfd.1 + ln -s ld.bfd.1.gz $(d_bin)/usr/share/man/man1/ld.1.gz + ln -s ld.bfd.1.gz $(d_bin)/usr/share/man/man1/gold.1.gz + + : # install a symlink for the gold linker + $(install_dir) $(d_bin)/usr/lib/gold-ld + ln -s ../../bin/ld.gold $(d_bin)/usr/lib/gold-ld/ld + + : # only keep the gold linker diversion to it's own package. + rm -fr $(d_gold) + $(install_dir) $(d_gold) + $(install_dir) $(d_gold)/usr/bin + ln -s ld.gold $(d_gold)/usr/bin/ld +endif + : # install a symlink for the old linker + $(install_dir) $(d_bin)/usr/lib/compat-ld + ln -s ../../bin/ld.bfd $(d_bin)/usr/lib/compat-ld/ld + + : # Remove empty directory + rmdir $(d_bin)/usr/include/ + + : # install libiberty PIC library + $(install_file) builddir-single/libiberty/pic/libiberty.a \ + $(d_dev)/usr/lib/libiberty_pic.a + + touch install-stamp + +install-hppa64-stamp: checkroot build-hppa64-stamp + $(checkdir) + + rm -fr $(d_hppa64) + $(install_dir) $(d_hppa64) + $(install_dir) $(d_hppa64)/usr/lib + + : # install binutils-hppa64 stuff + env MAKE="$(MAKE) VERSION=$(HPPA64_VERSION)" \ + $(MAKE) -C builddir-hppa64 \ + CFLAGS="$(CFLAGS)" \ + prefix=$(pwd)/$(d_hppa64)/usr/ \ + mandir=$(pwd)/$(d_hppa64)/usr/share/man \ + infodir=$(pwd)/$(d_hppa64)/usr/share/info install + + : # move shared libs to the standard path + mv $(d_hppa64)/usr/hppa-linux-gnu/hppa64-linux-gnu/lib/lib*-*.so \ + $(d_hppa64)/usr/lib/. + + : # Now get rid of just about everything in binutils-hppa64 + rm -rf $(d_hppa64)/usr/man + rm -rf $(d_hppa64)/usr/info + rm -rf $(d_hppa64)/usr/include + rm -rf $(d_hppa64)/usr/share + rm -rf $(d_hppa64)/usr/hppa-linux-gnu + rm -rf $(d_hppa64)/usr/lib/libiberty.a + +ifeq ($(with_strip),yes) + : # Strip shared libraries + $(STRIP) --strip-unneeded $(d_hppa64)/usr/lib/libbfd-*so + $(STRIP) --strip-unneeded $(d_hppa64)/usr/lib/libopcodes-*so + $(STRIP) $$(file $(d_hppa64)/usr/bin/* | awk -F: '$$0 !~ /script/ {print $$1}') +endif + + chmod ugo-x $(d_hppa64)/usr/lib/*.so + + : # Don't want /usr/-linux to exist in any package + rm -rf $(d_hppa64)/usr/hppa64-linux-gnu + + touch install-hppa64-stamp + +install-spu-stamp: checkroot build-spu-stamp + $(checkdir) + + rm -fr $(d_spu) + $(install_dir) $(d_spu) + $(install_dir) $(d_spu)/usr/lib + + : # install binutils-spu stuff + env MAKE="$(MAKE) VERSION=$(SPU_VERSION)" \ + $(MAKE) -C builddir-spu \ + CFLAGS="$(CFLAGS)" \ + prefix=$(pwd)/$(d_spu)/usr/ \ + mandir=$(pwd)/$(d_spu)/usr/share/man \ + infodir=$(pwd)/$(d_spu)/usr/share/info install + + : # move shared libs to the standard path + mv $(d_spu)/usr/$(DEB_HOST_GNU_TYPE)/spu-elf/lib/lib*-*.so \ + $(d_spu)/usr/lib/. + + : # Now get rid of just about everything in binutils-spu + rm -rf $(d_spu)/usr/man + rm -rf $(d_spu)/usr/info + rm -rf $(d_spu)/usr/include + rm -rf $(d_spu)/usr/share + rm -rf $(d_spu)/usr/$(DEB_HOST_GNU_TYPE) + rm -rf $(d_spu)/usr/lib/libiberty.a + rm -rf $(d_spu)/usr/lib/ldscripts + +ifeq ($(with_strip),yes) + : # Strip shared libraries + $(STRIP) --strip-unneeded $(d_spu)/usr/lib/libbfd-*so + $(STRIP) --strip-unneeded $(d_spu)/usr/lib/libopcodes-*so + $(STRIP) $$(file $(d_spu)/usr/bin/* | awk -F: '$$0 !~ /script/ {print $$1}') +endif + + chmod ugo-x $(d_spu)/usr/lib/*.so + + : # Don't want /usr/-linux to exist in any package + rm -rf $(d_spu)/usr/spu-elf + + touch install-spu-stamp + +################################################################################ + +####################### +# binary-indep target # +####################### + +binary-indep: checkroot build install + $(checkdir) + + rm -f debian/files debian/substvars + + $(install_dir) $(d_doc)/DEBIAN + + $(install_dir) $(d_doc)/usr/share/doc/$(p_doc)/ + $(install_file) debian/changelog $(d_doc)/usr/share/doc/$(p_doc)/changelog.Debian + $(install_file) debian/copyright $(d_doc)/usr/share/doc/$(p_doc)/ + for i in bfd gas gprof ld; do \ + ln -sf ../$(p_bin)/$$i $(d_doc)/usr/share/doc/$(p_doc)/$$i; \ + done + find $(d_doc)/usr/share/doc/$(p_doc) -maxdepth 1 -type f ! -name copyright | xargs gzip -9 + gzip -9 $(d_doc)/usr/share/info/* + + dpkg-gencontrol -isp -P$(d_doc) -p$(p_doc) + chown -R root:root $(d_doc) + chmod -R go=rX $(d_doc) + dpkg --build $(d_doc) .. + + $(install_dir) $(d_src)/usr/share/doc/$(p_src)/ + $(install_file) debian/changelog $(d_src)/usr/share/doc/$(p_src)/changelog.Debian + $(install_file) debian/copyright $(d_src)/usr/share/doc/$(p_src)/ + find $(d_src)/usr/share/doc/$(p_src) -maxdepth 1 -type f ! -name copyright | xargs gzip -9 + + $(install_dir) $(d_src)/DEBIAN + $(install_dir) $(d_src)/usr/src/binutils/patches + $(install_file) debian/patches/* $(d_src)/usr/src/binutils/patches/ + chmod 755 $(d_src)/usr/src/binutils/patches/*.dpatch + tar -c --bzip2 -C .. --exclude=CVS \ + -f $(pwd)/$(d_src)/usr/src/binutils/binutils-$(VERSION).tar.bz2 \ + $(source_files) + + dpkg-gencontrol -isp -P$(d_src) -p$(p_src) + chown -R root:root $(d_src) + chmod -R go=rX $(d_src) + dpkg --build $(d_src) .. + + +################################################################################ + +####################### +# binary-arch target # +####################### + +binary-arch: checkroot build install + $(checkdir) + + : # make lintian happy + $(install_file) -D debian/$(p_bin).overrides \ + $(d_bin)/usr/share/lintian/overrides/$(p_bin) +ifeq ($(with_multiarch),yes) + $(install_file) -D debian/$(p_mul).overrides \ + $(d_mul)/usr/share/lintian/overrides/$(p_mul) +endif +ifeq ($(DEB_HOST_ARCH),hppa) + $(install_file) -D debian/$(p_hppa64).overrides \ + $(d_hppa64)/usr/share/lintian/overrides/$(p_hppa64) +endif +ifeq ($(with_gold),yes) + $(install_file) -D debian/$(p_gold).overrides \ + $(d_gold)/usr/share/lintian/overrides/$(p_gold) +endif +ifneq (,$(filter $(DEB_HOST_ARCH),powerpc ppc64)) + $(install_file) -D debian/$(p_spu).overrides \ + $(d_spu)/usr/share/lintian/overrides/$(p_spu) +endif + + : # install maintainer scrtips + $(install_dir) $(d_bin)/DEBIAN + $(install_script) debian/binutils.postinst $(d_bin)/DEBIAN/postinst + $(install_script) debian/binutils.postrm $(d_bin)/DEBIAN/postrm + $(install_file) debian/binutils.shlibs $(d_bin)/DEBIAN/shlibs + + $(install_dir) $(d_dev)/DEBIAN + +ifeq ($(with_multiarch),yes) + $(install_dir) $(d_mul)/DEBIAN + $(install_script) debian/binutils-multiarch.postinst $(d_mul)/DEBIAN/postinst + $(install_script) debian/binutils-multiarch.postrm $(d_mul)/DEBIAN/postrm + $(install_script) debian/binutils-multiarch.preinst $(d_mul)/DEBIAN/preinst + $(install_file) debian/binutils-multiarch.shlibs $(d_mul)/DEBIAN/shlibs +endif + +ifeq ($(with_gold),yes) + $(install_dir) $(d_gold)/DEBIAN + $(install_script) debian/binutils-gold.postrm $(d_gold)/DEBIAN/postrm + $(install_script) debian/binutils-gold.preinst $(d_gold)/DEBIAN/preinst +endif + +ifeq ($(DEB_HOST_ARCH),hppa) + $(install_dir) $(d_hppa64)/DEBIAN + $(install_script) debian/binutils-hppa64.postinst $(d_hppa64)/DEBIAN/postinst + $(install_script) debian/binutils-hppa64.postrm $(d_hppa64)/DEBIAN/postrm + $(install_file) debian/binutils-hppa64.shlibs $(d_hppa64)/DEBIAN/shlibs +endif +ifneq (,$(filter $(DEB_HOST_ARCH),powerpc ppc64)) + $(install_dir) $(d_spu)/DEBIAN + $(install_script) debian/binutils-spu.postinst $(d_spu)/DEBIAN/postinst + $(install_script) debian/binutils-spu.postrm $(d_spu)/DEBIAN/postrm + $(install_file) debian/binutils-spu.shlibs $(d_spu)/DEBIAN/shlibs +endif + + : # install docs + $(install_dir) $(d_bin)/usr/share/doc/$(p_bin)/ + $(install_file) debian/changelog $(d_bin)/usr/share/doc/$(p_bin)/changelog.Debian + $(install_file) debian/copyright $(d_bin)/usr/share/doc/$(p_bin)/ + + $(install_dir) $(d_dev)/usr/share/doc/ + ln -sf $(p_bin) $(d_dev)/usr/share/doc/$(p_dev) +ifeq ($(with_multiarch),yes) + $(install_dir) $(d_mul)/usr/share/doc/ + ln -sf $(p_bin) $(d_mul)/usr/share/doc/$(p_mul) +endif +ifeq ($(with_gold),yes) + $(install_dir) $(d_gold)/usr/share/doc/ + ln -sf $(p_bin) $(d_gold)/usr/share/doc/$(p_gold) +endif +ifeq ($(DEB_HOST_ARCH),hppa) + $(install_dir) $(d_hppa64)/usr/share/doc/ + ln -sf $(p_bin) $(d_hppa64)/usr/share/doc/$(p_hppa64) +endif +ifneq (,$(filter $(DEB_HOST_ARCH),powerpc ppc64)) + $(install_dir) $(d_spu)/usr/share/doc/ + ln -sf $(p_bin) $(d_spu)/usr/share/doc/$(p_spu) +endif + +ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) +ifeq ($(with_check),yes) + $(install_file) $(pwd)/test-summary $(d_bin)/usr/share/doc/$(p_bin)/ +endif +endif + $(install_file) binutils/NEWS debian/README.cross \ + $(d_bin)/usr/share/doc/$(p_bin)/ + + $(install_file) binutils/ChangeLog $(d_bin)/usr/share/doc/$(p_bin)/changelog + + for pkg in bfd gas gprof ld; do \ + $(install_dir) $(d_bin)/usr/share/doc/$(p_bin)/$$pkg; \ + done + $(install_file) bfd/ChangeLog bfd/PORTING bfd/TODO \ + $(d_bin)/usr/share/doc/$(p_bin)/bfd/ + $(install_file) gas/ChangeLog gas/NEWS $(d_bin)/usr/share/doc/$(p_bin)/gas/ + $(install_file) gprof/ChangeLog gprof/TODO gprof/TEST \ + $(d_bin)/usr/share/doc/$(p_bin)/gprof/ + $(install_file) ld/ChangeLog ld/TODO ld/NEWS \ + $(d_bin)/usr/share/doc/$(p_bin)/ld/ + + : # These only exist in H. J. Lu releases not GNU ones. + for dir in binutils bfd gas gprof ld; do \ + if [ -f $$dir/ChangeLog.linux ]; then \ + $(install_file) $$dir/ChangeLog.linux $(d_bin)/usr/share/doc/$(p_bin)/$$dir/; \ + fi; \ + done + + : # Copy bbconv.pl to the doc dir for use by interested people + $(install_file) gprof/bbconv.pl $(d_bin)/usr/share/doc/$(p_bin)/gprof/. + + : # Compress stuff that needs it + gzip -9 $(d_bin)/usr/share/man/man1/*.1 + find $(d_bin)/usr/share/doc/$(p_bin)/ -type f ! -name copyright -a ! -name bbconv.pl | xargs gzip -9 + + : # Finish it all up + find $(d_bin) -type f | xargs file | grep ELF | cut -d: -f 1 | xargs dpkg-shlibdeps + dpkg-gencontrol -isp -P$(d_bin) -p$(p_bin) $(CONFLICTS) + + rm -f debian/substvars + dpkg-gencontrol -isp -P$(d_dev) -p$(p_dev) + +ifeq ($(with_multiarch),yes) + rm -f debian/substvars + find $(d_mul) -type f | xargs file | grep ELF | cut -d: -f 1 | xargs dpkg-shlibdeps + dpkg-gencontrol -isp -P$(d_mul) -p$(p_mul) +endif + +ifeq ($(with_gold),yes) + rm -f debian/substvars +# find $(d_gold) -type f | xargs file | grep ELF | cut -d: -f 1 | xargs dpkg-shlibdeps + dpkg-gencontrol -isp -P$(d_gold) -p$(p_gold) +endif +ifeq ($(DEB_HOST_ARCH),hppa) + rm -f debian/substvars + find $(d_hppa64) -type f | xargs file | grep ELF | cut -d: -f 1 | xargs dpkg-shlibdeps + dpkg-gencontrol -isp -P$(d_hppa64) -p$(p_hppa64) +endif +ifneq (,$(filter $(DEB_HOST_ARCH),powerpc ppc64)) + rm -f debian/substvars + find $(d_spu) -type f | xargs file | grep ELF | cut -d: -f 1 | xargs dpkg-shlibdeps + dpkg-gencontrol -isp -P$(d_spu) -p$(p_spu) +endif + + chown -R root:root $(d_bin) $(d_dev) + chmod -R go=rX $(d_bin) $(d_dev) + dpkg --build $(d_bin) .. + dpkg --build $(d_dev) .. +ifeq ($(with_multiarch),yes) + chown -R root:root $(d_mul) + chmod -R go=rX $(d_mul) + dpkg --build $(d_mul) .. +endif +ifeq ($(with_gold),yes) + chown -R root:root $(d_gold) + chmod -R go=rX $(d_gold) + dpkg --build $(d_gold) .. +endif +ifeq ($(DEB_HOST_ARCH),hppa) + chown -R root:root $(d_hppa64) + chmod -R go=rX $(d_hppa64) + dpkg --build $(d_hppa64) .. +endif +ifneq (,$(filter $(DEB_HOST_ARCH),powerpc ppc64)) + chown -R root:root $(d_spu) + chmod -R go=rX $(d_spu) + dpkg --build $(d_spu) .. +endif + +################################################################################ + +################# +# cross targets # +################# + +# If $(TARGET) is not set, try reading debian/target +ifeq ($(TARGET),) +TARGET := $(shell cat debian/target 2>/dev/null) +endif + +# Process the following only if $(TARGET) is set +ifneq ($(TARGET),) + +# Support TARGET 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) +ifneq ($(try_convert),) +override TARGET := $(try_convert) +endif + +p_cross = $(subst _,-,binutils-$(TARGET)) +d_cross = debian/$(p_cross) + +ifneq ($(filter sparc-linux-gnu powerpc-linux-gnu mips-linux-gnu, $(TARGET)),) +ADDITIONAL_TARGETS = --enable-targets=$(TARGET:%-linux-gnu=%64-linux-gnu) +endif +ifneq ($(filter i386-linux-gnu i486-linux-gnu i586-linux-gnu x86-linux-gnu, $(TARGET)),) +ADDITIONAL_TARGETS = --enable-targets=x86_64-linux-gnu +endif +ifneq ($(filter i386-kfreebsd-gnu i486-kfreebsd-gnu i586-kfreebsd-gnu x86-kfreebsd-gnu, $(TARGET)),) +ADDITIONAL_TARGETS = --enable-targets=x86_64-linux-gnu +endif +ifeq ($(TARGET), x86_64-linux-gnu) +ADDITIONAL_TARGETS = --enable-targets=i486-linux-gnu +endif +ifeq ($(TARGET), x86_64-kfreebsd-gnu) +ADDITIONAL_TARGETS = --enable-targets=i486-kfreebsd-gnu +endif +ifeq ($(TARGET), mipsel-linux-gnu) +ADDITIONAL_TARGETS = --enable-targets=mips64el-linux-gnu +endif +ifeq ($(TARGET), sparc64-linux-gnu) +ADDITIONAL_TARGETS = --enable-targets=sparc-linux-gnu +endif +ifeq ($(TARGET), s390-linux-gnu) +ADDITIONAL_TARGETS = --enable-targets=s390x-linux-gnu +endif +ifeq ($(TARGET), s390x-linux-gnu) +ADDITIONAL_TARGETS = --enable-targets=s390-linux-gnu +endif + +#----------------------------------------------------------------- +# sysroot options +ifdef WITH_SYSROOT + with_sysroot = $(WITH_SYSROOT) +endif +ifdef WITH_BUILD_SYSROOT + with_build_sysroot = $(WITH_BUILD_SYSROOT) +endif + +ifneq ($(with_sysroot),) + CONFARGS += --with-sysroot=$(with_sysroot) +endif +ifneq ($(with_build_sysroot),) + CONFARGS += --with-build-sysroot=$(with_build_sysroot) +endif + +configure-$(TARGET)-stamp: patch-stamp + $(checkdir) + test "" != "$(TARGET)" + rm -rf configure-$(TARGET)-stamp builddir-$(TARGET) + mkdir builddir-$(TARGET) + cd builddir-$(TARGET) \ + && env CC="$(CC)" CXX="$(CXX)" ../configure --host=$(DEB_HOST_GNU_TYPE) \ + --build=$(DEB_BUILD_GNU_TYPE) --target=$(TARGET) --prefix=/usr \ + $(ADDITIONAL_TARGETS) $(CONFARGS) + touch $@ + +build-$(TARGET)-stamp: configure-$(TARGET)-stamp + $(checkdir) + test "" != "$(TARGET)" + $(MAKE) -C builddir-$(TARGET) $(NJOBS) CFLAGS="$(CFLAGS)" + touch $@ + +install-$(TARGET)-stamp: build-$(TARGET)-stamp + $(checkdir) + test "" != "$(TARGET)" + rm -rf $(d_cross) + $(MAKE) -C builddir-$(TARGET) prefix=$(pwd)/$(d_cross)/usr \ + mandir=$(pwd)/$(d_cross)/usr/share/man \ + infodir=$(pwd)/$(d_cross)/usr/share/info install + rm -rf $(d_cross)/usr/lib* $(d_cross)/usr/share/info $(d_cross)/usr/share/locale +ifeq ($(with_strip),yes) + $(STRIP) $$(file $(d_cross)/usr/bin/* | awk -F: '$$0 !~ /script/ {print $$1}') +endif + gzip -9 $(d_cross)/usr/share/man/man1/* + touch $@ + +binary-cross: checkroot install-$(TARGET)-stamp + $(checkdir) + test "" != "$(TARGET)" + + sed "/^$$/ q" < debian/control > debian/control.$(TARGET) + sed -e "s/__TARGET__/$$(echo -n $(TARGET) | sed s/_/-/g)/" \ + < debian/control.cross.in >> debian/control.$(TARGET) + + $(install_dir) $(d_cross)/DEBIAN + + $(install_dir) $(d_cross)/usr/share/doc/$(p_cross)/ + $(install_file) debian/changelog $(d_cross)/usr/share/doc/$(p_cross)/changelog.Debian + $(install_file) debian/copyright debian/README.cross $(d_cross)/usr/share/doc/$(p_cross)/ + gzip -9f $(d_cross)/usr/share/doc/$(p_cross)/changelog.Debian + + for pkg in bfd gas gprof ld; do \ + ln -sf ../binutils/$$pkg $(d_cross)/usr/share/doc/$(p_cross)/$$pkg; \ + done + + rm -f debian/substvars + dpkg-shlibdeps $(d_cross)/usr/bin/* + dpkg-gencontrol -isp -cdebian/control.$(TARGET) -P$(d_cross) -p$(p_cross) + dpkg --build $(d_cross) .. + +clean-cross: unpatch + $(checkdir) + test "" != "$(TARGET)" + rm -rf $(d_cross) debian/control.$(TARGET) debian/files debian/substvars \ + builddir-$(TARGET) {configure,build,install}-$(TARGET)-stamp + +.PHONY: binary-cross clean-cross + +endif + +################################################################################ + +define checkdir + test -f bfd/elf32.c -a -f debian/rules +endef + +# Below here is fairly generic really + +binary: binary-indep binary-arch + +checkroot: + $(checkdir) + test root = "`whoami`" + +.PHONY: binary binary-arch binary-indep clean checkroot --- binutils-2.20.1.orig/debian/binutils-multiarch.preinst +++ binutils-2.20.1/debian/binutils-multiarch.preinst @@ -0,0 +1,82 @@ +#! /bin/sh + +set -e + +if [ install = "$1" -o upgrade = "$1" ]; then + + for f in size objdump ar strings ranlib objcopy addr2line \ + readelf nm strip gprof; do + dpkg-divert --package binutils-multiarch \ + --add --rename \ + --divert /usr/bin/$f.single /usr/bin/$f + done + + dpkg-divert --package binutils-multiarch \ + --add --rename \ + --divert /usr/lib/libbfd-single.a /usr/lib/libbfd.a + dpkg-divert --package binutils-multiarch \ + --add --rename \ + --divert /usr/lib/libopcodes-single.a /usr/lib/libopcodes.a + + if [ -x /usr/bin/ld.single ]; then + rm -f /usr/bin/ld + dpkg-divert --package binutils-multiarch \ + --remove --rename \ + --divert /usr/bin/ld.single /usr/bin/ld \ + | grep -v '^No diversion' || true + fi + +fi + +# remove obsolete diversions +for f in elf32_sparc elf32ppc elf64alpha elf_i386 m68kelf \ + alpha i386linux m68klinux sparclinux sun4; do + for ext in x xbn xn xr xs xu; do + dpkg-divert --package binutils-multiarch \ + --remove --rename \ + --divert /usr/lib/ldscripts/$f.$ext.single \ + /usr/lib/ldscripts/$f.$ext \ + | grep -v '^No diversion' || true + done +done +dpkg-divert --package binutils-multiarch \ + --remove --rename \ + --divert /usr/lib/libbfd-single-2.9.1.0.15.so.0.0.0 \ + /usr/lib/libbfd-2.9.1.0.15.so.0.0.0 \ + | grep -v '^No diversion' || true +dpkg-divert --package binutils-multiarch \ + --remove --rename \ + --divert /usr/lib/libopcodes-single-2.9.1.0.15.so.0.0.0 \ + /usr/lib/libopcodes-2.9.1.0.15.so.0.0.0 \ + | grep -v '^No diversion' || true +dpkg-divert --package binutils-multiarch \ + --remove --rename \ + --divert /usr/lib/libbfd-single.la \ + /usr/lib/libbfd.la \ + | grep -v '^No diversion' || true +dpkg-divert --package binutils-multiarch \ + --remove --rename \ + --divert /usr/lib/libopcodes-single.la \ + /usr/lib/libopcodes.la \ + | grep -v '^No diversion' || true +dpkg-divert --package binutils-multiarch \ + --remove --rename \ + --divert /usr/include/bfd.single.h /usr/include/bfd.h \ + | grep -v '^No diversion' || true +dpkg-divert --package binutils-multiarch \ + --remove --rename \ + --divert /usr/lib/ldscripts.single /usr/lib/ldscripts \ + | grep -v '^No diversion' || true +if [ -e /usr/bin/c++filt.single ]; then +dpkg-divert --package binutils-multiarch \ + --remove --rename \ + --divert /usr/bin/c++filt.single /usr/bin/c++filt \ + | grep -v '^No diversion' || true +fi + +if [ -e /usr/lib/libbfd-*-multiarch.so.0 ]; then + rm -f libbfd-*-multiarch.so.0; +fi +if [ -e /usr/lib/libopcodes-*-multiarch.so.0 ]; then + rm -f libopcodes-*-multiarch.so.0; +fi --- binutils-2.20.1.orig/debian/binutils-gold.overrides +++ binutils-2.20.1/debian/binutils-gold.overrides @@ -0,0 +1,5 @@ +# don't warn about missing man pages for diverted binaries +binutils-gold binary: binary-without-manpage + +# the API of the shared libs is not public, don't care about the name +binutils-multiarch binary: package-name-doesnt-match-sonames --- binutils-2.20.1.orig/debian/binutils-spu.postrm +++ binutils-2.20.1/debian/binutils-spu.postrm @@ -0,0 +1,7 @@ +#! /bin/sh + +set -e + +if [ "$1" = "remove" ]; then + ldconfig +fi --- binutils-2.20.1.orig/debian/control.cross.in +++ binutils-2.20.1/debian/control.cross.in @@ -0,0 +1,11 @@ +Package: binutils-__TARGET__ +Architecture: any +Depends: binutils, ${shlibs:Depends} +Suggests: binutils-doc (= ${Source-Version}) +Priority: extra +Description: The GNU binary utilities, for __TARGET__ target + This package provides GNU assembler, linker and binary utilities + for __TARGET__ target, for use in a cross-compilation environment. + . + You don't need this package unless you plan to cross-compile programs + for __TARGET__. --- binutils-2.20.1.orig/debian/copyright +++ binutils-2.20.1/debian/copyright @@ -0,0 +1,43 @@ +This is the Debian GNU/Linux prepackaged version of the GNU assembler, +linker, and binary utilities. + +This package was put together by me, James Troup , +from sources, which I obtained from: + + ftp://ftp.gnu.org/pub/gnu/binutils/ + +and: + + cvs://:pserver:anoncvs@sources.redhat.com:/cvs/src + +It was previously maintained by Christopher C. Chimelis + +GNU Binutils is Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, +1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 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. */ + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL' +and `/usr/share/common-licenses/LGPL'. + +The binutils manuals and associated documentation are also Copyright +(C) Free Software Foundation, Inc. They are distributed under the GNU +Free Documentation License Version 1.1 or any later version published +by the Free Software Foundation; with no Invariant Sections, with no +n Debian GNU/Linux systems, the complete text of the GFDL can be found +in `/usr/share/common-licenses/GFDL'. --- binutils-2.20.1.orig/debian/binutils-hppa64.overrides +++ binutils-2.20.1/debian/binutils-hppa64.overrides @@ -0,0 +1,8 @@ +# don't warn about missing man pages for diverted binaries +binutils-hppa64 binary: binary-without-manpage + +# the API of the shared libs is not public, don't care about the name +binutils-hppa64 binary: package-name-doesnt-match-sonames + +# it's a cross toolchain +binutils-hppa64 binary: binary-or-shlib-defines-rpath --- binutils-2.20.1.orig/debian/README.source +++ binutils-2.20.1/debian/README.source @@ -0,0 +1,2 @@ +The package uses dpatch to apply patches on top of the upstream source. +See /usr/share/doc/dpatch/README.source.gz. --- binutils-2.20.1.orig/debian/watch +++ binutils-2.20.1/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://ftp.gnu.org/gnu/binutils/binutils-([\d\.]*).tar.gz --- binutils-2.20.1.orig/debian/binutils-multiarch.overrides +++ binutils-2.20.1/debian/binutils-multiarch.overrides @@ -0,0 +1,10 @@ +# don't warn about missing man pages for diverted binaries +binutils-multiarch binary: binary-without-manpage + +# the API of the shared libs is not public, don't care about the name +binutils-multiarch binary: package-name-doesnt-match-sonames + +# not in binutils-multiarch, just move these away +binutils-multiarch: diversion-for-unknown-file usr/lib/libopcodes.a preinst:19 +binutils-multiarch: diversion-for-unknown-file usr/lib/libbfd.a preinst:16 + --- binutils-2.20.1.orig/debian/binutils-spu.shlibs +++ binutils-2.20.1/debian/binutils-spu.shlibs @@ -0,0 +1,2 @@ +libbfd 2.20.1-spu.20100303 binutils-spu (>= 2.20.1), binutils-spu (<< 2.20.2) +libopcodes 2.20.1-spu.20100303 binutils-spu (>= 2.20.1), binutils-spu (<< 2.20.2) --- binutils-2.20.1.orig/debian/binutils-gold.postrm +++ binutils-2.20.1/debian/binutils-gold.postrm @@ -0,0 +1,10 @@ +#! /bin/sh + +set -e + +if [ "$1" = "remove" -o "$1" = "abort-install" ]; then + dpkg-divert \ + --package binutils-gold \ + --remove --rename \ + --divert /usr/bin/ld.bfd-link /usr/bin/ld +fi --- binutils-2.20.1.orig/debian/binutils-spu.postinst +++ binutils-2.20.1/debian/binutils-spu.postinst @@ -0,0 +1,7 @@ +#! /bin/sh + +set -e + +if [ "$1" = "configure" ]; then + ldconfig +fi --- binutils-2.20.1.orig/debian/binutils-hppa64.shlibs +++ binutils-2.20.1/debian/binutils-hppa64.shlibs @@ -0,0 +1,2 @@ +libbfd 2.20.1-hppa64.20100303 binutils-hppa64 (>= 2.20.1), binutils-hppa64 (<< 2.20.2) +libopcodes 2.20.1-hppa64.20100303 binutils-hppa64 (>= 2.20.1), binutils-hppa64 (<< 2.20.2) --- binutils-2.20.1.orig/debian/binutils-multiarch.postinst +++ binutils-2.20.1/debian/binutils-multiarch.postinst @@ -0,0 +1,7 @@ +#! /bin/sh + +set -e + +if [ "$1" = "configure" ]; then + ldconfig +fi --- binutils-2.20.1.orig/debian/binutils-gold.preinst +++ binutils-2.20.1/debian/binutils-gold.preinst @@ -0,0 +1,21 @@ +#! /bin/sh + +set -e + +if [ install = "$1" -o upgrade = "$1" ]; then + if [ -n "$2" ] && dpkg --compare-versions $2 lt 2.20-3; then + case "$(dpkg-divert --list /usr/bin/ld)" in + *ld.single*) + rm -f /usr/bin/ld + dpkg-divert \ + --package binutils-gold \ + --remove --rename \ + --divert /usr/bin/ld.single /usr/bin/ld + esac + fi + + dpkg-divert \ + --package binutils-gold \ + --add --rename \ + --divert /usr/bin/ld.bfd-link /usr/bin/ld +fi --- binutils-2.20.1.orig/debian/binutils-hppa64.postrm +++ binutils-2.20.1/debian/binutils-hppa64.postrm @@ -0,0 +1,7 @@ +#! /bin/sh + +set -e + +if [ "$1" = "remove" ]; then + ldconfig +fi --- binutils-2.20.1.orig/debian/binutils-multiarch.postrm +++ binutils-2.20.1/debian/binutils-multiarch.postrm @@ -0,0 +1,32 @@ +#! /bin/sh + +set -e + +if [ "$1" = "remove" -o "$1" = "abort-install" ]; then + + for f in size objdump ar strings ranlib objcopy addr2line \ + readelf nm strip gprof; do + dpkg-divert --package binutils-multiarch \ + --remove --rename \ + --divert /usr/bin/$f.single /usr/bin/$f + done + + dpkg-divert --package binutils-multiarch \ + --remove --rename \ + --divert /usr/lib/libbfd-single.a /usr/lib/libbfd.a + dpkg-divert --package binutils-multiarch \ + --remove --rename \ + --divert /usr/lib/libopcodes-single.a /usr/lib/libopcodes.a + +fi + +if [ -e /usr/lib/libbfd-*-multiarch.so.0 ]; then + rm -f /usr/lib/libbfd-*-multiarch.so.0; +fi +if [ -e /usr/lib/libopcodes-*-multiarch.so.0 ]; then + rm -f /usr/lib/libopcodes-*-multiarch.so.0; +fi + +if [ "$1" = "remove" ]; then + ldconfig +fi --- binutils-2.20.1.orig/debian/changelog +++ binutils-2.20.1/debian/changelog @@ -0,0 +1,2992 @@ +binutils (2.20.1-14) unstable; urgency=low + + * Update ARM attribute support for Tag_DIV_use and Tag_MPextension_use. + Closes: #595649. + + -- Matthias Klose Mon, 06 Sep 2010 09:53:50 +0200 + +binutils (2.20.1-13) unstable; urgency=low + + * Fix --no-add-needed with weak symbols (Kirill Smelkov). Closes: #591405. + + -- Matthias Klose Sat, 07 Aug 2010 21:01:40 +0200 + +binutils (2.20.1-12) unstable; urgency=low + + * Mask a few opcodes away if producing code for e500 (Sebastian Andrzej + Siewior). Closes: #586068. + + -- Matthias Klose Sun, 11 Jul 2010 09:01:28 +0200 + +binutils (2.20.1-11) unstable; urgency=medium + + * Fix PR gold/10893, IFUNC support for gold backported from the trunk + (Aurelian Jarno). Closes: #585051. + + -- Matthias Klose Mon, 14 Jun 2010 07:17:13 +0200 + +binutils (2.20.1-10) unstable; urgency=low + + * Drop build dependency on expect-tcl8.3. Closes: #472964. + + -- Matthias Klose Sun, 30 May 2010 12:23:46 +0200 + +binutils (2.20.1-9) unstable; urgency=high + + * [arm] branches to weak symbols, update patch from the trunk. + + -- Matthias Klose Thu, 06 May 2010 15:42:22 +0200 + +binutils (2.20.1-8) unstable; urgency=low + + * [arm] branches to weak symbols, patch taken from the trunk. + + -- Matthias Klose Thu, 29 Apr 2010 20:36:07 +0200 + +binutils (2.20.1-7) unstable; urgency=low + + * Apply proposed patch for ARM: Add option to disable merging of adjacent + exidx unwinder entries. Addresses PR libgcj/40860. + + -- Matthias Klose Tue, 20 Apr 2010 22:51:35 +0000 + +binutils (2.20.1-6) unstable; urgency=low + + * Move the ld.gold binary into the binutils package, just keep the + diversion (ld) in the binutils-gold package. + * Linker selection: ld is used by default, to use the gold linker, + pass -fuse-linker-plugin (no other side effects if -flto/-fwhopr + is not passed). To force ld.bfd or ld.gold, pass -B/usr/lib/compat-ld + for ld.bfd or /usr/lib/gold-ld for ld.gold. + * Disable building gold on arm. Use gold from the trunk, if needed. + * Backport fixups of Loongson2F from the trunk. + + -- Matthias Klose Sat, 17 Apr 2010 18:27:45 +0200 + +binutils (2.20.1-5) unstable; urgency=medium + + * Apply patch for PR gas/11456: Use memcpy to copy overlap memory. + + -- Matthias Klose Fri, 02 Apr 2010 01:36:07 +0200 + +binutils (2.20.1-4) unstable; urgency=low + + * Mangle the soname of the binutils libraries to be different than + the default name. Closes: #557620. + Packaged cross builds should do the same. + * Reduce ARM linking time (backport from the trunk). + * Apply fix for PR ld/11426, taken from the trunk. + + -- Matthias Klose Tue, 30 Mar 2010 22:32:12 +0200 + +binutils (2.20.1-3) unstable; urgency=low + + * binutils-gold: Install the gold binary as `gold' as well, as proposed + by a patch to enable both gold and ld in a single toolchain. + + -- Matthias Klose Sun, 21 Mar 2010 06:43:48 +0100 + +binutils (2.20.1-2) unstable; urgency=low + + * Fix version in debian/*shlibs to match the release version; + the 2.20.1 upstream release identifies as 2.20.1.20100303. + + -- Matthias Klose Mon, 08 Mar 2010 18:01:22 +0100 + +binutils (2.20.1-1) unstable; urgency=low + + * New upstream release. + * Don't set has_ifunc_symbols if the symbol comes from a shared library + (backport from the trunk). + * Don't include documentation files in the -cross packages. + Closes: #571522. LP: #514509. + * Fix typo in ld documentation. LP: #497923. + * Add readelf --unwind support for ARM. + + -- Matthias Klose Mon, 08 Mar 2010 04:47:46 +0100 + +binutils (2.20-6) unstable; urgency=low + + * Apply updates from the 2.20 branch up to 20100205 + - 135_arm_dis_thumb2.dpatch: Remove, applied upstream. + - 136_gold_gnu_debuglink.dpatch: Remove, applied upstream. + * armel: Fix ld-shared/shared.exp and ld-elfvsb/elfvsb.exp failures + (proposed patch, Matthew Gretton-Dann). Closes: #564685. LP: #446478. + * Fix PR other/42602: demangling a global constructors symbol. + Closes: #561150. + + -- Matthias Klose Fri, 05 Feb 2010 20:01:20 +0100 + +binutils (2.20-5) unstable; urgency=low + + * Apply updates from the 2.20 branch up to 20100109 + * Apply patches from the trunk: + - [arm] Prevent disassembler from aborting on an invalid Thumb2 instruction. + - Fix PR gold/11072: Discard .gnu_debuglink sections. Closes: #563366. + - Fix PR ld/11138: internal error when DSO is before object files. + Closes: #562822. + - Fix PR gold/11042: COPY relocs need for the dynamic object. + Closes: #559183. + - Fix PR gold/10916: Fix --exclude-libs with undefined symbol. + Closes: #555012. + - Fix PR gold/10979: gold linker crashes. Closes: #553916. + - Fix PR gas/10740: Intel syntax far jumps broken. Closes: #541535. + + -- Matthias Klose Sat, 09 Jan 2010 10:43:04 +0100 + +binutils (2.20-4) unstable; urgency=low + + * Fix binutils-gold update. Closes: #555734. + * Don't configure gold for spu on powerpc. + + -- Matthias Klose Wed, 11 Nov 2009 23:33:20 +0100 + +binutils (2.20-3) unstable; urgency=low + + * Apply updates from the 2.20 branch up to 20091108: + - Fix PR gold/10876 (closes: #553435), PR gold/10910, PR gold/10860, + PR gold/10880 (closes: #553512, #553436), PR gold/10887, + PR gold/10893, PR gold/10895 (thanks to Peter Fritzsche for tracking + the gold reports). + * Fix libiberty build failure on sh4 (Nobuhiro Iwamatsu). Closes: #550810. + * PR ld/10858: Fix pie on mips/mipsel. Closes: #526961. + * Ignore regressions on sparc; the proper fix is to fix the testcases + for v9. + * Remove the conflict between binutils-multiarch and binutils-gold. + Closes: #521106. + + -- Matthias Klose Tue, 10 Nov 2009 02:15:41 +0100 + +binutils (2.20-2) unstable; urgency=high + + * Apply updates from the 2.20 branch up to 20091028: + - Fix PR binutils/10802, PR binutils/10793, PR binutils/10792, + PR gas/10856. + - Remove local patches now in the branch. + * Ignore regressions on armel when building with gcc-4.4; the proper fix + is to build the testcases using -fno-section-anchors. + + -- Matthias Klose Thu, 29 Oct 2009 22:17:42 +0100 + +binutils (2.20-1) unstable; urgency=low + + * binutils 2.20 final release. + - Fix PR binutils/10785, memory corruptions. + - PR ld/10749, ia64 linker failure. + - PR gas/2117, ia64 assembler fix. + - gold updates. + * Configure with --enable-plugins. Closes: #550088. + * debian/test-suite-compare.py: Don't count untested test cases as + regressions. + * binutils-gold: Install /usr/lib/compat-ld/ld to point to the + old linker. To use the old linker when gold is installed, use + gcc -B/usr/lib/compat-ld/ (including the trailing slash). + + -- Matthias Klose Sat, 17 Oct 2009 12:22:30 +0200 + +binutils (2.19.91.20091006-1) unstable; urgency=low + + * Snapshot, taken from the 2.20 release branch 20091006. + - cfi_sections changes applied. + * debian/*.shlibs: Update to the version from the branch. + * binutils-gold: Build the testsuite as part of the check target + instead of the build target to avoid build failures when the + installed binutils soname is the same as the one which is built + (gas is segfaulting). Just a workaround, not a solution. + * Add 150_gold_copyrelocs.dpatch, add -z copyrelocs option for gold. + * binutils-source: Depend on texinfo, zlib1g-dev. + + -- Matthias Klose Tue, 06 Oct 2009 22:13:24 +0200 + +binutils (2.19.91.20091003-1) unstable; urgency=medium + + * Snapshot, taken from the 2.20 release branch 20091003. + - Fix PR ld/9863, regression in testsuite on armel. + - Fix regressions seen in the GCC/libjava testsuite. + * debian/*.shlibs: Update to the version from the branch. + * No need to build libiberty_pic.a twice. + + -- Matthias Klose Sat, 03 Oct 2009 14:59:14 +0200 + +binutils (2.19.91.20090927-1) unstable; urgency=low + + * Snapshot, taken from the 2.20 release branch 20090927. + * debian/*.shlibs: Update to the version from the branch. + * On mips/mipsel disabled -pie/--pie-executable. Still broken, + see #526961. Add an option --force-pie on mips/mipsel only + for testing purposes. + Change requested by debian-release (Andreas Barth). + + -- Matthias Klose Sun, 27 Sep 2009 11:56:06 +0200 + +binutils (2.19.91.20090923-1) unstable; urgency=medium + + * Snapshot, taken from the 2.20 release branch 20090923 (last upload + was taken from the trunk).. + * debian/*.shlibs: Update to the version from the branch. + + -- Matthias Klose Wed, 23 Sep 2009 09:50:04 +0200 + +binutils (2.19.91.20090922-1) unstable; urgency=low + + * Snapshot, taken from the 2.20 release branch 20090922. + * debian/*.shlibs: Update to the version from the branch. + + -- Matthias Klose Tue, 22 Sep 2009 19:36:50 +0200 + +binutils (2.19.91.20090910-1) unstable; urgency=low + + * Snapshot, taken from the 2.20 release branch 20090910, corresponding + to the 2.19.90 upstream snapshot. + * Fix Thumb-2 shared libraries (Daniel Jacobowitz), patch taken + from the trunk. + + -- Matthias Klose Thu, 10 Sep 2009 17:05:30 +0200 + +binutils (2.19.90.20090909-1) unstable; urgency=low + + * Snapshot, taken from the 2.20 release branch 20090909. + * debian/*.shlibs: Update to the version from the branch. + * Disable build failure for regressions on mips/mipsel. + + -- Matthias Klose Wed, 09 Sep 2009 09:50:36 +0200 + +binutils (2.19.51.20090827-1) unstable; urgency=low + + * Snapshot, taken from the trunk 20090827. + - Fix PR ld/10518: In linker scripts override a "*" match by any other + wildcard match. Closes: #540751. + * debian/*.shlibs: Update to the version from the trunk. Closes: #540800. + * Add sysroot support for cross builds (Hector Oron). Closes: #522480. + * Update long description of binutils-doc. Closes: #428764. + * Tighten build dependency on autoconf. + * Fix some lintian warnings. + + -- Matthias Klose Thu, 27 Aug 2009 17:09:28 +0200 + +binutils (2.19.51.20090805-1) unstable; urgency=low + + * Snapshot, taken from the trunk 20090805. + - Fix PR binutils/10364, strip not failing on unwritable files. + Closes: #276428. + - Fix PR binutils/10363, objdump -T crashing on corrupted file. + Closes: #487963. + * 129_cortex_a8.dpatch: Fix a couple of cortex-a8 erratum bugs. + + -- Matthias Klose Wed, 05 Aug 2009 10:24:40 +0200 + +binutils (2.19.51.20090723-1) unstable; urgency=low + + * Snapshot, taken from the trunk 20090723. + * debian/*.shlibs: Update to the version from the trunk. + * Undo the reversion in the last upload, use the upstream fix instead. + + -- Matthias Klose Thu, 23 Jul 2009 09:39:50 +0200 + +binutils (2.19.51.20090722-2) unstable; urgency=low + + * Apply build-id patch to avoid memory corruption (taken from Fedora). + * Revert ld/ldlang.c rev 1.312. Closes: #537389. + + -- Matthias Klose Wed, 22 Jul 2009 19:19:30 +0200 + +binutils (2.19.51.20090722-1) unstable; urgency=low + + * Snapshot, taken from the trunk 20090722. + * debian/*.shlibs: Update to the version from the trunk. + + -- Matthias Klose Wed, 22 Jul 2009 16:51:11 +0200 + +binutils (2.19.51.20090714-1) unstable; urgency=low + + * Snapshot, taken from the trunk 20090714. + * debian/*.shlibs: Update to the version from the trunk. + * Install a libiberty compiled with -fPIC as libiberty_pic.a. + Closes: #530888. + * Remove obsolete README.Debian. Closes: #324260. + * binutils-dev: Include demangle.h. Closes: #134985. + + -- Matthias Klose Tue, 14 Jul 2009 13:13:37 -0400 + +binutils (2.19.51.20090704-1) unstable; urgency=low + + * Snapshot, taken from the trunk 20090704. + - debian/patches/128_arm_eabi_auto_it.dpatch: Remove, applied upstream. + * debian/*.shlibs: Update to the version from the trunk. + * Bump standards version. + + -- Matthias Klose Sat, 04 Jul 2009 10:37:18 +0200 + +binutils (2.19.51.20090613-1) experimental; urgency=low + + * Snapshot, taken from the trunk 20090613. + * debian/*.shlibs: Update to the version from the trunk. + * Build binutils-gold on armel. + * Apply proposed patch for new option for automatically generating IT blocks. + + -- Matthias Klose Sat, 13 Jun 2009 14:39:41 +0000 + +binutils (2.19.51.20090508-1) experimental; urgency=low + + * Snapshot, taken from the trunk 20090508. + - Fix PR binutils/9743, relocation issues on arm. + * debian/*.shlibs: Update to the version from the trunk. + + -- Matthias Klose Fri, 08 May 2009 11:08:14 +0200 + +binutils (2.19.51.20090419-1) experimental; urgency=low + + * Snapshot, taken from the trunk 20090419. + * debian/*.shlibs: Update to the version from the trunk. + * debian/patches/013_bash_in_ld_testsuite.dpatch: Update. + + -- Matthias Klose Sun, 19 Apr 2009 22:12:19 +0200 + +binutils (2.19.51.20090315-1) experimental; urgency=low + + * Snapshot, taken from the trunk 20090315. + * debian/*.shlibs: Update to the version from the trunk. + + -- Matthias Klose Sun, 15 Mar 2009 11:38:58 +0100 + +binutils (2.19.1-1) unstable; urgency=low + + * Upload to unstable. + * binutils-source: Make .dpatch files executable. + + -- Matthias Klose Sun, 15 Feb 2009 22:46:34 +0100 + +binutils (2.19.1-1~exp1) experimental; urgency=low + + * Binutils 2.19.1 release. + * debian/*.shlibs: Update to the release version. + + -- Matthias Klose Wed, 04 Feb 2009 09:57:55 +0100 + +binutils (2.19.0.20090110-1~exp1) experimental; urgency=low + + * Update to the binutils-2_19-branch 20090110. + - Fix PR binutils/7011. LP: #254790. + * debian/*.shlibs: Update to the version from the branch. + + -- Matthias Klose Sat, 10 Jan 2009 13:56:09 +0100 + +binutils (2.19-1~exp2) experimental; urgency=low + + * debian/patches/129_scale-DW_CFA_advance_loc.dpatch: Scale + DW_CFA_advance_loc[124] output values. + * debian/patches/128_arm_relocs_against_weak.dpatch: Fix R_ARM_THM_CALL + relocations against undefined weak symbols in shared libraries. + + -- Matthias Klose Sun, 30 Nov 2008 13:22:11 +0100 + +binutils (2.19-1~exp1) experimental; urgency=low + + * Binutils 2.19 release. + * debian/*.shlibs: Update to the release version. + * Build binutils-gold on powerpc. + * debian/control: Update to GPL3, reference the GFDL. + * Fail the build if the testsuite shows regressions compared to the + last (installed) build. + * Make lintian more happy. + + -- Matthias Klose Sun, 26 Oct 2008 13:06:27 +0200 + +binutils (2.18.93.20081009-1) experimental; urgency=low + + * Snapshot, taken from the 2.19 branch 20081009 (corresponding to the + 2.18.93 upstream snapshot. + * debian/*.shlibs: Update to the version from the branch. + * Add build dependency on zlib1g-dev. + * In gprof(1), remove references to monitor(3) and profil(2). + Closes: #293948. + + -- Matthias Klose Sat, 11 Oct 2008 16:45:35 +0000 + +binutils (2.18.92.20081003-1) experimental; urgency=low + + * Snapshot, taken from the 2.19 branch 20081003. + * debian/*.shlibs: Update to the version from the trunk. + + -- Matthias Klose Fri, 03 Oct 2008 11:29:16 +0000 + +binutils (2.18.90.20080910-1) experimental; urgency=low + + * Snapshot, taken from the 2.19 branch 20080910. + * debian/*.shlibs: Update to the version from the trunk. + + -- Matthias Klose Fri, 12 Sep 2008 19:23:07 +0200 + +binutils (2.18.50.20080803-1) experimental; urgency=low + + * Snapshot, taken from the trunk 20080803. + * debian/*.shlibs: Update to the version from the trunk. + + -- Matthias Klose Mon, 04 Aug 2008 00:53:47 +0200 + +binutils (2.18.50.20080707-1) experimental; urgency=low + + * Snapshot, taken from the trunk 20080707. + * debian/*.shlibs: Update to the version from the trunk. + * include/safe-ctype.h: Add #include of ctype.h before redefining + the ctype.h macros (proposed for the trunk). + * Add Daniel Jacobowitz as uploader. + + -- Matthias Klose Mon, 07 Jul 2008 01:08:13 +0200 + +binutils (2.18.50.20080610-1) experimental; urgency=low + + * Snapshot, taken from the trunk 20080610. + * debian/*.shlibs: Update to the version from the trunk. + + -- Matthias Klose Tue, 10 Jun 2008 16:21:02 +0200 + +binutils (2.18.50.20080530-1) experimental; urgency=low + + * Snapshot, taken from the trunk 20080530. + * Switch maintainer and uploader. + * debian/rules: Explicitely set SHELL to /bin/bash, build-depend on bash. + * debian/rules: Fix setting of TARGET for cross builds. + + -- Matthias Klose Fri, 30 May 2008 23:49:40 +0200 + +binutils (2.18.50.20080507-1) experimental; urgency=low + + * Snapshot, taken from the trunk 20080507. + * Remove patches applied upstream: 304_pr4476.dpatch, 305_arm-dis.dpatch, + 306_pr4453.dpatch, 307_ld-pic.dpatch, 308_mips-pic.dpatch. + * debian/patches/013_bash_in_ld_testsuite.dpatch: Use bash in the ld + testsuite (some tests have bashisms). + * debian/*.shlibs: Update to the version from the trunk. + * On amd64, i386 and sparc, build a binutils-gold package, + diverting /usr/bin/ld. + * Use expect instead of expect-tcl8.3 on all architectures except hppa. + * Remove binutils and gcc build dependencies (versions are in oldstable). + + -- Matthias Klose Thu, 08 May 2008 00:56:30 +0200 + +binutils (2.18.1~cvs20080103-4) unstable; urgency=medium + + * debian/rules: Remove libiberty in /usr/lib64; workaround for + `gcc -print-multi-os-directory' printing the symlink. + Closes: #473665, #473591. + * Don't include development files in binutils-spu. + * Fix binutils-spu build on ppc64 (Andreas Jochens). Closes: #474116. + * Build libiberty with -fPIC on mips/mipsel (Aurelian Jarno). + + -- Matthias Klose Sat, 05 Apr 2008 11:21:08 +0200 + +binutils (2.18.1~cvs20080103-3) unstable; urgency=low + + [ Arthur Loiret ] + * Build a binutils for spu-elf target on powerpc and ppc64. + - debian/control: Add a binutils-spu package. + - debian/binutils-spu.{postinst,postrm,shlibs}: Add. + * Add sh64-linux-gnu to multiarch targets. + * Fix cross-compilation support. + * Make lintian happier: + - Use ${source:Version}, ${binary:Version} variables. + - Remove -1 from Build-Depends revisions. + - Bump Standards-Version to 3.7.3. + + [ Matthias Klose ] + * Keep the spu elfscripts in bintutils, remove them from binutils-spu. + * debian/patches/307_ld-pic.dpatch: Fix failing ld-shared tests when built + with gcc-4.3. + + -- Matthias Klose Sat, 29 Mar 2008 20:32:35 +0100 + +binutils (2.18.1~cvs20080103-2) unstable; urgency=low + + * debian/patches/306_pr4453.dpatch: Fix PR binutils/4453, taken from + the trunk (Aurelian Jarno). Closes: #363423. + + -- Matthias Klose Fri, 21 Mar 2008 20:49:17 +0100 + +binutils (2.18.1~cvs20080103-1) unstable; urgency=low + + * Update to 20080103 from the binutils-2_18-branch. + - Set version number to 2.18.0 (smaller than the one from the trunk). + - Fix PR ld/5398. Closes: #452725. + * debian/*.shlibs: Update to version from the branch. + * debian/patches/305_arm-dis.dpatch: Fix segfault when disassembling ARM + code. Closes: #438956. + * Support kfreebsd-amd64-gnu and i486-kfreebsd-gnu (Aurilian Jarno): + - debian/patches/127_x86_64_i386_biarch.dpatch: Extend for kfreebsd. + - debian/rules: biarch enabled binutils for kfreebsd-{amd64,i486}-gnu, + kfreebsd-{amd64,i486}-gnu support for cross-builds, + kfreebsd-{amd64,i486}-gnu enabled for binutils-multiarch. + - Closes: #380373. + + -- Matthias Klose Thu, 03 Jan 2008 21:57:51 +0100 + +binutils (2.18.1~cvs20071027-2) unstable; urgency=low + + * Do not include static libraries in the multiarch package. + * Don't include /usr/lib64 in cross packages. Closes: #450429. + + -- Matthias Klose Sat, 24 Nov 2007 12:13:22 +0100 + +binutils (2.18.1~cvs20071027-1) unstable; urgency=low + + * Update to 20071027 from the binutils-2_18-branch. + - Fix PR ld/4988, assertion failures in ld. Closes: #440015. + * debian/*.shlibs: Update to version from the branch. + + -- Matthias Klose Sat, 27 Oct 2007 17:55:41 +0200 + +binutils (2.18-1) unstable; urgency=low + + [ Matthias Klose ] + * New upstream release. + - Remove patches applied upstream: 100_warning_arm, 400_gcc42_fix, + 401_builddoc. + * debian/*.shlibs: Update to release version. + + -- Matthias Klose Wed, 29 Aug 2007 01:07:31 +0200 + +binutils (2.18~cvs20070812-1) unstable; urgency=low + + [ Matthias Klose ] + * New upstream CVS snapshot, taken from the binutils-2_18-branch. + * debian/rules: Support parallel= with comma separated keywords + in DEB_BUILD_OPTIONS. + * debian/rules (clean): Remove stamp files. + * debian/*.shlibs: Update to snapshot version. + * debian/patches/401_builddoc.dpatch: Fix doc build failure on the branch. + + -- Matthias Klose Sun, 12 Aug 2007 10:56:18 +0200 + +binutils (2.17cvs20070804-1) unstable; urgency=low + + [ Matthias Klose ] + * New upstream CVS snapshot. + - PR binutils/4888, fixes objcopy --only-keep-debug. Closes: #435444. + * debian/rules: Support parallel= in DEB_BUILD_OPTIONS (see #209008). + * debian/*.shlibs: Update to snapshot version. + + -- Matthias Klose Sat, 04 Aug 2007 12:45:07 +0200 + +binutils (2.17cvs20070801-1) unstable; urgency=medium + + [ Matthias Klose ] + * New upstream CVS snapshot. + - Fixes objcopy --only-keep-debug on amd64. Closes: #435444. + * binutils-multiarch: Enable the armel-linux-gnu target. Closes: #408805. + + -- Matthias Klose Wed, 01 Aug 2007 18:24:51 +0200 + +binutils (2.17cvs20070718-1) unstable; urgency=low + + [ Matthias Klose ] + * New upstream CVS snapshot. + - Fix build failure on m68k. + * debian/patches/400_gcc42_fix.dpatch: Fix build failure with gcc-4.2. + Closes: #433062. + * Fix cross build failure while stripping binaries. Closes: #432907. + + -- Matthias Klose Wed, 18 Jul 2007 20:25:03 +0200 + +binutils (2.17cvs20070713-1) unstable; urgency=low + + [ Matthias Klose ] + * New upstream CVS snapshot. + - Remove patches applied upstream: 301_pr4436.dpatch, 302_pr4448.dpatch, + 303_pr4454.dpatch, 305_pr4497.dpatch, 306_ld_demangler_segfault.dpatch, + 307_pr4558.dpatch. + - Fix build failure with gcc-4.2. Closes: #429738. + - Fix kernel build with grsecurity patch. Closes: #430041. + * debian/copyright: Include GPL-3. + * debian/rules: Fix version extraction. + * debian/rules: Honor `noopt' in DEB_BUILD_OPTIONS. + + -- Matthias Klose Fri, 13 Jul 2007 14:45:21 +0200 + +binutils (2.17cvs20070426-8) unstable; urgency=low + + * Fix PR gas/4558. + * debian/rules: Add empty NJOBS macro. + + -- Matthias Klose Mon, 28 May 2007 09:06:35 +0000 + +binutils (2.17cvs20070426-7) unstable; urgency=low + + * 306_ld_demangler_segfault.dpatch: new CVS patch from Alan Modra to fix + segfaults in ld seen when building, e.g. openipmi. + + * debian/copyright: update source location and copyright years. + * debian/rules: idem. + + -- James Troup Wed, 23 May 2007 02:19:09 +0100 + +binutils (2.17cvs20070426-6) unstable; urgency=low + + * Fix PR ld/4497, regression introduced with the fix for PR ld/4454. + Closes: #423496. + * Fix binutils/4476, readelf support for --hash-style=gnu. Closes: #421790. + + -- Matthias Klose Mon, 14 May 2007 10:51:40 +0200 + +binutils (2.17cvs20070426-5) unstable; urgency=low + + * Fix PR ld/4454. + + -- Matthias Klose Sun, 06 May 2007 09:50:29 +0200 + +binutils (2.17cvs20070426-4) unstable; urgency=low + + * Fix PR gas/4448, overstrict check for powerpc lswi. Closes: #421799. + + -- Matthias Klose Wed, 2 May 2007 18:26:03 +0200 + +binutils (2.17cvs20070426-3) unstable; urgency=low + + * Update debian/*.shlibs files. Closes: #421454. + * Fix PR gas/4436, wrong reject in powerpc opcode table checks. + Closes: #421455. + * Fix build failure on arm (Aurelian Jarno). Closes: #421365. + * Compare testsuite results of the installed binutils with the built one. + + -- Matthias Klose Mon, 30 Apr 2007 07:47:09 +0200 + +binutils (2.17cvs20070426-2) unstable; urgency=low + + * Fix typo preparing the binutils-hppa64 package. + + -- Matthias Klose Fri, 27 Apr 2007 08:06:49 +0200 + +binutils (2.17cvs20070426-1) unstable; urgency=low + + [ James Troup ] + * New upstream CVS snapshot. + * debian/test-suite-compare.py: simplistic comparator for binutils test + suite runs. + + [ Matthias Klose ] + * Merge changes from the experimental uploads: + * debian/patches/121_i386_x86_64_biarch.dpatch: Remove, applied upstream. + * Build a binutils-source package (containing the patched sources). + * Check for a working expect before building the package. + * Configure the multiarch build for x86_64-linux-gnu instead of + x86_64-linux. + * debian/rules: Don't strip binaries if nostrip is in DEB_BUILD_OPTIONS. + * debian/rules: Don't try to strip shell scripts. + * Configure --with-pkgversion to include the distribution name. + * debian/patches/000_print_debian_version.dpatch: Remove. + * debian/control: Build-depend on lsb-release. + * Enable spu target in powerpc and binutils-multiarch build. + * Don't include embedspu in binutils-multiarch on powerpc. + * debian/control: Set priority for source package to optional. + + -- James Troup Fri, 27 Apr 2007 01:29:57 +0100 + +binutils (2.17-3) unstable; urgency=low + + * debian/rules (configure-multi-stamp): drop i486-kfreebsd-gnu again as + it breaks objdump for i386 on amd64. Closes: #380539 + + -- James Troup Tue, 3 Oct 2006 00:53:17 +0100 + +binutils (2.17-2) unstable; urgency=low + + * The "Laisse le Wookie gagner" release. + + * 127_x86_64_i386_biarch.dpatch: new patch from Aurelien Jarno + to add (/usr)/lib32 to the search paths on + amd64. Closes: #369052 + + * debian/rules (configure-multi-stamp): add i486-kfreebsd-gnu at request + of Aurelien Jarno. Closes: #315306 + + -- James Troup Wed, 26 Jul 2006 20:33:13 +0100 + +binutils (2.17-1) unstable; urgency=low + + * New upstream release. + * 120_mips_xgot_multigot_workaround.dpatch: removed - superseded by a + proper fix upstream. Closes: #274738 + * debian/binutils.shlibs, debian/binutils-multiarch.shlibs, + debian/binutils-hppa64.shlibs: updated SONAME to 2.17. + + -- James Troup Mon, 26 Jun 2006 13:17:36 +0100 + +binutils (2.16.1cvs20060507-1) unstable; urgency=low + + * New upstream CVS snapshot of 'binutils-2_17-branch'. + + * debian/control (Standards-Version): bump to 3.7.2.0. + + -- James Troup Sun, 7 May 2006 19:57:08 +0100 + +binutils (2.16.1cvs20060413-1) unstable; urgency=low + + * New upstream CVS snapshot. + * 120_mips_xgot_multigot_workaround.dpatch: updated to work with CVS + r1.163 of bfd/elfxx-mips.c, pass 'info' instead of 'output_bfd' to + MIPS_ELF_GOT_MAX_SIZE(). + + * Patch from NIIBE Yutaka in #280884: + * debian/rules (configure-multi-stamp): Support m32r-linux. Closes: + #340264 + * debian/rules: Run 'make check' only if build == host. + + * debian/rules: Also don't run 'make check' if nocheck is in + DEB_BUILD_OPTIONS. Based on a patch from Michael Banck + . Closes: #315290 + + * Integrate most of a patch to build arbitrary binutils-$TARGET + cross-packages from #231707. Thanks to Nikita V. Youshchenko + and Josh Triplett . + + * debian/copyright: update to include GFDL. Closes: #81950 + * debian/copyright: update FSF address. + + * debian/rules: move non-architecture specific conflicts (gas, + elf-binutils, modutils (<< 2.4.19-1)) out of a substitued variable and + into the control file. Rename variable to extraConflicts. + * debian/control: likewise. + + -- James Troup Sat, 15 Apr 2006 03:05:41 +0100 + +binutils (2.16.1cvs20060117-1) unstable; urgency=low + + * New upstream CVS snapshot. + + * 118_arm_pass_all.dpatch, 125_fix_tc_arm_cast.dpatch: merged upstream - + removed. + + -- James Troup Wed, 18 Jan 2006 02:25:25 +0000 + +binutils (2.16.1cvs20051214-1) unstable; urgency=low + + * New upstream CVS snapshot. + * Fix ld segfaults on ia64. Closes: #342777 + + * 126_fix_PROVIDE_HIDDEN.dpatch: merged upstream - removed. + + -- James Troup Wed, 14 Dec 2005 08:06:37 +0000 + +binutils (2.16.1cvs20051206-1) unstable; urgency=low + + * New upstream CVS snapshot. + * Fixes linking of qemu. Closes: #340328 + + * 126_fix_PROVIDE_HIDDEN.dpatch: new patch from Thiemo Seufer to fix + handling of hidden symbols which were provided by a linker + script. Closes: #342307 + + * debian/control (Standards-Version): updated to 3.6.2.1. + + -- James Troup Sat, 10 Dec 2005 05:23:34 +0000 + +binutils (2.16.1cvs20051117-1) unstable; urgency=low + + * New upstream CVS snapshot. + * Fixes c++filt's flushing of stdout which broke gcj. Closes: #339287 + + * debian/control (Build-Depends): switch from expect to expect-tcl8.3 + since tcl8.4's broken threading causes the testsuite to fail entirely + on hppa. Closes: #339509 + + -- James Troup Thu, 17 Nov 2005 13:15:15 +0000 + +binutils (2.16.1cvs20051109-1) unstable; urgency=low + + * New upstream CVS snapshot. + * Fixes broken PLT handling on m68k. Closes: #327780 + * Don't compile flex files with -Werror, fixing mips builds. + Closes: #333980 + * Don't check undefined symbols introduced by "ld -u" for TLS. Closes: + #326103 + + * 117_mips_symbolic_link.dpatch: merged upstream - removed. + + * debian/rules: pass --disable-werror on ia64 as current gcc generates + too many false positives. Closes: #336939 + + * 125_fix_tc_arm_cast.dpatch: new patch from Lennert Buytenhek to fix + cast warning and arm builds. Closes: #336175 + + * 121_i386_x86_64_biarch.dpatch: imported from Ubuntu at request of + Daniel Jacobwitz to fix biarch linking on i386/amd64. Closes: + #334626, #334673 + + * debian/rules: remove any reference to pkgstriptranslations - an + Ubuntu-ism that shouldn't have been in the Debian package in the first + place but that isn't needed in Ubuntu any more in any event. + + * debian/rules: MAKEOVERRIDES is now clobbered by the top level + Makefile, so switch to overriding MAKE itself (sic) to pass the + customized VERSION variable/string down to sub-directories for + -multiarch and -hppa64 builds. Thanks to Daniel Silverstone for the + suggestion. + + -- James Troup Fri, 11 Nov 2005 20:38:22 +0000 + +binutils (2.16.1cvs20050902-1) unstable; urgency=low + + * New upstream CVS snapshot. + * Fixes --as-needed on sparc and hppa. Closes: #320697 + * Fixes buffer overflows and other crashes. Closes: #311975 + + * 124_readelf_robustify.dpatch: merged upstream - removed. + * 001_ld_makefile_patch: regenerated with help of wiggle. + + * debian/*.shlibs: update to version 2.16.91. + + * debian/copyright: use canonical GNU URL. Update copyright years. + * debian/rules: update version and copyright. + + * debian/rules (pre-build): not relevant with a CVS snapshot which + doesn't have pre-generated info files - removed. + * debian/rules (clean): don't save info files for the same reason, in + fact explicitly remove them. + * debian/rules (build_stamps): drop pre-build. + + -- James Troup Sat, 3 Sep 2005 00:30:56 +0100 + +binutils (2.16.1-3) unstable; urgency=low + + * debian/rules: remove powerpc libc header hack. + * debian/include/sys/procfs.h: remove. + + * 124_readelf_robustify.dpatch: new patch from Jakub Jelinek to + robustify readelf. Thanks to Thiemo Seufer . + Closes: #318344 + + -- James Troup Wed, 31 Aug 2005 05:03:11 +0100 + +binutils (2.16.1-2) unstable; urgency=low + + * debian/include/sys/procfs.h: Include fixed powerpc libc header, to fix + FTBFS on powerpc. Temporary fix, to be removed with glibc-2.3.5. + + -- Matthias Klose Sun, 10 Jul 2005 16:35:17 +0200 + +binutils (2.16.1-1) unstable; urgency=medium + + * New upstream version. + * debian/patches/117_mips_symbolic_link.dpatch: Updated, apply it again. + (Thiemo Seufer). + * debian/patches/130_bfd_doc_makefile.dpatch: Remove, applied upstream. + * debian/control: Build depend on dpkg-dev (>= 1.13.9), needed to determine + the GNU architecture type. + * The symlinks for the tools change to the the new output of + dpkg-architecture -qDEB_HOST_GNU_TYPE (i.e. i386-linux-ld becomes + i486-linux-gnu-ld). + * Change the values for --enable-targets according to the dpkg-architecture + update. + * Configure the hppa64 cross compiler for hppa64-linux-gnu. Adjust + the hppa64 install target. + * debian/*shlibs: Update to version 2.16.1. + * Make restoring of saved pregenerated info files more robust. + + -- Matthias Klose Sat, 9 Jul 2005 14:58:49 +0200 + +binutils (2.16-1) unstable; urgency=low + + * Update to CVS 2.16 branch 20050612. + * debian/patches/130_bfd_doc_makefile.dpatch: New patch to fix + build failure in bfd/doc. + * debian/watch: New file. + + -- Matthias Klose Sun, 12 Jun 2005 12:29:12 +0200 + +binutils (2.16-0) experimental; urgency=low + + * New upstream release. + - Fixes build failure using gcc-4.0 (closes: #299671). + * debian/patches: + - 000_print_debian_version.dpatch: Updated. + - 001_ld_makefile_patch.dpatch, 002_gprof_profile_arcs.dpatch, + 002_gprof_profile_arcs.dpatch: Regenerated. + - 012_check_ldrunpath_length.dpatch: Updated. + - 112_fix_reloc_sizing.dpatch, 113_elf_backend_hide_symbol.dpatch, + 114_mips_delay_slots_in_branch.dpatch, 115_fix_sparc_fmov.dpatch, + 116_ar_nonexistent_files.dpatch: Removed, applied upstream. + - 117_mips_symbolic_link.dpatch: Disabled. Needs an update. + - 118_arm_pass_all.dpatch: Regenerated. + - 119_fix_gas_double_negative.dpatch: Removed, applied upstream. + - 120_mips_xgot_multigot_workaround.dpatch: Updated. + - 121_ia64_unwind_fixes.dpatch, 122_m68k_undefweak_symbols.dpatch: + Removed, applied upstream. + * Merge Ubuntu changes: + - debian/patches: + - 123_dont_add_to_undefs_twice.dpatch: Removed, applied upstream. + - debian/rules: Call pkgstriptranslations if present. + * debian/rules: + - Fix VERSION extraction. + - Save info files before build and restore them in clean target. + * debian/control: + - Add me as an uploader. + + -- Matthias Klose Fri, 6 May 2005 18:43:09 +0200 + +binutils (2.15-6) unstable; urgency=low + + * 123_bfd_overflow_fix.dpatch: new patch from Alan Modra to fix BFD + overflows. Closes: #308625 + + -- James Troup Sat, 21 May 2005 20:20:01 +0100 + +binutils (2.15-5ubuntu2) hoary; urgency=low + + * debian/rules: Call pkgstriptranslations if present (the package does not + use debhelper, thus it does not happen automatically). + + -- Martin Pitt Fri, 18 Mar 2005 13:07:52 +0000 + +binutils (2.15-5ubuntu1) hoary; urgency=low + + * 123_dont_add_to_undefs_twice.dpatch: new patch from Alan Modra (PR338) to + not add symbols to the undefined list twice, causing an assertion failure + in ld when building the kernel on amd64. + + -- Daniel Stone Tue, 7 Dec 2004 09:29:31 +0100 + +binutils (2.15-5) unstable; urgency=low + + * 121_ia64_unwind_fixes.dpatch: new patch from David Mosberger to fix + unwind related bugs. Closes: #278836 + * 122_m68k_undefweak_symbols: new patch from Andreas Schwab to fix undef + weak symbols with non-default visibilty on m68k. Closes: #278388 + + -- James Troup Thu, 25 Nov 2004 00:13:28 +0000 + +binutils (2.15-4) unstable; urgency=low + + * 120_mips_xgot_multigot_workaround.dpatch: new patch from Thiemo Seufer + to make multigot/xgot handling exclusive and fix mozilla builds on + mipsen. Closes: #272149 + + -- James Troup Thu, 23 Sep 2004 22:44:03 +0100 + +binutils (2.15-3) unstable; urgency=low + + * 112_fix_reloc_sizing.dpatch: update patch based on revised change from + Alan Modra. + + * 116_ar_nonexistent_files.dpatch: new patch from Nick Clifton to fix + ar's handling of non-existent files. Closes: #267139 + + * 117_mips_symbolic_link.dpatch: new patch from Thiemo Seufer to fix the + "final link failed: Bad value" error on mips. Closes: #270619 + + * 118_arm_pass_all.dpatch: new kludge patch to fix broken libtool pass_all + handling on arm and other arches. + + * 119_fix_gas_double_negative.dpatch: new patch from Alan Modra via + Daniel Jacobowitz to fix gas' handling of -- and ++. Closes: #266772 + + -- James Troup Thu, 9 Sep 2004 22:24:08 +0100 + +binutils (2.15-2) unstable; urgency=low + + * 112_fix_reloc_sizing.dpatch: new patch from Daniel Jacobowitz to fix + objcopy relocation sections. Closes: #252719 + + * 113_elf_backend_hide_symbol.dpatch: new patch from Alan Modra to fix + ld internal error on hppa. Closes: #254549 + + * 114_mips_delay_slots_in_branch.dpatch: new patch from Thiemo Seufer to + handle delay slots in branch correctly on mips. Closes: #266660 + + * 115_fix_sparc_fmov.dpatch: new patch from Jakub Jelinek via Dave + Miller to fix bogus fmov* SPARC opcodes. Closes: #267824 + + -- James Troup Tue, 31 Aug 2004 22:45:13 +0100 + +binutils (2.15-1) unstable; urgency=low + + * New upstream release. Closes: #248990, #259458 + * Fixes -Wl,-z,defs to correctly abort builds with unresolved + symbols. Closes: #256481 + * Better error message for truncation of bignums in as. + Closes: #219933 + * strip(1) no longer corrupts binaries for architectures it doesn't + recognise. Closes: #211052 + * nm -C /usr/lib/libcrypto++.a no longer segfaults. Closes: #247917 + + * 105_alpha_rpcc_opcode_fix.dpatch, 106_arm_pic.dpatch, + 107_powerpc_ld_segfault.dpatch, 108_m68k_fmoveml_fix.dpatch, + 109_objcopy_keep_debug.dpatch, 110_hppa64_local_symbols.dpatch, + 111_objcopy_vs_unstripped.dpatch, 906_hjl_libtool_dso.dpatch: merged + upstream - removed. + * 012_check_ldrunpath_length.dpatch: resynced with wiggle(1). + + * debian/binutils.shlibs, debian/binutils-hppa64.shlibs, + debian/binutils-multiarch.shlibs: update for 2.15. + + * debian/rules (install): remove gas.info hack as no longer needed + (fixed properly upstream). + * debian/rules (clean): remove gas/doc/as.info which doesn't seem to be + in the upstream tar ball. + + * debian/rules (binary-arch): install $pkg/ChangeLog.linux only if they + exist (because they don't in GNU releases). + + -- James Troup Thu, 29 Jul 2004 22:44:04 +0100 + +binutils (2.14.90.0.7-8) unstable; urgency=low + + * debian/rules: don't use gcc-2.95 on m68k. Thanks to Adam Conrad for + pointing this out. + + -- James Troup Wed, 19 May 2004 10:35:44 +0100 + +binutils (2.14.90.0.7-7) unstable; urgency=low + + * 111_objcopy_vs_unstripped.dpatch: new patch from Alan Modra via Daniel + Jacobowitz to fix objcopy on unstripped libraries on alpha and arm. + Closes: #234021 + + * debian/control (Build-Depends): remove m68k specific build-depends on + gcc-2.95 and libc6-dev (<< 2.3). Many thanks to Michael Schmitz for + testing this. + + -- James Troup Tue, 30 Mar 2004 18:00:54 +0100 + +binutils (2.14.90.0.7-6) unstable; urgency=low + + * 110_hppa64_local_symbols.dpatch: new patch from Randolph Chung to fix + dynamic name generation of local symbols on hppa64 - needed to build + 64-bit hppa kernels. Closes: #238176 + + -- James Troup Fri, 26 Mar 2004 15:52:27 +0000 + +binutils (2.14.90.0.7-5) unstable; urgency=low + + * 109_objcopy_keep_debug.dpatch: new patch from Daniel Jacobowitz + , objcopy --only-keep-debug and readelf SHT_NOBITS + fixes. + + -- James Troup Mon, 26 Jan 2004 16:25:25 +0000 + +binutils (2.14.90.0.7-4) unstable; urgency=low + + * debian/control: add binutils-hppa64 package. + * debian/rules: add support for binutils-hppa64 package and don't enable + hppa64-linux for binutils or binutils-multiarch. + * debian/binutils-hppa64.postinst: new file. + * debian/binutils-hppa64.postrm: likewise. + * debian/binutils-hppa64.shlibs: likewise. + * Above changes largely based on a patch from Matthias Klose + . Closes: #225892 + + * debian/control (Build-Depends): drop bzip2. + + * debian/rules (install-stamp): remove empty /usr/include directory in + binutils. + * debian/rules (install-stamp): remove /usr/share/info/dir* to + workaround install-info brain damage (cf #213524). + + -- James Troup Thu, 22 Jan 2004 21:32:44 +0000 + +binutils (2.14.90.0.7-3) unstable; urgency=low + + * 108_m68k_fmoveml_fix.dpatch: new patch from H.J. Lu + to fix fmoveml disassembly and associated + testsuite regression on m68k. + + -- James Troup Tue, 18 Nov 2003 14:35:23 +0000 + +binutils (2.14.90.0.7-2) unstable; urgency=low + + * 107_powerpc_ld_segfault.dpatch: new patch from Alan Modra + to fix ld segfault on powerpc. Thanks to + Josselin Mouette for the report. Closes: #219187 + + -- James Troup Wed, 5 Nov 2003 13:32:17 +0000 + +binutils (2.14.90.0.7-1) unstable; urgency=low + + * New upstream release. + * 100_null_owner_ld_fix.dpatch, 101_ppc_as_shf_and_rel_fix.dpatch, + 102_alpha_null_got_ld_fix.dpatch, + 103_static_linking_elf_eh_frame.dpatch, + 104_elf_eh_frame_alpha_fix.dpatch: removed; merged upstream. + * debian/rules: update version number. + * debian/binutils.shlibs: likewise. + * debian/binutils-multiarch.shlibs: likewise. + + * 009_signed_char_fix.dpatch: removed; this was fixed upstream correctly + (http://sources.redhat.com/ml/binutils/2003-05/msg00304.html) and this + patch is breaking that fix. Thanks to Daniel Jacobowitz + . + + * 003_gmon_manpage_fix.dpatch -> 002_gprof_profile_arcs.dpatch. + * 014_gprof_manpage_fix.dpatch -> 003_gprof_see_also_monitor.dpatch. + + * 300_alpha_rpcc_opcode_fix.dpatch -> 105_alpha_rpcc_opcode_fix.dpatch + (committed to trunk). + + * debian/rules (configure-multi-stamp): also enable mips64{el,}-linux + for binutils-multiarch. Alphabetize target list. + + * 106_arm_pic: new patch from Phil Blundell and Daniel + Jacobowitz which implements GC for GOT and PLT relocs + in the elf32-arm backend. + + * debian/rules (install-stamp): work around upstream bug which causes + as.info and as.1 to disappear by explicitly calling "make + install-info-am install-am" in builddir-single/gas/doc. + + -- James Troup Sat, 1 Nov 2003 18:14:04 +0000 + +binutils (2.14.90.0.6-5) unstable; urgency=low + + * 104_elf_eh_frame_alpha_fix.dpatch: new patch from H.J. Lu + to fix regressions on alpha caused by + 103_static_linking_elf_eh_frame. Thanks to Thimo Neubauer + for the original report. Closes: #215636 + + -- James Troup Fri, 17 Oct 2003 00:02:09 +0100 + +binutils (2.14.90.0.6-4) unstable; urgency=low + + * 103_static_linking_elf_eh_frame.dpatch: new patch from H.J. Lu + to fix static linking of C++ binaries. + + * 200_alpha_null_got_ld_fix.dpatch: renamed... + * 102_alpha_null_got_ld_fix.dpatch: to this. + + * debian/rules: patch from Guido Guenther to enable + mips64 support. Closes: #213448 + + -- James Troup Sun, 12 Oct 2003 14:26:26 +0100 + +binutils (2.14.90.0.6-3) unstable; urgency=low + + * 100_null_owner_ld_fix.dpatch: new patch from Alan Modra + to fix an ld crash with null owner sections. + Closes: #212029 + + * debian/rules: don't compile with gcc-2.95 on arm; the only failures + are a) testsuite-only (i.e. don't appear to affect real world + applications) and b) fixed by upcoming gcc patches by Phil Blundell + in any event. + * debian/control (Build-Depends): likewise don't build-depend on + gcc-2.95 for arm. + + * 101_ppc_as_shf_and_rel_fix.dpatch: new patch from Alan Modra + to fix an as regression where it refused to + compile utils.S from Linux/PPC 2.6. Closes: #211668 + + -- James Troup Tue, 23 Sep 2003 01:32:08 +0100 + +binutils (2.14.90.0.6-2) unstable; urgency=low + + * debian/rules (CONFLICTS): remove spurious "--", left over from + debhelper based-rules. Fixes build failure on sparc. + + * 200_alpha_null_got_ld_fix.dpatch: new patch from Daniel Jacobowitz + to fix an ld crash on alpha with null .got sections. + Closes: #204615 + + * scripts/dpkg-arch.mk: remove. + * debian/rules: define DEB_BUILD_GNU_TYPE, DEB_HOST_ARCH and + DEB_HOST_GNU_TYPE here instead. + + * debian/rules (binary-indep): use ':' as a separator to chown, rather + than '.' which is a legal character for a username. + * debian/rules (binary-arch): likewise. + + * debian/rules: further trivial cleanups. + + -- James Troup Thu, 18 Sep 2003 22:13:36 +0100 + +binutils (2.14.90.0.6-1) unstable; urgency=low + + * New "upstream" release. + * Fixes core dump of nm -C on certain object files. Closes: #205616 + + * New maintainer. + * debian/control (Maintainer): adjust accordingly. + * debian/copyright: likewise. Update copyright years, URL. + * debian/control (Standards-Version): bump to 3.6.1.0. + + * 011_disable_combreloc_ARM_ONLY.diff: dropped on request of Phil + Blundell - this is obsolete, it was working around a + bug in ld since fixed by Daniel Jacobowitz upstream. + + * 890-elf64_alpha_segfault.diff: dropped as bogus + (http://sources.redhat.com/ml/binutils/2003-04/msg00399.html); rth's + correct fix is already in the upstream source. + + * debian/README.Debian: migrate nearly-obsolete debconf notes to here. + * debian/control (Depends): drop debconf. + * binutils.config, binutils.templates, binutils.templates.ca, + binutils.templates.fr, binutils.templates.ja, + binutils.templates.pt_BR, postrm.debhelper: obsolete, removed. + Closes: #189641, #198222 + + * Migrated from dbs... + * debian/README.build: obsolete; removed. + * debian/rules: remove $(BUILD_TREE)/, $(STAMP_DIR)/, $(unpacked), $(patched) and other references + to DBS. + * debian/rules (clean): remove build tree directories. + * debian/scripts/dbs-build.mk: unused, remove. + * debian/scripts/file2cat: likewise. + + * ... to dpatch. + * debian/rules: include /usr/share/dpatch/dpatch.make. + * debian/rules (configure-single-stamp): depend on patch-stamp. + * debian/rules (configure-multi-stamp): likewise. + * debian/rules (clean): depend on unpatch. Remove debian/patched. + * debian/control (Build-Depends): add dpatch. + + * binutils-doc.postinst, binutils-doc.prerm, + binutils-multiarch.postinst, binutils-multiarch.postrm, + binutils-multiarch.preinst, binutils-multiarch.shlibs, + binutils.postinst, binutils.postrm, binutils.shlibs: new files based + on .deb and packages.d/. + * scripts/dh_split: obsolete, removed. + * debian/packages.d/binutils-dev.in, debian/packages.d/binutils-doc.in, + debian/packages.d/binutils-multiarch.in, + debian/packages.d/binutils.in: likewise. + + * debian/rules: rewritten, de-debhelper-ized. + * debian/control (Build-Depends): drop debhelper and add file. + + -- James Troup Thu, 11 Sep 2003 22:08:18 +0100 + +binutils (2.14.90.0.5-0.2) unstable; urgency=low + + * NMU. + * Rebuild using fixed gcc on sparc (closes: #202924). + + -- Matthias Klose Mon, 28 Jul 2003 20:12:00 +0200 + +binutils (2.14.90.0.5-0.1) unstable; urgency=low + + * NMU. + * New upstream version. + * Remove patches applied upstream: + - debian/patches/500_s390_gas.diff + - debian/patches/905-hppa_visibility.diff + - debian/patches/906-mips_ld_fix.diff + * Updated patch: + - debian/patches/906-hjl_libtool_dso.diff + + -- Matthias Klose Wed, 23 Jul 2003 20:09:51 +0200 + +binutils (2.14.90.0.4-0.1) unstable; urgency=low + + * NMU + * New upstream version. + 1. Work around the brain dead libtool. + * New patches: + - debian/patches/500_s390_gas.diff (closes: #194929). + - debian/patches/905-hppa_visibility.diff (closes: #195203). + - debian/patches/906-mips_ld_fix.diff (closes: #195207). + - debian/patches/906-hjl_libtool_dso.diff + + -- Matthias Klose Sat, 31 May 2003 12:12:10 +0200 + +binutils (2.14.90.0.3-0.1) unstable; urgency=low + + * NMU + * New upstream version. + 1. Update from binutils 2003 0523. + 2. Fix 2 ELF visibility bugs. + 3. Fix ELF/ppc linker bugs. + * Remove patches applied upstream: + - debian/patches/903-hjl_ld-dso-test.diff + - debian/patches/904_hjl_hppa_whitespace.diff + + -- Matthias Klose Sat, 24 May 2003 09:02:54 +0200 + +binutils (2.14.90.0.2-0.1) unstable; urgency=low + + * NMU + * New upstream version. + 1. Update from binutils 2003 0515. + 2. Fix various ELF visibility bugs. + 3. Fix some ia64 linker bugs. + 4. Add more IAS compatibilities to ia64 assembler. + * New patches: + - debian/patches/903-hjl_ld-dso-test.diff (closes: #193505). + - debian/patches/904_hjl_hppa_whitespace.diff. + * Remove patches applied upstream: + - debian/patches/900_binutils-2.14.90.0.1-empty-test.diff + - debian/patches/901-hjl_weaksymfix.diff + + -- Matthias Klose Sun, 18 May 2003 10:50:00 +0200 + +binutils (2.14.90.0.1-0.1) unstable; urgency=low + + * NMU + * New upstream version. + - Fix: MIPS branch-to-global bug (closes: #189031). + - Fix: Crash on alpha with --gdwarf2 and bad file number (closes: #187211). + - Fix: objdump -R BFD ICE on prelinked binaries (closes: #180088). + * New patches: + - debian/patches/900_binutils-2.14.90.0.1-empty-test.diff + - debian/patches/901-hjl_weaksymfix.diff + * Remove patches applied upstream: + - debian/patches/002_ldlex_inflexible_transition.diff + - debian/patches/013_objdump_doc_fix.diff + - debian/patches/850_hppa_stub_fix.diff + - debian/patches/860_m68k_elf.diff + - debian/patches/861_m68k_elf.diff + - debian/patches/870-sparc64-update.diff + - debian/patches/880-alpha-update.diff + * Remove obsolete patch: + - debian/patches/patches/800_hjl_mips_fixes.diff + * Add x86_64 for the i386 binutils package and the binutils-multiarch + package (closes: #189350). + * Set CFLAGS to -g -O2 for build (closes: #181268). + + -- Matthias Klose Tue, 6 May 2003 09:58:14 +0200 + +binutils (2.13.90.0.18-1.7) unstable; urgency=high + + * NMU + * Fixed ld segv (replaced yy_current_buffer by YY_CURRENT_BUFFER) + (Closes: #188876, 188900, 188912) + + -- Julien LEMOINE Mon, 14 Apr 2003 04:45:03 +0200 + +binutils (2.13.90.0.18-1.6) unstable; urgency=high + + * NMU + * [002_ldlex_inflexible_transition.diff] New. Make ld buildable again with + sid's current flex. + + -- J.H.M. Dassen (Ray) Sun, 13 Apr 2003 16:54:46 +0200 + +binutils (2.13.90.0.18-1.5) unstable; urgency=medium + + * NMU + * [890-elf64_alpha_segfault.diff] Patch from Julien LEMOINE + to fix the segfault encountered while building + gal on alpha. (Closes: #185556) + * sid's current flex breaks the building of several packages, including this + one; see #188665. The i386 upload is built using a pbuilder sid chroot + with flex downgraded to the sarge version. + + -- J.H.M. Dassen (Ray) Sun, 13 Apr 2003 13:44:17 +0200 + +binutils (2.13.90.0.18-1.4) unstable; urgency=low + + * NMU + * ld/emulparams/elf64_sparc.sh: Set LIBPATH_SUFFIX instead of suffix + for emulation. Patch from current CVS suggested by Clint Adams, + needed for sparc64 glibc build. + * bfd/elf64-alpha.c: Patch from current CVS suggested by Falk Hueffner, + needed to build xstow, kdegames (#181623), sfs. + * Explicitely fail, when trying to build with glibc-2.3 on arm and + m68k. See #184048 for m68k ld failures. + + -- Matthias Klose Tue, 8 Apr 2003 23:27:46 +0200 + +binutils (2.13.90.0.18-1.3) unstable; urgency=low + + * NMU + * Another fix for ELF/m68k (__bb_exit_func initialization). + + -- Matthias Klose Tue, 18 Mar 2003 00:05:47 +0100 + +binutils (2.13.90.0.18-1.2) unstable; urgency=high + + * NMU + * Apply upstream fix for ELF/m68k. Closes: #182313. + * Use gcc-2.95 on m68k-linux. Built on testing (glibc-2.2). + + -- Matthias Klose Sun, 9 Mar 2003 01:02:39 +0100 + +binutils (2.13.90.0.18-1.1) unstable; urgency=low + + * NMU + * Apply upstream fix for hppa stubs. Closes: #181397 + + -- LaMont Jones Wed, 19 Feb 2003 12:34:58 -0700 + +binutils (2.13.90.0.18-1) unstable; urgency=low + + * New upstream version (synced with CVS 2002-01-21) + * Upstream: Fix an ia64 gas bug + * Upstream: Fix some TLS bugs + * Upstream: Fix ELF/ppc bugs + * Upstream: Fix an ELF/m68k bug + * Corrected ARM combreloc disabling patch + (closes: Bug#175204) + * Upstream fixes take care of TEXTREL bug + on powerpc (closes: Bug#176084) + * Fixed shellutils dependency problem + (closes: Bug#175673) + * Removed mention of the monitor manpage + from the gprof manpage (closes: Bug#160654) + + -- Christopher C. Chimelis Sun, 2 Feb 2003 23:17:29 -0500 + +binutils (2.13.90.0.16-1) unstable; urgency=low + + * New upstream version (synced with CVS 2002-11-26) + * Upstream: Include /usr/bin/c++filt + * Upstream: Fix "ld -r" with exception handling + + -- Christopher C. Chimelis Mon, 9 Dec 2002 19:14:02 -0500 + +binutils (2.13.90.0.14-1) unstable; urgency=low + + * New upstream version (synced with CVS 2002-11-14) + * Upstream: Fix ELF/alpha bugs + * Upstream: Fix an ELF/i386 assembler bug + * Updated package MIPS patch from HJ Lu + * Added s390 patches from Gerhard Tonn. + Actually, the patches to support s390x were + already included upstream, so I just enabled + it in the rules script (closes: Bug#168074, Bug#168974) + * Since powerpc64-linux support was already + added in a prior upload, I'm closing the + wishlist bug for it (closes: Bug#156955) + + -- Christopher C. Chimelis Tue, 20 Nov 2002 05:36:21 -0500 + +binutils (2.13.90.0.10-2) unstable; urgency=low + + * Added two patches from upstream to fix alpha BFD. + (closes: Bug#165633) + + -- Christopher C. Chimelis Sun, 27 Oct 2002 14:21:51 -0400 + +binutils (2.13.90.0.10-1) unstable; urgency=low + + * New upstream version (synced with CVS 2002-10-10) + * Upstream: More ELF/PPC linker bug fixes. + * Upstream: Fix an ELF/alpha linker bug. + * Upstream: Fix an ELF/sparc linker bug to support + Solaris. + * Upstream: More TLS updates. + * Updated m68k gcc 3.1 patch since it wasn't applying + cleanly. Is this still needed? + * Added patches to allow building with new bison + (closes: Bug#164436, Bug#164042) + * Should be better for prelink support, which is coming + soon (closes: Bug#161427) + * Removed windres manpage from all packages + (closes: Bug#157415) + * Fixed download location in copyright file + (closes: Bug#158028) + * Added i386-gnu to multiarch build targets + (closes: Bug#157057) + * Add alpha opcode patch from Falk Hueffner + (closes: Bug#164201) + * Remove .la files from packages + (closes: Bug#160455) + + -- Christopher C. Chimelis Mon, 15 Oct 2002 20:22:29 -0400 + +binutils (2.13.90.0.4-1) unstable; urgency=low + + * New upstream version (synced with CVS 2002-08-) + * Upstream: Update from binutils 2002 0814 + * Upstream: Fix symbol versioning bugs for gcc 3.2 + * Upstream: Fix mips gas + * Upstream: Fix an x86 TLS bfd bug + * Upstream: Fix an x86 PIC gas bug + + -- Christopher C. Chimelis Thu, 15 Aug 2002 20:13:44 -0400 + +binutils (2.12.90.0.15-2) unstable; urgency=low + + * Fix combreloc disabling patch for ARM + (closes: Bug#156315) + * Remove S390 patch since it is no longer + needed (thanks to Gerhard Tonn for checking + this out) + * Fix BFD version string escaping + (closes: Bug#154989) + * Add SH patch from Yaegashi Takeshi + (closes: Bug#156230) + * Added conflicts for older modutils + (closes: Bug#155324) + * Forgot to apply MIPS patch from HJ Lu + (apologies to MIPS folks) + + -- Christopher C. Chimelis Wed, 14 Aug 2002 13:09:12 -0400 + +binutils (2.12.90.0.15-1) unstable; urgency=low + + * New upstream version (synced with CVS 2002-07-17) + * Upstream: Fix an ia64 assembler bug + * Upstream: Fix a symbol versioning bug + * Upstream: You have to apply the modutils patch + enclosed here in order to support System.map + generated by the new nm (bug filed) + * The symbol visibility patch is included + upstream, as is the alpha PLT/GOT patch, so + both removed from my packaging. + * Included patch from upstream to fix RELA targets + (closes: Bug#153729) + + -- Christopher C. Chimelis Thu, 2 Aug 2002 02:24:29 -0400 + +binutils (2.12.90.0.14-2) unstable; urgency=low + + * The "Let's Get This Party Started Right" upload + (since I'm closing as many old bugs as possible) + * Removed sparc patch altogether + * Added a small alpha patch from upstream to fix + some obscure PLT/GOT issues. + * Manpages are now fixed finally -- no more + I (closes: Bug#108369) + * Have not gotten another report of the + debconf message being cut off, so I'm closing + the debconf-related bug. I suspect this may + have been a problem in the debconf front-end + being used, but I have not been able to reproduce + it (closes: Bug#149045) + * Closing a bug report that I had tagged moreinfo + a LONG time ago (over one year), but never got + more info on. I have not heard of this kind + of problem since, nor have I been able to + reproduce it at any time since (closes: Bug#105986). + For interested parties, it revolved around + allowing gcc to show a linker error, but the + reporter didn't know about the -v option for + gcc. There was a linker problem, but it appeared + to be either hardware failure or user error. + * Closing a demangler 'bug' that revolved around + stripping @PLT from symbol names. Since the + PLT suffix is documented, I'm going to close + this bug. Also, it doesn't help that the symbol + in the bug report uses an obsolete mangling style, + so I can't test this even if I wanted to + (closes: Bug#45889) + + -- Christopher C. Chimelis Mon, 22 Jul 2002 12:54:01 -0400 + +binutils (2.12.90.0.14-1) unstable; urgency=low + + * New upstream version (synced with CVS 2002-06-27) + * Upstream: Fix a mips assembler bug + * Upstream: Fix an ELF/mips SHF_MERGE bug + * Upstream: Fix a linker bug which leads to the + incorrect Linux 2.2 kernel. + * PE patch removed since it is included + in upstream source now + * Includes some patches which allow for + more true testsuite results from gcc-3.1 + * Fix sparc ld emulation script patches to get + rid of the lib/64 silliness (now uses lib64) + * Removed the L word from the package description + since Debian is no longer linux-only + (closes: Bug#150575) + * The strings dereferencing problem with + some Windows binaries seems to also be fixed now + (closes: Bug#121366) + * Added a patch to only generate an RPATH entry + if LD_RUN_PATH is not empty, for cases where + -rpath isn't specified (closes: Bug#151024) + * Fixed arch detection problem in the build + scripts. + * Fixed bad capitalisation of -g in the objdump + manpage (closes: Bug#152697) + * Added patch from HJ Lu to fix a symbol + visibility issue. + + -- Christopher C. Chimelis Wed, 17 Jul 2002 14:23:42 -0400 + +binutils (2.12.90.0.9-1) unstable; urgency=low + + * New upstream version (synced with CVS 2002-05-26). + * Upstream: Supports "-z muldefs" + * Updated PE bfd from CVS to fix auto-import + segfaults (closes: Bug#131407) + * Remove the PE-removing patch for i386 targets + due to the above + + -- Christopher C. Chimelis Thu, 6 Jun 2002 15:52:29 -0400 + +binutils (2.12.90.0.7-1) unstable; urgency=low + + * New upstream version (synced with CVS 2002-04-23). + * Upstream: ELF EH frame bug fix + * Upstream: MIPS ELF visibility bug fix + * Upstream: Bug fixes for ELF/sparc + * Upstream: Bug fixes for ELF/cris + * Upstream: Fix linking a.out relocatable files + with ELF + * Upstream: Fix a PPC altivec assembler bug + * Numerous upstream changes since I have + deliberately not updated in awhile so that + I could stabilise the package for woody + release + * Fixed a glaring typo in the Debian additions + to the version string. + * Upstream incorporated --oformat + documentation patch; removed. + * Added a patch from upstream involving + relative relocs on Alpha + * Removed configure.info-[1-3] from -doc + (closes: Bug#146205) + + -- Christopher C. Chimelis Sun, 5 Apr 2002 04:52:33 -0400 + +binutils (2.12.90.0.1-5) unstable; urgency=high + + * Added a patch to m68k bits for gas to allow + gcc 3.1 to build + * Added Brazilian Portuguese translation for + debconf (closes: Bug#144677) + * Removed unneeded gasp manpage since gasp + was eliminated as a distinct binary + (closes: Bug#144583) + + -- Christopher C. Chimelis Mon, 29 Apr 2002 14:40:21 -0400 + +binutils (2.12.90.0.1-4) unstable; urgency=low + + * Added patch from Gerhardt Tonn + to fix s390 merge problem (closes: Bug#143187) + * Corrected DOW of my last changelog entry :-P + + -- Christopher C. Chimelis Thu, 18 Apr 2002 13:03:49 -0400 + +binutils (2.12.90.0.1-3) unstable; urgency=low + + * Oops...I used dpkg-architecture from dpkg-dev + in the postinst and didn't add a dependency + for it. It was a bad choice anyway and I'm + going to use uname -s instead + (closes: Bug#142744, Bug#142915) + + -- Christopher C. Chimelis Mon, 15 Apr 2002 12:41:10 -0400 + +binutils (2.12.90.0.1-2) unstable; urgency=low + + * Added Catalan debconf translation + (closes: Bug#139740) + * Ensure that info entries are removed from the + texinfo dirfile when binutils-doc is removed + (closes: Bug#126557) + * Ensure that the kernel link debconf warning + only shows up on linux systems + (closes: Bug#142360) + + -- Christopher C. Chimelis Thu, 13 Mar 2002 01:30:22 -0400 + +binutils (2.12.90.0.1-1) unstable; urgency=high + + * New upstream version (synced with CVS 2002-03-07). + * Upstream: Add the .preinit_array/.init_array/.fini_array + support. + * Upstream: Fix eh_frame. + * Upstream: Turn on combreloc by default. + * Upstream: Enable gprof for Linux/mips. + * Turn combreloc off for ARM explicitly until + I can confirm that PIC is not still broken + by using it. + * Remove IA-64 unwind patch and objcopy fix + since they are included in the upstream sources + now. + * Re-enable testsuite run since Randolph did the NMU + on dejagnu (thank you!). + * Appears to fix sparc64 linking problems. I'm + still looking into exactly what was going on with + that (closes: Bug#137850) + * Enabled hppa64-linux support in main binutils + package (closes: Bug#137955) + * Added Japanese debconf template. Thanks to + Tomohiro KUBOTA for supplying that + (closes: Bug#138112) + * Added patch for ld to fix dosemu problems + (closes: Bug#126863) + + -- Christopher C. Chimelis Mon, 11 Mar 2002 14:02:45 -0500 + +binutils (2.11.93.0.2-3) unstable; urgency=high + + * Split translated debconf templates out. + I apparently misunderstood the instructions + on integrating the French translation since + this is my first real attempt at using + debconf (closes: Bug#136295) + * Disable combreloc default on ARM since it + breaks PIC, apparently (closes: Bug#134241) + Please test other ARM bugs against this + version and inform me of the results! + + -- Christopher C. Chimelis Fri, 8 Mar 2002 19:10:10 -0500 + +binutils (2.11.93.0.2-2) unstable; urgency=high + + * Include a patch from upstream to fix stripping + archives containing multiple files with the + same name (like libgcj, unfortunately). + (closes: Bug#107812) + * Include IA64 unwind fix from CVS to fix kernel + linking on IA64. (closes: Bug#135143) + * Added French translation of the debconf + bits. Thanks to Denis Barbier for the + work on that. (closes: Bug#134626) + * Disabled testsuite run until dejagnu is + fixed. I'm leaving the build-dep for dejagnu + in, though, since I know I'll forget to + reinsert it when I do re-enable the testsuite + run. + + -- Christopher C. Chimelis Fri, 22 Feb 2002 14:05:22 -0500 + +binutils (2.11.93.0.2-1) unstable; urgency=high + + * New upstream version (synced with CVS 2002-02-07). + * Upstream: Fix a weak symbol alpha linker bug for glibc. + * Upstream: More support for gcc 3.1. + * Keep on disabling efi-app-ia32 type targets + since the segfault is still unfixed in CVS and + I haven't had the time to go back and really + debug and fix this. + * Updated standards version. + * Corrected some of the lintian problems (all except + the ones involving Changelog.linux, the .comment + section, and the missing manpages for + binutils-multiarch's binaries since that package + depends on binutils, which provides those). + + -- Christopher C. Chimelis Wed, 13 Feb 2002 13:41:47 -0500 + +binutils (2.11.92.0.12.3-7) unstable; urgency=high + + * The "Remind Me To Think Next Time" upload. + * Fix the postinst to only compare versions on + upgrade rather than during configure. + (closes: Bug#133349, Bug#133514) + * Still working on the other bugs...if only + I could get a day off of work... + + -- Christopher C. Chimelis Tue, 12 Feb 2002 06:15:02 -0500 + +binutils (2.11.92.0.12.3-6) unstable; urgency=high + + * The "Make The Bad Man Stop" upload. + * Revert patch to bfd/elf32-sparc.c (already + reverted upstream) that broke UA32 relocs on sparc + and caused bus errors with C++/Java binaries + (closes: Bug#126162) + * Remove i486-mingw32 target from the enabled + in multiarch and removed efi-app-ia32 from the + BFD config for Intel linux targets until I can find + and fixthe segfaults that seem to keep coming up when + reading Windows files and viruses with objdump or + strings. This is only temporary, so I'm not closing + the bugs until the problem gets fixed, but + I am going to bump them down to wishlist, merge + them, and note the above in them. + (debian/patches/010_disable_efi_app_ia32_TEMPORARY.diff + disables the efi-app-ia32 BFD in case someone + wants to revert this change easily) + * Added debconf warning about the kernel linking + situation since it keeps coming up and people + keep initially disagreeing with me about this + being a kernel bug. Also, merged prior warning + about -oformat change into the same debconf warning + (it's two, two, two warnings in one). This makes + the DEBIAN_FRONTEND case bug moot (closes: Bug#131801) + * Added powerpc64-linux target to multiarch since + work is progressing on that target and the machines + are due to hit the shelves Very Soon(TM). + + -- Christopher C. Chimelis Fri, 1 Feb 2002 17:06:29 -0500 + +binutils (2.11.92.0.12.3-5) unstable; urgency=high + + * Fix signed char assumption in i386 disassembly bits + (closes: Bug#126993) + + -- Christopher C. Chimelis Mon, 8 Jan 2002 17:27:17 -0500 + +binutils (2.11.92.0.12.3-4) unstable; urgency=high + + * Go back to enabling archs by enumeration for + multiarch. Apparently, a few aren't enabled + with --enable-targets=all (sparc64-linux, namely). + Besides, multiarch was incredibly large, which + was probably unneeded. + + -- Christopher C. Chimelis Wed, 26 Dec 2001 13:53:49 -0500 + +binutils (2.11.92.0.12.3-3) unstable; urgency=high + + * Include patch from Alan Modra to fix more + refcount problems on hppa. + + -- Christopher C. Chimelis Fri, 7 Dec 2001 05:42:04 -0500 + +binutils (2.11.92.0.12.3-2) unstable; urgency=high + + * Include patch from Alan Modra to fix hppa linking + woes wrt undefined symbols (closes: Bug#121993) + + -- Christopher C. Chimelis Wed, 5 Dec 2001 04:14:51 -0500 + +binutils (2.11.92.0.12.3-1) unstable; urgency=high + + * New upstream version (synced with CVS 2001-11-21) + * Upstream: Fix a linker symbol version bug + for common symbols. + * Upstream: Update handling relocations against + the discarded sections. You may need to apply + the kernel patch enclosed here to your kernel + source. + * Upstream: Support "-march=xxx -mipsN" for mips + gas if they are compatible. + * Upstream: Fix a regression when linking with + non-ELF object files. + * Includes Alan Modra's patch to reduce stub sizes + on HPPA. Should help C++ on HPPA. + * Once again includes a mips patch from HJ Lu. + * My documentation changes were cleaned up and + accepted upstream, so the gas manpage fixes go + away (hurray!). + * Stopped iterating targets for binutils-multiarch + and started enabling all of them. This saves + maintenance time since new targets will be + automatically supported in future uploads + and existing targets that I didn't include + before will be supported from now on. This may + grow build time and the libbfd in the multiarch + package, but it's worth it. + * Also, started using the --enable-64-bit-bfd + flag for configuring multiarch. I don't know + why I didn't realise this wasn't there before + since I test with it all of the time. + + -- Christopher C. Chimelis Fri, 30 Nov 2001 20:11:42 -0500 + +binutils (2.11.92.0.10-4) unstable; urgency=high + + * The "Fingers crossed" upload. + * Enable combreloc by default for s390 again. + Rumour has it that it worked before, but there + was a misunderstanding in the s390 developer + community, hence the disabling in the past. + * Fix the ld texinfo file to not mention the old + oformat invocation (closes: Bug#116182) + * Next upload should include the mips updates and + some powerpc updates. I just need time to test + those out first. + + -- Christopher C. Chimelis Fri, 23 Nov 2001 23:23:22 -0500 + +binutils (2.11.92.0.10-3) unstable; urgency=high + + * Replace HPPA reloc patch with patches from Alan + Modra upstream. + * Add upstream patch to fix quoted -rpath bug + (closes: Bug#107214) + + -- Christopher C. Chimelis Sat, 10 Nov 2001 18:19:05 -0400 + +binutils (2.11.92.0.10-2) unstable; urgency=high + + * Disable -z combreloc enable patch on S/390 + since it's not supported there yet + (closes: Bug#117087) + + -- Christopher C. Chimelis Fri, 26 Oct 2001 00:07:01 -0400 + +binutils (2.11.92.0.10-1) unstable; urgency=high + + * New upstream version (synced with CVS 2001-10-21) + * Upstream: Fix the ELF/PPC linker. + * Upstream: Fix the ELF/cris linker. + * Upstream: Fix ELF strip. + * Includes beginnings of Altivec support + (closes: Bug#98617) + * Fixes use of BookE instruction format on 4xx + PowerPC (closes: Bug#116627) + * Includes patches from Alan Modra to fix hppa + relocations. + * Forgot to close the previous PPC bug with last + upload (closes: Bug#116454) + * Moved to enclosing a bzipped tarball rather than + a gzipped one to save download time for everyone + involved. Build-deps adjusted accordingly. + + -- Christopher C. Chimelis Tue, 23 Oct 2001 03:29:49 -0400 + +binutils (2.11.92.0.7-2) unstable; urgency=high + + * Include a patch from H.J Lu to fix a powerpc + issue not shown in the testsuite results. + + -- Christopher C. Chimelis Fri, 19 Oct 2001 00:49:04 -0400 + +binutils (2.11.92.0.7-1) unstable; urgency=high + + * New upstream release (synced with CVS 2001-10-16) + * Upstream: Fix all breakages introduced in 2.11.92.0.5 + * No mips/ dir patches need to be applied with this one. + Woohoo! + * Removed patches from debian/patches that are already + applied upstream. + * Patched version strings to reflect that this is a + Debian release at the request of upstream (to prevent + confusion, apparently). + * Applied patch from H.J. Lu to fix mips section + misalignment. + * Applied patch from Jakub Jelinek to fix kernel linking + on i386 and possibly other archs (closes: Bug#116041) + * Fixed postinst and prerm for binutils-doc to test that + the files exist before calling install-info. This should + fix the odd circumstance when binutils-doc is packaged on + an arch that doesn't support gprof (or any other dir for + that matter) and, therefore, the docs that are usually + made in that dir aren't made. This is particularly true + with gprof on mips. + + -- Christopher C. Chimelis Wed, 17 Oct 2001 18:56:51 -0400 + +binutils (2.11.92.0.5-3) unstable; urgency=high + + * Enable -z combreloc on all targets. This will make + prelinking possible with the prelink package. Please + test this on all archs prior to upload. If it fails, file + a bug immediately and I'll disable the patch for that + platform. + * Added patches from Alan Modra (from CVS) to fix other + archs after the refcount patch broke them. This supercedes + the powerpc patch, so I replaced that with this. + (closes: Bug#115218) + * Added patch from H.J. Lu (from CVS) to fix IA64 linker + problems as well. + * Added patch from David Kimdon to specify which filename is + causing an error if that filename is a dir (closes: Bug#45832). + * Removed workaround patch for stabs problem on Alpha since + it appears to be causing problems on mips and is no longer + needed on Alpha anyway. + * Now runs the testsuite and includes the results in the + binutils package for reference. + + -- Christopher C. Chimelis Sat, 13 Oct 2001 15:10:20 -0400 + +binutils (2.11.92.0.5-2) unstable; urgency=high + + * Applied fix from H.J. Lu to fix PowerPC target + (closes: Bug#115285). Thanks to Jack Howarth + for forcing the issue upstream. + + -- Christopher C. Chimelis Fri, 12 Oct 2001 23:14:51 -0400 + +binutils (2.11.92.0.5-1) unstable; urgency=high + + * New upstream release (synced with CVS 2001-10-05) + * Upstream: Support gcc 3.1 for IA64. + * Upstream: Support prelink for ELF/PPC. + * Upstream: Fix an ELF/x86 linker bug for Oracle + (closes: Bug#113614) + * Upstream: Fix a weak symbol bug. + * Upstream: Support locale. + + -- Christopher C. Chimelis Tue, 9 Oct 2001 19:53:49 -0400 + +binutils (2.11.90.0.31-2) unstable; urgency=high + + * Applied IA64 patch from CVS to fix gcc issues + on IA64. + + -- Christopher C. Chimelis Mon, 24 Sep 2001 12:45:29 -0400 + +binutils (2.11.90.0.31-1) unstable; urgency=high + + * New upstream source (synced with CVS 2001-08-30) + * Upstream: Fix a MIPS linker bug. + * Now applying mips diffs from H.J. Lu (upstream) + for better MIPS and MIPS64 support. + * Applied patch from Christopher Cramer to fix + gasp .REG issue (closes: Bug#110560) + + -- Christopher C. Chimelis Sat, 1 Sep 2001 23:42:22 -0400 + +binutils (2.11.90.0.29-1) unstable; urgency=high + + * New upstream source (synced with CVS 2001-08-27) + * Upstream: Fix an Alpha assembler bug. + * Upstream: Fix an IA64 linker bug. + * Upstream: Fix a MIPS linker bug. + * Upstream: Support '-z combreloc|nocombreloc' in linker. + + -- Christopher C. Chimelis Thu, 30 Aug 2001 04:48:04 -0400 + +binutils (2.11.90.0.27-4) unstable; urgency=high + + * Argh. Really remove the manpages from multiarch + this time (closes: Bug#110410) + + -- Christopher C. Chimelis Tue, 28 Aug 2001 14:32:34 -0400 + +binutils (2.11.90.0.27-3) unstable; urgency=high + + * Include hppa patch to force error + (closes: Bug#109173) + * Fix manpages - seems that I accidentally included + the multiarch manpages rather than the target + manpages (sorry). + * Partial update to as manpage to denote arch options + and added options for the rest of the targets + Still need to elaborate on them, though. More + changes are forthcoming (closes: Bug#110127) + + -- Christopher C. Chimelis Mon, 27 Aug 2001 10:13:27 -0400 + +binutils (2.11.90.0.27-2) unstable; urgency=high + + * Remove bash dependency...ash's behaviour has + already been modified, so it should be able + to build binutils now (closes: Bug#106992) + * Includes new S/390 patch (closes: Bug#109300) + * Could never reproduce objdump segfault and + never got a reply on the bug report + (closes: Bug#93884) + * Can't reproduce m68k segfault either + (closes: Bug#87714) + + -- Christopher C. Chimelis Mon, 20 Aug 2001 23:07:30 -0400 + +binutils (2.11.90.0.27-1) unstable; urgency=high + + * New upstream source (synced with 20010810 CVS) + * Upstream: Fixed x86 linker bug. + * Reverted a patch to gas to dodge a bug in STABS output + on Alpha using gcc 2.95.4, so alpha can be in sync + with the rest of the archs now. + * Fixes strip problems with busybox (closes: Bug#106593) + * Kernels should compile ok again on i386 + (closes: Bug#107190) + + -- Christopher C. Chimelis Thu, 16 Aug 2001 08:24:49 -0400 + +binutils (2.11.90.0.25-1) unstable; urgency=high + + * New upstream source (synced with 20010726 CVS) + * Upstream: fix i386 assembler bug. + * Upstream: "make check" has 2 failures in the + ld-selective test in ld on Linux/alpha. They + should be marked xfail. Fixed in the next release. + * Removed m68k patch (closes: Bug#106431) + * Man pages appear to be correctly generated now + (closes: Bug#98569, Bug# 98938) + * Added bash build dependency (closes: Bug#106992) + * Should compile ok on powerpc (the last one did + also...don't know why voltaire's build daemon failed). + I won't close this bug until I build it myself + on voltaire or hear back from the autobuilder folks + on PPC. + * Looking into the whole LD_LIBRARY_PATH issue that + keeps being brought up. I think the docs are wrong + because the templates say that it shouldn't obey that + at all. Can we please stop filing duplicate bugs for + this? I would greatly appreciate it... + + -- Christopher C. Chimelis Wed, 1 Aug 2001 07:06:52 -0400 + +binutils (2.11.90.0.24-1) unstable; urgency=high + + * New upstream source (synced with 20010714 CVS) + * DO NOT COMPILE FOR ALPHA. I need to fix gcc 2.95.4 + prior to this release working on Alpha correctly + (long story). + * Upstream: Avoid COPY relocs on i386 + * Upstream: Fix IA64 assembler (please try this and let me know) + * Upstream: Fix a static linking the PIC object files on ia32 + * Upstream: Add the version script support for --export-dynamic + * Upstream: Fix sparc/elf for linux/sparc + * Upstream: Fix alpha/elf for gcc 3.0 + * Supposedly required for gcc-3.0 usage on many platforms + * Add s390 to multiarch list (closes: Bug#98095) + * Supposedly good on mips, but please check. I emailed Ryan + to see if bug 98095 still happens, but never got a reply. + If I get around it, I'll check it myself since my mips + lives once again. + * Retake my package from Matt (next time we agree to an NMU, + please don't change the maintainer name...no wonder I didn't + get any bug reports!) + * Cross-compilation support will be added in the next upload + (I'll be uploading alpha debs with the next release as well, + the alpha problem outweighs cross-compilation support in + priority right now). + + -- Christopher C. Chimelis Thu, 19 Jul 2001 05:12:05 -0400 + +binutils (2.11.90.0.7-2) unstable; urgency=high + + * Applied patch from Alan Modra to fix m68k + assertion problems (closes: Bug#96352) + * Applied srec patch from Richard Henderson for + alpha. + + -- Christopher C. Chimelis Wed, 9 May 2001 03:11:19 -0400 + +binutils (2.11.90.0.7-1) unstable; urgency=high + + * New upstream source (synced with 20010425 CVS) + * Upstream: Fix the -Bsymbolic bug introduced in + binutils 2.11.90.0.5 (closes: Bug#95168) + + -- Christopher C. Chimelis Sun, 29 Apr 2001 20:03:22 -0400 + +binutils (2.11.90.0.5-1) unstable; urgency=high + + * New upstream source (synced with 20010414 CVS) + * Upstream: Fix in IA64 assembler + * Upstream: Change Linux/MIPS to use SVR4 MIPS ABI + rather than IRIX ABI. + * The above change may cause problems for MIPS. + If so, please file a bug and I'll revert those + changes if need be. I suspect that glibc, gcc, + and the kernel may eventually follow suit, though + to fit in with this change (it makes sense... + see the symbol ordering problems threads on the + binutils list for more info). + * Upstream: IA32 gas bug fixed...no further details + provided, unfortunately. + * Reportedly fixes core dumping when trying to link + object files from other platforms (now warns) + (closes: Bug#60502) + * Includes Philip Blundell's ARM PLT patch finally... + sorry for the delay (closes: Bug#94181) + * m68k problems should be fixed by now. Wish I had + gotten more feedback, but I didn't so I'm assuming it + works at this point (closes: Bug#74396) + * Stopped compiling cross-compiler packages until we + work out a better system for the entire toolchain. + Sorry, but it was taking far too long on even fast + machines and I've gotten more complaints about the + current arrangement than I have positive feedback. + (closes: Bug#91120, Bug#91119, Bug#91118, Bug#91117, + Bug#91116, Bug#88311, Bug#78028, Bug#90177) + * Fixed readelf manpage so that it no longer says that + it is a preprocessor for assembly programs + (closes: Bug#90798) + + -- Christopher C. Chimelis Tue, 17 Apr 2001 20:07:14 -0400 + +binutils (2.11.90.0.1-1) unstable; urgency=high + + * New upstream source (synced with 20010309 + CVS). + * Fixed misapplied m68k ld patch. + I am hoping that this almost totally fixes + m68k ELF for now. + * Fixed typo in mips patch and applied another + mips patch from Daniel Jacobowitz. + * Should no longer build same-arch cross + packages. Please let me know if this fix + worked so that I can close the bugs (I have + no access to such an arch at the moment) + * Made urgency high since m68k really needs + this if the bugs are truly fixed. Even if + not, this version is infinitely better on + at least two platforms than prior ones were. + + -- Christopher C. Chimelis Thu, 15 Mar 2001 16:29:32 -0500 + +binutils (2.10.91.0.2-4) unstable; urgency=low + + * Applied m68k ld and bfd patches from + Michael Fedrowitz to hopefully make things + better on m68k. + + -- Christopher C. Chimelis Sun, 11 Mar 2001 20:16:44 -0500 + +binutils (2.10.91.0.2-3) unstable; urgency=low + + * Adjusted the priority of binutils-doc to + optional. + * Added debhelper build-depends (closes: Bug#87690) + * Fixed postinst problem for new binutils + installations (closes: Bug#87911) + + -- Christopher C. Chimelis Thu, 1 Mar 2001 15:06:50 -0500 + +binutils (2.10.91.0.2-2) unstable; urgency=low + + * Add support for SH and IA64 to binutils-multiarch. + * Applied m68k gas patch from Michael Fedrowitz + in hopes that this will fix the grave bug that + has been such a pain to m68k folks. I'll leave + the bug open until it's verified that it works + ok. + * Applied IA-64 printf patch (closes: Bug#82702) + * Kernels appear to be building fine with this + release on all archs available to me + (closes: Bug#77610) + * Added text during postinst that informs users + to modify their i386 kernel Makefiles for the + --oformat change (closes: Bug#86995) + * Incorporated remaining mips diffs that weren't + already applied upstream (closes: Bug#81280) + * Sparc/sparc64 patch seems to be doing fine, so + closing the bug (closes: Bug#86781) + * Added non-linux cross- package support to rules + (closes: Bug#79948) + * Close misc bugs: + Missing info file in binutils-doc (closes: Bug#78754) + + -- Christopher C. Chimelis Thu, 22 Feb 2001 19:36:12 -0500 + +binutils (2.10.91.0.2-1) unstable; urgency=low + + * New upstream version. + * Added weak symbol relocation patch for sparc/sparc64. + * Included m68k ELF fix from Michael Fedrowitz. + * BIG NOTE: any i386 kernels compiled with this will need + to be patched to change the ld option '-oformat' to + '--oformat' (extra hyphen). + + -- Christopher C. Chimelis Tue, 20 Feb 2001 21:32:44 -0500 + +binutils (2.10.1.0.2-1) unstable; urgency=low + + * New upstream release (really prerel, but better than + using a CVS version). + * Should re-add Compaq demangling style to all + tools (alpha-only). + * Again, hopefully fixes m68k ELF support...still have + no idea why or how this was broken before. + + -- Christopher C. Chimelis Mon, 20 Nov 2000 16:25:44 -0500 + +binutils (2.10.0.27-0.cvs20001011.2) unstable; urgency=low + + * Applied another PowerPC patch to correct the + implementation of .protected and .hidden in the + linker. This should also aid in the glibc + transition on PowerPC. + + -- Christopher C. Chimelis Tue, 17 Oct 2000 13:23:40 -0400 + +binutils (2.10.0.27-0.cvs20001011.1) unstable; urgency=low + + * Applied PowerPC weak symbol patch from CVS to aid + in glibc transition on that platform. + + -- Christopher C. Chimelis Sun, 15 Oct 2000 19:12:22 -0400 + +binutils (2.10.0.27-0.cvs20001011) unstable; urgency=low + + * Grabbed a new CVS version since it backs out a + change that prevented current gcc snapshots from + linking properly to libstdc++v3. This may also + solve some other problems related to global + section symbols (feedback appreciated). + * Finally changed my email address in the control + file (how I overlooked this after all of this + time I'll never know). + + -- Christopher C. Chimelis Wed, 11 Oct 2000 08:59:36 -0400 + +binutils (2.10.0.27-0.cvs20001008) unstable; urgency=low + + * Removed configure.info.gz from binutils-doc since + it didn't really belong there. (closes: Bug#72746) + * Update for hppa/hppa64 targets (included testsuite + changes committed on 07-Oct-2000). (closes: Bug#71524) + * Upstream change to elflink.h to hopefully stop + segfaults on some archs when linking binaries to + shared libs. + + -- Christopher C. Chimelis Sun, 8 Oct 2000 16:14:08 -0400 + +binutils (2.10.0.27-0.cvs20000923.1) unstable; urgency=low + + * Fixed rules file so that builds don't fail when compiling the + binary-arch target (added binary-cross to binary-arch). + * Fixed harmless attempt at removing builddir-avr twice. + + -- Christopher C. Chimelis Thu, 28 Sep 2000 10:39:12 -0400 + +binutils (2.10.0.27-0.cvs20000923) unstable; urgency=low + + * CVS snapshot from 2000-09-23. + * Should fix some (most) HPPA issues. + * Adds binutils-m68k cross-assembler. + + -- Christopher C. Chimelis Sun, 24 Sep 2000 10:19:20 -0400 + +binutils (2.10.0.26-2) unstable; urgency=low + + * Added the avr target for Amtel's AVR MCU's + * Applied Frank I. Smith to generate packages for + multiple cross targets: + + Bump rev number, NOP. + + Testing out bumping up the rev number. + + Added powerpc, arm, mipsel cross binutils packages. + + -- Christopher C. Chimelis Fri, 22 Sep 2000 17:31:44 -0400 + +binutils (2.10.0.26-1) unstable; urgency=low + + * New upstream source. + * Added mips-linux, hppa-linux, and hppa64-linux to multiarch targets + + -- Christopher C. Chimelis Sun, 17 Sep 2000 01:05:49 -0400 + +binutils (2.10.0.24-1) unstable; urgency=low + + * New upstream source. + * Fixes ia32 assembler buglet. + * (Hopefully) fixes PPC visibility problems with + glibc 2.2 + + -- Christopher C. Chimelis Thu, 24 Aug 2000 16:52:44 -0400 + +binutils (2.10.0.18-3) unstable; urgency=low + + * Added build depends stuff. + + -- Christopher C. Chimelis Sat, 5 Aug 2000 21:09:04 -0400 + +binutils (2.10.0.18-2) unstable; urgency=low + + * Added proviso to control file saying that -multiarch + should not be installed by the average user. + + -- Christopher C. Chimelis Sat, 29 Jul 2000 20:07:15 -0400 + +binutils (2.10.0.18-1) unstable; urgency=low + + * New upstream source. + * Should address some needed things for glibc 2.2 + (added new DT_XXXX dynamic tags and fixes DT_NEEDED + link bug) + * Reapplied the now-infamous "ObjC patch" until + we can figure out why we still have this problem + (hint hint hint...we really need to do this). + + -- Christopher C. Chimelis Sat, 22 Jul 2000 13:18:27 -0400 + +binutils (2.10.0.9-4) unstable; urgency=low + + * Applied a patch from Ben Collins to fix sparc64 + linker scripts + + -- Christopher C. Chimelis Sat, 8 Jul 2000 07:24:10 -0400 + +binutils (2.10.0.9-3) unstable; urgency=low + + * Applied a patch from the libstdc++ mailing list to + make sure that the linker doesn't eat the eh_frame + section. + + -- Christopher C. Chimelis Fri, 7 Jul 2000 10:26:59 -0400 + +binutils (2.10.0.9-2) unstable; urgency=low + + * Wow, already a bug fix. + * binutils-dev now provides libiberty.h + + -- Christopher C. Chimelis Fri, 23 Jun 2000 19:54:39 -0400 + +binutils (2.10.0.9-1) unstable; urgency=low + + * New upstream version (more linux-specific). + + -- Christopher C. Chimelis Fri, 23 Jun 2000 14:31:04 -0400 + +binutils (2.10-1) unstable; urgency=low + + * New upstream version (finally, a real release!) + + -- Christopher C. Chimelis Wed, 21 Jun 2000 19:08:14 -0400 + +binutils (2.9.5.0.46-1) unstable; urgency=low + + * New upstream source. + * ELF visibility attribute should work correctly now. + * ia32 "jmp" instructions are now assembled differently + to use relocation for global jumps (affects PIC asm + code). + + -- Christopher C. Chimelis Thu, 8 Jun 2000 21:34:42 -0400 + +binutils (2.9.5.0.42-1) unstable; urgency=low + + * New upstream source. + * Includes a testcase for hidden symbol support. + + -- Christopher C. Chimelis Fri, 19 May 2000 20:48:52 -0400 + +binutils (2.9.5.0.41-1) unstable; urgency=high + + * New upstream source. + * Now includes patch to enable hidden symbol support + needed for gcc 3.0 testing. + + -- Christopher C. Chimelis Fri, 5 May 2000 20:38:41 -0400 + +binutils (2.9.5.0.37-1) frozen unstable; urgency=high + + * Was forced to bring the current frozen version up to + upstream 2.9.5.0.37 in order to fix a rather nasty + i386 gas bug and also since the existing ARM patch + applied in 2.9.5.0.31-3 has been superceded upstream + (closes:Bug#62119) + * Includes proper demangler support for Compaq compiler + usage on Alpha (may be superceded upstream shortly, + but is good enough for potato and for Compaq's usage) + (closes:Bug#62079) + * Added cross-compilation support for individual use. + Please note that the binary packages do not support + this. If you require this feature, you need to compile + the source package changing debian/rules. Also, if + you do this, YMMV since things on this front are changing + rapidly upstream and also because cross-compiling from + certain platforms to others may not work (i386->alpha, + for example). (closes:Bug#59246) + * Fixed replaces statement in binutils-multiarch + (closes:Bug#62496) + * Release Manager: I once again beg that this be included + in potato. I've freed up some time to deal with bug + reports quickly if needed. + + -- Christopher C. Chimelis Sat, 29 Apr 2000 04:03:39 -0400 + +binutils (2.9.5.0.31-3) frozen unstable; urgency=high + + * Applied patch to fix broken ARM code generation (closes:Bug#61977) + + -- Christopher C. Chimelis Fri, 7 Apr 2000 15:50:42 -0400 + +binutils (2.9.5.0.31-2) frozen unstable; urgency=high + + * Remove ld from binutils-multiarch since it doesn't want to + link kernels on several archs properly (fixes severity:important bug) + (closes: Bug#61719, Bug#61615, Bug#51625) + + -- Christopher C. Chimelis Mon, 3 Apr 2000 22:48:55 -0400 + +binutils (2.9.5.0.31-1) frozen unstable; urgency=high + + * Yet another patch (this time from H.J. Lu upstream) to fix + the unlink race condition bug. This is VERY important and + needs to be in potato. It also fixes the temp file creation + problem with objcopy on PPC (closes: Bug#60934) + * New upstream release. Fixes a serious Alpha bug along + with a demangler bug and several others (closes: Bug#61121) + * Should fix apt-get upgrade problem...please test + (closes: Bug#56175) + * Release manager: can we squeeze this in? I know it's a + new version, but the ELF bug on Alpha really needs to + be fixed along with the rest of the above and some others + not mentioned here. + + -- Christopher C. Chimelis Wed, 22 Mar 2000 05:05:12 -0500 + +binutils (2.9.5.0.22-5) frozen unstable; urgency=high + + * Applied fixed patch from Colin Phipps to seal the unlink + race condition in bfd/cache.c (closes: Bug#58865, Bug#57831) + * Installed a proper changelog in binutils-doc + (closes: Bug#58522) + * Closes other older bug (closes: Bug#55801) + * Included bbconv.pl in binutils main package in the doc dir + under the gprof subdir (closes: Bug#57521) + + -- Christopher C. Chimelis Tue, 14 Mar 2000 10:32:52 -0500 + +binutils (2.9.5.0.22-4) frozen unstable; urgency=high + + * Patched gprof/hertz.h to allow binutils to actually + build and work on Hurd (closes: Bug#57564) + * Patched bfd/cache.c to avoid a rare, but possible + security problem when as is creating/opening temp + files (closes: Bug#57831) + + -- Christopher C. Chimelis Thu, 17 Feb 2000 10:31:05 -0500 + +binutils (2.9.5.0.22-3) frozen unstable; urgency=high + + * Removed standards.info...do we really need seven + bugs filed for the same problem + (closes: Bug#54521, Bug#54546, Bug#54614, Bug#54682, Bug#55402, Bug#55582, Bug#55602) + * Changed binutils-multiarch extended description + to mention that a cross-assembling gas is not + included (closes: Bug#49308) + * Closing a bug because it related to lack of disk space + (closes: Bug#52714) + + -- Christopher C. Chimelis Wed, 19 Jan 2000 19:28:09 -0500 + +binutils (2.9.5.0.22-2) unstable; urgency=high + + * Added getopt.h include that was omitted in the -taso patch + (closes: Bug#52380) + * Fixed table misalignment when calling objdump --info + (closes: Bug#51517) + * Added Debian changelog to binutils-doc (closes: Bug#52574) + + -- Christopher C. Chimelis Wed, 15 Dec 1999 19:14:05 -0500 + +binutils (2.9.5.0.22-1) unstable; urgency=high + + * New upstream version. + * More MIPS fixes. + * Added support for -taso linker flag for Alpha. + * Reapplied all previous patches. + + -- Christopher C. Chimelis Wed, 7 Dec 1999 01:08:51 -0600 + +binutils (2.9.5.0.19-1) unstable; urgency=high + + * New upstream version + * Fixes some MIPS problems + * Reapplied the ObjC patch (is this ever going to be fixed upstream) + since it's badly needed right now + + -- Christopher C. Chimelis Thu, 4 Nov 1999 15:00:35 -0400 + +binutils (2.9.5.0.16-3) unstable; urgency=low + + * Added support for mipsel-linux in binutils-multiarch + + -- Christopher C. Chimelis Thu, 4 Nov 1999 15:00:35 -0400 + +binutils (2.9.5.0.16-2) unstable; urgency=low + + * Added a replaces field in the control file to fix + previous file overwrite problems (closes: Bug#47518, Bug#47938) + * Verified manpages are up to date (closes: Bug#18483) + * Added m68k-rtems to targets in -multiarch in hopes + that it will actually work as advertised (closes: Bug#47468) + + -- Christopher C. Chimelis Mon, 25 Oct 1999 15:58:55 -0400 + +binutils (2.9.5.0.16-1) unstable; urgency=low + + * New upstream version. + * Massive bugfix upload on the Debian side: + * Fixes changelog problems between all of the binutils + debs (closes: Bug#47133, Bug#47208, Bug#47211) + * Fixes other overwrite problems (closes: Bug#46991, Bug#47024, Bug#46074) + * Multiarch should now make good diversions when + upgrading (closes: Bug#47359) + * Applied patch from Kevin Buhr to fix ld segfaults with + empty archives (closes: Bug#47019) + * Should have fixed info install problems by now + (closes: Bug#35935) + + -- Christopher C. Chimelis Fri, 15 Oct 1999 03:18:55 -0400 + +binutils (2.9.5.0.14-1) unstable; urgency=low + + * New upstream version. + * Thanks to Matthias Klose for the following: + * Separate documentation to binutils-doc package. + * debian/rules: + - Remove extra /usr/share/doc/binutils/changelog.gz file. + - Move bfd docs to binutils-dev package. + - Move upstream changelogs to binutils-doc package. + - Remove standard GNU info files left in /usr/share/info. + - Call dh_installdocs for all packages. + * debian/*{dirs,files}: Remove. Mention explicitly in debian/rules. + + -- Christopher C. Chimelis Wed, 6 Oct 1999 03:18:55 -0400 + +binutils (2.9.5.0.12-2) unstable; urgency=low + + * Applied patch from Matthias Klose to fix many issues including architecture detection. + * Rules file is now much prettier and easier to manage. + * Binutils is now built for i386 rather than i486 in the rules file (oops). + * Added diversion for readelf in binutils-multiarch. + + -- Christopher C. Chimelis Tue, 21 Sep 1999 03:39:08 -0400 + +binutils (2.9.5.0.12-1) unstable; urgency=low + + * Massive bugfix release. + * New upstream source (finally) (closes: Bug#44934) + * Fixes upstream bugs on many platforms. + * Gives powerpc a working binutils again. (closes: Bug#45052) + * Now provides .code16 support on i386 (please test) + * Manpage for objdump should now be complete (closes: Bug#27039) + * Put together manpages for gasp and the new binary readelf (closes: Bug#21918) + * Fixes nm core dump problem (closes: Bug#41999) + * Applied patches from Ben Collins to add sparc64 support (closes: Bug#44426) + * Update Standards version + * FHS compliance + + -- Christopher C. Chimelis Sat, 18 Sept 1999 01:21:05 -0400 + +binutils (2.9.5.0.12-0.2) experimental; urgency=low + + * Added Sparc/Sparc64 changes from Ben Collins (I really need a Sparc one of these days). + * Again, this should be the last experimental before a new release. + + -- Christopher C. Chimelis Fri, 17 Aug 1999 16:32:05 -0400 + +binutils (2.9.5.0.12-0.1) experimental; urgency=low + + * New upstream version. + * Should be the last experimental before a new release. + + -- Christopher C. Chimelis Thu, 9 Aug 1999 23:12:52 -0400 + +binutils (2.9.5.0.10-0.1) experimental; urgency=low + + * New upstream version. + * Didn't apply PPC patches...let me know if still needed + + -- Christopher C. Chimelis Thu, 9 Aug 1999 23:12:52 -0400 + +binutils (2.9.5.0.6-0.1) experimental; urgency=low + + * New upstream version. + * Didn't apply PPC patches...let me know if still needed + + -- Christopher C. Chimelis Thu, 9 Aug 1999 23:12:52 -0400 + +binutils (2.9.4.0.8-0.1) unstable; urgency=low + + * New upstream version. + * Applied as much of the PPC patches as I could. + + -- Christopher C. Chimelis Thu, 15 Jul 1999 12:46:45 -0400 + +binutils (2.9.4.0.3-0.1) unstable; urgency=low + + * New upstream version. + * Apply patch from Richard Henderson to fix PPC's libpath. + * Apply patch from Franz Sirl to fix Richard Henderson. + + -- Daniel Jacobowitz Sun, 6 Jun 1999 01:27:10 -0400 + +binutils (2.9.4.0.2-0.1) unstable; urgency=low + + * New upstream version. 2.9.4.0.1 was hurriedly recalled. + + -- Daniel Jacobowitz Sun, 6 Jun 1999 01:27:10 -0400 + +binutils (2.9.4.0.1-0.1) unstable; urgency=low + + * New upstream version. + + -- Daniel Jacobowitz Sun, 6 Jun 1999 01:27:10 -0400 + +binutils (2.9.1.0.25-2) unstable; urgency=low + + * Added ObjC patch AGAIN...sorry about that + + -- Christopher C. Chimelis Sun, 23 May 1999 15:14:35 -0400 + +binutils (2.9.1.0.25-1) unstable; urgency=low + + * New upstream version - Fixes a PIII asm optimisation bug + + -- Christopher C. Chimelis Sun, 23 May 1999 00:36:55 -0400 + +binutils (2.9.1.0.24-2) unstable; urgency=low + + * Reapplied ObjC patch...apparently it's still needed. + + -- Christopher C. Chimelis Mon, 10 May 1999 19:53:15 -0400 + +binutils (2.9.1.0.24-1) unstable; urgency=low + + * New upstream release - fixes too many little things to mention. + + -- Christopher C. Chimelis Tue, 3 May 1999 16:35:08 -0400 + +binutils (2.9.1.0.23-1) unstable; urgency=low + + * New upstream release - incorporates sparc64 and arm patches. + * Added RPATH patch from Joel Klecker since my last upload failed. + * Removed ObjC patch. Let me know if it is still needed (doubtful, but + still might be). + + -- Christopher C. Chimelis Mon, 5 Apr 1999 13:26:55 -0500 + +binutils (2.9.1.0.22b-2) unstable; urgency=low + + * Added patch from Joel Klecker to finally (properly) fix the rpath issue + (Thanks, Joel!). + + -- Christopher C. Chimelis Fri, 2 Apr 1999 18:14:05 -0600 + +binutils (2.9.1.0.22b-1) unstable; urgency=low + + * Converted package to CVS (so bear with any delays in handling + bug fixes; I'm new to CVS ironically) + * New upstream version (sparc64 and ARM patches again added). + * Added support for mingw32 target in binutils-multiarch + + -- Christopher C. Chimelis Fri, 12 Mar 1999 03:51:44 -0600 + +binutils (2.9.1.0.19a-4) frozen unstable; urgency=high + * Added sparc64 patches from Steve Dunham to fix sparc64 targets + * Modified rules to add support for gcc/egcs by arch. + + -- Christopher C. Chimelis Mon, 1 Feb 1999 15:51:19 -0600 + +binutils (2.9.1.0.19a-3) frozen unstable; urgency=high + + * Reverted a patch to elflink.h that caused problems for + Obj-C code (symbols weren't exported with a size or + type). + + -- Christopher C. Chimelis Thu, 21 Jan 1999 19:25:17 -0600 + +binutils (2.9.1.0.19a-2) frozen unstable; urgency=low + + * Added arm-linux as multiarch target (sorry Jim). + * Uploaded to frozen to fix strange intermittant kernel + compilation problems (Fixes #31434). + * Fixed multiarch's postinst script to check for + c++filt.single before trying to remove it to prevent + warning messages if using g++ from egcs. + * Fixed typo in multiarch's postrm (addr2line) (Fixes: #31533) + * Added links to .so's for clean removal in the future (Fixes: #31536) + + -- Christopher C. Chimelis Fri, 8 Jan 1999 15:28:32 -0600 + +binutils (2.9.1.0.19a-1) unstable; urgency=low + + * New upstream version; fixes some Alpha problems and other archs + should benefit also. + * Added ARM target patch from Corel again (still not in upstream). + + -- Christopher C. Chimelis Mon, 4 Jan 1999 20:24:36 -0600 + +binutils (2.9.1.0.16-1) unstable; urgency=low + + * New upstream version; merges some ARM patches for Netwinders + * Added patch for ARM target from Corel (thanks Jim Pick) + + -- Christopher C. Chimelis Mon, 30 Nov 1998 16:59:25 -0600 + +binutils (2.9.1.0.15-5) frozen unstable; urgency=low + + * Reuploaded to frozen (why it wasn't there earlier....) + + -- Christopher C. Chimelis Mon, 30 Nov 1998 16:37:08 -0600 + +binutils (2.9.1.0.15-4) unstable frozen; urgency=low + + * Removed c++filt diversion in -multiarch to prevent conflicting + diversions when using egcs' g++ (which also wants to divert c++filt) + + -- Christopher C. Chimelis Wed, 25 Nov 1998 18:06:17 -0600 + +binutils (2.9.1.0.15-3) unstable frozen; urgency=low + + * Made Roman's changes "official" (thanks Roman). + + -- Christopher C. Chimelis Mon, 2 Nov 1998 05:46:56 -0600 + +binutils (2.9.1.0.15-2.1) unstable; urgency=low + + * Non-maintainer upload with agreement from Chris. + * Use a different soname for multi-arch libbfd and libopcodes; this + fixes the problem that the single-arch binaries (as and the diverted + ones) will all dump core because they're runtime-linked against the + multi-arch libs. (Fixes: #28656) + * Due to the above, binutils-multiarch also needs ldconfig in postinst + now. + * Fixup diversions once again: Do not even package the ldscripts for the + native architecture, so diversions for files in /usr/lib/ldscripts + aren't necessary. + * Also remove diversions on abort-install. + * Remove now obsolete diversions in preinst. + * Also symlink /usr/doc/binutils-multiarch to binutils, and do not + put /usr/doc/binutils in the package again. + * Put the symlinks libbfd.so and libopcode.so into binutils-dev, so one + can link to them. + + -- Roman Hodek Sat, 31 Oct 1998 11:31:14 +0100 + +binutils (2.9.1.0.15-2) unstable; urgency=low + + * Fixed binutils-multiarch diversions + * Reverted elf.c to .13 version to fix bug in strip + + -- Christopher C. Chimelis Tue, 27 Oct 1998 05:26:28 -0600 + +binutils (2.9.1.0.15-1) unstable; urgency=low + + * New upstream version. + * Moved over to debhelper and updated standards version to 2.4.1.4. + * Adds 3DNow instruction support for AMD processors. + * Fixes MANY Alpha bugs and a few for Sparc, PPC, and m68k reportedly. + * Added binutils-multiarch package to allow for multiple-arch support + (fixes bug #19471). + + -- Christopher C. Chimelis Thu, 14 Oct 1998 19:30:10 -0500 + +binutils (2.9.1.0.13-1) unstable; urgency=low + + * New upstream version, fixes bug #25354. + * Hopefully, all requested docs are included, fixes bug #21325. + * Fixes MANY Alpha problems. + * Reportedly may fix MIPS and Sparc problems also...see changelogs. + * Has been tested on x86's with great success. + + -- Christopher C. Chimelis Mon, 5 Oct 1998 23:02:08 -0500 + +binutils (2.9.1-0.2) frozen unstable; urgency=low + + * Fixed binutils-dev dependencies. + + -- Joel Klecker Tue, 05 May 1998 09:24:04 -0700 + +binutils (2.9.1-0.1) frozen unstable; urgency=medium + + * Non-maintainer release. + * New upstream release. + * Moved docs into subdirs where appropriate. + * Integrated the following changes from J.H.M. Dassen: + * Updated FSF address in copyright file. (lintian). + * Reported lack of "gasp" manpage (# ....), and link it to + undocumented(7). (lintian). + * Added a TODO list. + + -- Joel Klecker Thu, 30 Apr 1998 10:43:42 -0700 + +binutils (2.9-0.3) frozen unstable; urgency=medium + + * Added upstream patch which fixes a problem with strip + and netscape (#17971). + + -- Joel Klecker Tue, 28 Apr 1998 08:58:27 -0700 + +binutils (2.9-0.2) frozen unstable; urgency=low + + * Added more of the upstream docs (#21325). + * Put a changelog.gz symlink in /usr/doc/binutils + to satisfy policy. + + -- Joel Klecker Tue, 21 Apr 1998 09:02:22 -0700 + +binutils (2.9-0.1) frozen unstable; urgency=low + + * Non-maintainer release. + * New upstream release (bugfixes only). + + -- Joel Klecker Sun, 12 Apr 1998 04:11:07 -0700 + +binutils (2.8.1.0.23-1) unstable; urgency=low + + * New upstream version + * -dev replaces libc5-dev (#17840) + * No longer possible to link against shared libbbfd/opcodes (#18121) + + -- Galen Hazelwood Sat, 14 Mar 1998 18:19:10 -0700 + +binutils (2.8.1.0.19-1) unstable; urgency=low + + * New upstream version (#17296) + * Fixed typo in description (#16481) + * Fully replaces libbfd-dev (#16619) + + -- Galen Hazelwood Sun, 25 Jan 1998 15:37:03 -0700 + +binutils (2.8.1.0.17-1) unstable; urgency=low + + * New upstream version + * Rejoined libbfd and binutils packages (#15486) + * Added "SHELL=bash" to rules file (#14528) + * bfd info docs seem to be broken, don't install for now + + -- Galen Hazelwood Sat, 6 Dec 1997 14:55:26 -0700 + +binutils (2.8.1.0.15-1) unstable; urgency=low + + * New upstream version (#14250) + * Updated to Standard 2.3.0.0 + * Restored ansidecl.h to libbfd-dev (#14116) + + -- Galen Hazelwood Thu, 30 Oct 1997 20:04:24 -0700 + +binutils (2.8.1-2) unstable; urgency=low + + * Added 2.8.1.0.4 patch + + -- Galen Hazelwood Thu, 12 Jun 1997 20:49:57 -0600 + +binutils (2.8.1-1) unstable; urgency=low + + * New upstream version + * Added 2.8.1.0.1 patch + + -- Galen Hazelwood Fri, 30 May 1997 14:48:42 -0600 + +binutils (2.8-1) unstable; urgency=low + + * New upstream version + * Smarter debian build environment (automatic version handling) + * Added 2.8.0.3 patch + * Built with libc6 + + -- Galen Hazelwood Sun, 4 May 1997 11:16:12 -0600 + +binutils (2.7.0.9-3) frozen unstable; urgency=low + + * Patched for alpha support + * Distribute libiberty.a with -dev package (#8376) + * libbfd[x]-dev now has standard Provides/Conflicts behavior (#8377) + + -- Galen Hazelwood Fri, 28 Mar 1997 11:45:58 -0700 + +binutils (2.7.0.9-2) unstable; urgency=low + + * Moved 2.7.0.9 out of experimental (no longer unreleased beta) + + -- Galen Hazelwood Sun, 9 Mar 1997 23:43:19 -0700 + +binutils (2.7.0.9-1) experimental; urgency=low + + * New upstream beta version (fixes bug #7336) + * Split shared libraries (bfd) out of binutils (fixes bug #7244) + * No longer builds aout-binutils + + -- Galen Hazelwood Thu, 13 Feb 1997 00:27:18 -0700 + +binutils (2.7-6) unstable; urgency=low + + * Uses dpkg --print-gnu-build-architecture for build + * Demoted aout-binutils to priority "extra" + + -- Galen Hazelwood Mon, 27 Jan 1997 13:34:08 -0700 + +binutils (2.7-5) unstable; urgency=low (HIGH for m68k) + + * Added patch for m68k, will now compile X68 and kernel 2.1.15 + + -- Galen Hazelwood Tue, 31 Dec 1996 22:15:03 -0700 + +binutils (2.7-4) unstable; urgency=low + + * New maintainer + * Updated to new source format + * Fixed typo in script.1 (Fixes bug #4558) + * Fixed typo in as.1 (Fixes bug #5567) + * Postinst now calls ldconfig without explicit pathname (Fixes bug #6151) + + -- Galen Hazelwood Mon, 30 Dec 1996 12:10:25 -0700 + +binutils (2.7-3): + +Remove lib*.so links so the libs are not used for develpment. +gzip manpages + +Changes made by Michael Meskes in consent with David Engel. + +binutils (2.7-2): + +Include shared libraries +Strip shared libraries +Also update AOUT version +Minor changes to debian.rules + +binutils (2.7-1): + +Updated to new upstream version. + +Added a simple extended description (Bug#3574). + +Don't call ldconfig from postrm script (Bug#4246). + + LocalWords: Aurelien Jarno + --- binutils-2.20.1.orig/debian/binutils.postrm +++ binutils-2.20.1/debian/binutils.postrm @@ -0,0 +1,7 @@ +#! /bin/sh + +set -e + +if [ "$1" = "remove" ]; then + ldconfig +fi --- binutils-2.20.1.orig/debian/control +++ binutils-2.20.1/debian/control @@ -0,0 +1,109 @@ +Source: binutils +Section: devel +Priority: optional +Maintainer: Matthias Klose +Uploaders: James Troup , Daniel Jacobowitz +Standards-Version: 3.8.4 +Build-Depends: dpkg-dev (>= 1.13.9), autoconf (>= 2.64), bison, flex, gettext, texinfo, dejagnu (>= 1.4.2-1.1), dpatch, file, bzip2, lsb-release, zlib1g-dev + +Package: binutils +Architecture: any +Depends: ${shlibs:Depends} +Conflicts: gas, elf-binutils, modutils (<< 2.4.19-1), ${extraConflicts}, binutils-gold (<< 2.20.1-6) +Replaces: binutils-gold (<< 2.20.1-6) +Provides: elf-binutils +Suggests: binutils-doc (>= ${source:Version}) +Description: The 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. + . + On some architectures the (experimental) GNU gold linker is included. + It currently fails to link some applications and libraries (i.e. won't + link usable kernels). + +Package: binutils-dev +Architecture: any +Priority: extra +Depends: binutils (= ${binary:Version}) +Conflicts: libbfd-dev +Provides: libbfd-dev +Replaces: libbfd-dev, libc5-dev +Description: The 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 i386 powerpc sparc +Priority: extra +Depends: ${shlibs:Depends}, binutils (= ${binary:Version}) +Description: The (experimental) GNU gold linker utility + Gold is a new linker, still in development, which is faster than the + current linker included in binutils. It currently fails to link some + applications and libraries (i.e. won't link usable kernels). + . + This package diverts the GNU linker (ld) with the experimental gold + linker. + +Package: binutils-hppa64 +Architecture: hppa +Depends: ${shlibs:Depends}, binutils (= ${binary:Version}) +Recommends: libc6-dev +Suggests: binutils-doc (>= ${source:Version}) +Description: The 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: The 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 +Description: The GNU assembler, linker and binary utilities (source) + This package contains the sources and patches which are needed to + build binutils. --- binutils-2.20.1.orig/debian/binutils.overrides +++ binutils-2.20.1/debian/binutils.overrides @@ -0,0 +1,2 @@ +# the API of the shared libs is not public, don't care about the name +binutils binary: package-name-doesnt-match-sonames --- binutils-2.20.1.orig/debian/test-suite-compare.py +++ binutils-2.20.1/debian/test-suite-compare.py @@ -0,0 +1,230 @@ +#!/usr/bin/env python + +# Quick'n'dirty regression check for dejagnu testsuites +# Copyright (C) 2003, 2004, 2005, 2006, 2007 James Troup + +# 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 2 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;5B General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +################################################################################ + +import optparse +import os +import sys + +################################################################################ + +def fubar(msg, exit_code=1): + sys.stderr.write("E: %s\n" % (msg)) + sys.exit(exit_code) + +def warn(msg): + sys.stderr.write("W: %s\n" % (msg)) + +def info(msg): + sys.stderr.write("I: %s\n" % (msg)) + +################################################################################ + +def read_testsummary(filename): + results = {} + file = open(filename) + for line in file.readlines(): + if not line: + continue + if line.startswith("Running"): + s = line.split() + if "/" in s[1]: + x = s[1] + if x.find("/testsuite/") == -1: + fubar("Can't find /testsuite/ in '%s'." % (x)) + # 'Running /home/james/debian/packages/binutils/binutils-2.14.90.0.7/gas/testsuite/gas/hppa/unsorted/unsorted.exp ...' -> 'gas/hppa/unsorted/unsorted.exp' + # ... since using basename() isn't dupe safe. + section = x[x.find("/testsuite/"):].replace("/testsuite/","").split()[0] + + # Tests can be duplicated, e.g. hppa/basic/basic.exp + # is run twice, once for hppa-linux and once for + # hppa64-linux. This is of course a horrible bodge, + # but I can't think of anything trivial and better off + # hand. + + if results.has_key(section): + extra = 1 + too_many = 10 + while results.has_key(section) and extra < too_many: + section = "%s.%s" % (section, extra) + extra += 1 + if extra >= too_many: + fubar("gave up trying to unduplicate %s." % (section)) + + results[section] = {} + continue + + got_state = 0 + for state in [ "PASS", "XPASS", "FAIL", "XFAIL", "UNRESOLVED", + "UNTESTED", "UNSUPPORTED" ]: + if line.startswith(state): + s = line.split(':') + state = s[0] + test = ':'.join(s[1:]).strip() + if results.has_key(test): + warn("%s/%s is duplicated." % (section, test)) + results[section][test] = state + got_state = 1 + break + + if got_state: + continue + + return results + +################################################################################ + +def compare_results(old, new): + total_num = 0 + pass_count = 0 + fail_count = 0 + xfail_count = 0 + untested_count = 0 + regression_count = 0 + progression_count = 0 + change_count = 0 + + for section in new.keys(): + for test in new[section].keys(): + state = new[section][test] + + # Stats pr0n + total_num += 1 + if state == "PASS" or state == "XPASS": + pass_count += 1 + elif state == "FAIL" or state == "UNRESOLVED": + fail_count += 1 + elif state == "XFAIL": + xfail_count += 1 + elif state == "UNTESTED": + untested_count += 1 + + # Compare to old + if not old.has_key(section): + continue + if not old[section].has_key(test): + continue + old_state = old[section][test] + if state == "PASS": + if old_state != "PASS": + progression_count += 1 + info("[%s] progression (%s -> %s): %s" % (section, old_state, state, test)) + elif state == "XPASS": + if old_state != "XPASS" and old_state != "PASS": + progression_count += 1 + warn("[%s] %s: %s" % (section, state, test)) + elif state == "FAIL": + if old_state != "FAIL": + regression_count += 1 + warn("[%s] REGRESSION (%s -> %s): %s" % (section, old_state, state, test)) + elif state == "XFAIL": + if old_state != "XFAIL": + change_count += 1 + info("[%s] change (%s -> %s): %s" % (section, old_state, state, test)) + elif state == "UNRESOLVED": + if old_state != "UNRESOLVED" and old_state != "FAIL": + regression_count += 1 + warn("[%s] REGRESSION (%s -> %s): %s" % (section, old_state, state, test)) + if old_state == "FAIL": + change_count += 1 + info("[%s] change (%s -> %s): %s" % (section, old_state, state, test)) + elif state == "UNTESTED": + if old_state != "UNTESTED": + change_count += 1 + warn("[%s] REGRESSION (%s -> %s): %s" % (section, old_state, state, test)) + + if regression_count: + print "%d REGRESSIONS (%.2f%%)." % (regression_count, (float(regression_count)/total_num)*100) + if progression_count: + print "%d progressions (%.2f%%)." % (progression_count, (float(progression_count)/total_num)*100) + + if change_count: + print "%d changes (%.2f%%)." % (change_count, (float(change_count)/total_num)*100) + + print "%d tests: %d pass (%.2f%%), %d fail (%.2f%%), %d xfail (%.2f%%) %d untested (%.2f%%)." \ + % (total_num, pass_count, (float(pass_count)/total_num)*100, + fail_count, (float(fail_count)/total_num)*100, + xfail_count, (float(xfail_count)/total_num)*100, + untested_count, (float(untested_count)/total_num)*100) + + if regression_count: + sys.exit(1) + +################################################################################ + +def compare_multiple(directory, first_version, second_version): + architectures = [ "alpha", "arm", "hppa", "i386", "ia64", "mips", + "m68k", "mipsel", "powerpc", "s390", "sparc" ] + + for arch in architectures: + print "*********************************** %s ******************************" % (arch) + second_filename = "%s/%s_%s" % (directory, second_version, arch) + if not os.path.exists(second_filename): + print " -- NOT AVAILABLE --" + continue + + new = read_testsummary(second_filename) + first_filename = "%s/%s_%s" % (directory, first_version, arch) + old = read_testsummary(first_filename) + compare_results(old, new) + +################################################################################ + +def init(): + """Initalization, including parsing of options.""" + + usage = """usage: %prog [OPTIONS] +compare (binutils) dejagnu testsuite results. + +Example usage: + + test-suite-compare.py binutils-2.17/test-summary binutils-2.18/test-summary + +Or to compare across all architectures (with test results stored in a +'test-summary' directory): + + test-suite-compare.py -mtest-summary 2.17-3 2.18-1""" + parser = optparse.OptionParser(usage) + parser.add_option("-m", "--multiple", dest="multiple", + nargs=1, type="string", + help="compare multiple architectures") + (options, args) = parser.parse_args() + + if len(args) > 2 or len(args) < 2: + parser.error("takes 2 arguments (old and new)") + (old_version, new_version) = args + + return options, old_version, new_version + +################################################################################ + +def main(): + (options, old_version, new_version) = init() + if options.multiple: + compare_multiple(options.multiple, old_version, new_version) + else: + old = read_testsummary(old_version) + new = read_testsummary(new_version) + compare_results(old, new) + +################################################################################ + +if __name__ == '__main__': + main() --- binutils-2.20.1.orig/debian/binutils-spu.overrides +++ binutils-2.20.1/debian/binutils-spu.overrides @@ -0,0 +1,8 @@ +# don't warn about missing man pages for diverted binaries +binutils-spu binary: binary-without-manpage + +# the API of the shared libs is not public, don't care about the name +binutils-spu binary: package-name-doesnt-match-sonames + +# it's a cross toolchain +binutils-spu binary: binary-or-shlib-defines-rpath --- binutils-2.20.1.orig/debian/binutils.shlibs +++ binutils-2.20.1/debian/binutils.shlibs @@ -0,0 +1,2 @@ +libbfd 2.20.1-system.20100303 binutils (>= 2.20.1-3ubuntu2), binutils (<< 2.20.2) +libopcodes 2.20.1-system.20100303 binutils (>= 2.20.1-3ubuntu2), binutils (<< 2.20.2) --- binutils-2.20.1.orig/debian/patches/202_elflink_noaddneeded_vs_weak.dpatch +++ binutils-2.20.1/debian/patches/202_elflink_noaddneeded_vs_weak.dpatch @@ -0,0 +1,87 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 202_elflink_noaddneeded_vs_weak.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fixes '-no-add-needed breaks linking with weak symbols' +## DP: Upstream status: submitted upstream for binutils-2_20-branch + + +2010-08-07 Kirill Smelkov + + Backport from mainline: + 2010-01-21 Nick Clifton + + * elflink.c (elf_link_add_object_symbols): Look up name of + undefined symbol both before and after versioning has been + applied. Do not bother with symbols that are weakly undefined. + + +@DPATCH@ +diff --git a/bfd/elflink.c b/bfd/elflink.c +index 10eee8c..e058064 100644 +--- a/bfd/elflink.c ++++ b/bfd/elflink.c +@@ -3991,6 +3991,20 @@ error_free_dyn: + unsigned int vernum = 0; + bfd_boolean skip; + ++ /* If this is a definition of a symbol which was previously ++ referenced in a non-weak manner then make a note of the bfd ++ that contained the reference. This is used if we need to ++ refer to the source of the reference later on. */ ++ if (! bfd_is_und_section (sec)) ++ { ++ h = elf_link_hash_lookup (elf_hash_table (info), name, FALSE, FALSE, FALSE); ++ ++ if (h != NULL ++ && h->root.type == bfd_link_hash_undefined ++ && h->root.u.undef.abfd) ++ undef_bfd = h->root.u.undef.abfd; ++ } ++ + if (ever == NULL) + { + if (info->default_imported_symver) +@@ -4098,16 +4112,15 @@ error_free_dyn: + name = newname; + } + +- /* If this is a definition of a previously undefined symbol +- make a note of the bfd that contained the reference in +- case we need to refer to it later on in error messages. */ +- if (! bfd_is_und_section (sec)) ++ /* If necessary, make a second attempt to locate the bfd ++ containing an unresolved, non-weak reference to the ++ current symbol. */ ++ if (! bfd_is_und_section (sec) && undef_bfd == NULL) + { + h = elf_link_hash_lookup (elf_hash_table (info), name, FALSE, FALSE, FALSE); + + if (h != NULL +- && (h->root.type == bfd_link_hash_undefined +- || h->root.type == bfd_link_hash_undefweak) ++ && h->root.type == bfd_link_hash_undefined + && h->root.u.undef.abfd) + undef_bfd = h->root.u.undef.abfd; + } +@@ -4448,12 +4461,14 @@ error_free_dyn: + /* A symbol from a library loaded via DT_NEEDED of some + other library is referenced by a regular object. + Add a DT_NEEDED entry for it. Issue an error if +- --no-add-needed is used. */ +- if ((elf_dyn_lib_class (abfd) & DYN_NO_NEEDED) != 0) ++ --no-add-needed is used and the reference was not ++ a weak one. */ ++ if (undef_bfd != NULL ++ && (elf_dyn_lib_class (abfd) & DYN_NO_NEEDED) != 0) + { + (*_bfd_error_handler) + (_("%B: undefined reference to symbol '%s'"), +- undef_bfd == NULL ? info->output_bfd : undef_bfd, name); ++ undef_bfd, name); + (*_bfd_error_handler) + (_("note: '%s' is defined in DSO %B so try adding it to the linker command line"), + abfd, name); +-- +1.7.2.1.44.g721e7 + --- binutils-2.20.1.orig/debian/patches/152_arm_branches_to_weak_symbols.dpatch +++ binutils-2.20.1/debian/patches/152_arm_branches_to_weak_symbols.dpatch @@ -0,0 +1,240 @@ +#!/bin/sh -e +## 152_arm_branches_to_weak_symbols.dpatch +## +## DP: Description: http://sourceware.org/ml/binutils/2010-04/msg00446.html +## DP: Description: taken from the trunk + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p0 < $0;; + -unpatch) patch $patch_opts -p0 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +gas/ + +2010-05-04 Nick Clifton + + * write.c (fixup_segment): Revert previous delta. + * config/tc-arm.h (TC_FORCE_RELOCATION_LOCAL): Also force the + generation of relocations for fixups against weak symbols. + +2010-04-29 Nathan Sidwell + + * write.c (fixup_segment): Do not assume we know the section a + defined weak symbol is in. + * config/tc-arm.c (relax_adr, relax_branch, md_apply_fix): Treat + weak symbols as not known to be in the same section, even if they + are defined. + +gas/testsuite/ + +2010-04-29 Nathan Sidwell + + * gas/arm/weakdef-1.s: New. + * gas/arm/weakdef-1.d: New. + * gas/arm/weakdef-2.s: New. + * gas/arm/weakdef-2.d: New. + * gas/arm/weakdef-2.l: New. + +@DPATCH@ +diff -urN gas.orig/config/tc-arm.c gas/config/tc-arm.c +--- gas.orig/config/tc-arm.c 2010-02-22 08:06:52.000000000 +0000 ++++ gas/config/tc-arm.c 2010-05-06 12:52:25.391085365 +0000 +@@ -18207,7 +18207,8 @@ + + /* Assume worst case for symbols not known to be in the same section. */ + if (!S_IS_DEFINED (fragp->fr_symbol) +- || sec != S_GET_SEGMENT (fragp->fr_symbol)) ++ || sec != S_GET_SEGMENT (fragp->fr_symbol) ++ || S_IS_WEAK (fragp->fr_symbol)) + return 4; + + val = relaxed_symbol_addr (fragp, stretch); +@@ -18250,7 +18251,8 @@ + + /* Assume worst case for symbols not known to be in the same section. */ + if (!S_IS_DEFINED (fragp->fr_symbol) +- || sec != S_GET_SEGMENT (fragp->fr_symbol)) ++ || sec != S_GET_SEGMENT (fragp->fr_symbol) ++ || S_IS_WEAK (fragp->fr_symbol)) + return 4; + + #ifdef OBJ_ELF +@@ -19463,22 +19465,23 @@ + not have a reloc for it, so tc_gen_reloc will reject it. */ + fixP->fx_done = 1; + +- if (fixP->fx_addsy +- && ! S_IS_DEFINED (fixP->fx_addsy)) ++ if (fixP->fx_addsy) + { +- as_bad_where (fixP->fx_file, fixP->fx_line, +- _("undefined symbol %s used as an immediate value"), +- S_GET_NAME (fixP->fx_addsy)); +- break; +- } ++ const char *msg = 0; + +- if (fixP->fx_addsy +- && S_GET_SEGMENT (fixP->fx_addsy) != seg) +- { +- as_bad_where (fixP->fx_file, fixP->fx_line, +- _("symbol %s is in a different section"), +- S_GET_NAME (fixP->fx_addsy)); +- break; ++ if (! S_IS_DEFINED (fixP->fx_addsy)) ++ msg = _("undefined symbol %s used as an immediate value"); ++ else if (S_GET_SEGMENT (fixP->fx_addsy) != seg) ++ msg = _("symbol %s is in a different section"); ++ else if (S_IS_WEAK (fixP->fx_addsy)) ++ msg = _("symbol %s is weak and may be overridden later"); ++ ++ if (msg) ++ { ++ as_bad_where (fixP->fx_file, fixP->fx_line, ++ msg, S_GET_NAME (fixP->fx_addsy)); ++ break; ++ } + } + + newimm = encode_arm_immediate (value); +@@ -19504,24 +19507,25 @@ + unsigned int highpart = 0; + unsigned int newinsn = 0xe1a00000; /* nop. */ + +- if (fixP->fx_addsy +- && ! S_IS_DEFINED (fixP->fx_addsy)) ++ if (fixP->fx_addsy) + { +- as_bad_where (fixP->fx_file, fixP->fx_line, +- _("undefined symbol %s used as an immediate value"), +- S_GET_NAME (fixP->fx_addsy)); +- break; +- } ++ const char *msg = 0; + +- if (fixP->fx_addsy +- && S_GET_SEGMENT (fixP->fx_addsy) != seg) +- { +- as_bad_where (fixP->fx_file, fixP->fx_line, +- _("symbol %s is in a different section"), +- S_GET_NAME (fixP->fx_addsy)); +- break; ++ if (! S_IS_DEFINED (fixP->fx_addsy)) ++ msg = _("undefined symbol %s used as an immediate value"); ++ else if (S_GET_SEGMENT (fixP->fx_addsy) != seg) ++ msg = _("symbol %s is in a different section"); ++ else if (S_IS_WEAK (fixP->fx_addsy)) ++ msg = _("symbol %s is weak and may be overridden later"); ++ ++ if (msg) ++ { ++ as_bad_where (fixP->fx_file, fixP->fx_line, ++ msg, S_GET_NAME (fixP->fx_addsy)); ++ break; ++ } + } +- ++ + newimm = encode_arm_immediate (value); + temp = md_chars_to_number (buf, INSN_SIZE); + +diff -urN gas.orig/config/tc-arm.h gas/config/tc-arm.h +--- gas.orig/config/tc-arm.h 2009-09-01 00:24:01.000000000 +0000 ++++ gas/config/tc-arm.h 2010-05-06 12:53:42.784835970 +0000 +@@ -183,6 +183,7 @@ + (!(FIX)->fx_pcrel \ + || (FIX)->fx_r_type == BFD_RELOC_ARM_GOT32 \ + || (FIX)->fx_r_type == BFD_RELOC_32 \ ++ || ((FIX)->fx_addsy != NULL && S_IS_WEAK ((FIX)->fx_addsy)) \ + || TC_FORCE_RELOCATION (FIX)) + + /* Force output of R_ARM_REL32 relocations against thumb function symbols. +diff -urN gas.orig/testsuite/gas/arm/weakdef-1.d gas/testsuite/gas/arm/weakdef-1.d +--- gas.orig/testsuite/gas/arm/weakdef-1.d 1970-01-01 00:00:00.000000000 +0000 ++++ gas/testsuite/gas/arm/weakdef-1.d 2010-05-06 12:52:25.391085365 +0000 +@@ -0,0 +1,20 @@ ++# name: Thumb branch to weak ++# as: ++# objdump: -dr ++# This test is only valid on ELF based ports. ++#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* ++ ++.*: +file format .*arm.* ++ ++ ++Disassembly of section .text: ++ ++0+000 : ++ 0: e7fe b.n 2 ++ 0: R_ARM_THM_JUMP11 Strong ++ ++0+002 : ++ 2: f7ff bffe b.w 0 ++ 2: R_ARM_THM_JUMP24 Random ++ 6: f7ff bffe b.w 0 ++ 6: R_ARM_THM_JUMP24 Weak +diff -urN gas.orig/testsuite/gas/arm/weakdef-1.s gas/testsuite/gas/arm/weakdef-1.s +--- gas.orig/testsuite/gas/arm/weakdef-1.s 1970-01-01 00:00:00.000000000 +0000 ++++ gas/testsuite/gas/arm/weakdef-1.s 2010-05-06 12:52:25.391085365 +0000 +@@ -0,0 +1,18 @@ ++ .syntax unified ++ .text ++ .thumb ++ ++ .globl Weak ++ .weak Weak ++ .thumb_func ++ .type Weak, %function ++Weak: ++ b Strong ++ .size Weak, .-Weak ++ ++ .globl Strong ++ .type Strong, %function ++Strong: ++ b Random ++ b Weak ++ .size Strong, .-Strong +diff -urN gas.orig/testsuite/gas/arm/weakdef-2.d gas/testsuite/gas/arm/weakdef-2.d +--- gas.orig/testsuite/gas/arm/weakdef-2.d 1970-01-01 00:00:00.000000000 +0000 ++++ gas/testsuite/gas/arm/weakdef-2.d 2010-05-06 12:52:25.391085365 +0000 +@@ -0,0 +1,5 @@ ++# name: adr of weak ++# as: ++# error-output: weakdef-2.l ++# This test is only valid on ELF based ports. ++#not-target: *-*-*coff *-*-pe *-*-wince *-*-*aout* *-*-netbsd *-*-riscix* +diff -urN gas.orig/testsuite/gas/arm/weakdef-2.l gas/testsuite/gas/arm/weakdef-2.l +--- gas.orig/testsuite/gas/arm/weakdef-2.l 1970-01-01 00:00:00.000000000 +0000 ++++ gas/testsuite/gas/arm/weakdef-2.l 2010-05-06 12:52:25.391085365 +0000 +@@ -0,0 +1,3 @@ ++[^:]*: Assembler messages: ++[^:]*:9: Error: symbol Weak is weak and may be overridden later ++[^:]*:10: Error: symbol Weak is weak and may be overridden later +diff -urN gas.orig/testsuite/gas/arm/weakdef-2.s gas/testsuite/gas/arm/weakdef-2.s +--- gas.orig/testsuite/gas/arm/weakdef-2.s 1970-01-01 00:00:00.000000000 +0000 ++++ gas/testsuite/gas/arm/weakdef-2.s 2010-05-06 12:52:25.391085365 +0000 +@@ -0,0 +1,10 @@ ++ .syntax unified ++ .text ++ .globl Strong ++Strong: ++ adrl r0,Strong ++ adr r0,Strong ++ .globl Weak ++ .weak Weak ++Weak: adrl r0,Weak ++ adr r0,Weak --- binutils-2.20.1.orig/debian/patches/142_arm_fix_arm_failures.dpatch +++ binutils-2.20.1/debian/patches/142_arm_fix_arm_failures.dpatch @@ -0,0 +1,178 @@ +#!/bin/sh -e +## 142_arm_fix_arm_failures.dpatch +## +## DP: Description: [arm] Fix ld-shared/shared.exp and ld-elfvsb/elfvsb.exp failures + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +Index: ld/testsuite/ld-elfvsb/elfvsb.exp +=================================================================== +RCS file: /cvs/src/src/ld/testsuite/ld-elfvsb/elfvsb.exp,v +retrieving revision 1.32 +diff -u -p -r1.32 elfvsb.exp +--- ./ld/testsuite/ld-elfvsb/elfvsb.exp 2 Sep 2009 07:25:39 -0000 1.32 ++++ ./ld/testsuite/ld-elfvsb/elfvsb.exp 5 Feb 2010 15:54:46 -0000 +@@ -60,6 +60,7 @@ if ![isnative] then {return} + + set tmpdir tmpdir + set SHCFLAG "" ++set shared_needs_pic "no" + + if { [istarget rs6000*-*-aix*] || [istarget powerpc*-*-aix*] } { + +@@ -91,6 +92,27 @@ if { [istarget rs6000*-*-aix*] || [istar + close $file + } + ++if [istarget arm*-*-linux*] { ++ # On ARM section anchors can change the symbol pre-emptability for ++ # non-PIC shared libraries, causing these tests to fail. Turn section ++ # anchors off. ++ set SHCFLAG "-fno-section-anchors" ++ ++ # On targets that have MOVW the compiler will emit relocations which ++ # the linker doesn't support when compiling -shared without -fpic. The ++ # test to find out whether we want to XFAIL the non-PIC tests requires ++ # a compile - so we pre-calculate it here. We also note that this can ++ # only affect arm*-*-*eabi targets as the old ABI doesn't support v7. ++ if [istarget arm*-*-*eabi] { ++ set file [open $tmpdir/movw-detect.c w] ++ puts $file "void foo(void) { __asm (\"movw r0, #0\"); }" ++ close $file ++ if [run_host_cmd_yesno "$CC" "$CFLAGS -c $tmpdir/movw-detect.c -o $tmpdir/movw-detect.o"] { ++ set shared_needs_pic "yes" ++ } ++ } ++} ++ + set support_protected "no" + + if [istarget *-*-linux*] { +@@ -201,6 +223,7 @@ proc visibility_run {visibility} { + global picflag + global target_triplet + global support_protected ++ global shared_needs_pic + + if [ string match $visibility "hidden" ] { + set VSBCFLAG "-DHIDDEN_TEST" +@@ -273,6 +296,9 @@ proc visibility_run {visibility} { + if { ![istarget hppa*64*-*-linux*] } { + setup_xfail "hppa*-*-linux*" + } ++ if [ string match $shared_needs_pic "yes" ] { ++ setup_xfail "arm*-*-linux*" ++ } + + visibility_test $visibility vnp "visibility ($visibility) (non PIC)" mainnp.o sh1np.o sh2np.o elfvsb + +@@ -311,6 +337,9 @@ proc visibility_run {visibility} { + if { ![istarget hppa*64*-*-linux*] } { + setup_xfail "hppa*-*-linux*" + } ++ if [ string match $shared_needs_pic "yes" ] { ++ setup_xfail "arm*-*-linux*" ++ } + + visibility_test $visibility vnp "visibility ($visibility) (non PIC, load offset)" \ + mainnp.o sh1np.o sh2np.o elfvsb \ +@@ -377,6 +406,9 @@ proc visibility_run {visibility} { + if { ![istarget hppa*64*-*-linux*] } { + setup_xfail "hppa*-*-linux*" + } ++ if [ string match $shared_needs_pic "yes" ] { ++ setup_xfail "arm*-*-linux*" ++ } + + visibility_test $visibility vmpnp "visibility ($visibility) (PIC main, non PIC so)" mainp.o sh1np.o sh2np.o elfvsb + } +Index: ld/testsuite/ld-shared/shared.exp +=================================================================== +RCS file: /cvs/src/src/ld/testsuite/ld-shared/shared.exp,v +retrieving revision 1.23 +diff -u -p -r1.23 shared.exp +--- ./ld/testsuite/ld-shared/shared.exp 2 Sep 2009 07:25:42 -0000 1.23 ++++ ./ld/testsuite/ld-shared/shared.exp 5 Feb 2010 15:54:47 -0000 +@@ -66,6 +66,7 @@ if { [istarget *-*-linux*aout*] \ + + set tmpdir tmpdir + set SHCFLAG "" ++set shared_needs_pic "no" + + if { [istarget rs6000*-*-aix*] || [istarget powerpc*-*-aix*] } { + +@@ -97,6 +98,27 @@ if { [istarget rs6000*-*-aix*] || [istar + close $file + } + ++if [istarget arm*-*-linux*] { ++ # On ARM section anchors can change the symbol pre-emptability for ++ # non-PIC shared libraries, causing these tests to fail. Turn section ++ # anchors off. ++ set SHCFLAG "-fno-section-anchors" ++ ++ # On targets that have MOVW the compiler will emit relocations which ++ # the linker doesn't support when compiling -shared without -fpic. The ++ # test to find out whether we want to XFAIL the non-PIC tests requires ++ # a compile - so we pre-calculate it here. We also note that this can ++ # only affect arm*-*-*eabi targets as the old ABI doesn't support v7. ++ if [istarget arm*-*-*eabi] { ++ set file [open $tmpdir/movw-detect.c w] ++ puts $file "void foo(void) { __asm (\"movw r0, #0\"); }" ++ close $file ++ if [run_host_cmd_yesno "$CC" "$CFLAGS -c $tmpdir/movw-detect.c -o $tmpdir/movw-detect.o"] { ++ set shared_needs_pic "yes" ++ } ++ } ++} ++ + # The test procedure. + proc shared_test { progname testname main sh1 sh2 dat args } { + global CC +@@ -212,6 +234,9 @@ if ![ld_compile "$CC $CFLAGS $SHCFLAG" $ + } + setup_xfail "x86_64-*-linux*" + setup_xfail "s390x-*-linux*" ++ if [ string match $shared_needs_pic "yes" ] { ++ setup_xfail "arm*-*-linux*" ++ } + shared_test shnp "shared (non PIC)" mainnp.o sh1np.o sh2np.o shared + + # Test ELF shared library relocations with a non-zero load +@@ -232,6 +257,9 @@ if ![ld_compile "$CC $CFLAGS $SHCFLAG" $ + } + setup_xfail "x86_64-*-linux*" + setup_xfail "s390x-*-linux*" ++ if [ string match $shared_needs_pic "yes" ] { ++ setup_xfail "arm*-*-linux*" ++ } + shared_test shnp "shared (non PIC, load offset)" \ + mainnp.o sh1np.o sh2np.o shared \ + "-T $srcdir/$subdir/elf-offset.ld" +@@ -281,6 +309,9 @@ if ![ld_compile "$CC $CFLAGS $SHCFLAG $p + } + setup_xfail "x86_64-*-linux*" + setup_xfail "s390x-*-linux*" ++ if [ string match $shared_needs_pic "yes" ] { ++ setup_xfail "arm*-*-linux*" ++ } + shared_test shmpnp "shared (PIC main, non PIC so)" mainp.o sh1np.o sh2np.o shared + } + } else { --- binutils-2.20.1.orig/debian/patches/140_gold_pr10979_3.dpatch +++ binutils-2.20.1/debian/patches/140_gold_pr10979_3.dpatch @@ -0,0 +1,51 @@ +#!/bin/sh -e +## 140_gold_pr10979_1.dpatch +## +## DP: Description: PR gold/10979: Fix internal errors + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +2009-12-30 Ian Lance Taylor + + PR 10979 + * layout.cc (Layout::relaxation_loop_body): If -Ttext was used, + don't put the file header and segment headers in the text + segment. + +@DPATCH@ +=================================================================== +RCS file: /cvs/src/src/gold/layout.cc,v +retrieving revision 1.154 +retrieving revision 1.155 +diff -u -r1.154 -r1.155 +--- src/gold/layout.cc 2009/12/31 03:48:46 1.154 ++++ src/gold/layout.cc 2009/12/31 05:43:29 1.155 +@@ -1482,6 +1482,12 @@ + != General_options::OBJECT_FORMAT_ELF) + load_seg = NULL; + ++ // If the user set the address of the text segment, that may not be ++ // compatible with putting the segment headers and file headers into ++ // that segment. ++ if (parameters->options().user_set_Ttext()) ++ load_seg = NULL; ++ + gold_assert(phdr_seg == NULL + || load_seg != NULL + || this->script_options_->saw_sections_clause()); --- binutils-2.20.1.orig/debian/patches/201_elflink_improve_noaddneeded_errors.dpatch +++ binutils-2.20.1/debian/patches/201_elflink_improve_noaddneeded_errors.dpatch @@ -0,0 +1,70 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 201_elflink_improve_errors.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Improves error messages regarding -no-add-needed cases; needed for +## DP: later elflink patches +## DP: Upstream status: submitted upstream for binutils-2_20-branch + +2010-08-07 Kirill Smelkov + + Backport from mainline: + 2009-11-05 Nick Clifton + + * elflink.c (elf_link_add_object_symbols): Improve error + message generated when a symbol is left unresolved because a + --no-add-needed command line option has prevented the + inclusion of the DSO defining it. + +@DPATCH@ +diff --git a/bfd/elflink.c b/bfd/elflink.c +index 4a348de..10eee8c 100644 +--- a/bfd/elflink.c ++++ b/bfd/elflink.c +@@ -3866,6 +3866,7 @@ error_free_dyn: + bfd_boolean common; + unsigned int old_alignment; + bfd *old_bfd; ++ bfd * undef_bfd = NULL; + + override = FALSE; + +@@ -4097,6 +4098,20 @@ error_free_dyn: + name = newname; + } + ++ /* If this is a definition of a previously undefined symbol ++ make a note of the bfd that contained the reference in ++ case we need to refer to it later on in error messages. */ ++ if (! bfd_is_und_section (sec)) ++ { ++ h = elf_link_hash_lookup (elf_hash_table (info), name, FALSE, FALSE, FALSE); ++ ++ if (h != NULL ++ && (h->root.type == bfd_link_hash_undefined ++ || h->root.type == bfd_link_hash_undefweak) ++ && h->root.u.undef.abfd) ++ undef_bfd = h->root.u.undef.abfd; ++ } ++ + if (!_bfd_elf_merge_symbol (abfd, info, name, isym, &sec, + &value, &old_alignment, + sym_hash, &skip, &override, +@@ -4437,9 +4452,12 @@ error_free_dyn: + if ((elf_dyn_lib_class (abfd) & DYN_NO_NEEDED) != 0) + { + (*_bfd_error_handler) +- (_("%B: invalid DSO for symbol `%s' definition"), ++ (_("%B: undefined reference to symbol '%s'"), ++ undef_bfd == NULL ? info->output_bfd : undef_bfd, name); ++ (*_bfd_error_handler) ++ (_("note: '%s' is defined in DSO %B so try adding it to the linker command line"), + abfd, name); +- bfd_set_error (bfd_error_bad_value); ++ bfd_set_error (bfd_error_invalid_operation); + goto error_free_vers; + } + +-- +1.7.2.1.44.g721e7 + --- binutils-2.20.1.orig/debian/patches/020_pie_mips.dpatch +++ binutils-2.20.1/debian/patches/020_pie_mips.dpatch @@ -0,0 +1,41 @@ +#!/bin/sh -e +## 020_pie_mips.dpatch +## +## DP: Description: Fix -pie on mips/mipsel +## DP: Author: Alan Modra +## DP: Upstream status: in BTS, not yet merged + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +--- a/bfd/elfxx-mips.c 18 Sep 2009 20:34:30 -0000 1.262 ++++ b/bfd/elfxx-mips.c 4 Nov 2009 01:50:24 -0000 +@@ -5688,9 +5688,9 @@ mips_elf_create_dynamic_relocation (bfd + + /* We must now calculate the dynamic symbol table index to use + in the relocation. */ +- if (h != NULL +- && (!h->root.def_regular +- || (info->shared && !info->symbolic && !h->root.forced_local))) ++ if (!(h == NULL ++ || (h->root.def_regular ++ && (info->executable || info->symbolic || h->root.forced_local)))) + { + indx = h->root.dynindx; + if (SGI_COMPAT (output_bfd)) --- binutils-2.20.1.orig/debian/patches/132_libiberty_sh.dpatch +++ binutils-2.20.1/debian/patches/132_libiberty_sh.dpatch @@ -0,0 +1,45 @@ +#!/bin/sh -e +## 132_libiberty_sh.dpatch +## +## DP: Description: libiberty build fix for sh +## DP: Author: Nobuhiro Iwamatsu + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +--- a/libiberty/configure.ac ++++ b/libiberty/configure.ac +@@ -217,6 +217,7 @@ if [[ "${shared}" = "yes" ]]; then + * ) PICFLAG=-fPIC ;; + esac ;; + s390*-*-*) PICFLAG=-fpic ;; ++ sh*-*-*) PICFLAG=-fPIC ;; + esac + fi + AC_SUBST(PICFLAG) +--- a/libiberty/configure ++++ b/libiberty/configure +@@ -4860,6 +4860,7 @@ if [ "${shared}" = "yes" ]; then + * ) PICFLAG=-fPIC ;; + esac ;; + s390*-*-*) PICFLAG=-fpic ;; ++ sh*-*-*) PICFLAG=-fPIC ;; + esac + fi + --- binutils-2.20.1.orig/debian/patches/00list +++ binutils-2.20.1/debian/patches/00list @@ -0,0 +1,41 @@ +#000_branch_updates +001_ld_makefile_patch +002_gprof_profile_arcs +003_gprof_see_also_monitor +006_better_file_error +012_check_ldrunpath_length +013_bash_in_ld_testsuite +020_pie_mips.dpatch + +127_x86_64_i386_biarch +128_build_id +129_dir_section +130_gold_disable_testsuite_build +131_ld_bootstrap_testsuite +132_libiberty_sh +133_enable_gold +134_gold_no_spu +137_pr11138 +138_gold_asneeded +139_gold_pr10916 +140_gold_pr10979_1 +140_gold_pr10979_2 +140_gold_pr10979_3 +141_pr10740 +142_arm_fix_arm_failures +143_pr42602 +144_no_infunc_symbols_from_shlib +145_ld_man_typo +146_arm_readelf_unwind +#147_arm_linking_time +148_pr11426 +149_pr11456 +150_loongson-2f +151_arm_opt_merge_exidx_entries +152_arm_branches_to_weak_symbols +153_gold_pr10893 +154_e500_mask +155_arm_attribute_support +200_elflink_%B_fixes +201_elflink_improve_noaddneeded_errors +202_elflink_noaddneeded_vs_weak --- binutils-2.20.1.orig/debian/patches/001_ld_makefile_patch.dpatch +++ binutils-2.20.1/debian/patches/001_ld_makefile_patch.dpatch @@ -0,0 +1,52 @@ +#!/bin/sh -e +## 001_ld_makefile_patch.dpatch +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Description: correct where ld scripts are installed +## DP: Author: Chris Chimelis +## DP: Upstream status: N/A +## DP: Date: ?? + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad --exclude=CVS --exclude=.svn ./ld/Makefile.am /tmp/dpep-work.eKU2vW/binutils-2.16.1cvs20050902/ld/Makefile.am +--- ./ld/Makefile.am 2005-08-31 03:27:36.000000000 +0000 ++++ /tmp/dpep-work.eKU2vW/binutils-2.16.1cvs20050902/ld/Makefile.am 2005-09-02 21:42:18.000000000 +0000 +@@ -20,7 +20,7 @@ + # We put the scripts in the directory $(scriptdir)/ldscripts. + # We can't put the scripts in $(datadir) because the SEARCH_DIR + # directives need to be different for native and cross linkers. +-scriptdir = $(tooldir)/lib ++scriptdir = $(libdir) + + EMUL = @EMUL@ + EMULATION_OFILES = @EMULATION_OFILES@ +diff -urNad --exclude=CVS --exclude=.svn ./ld/Makefile.in /tmp/dpep-work.eKU2vW/binutils-2.16.1cvs20050902/ld/Makefile.in +--- ./ld/Makefile.in 2005-08-31 03:27:36.000000000 +0000 ++++ /tmp/dpep-work.eKU2vW/binutils-2.16.1cvs20050902/ld/Makefile.in 2005-09-02 21:43:37.259127535 +0000 +@@ -268,7 +268,7 @@ + # We put the scripts in the directory $(scriptdir)/ldscripts. + # We can't put the scripts in $(datadir) because the SEARCH_DIR + # directives need to be different for native and cross linkers. +-scriptdir = $(tooldir)/lib ++scriptdir = $(libdir) + BASEDIR = $(srcdir)/.. + BFDDIR = $(BASEDIR)/bfd + INCDIR = $(BASEDIR)/include --- binutils-2.20.1.orig/debian/patches/139_gold_pr10916.dpatch +++ binutils-2.20.1/debian/patches/139_gold_pr10916.dpatch @@ -0,0 +1,58 @@ +#!/bin/sh -e +## 139_gold_pr10916.dpatch +## +## DP: Description: PR gold/10916: Fix --exclude-libs with undefined symbol + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +--- ./gold/symtab.cc 29 Dec 2009 00:31:48 -0000 1.134 ++++ ./gold/symtab.cc 31 Dec 2009 01:12:48 -0000 +@@ -1151,7 +1151,8 @@ Symbol_table::add_from_relobj( + } + + // Fix up visibility if object has no-export set. +- if (relobj->no_export()) ++ if (relobj->no_export() ++ && (orig_st_shndx != elfcpp::SHN_UNDEF || !is_ordinary)) + { + // We may have copied symbol already above. + if (psym != &sym2) +diff -p -u -r1.1 exclude_libs_test_1.c +--- ./gold/testsuite/exclude_libs_test_1.c 19 May 2009 22:14:17 -0000 1.1 ++++ ./gold/testsuite/exclude_libs_test_1.c 31 Dec 2009 01:12:48 -0000 +@@ -2,6 +2,8 @@ void lib1_default (void); + void lib1_hidden (void); + void lib1_internal (void); + void lib1_protected (void); ++void lib1_ref (void); ++extern void lib2_default (void); + + void __attribute__((visibility ("default"))) + lib1_default (void) +@@ -22,3 +24,9 @@ void __attribute__((visibility ("protect + lib1_protected (void) + { + } ++ ++void ++lib1_ref (void) ++{ ++ lib2_default (); ++} --- binutils-2.20.1.orig/debian/patches/128_build_id.dpatch +++ binutils-2.20.1/debian/patches/128_build_id.dpatch @@ -0,0 +1,64 @@ +#!/bin/sh -e +## 128_build_id.dpatch +## +## DP: Description: Fix ld corrupt build ID generation +## DP: Author: Nick Clifton +## DP: Upstream status: Taken from Fedora (BZ 501582) + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +--- ./bfd/section.c.orig 2009-09-09 23:40:20.000000000 +0200 ++++ ./bfd/section.c 2009-09-10 17:09:57.000000000 +0200 +@@ -1496,7 +1496,7 @@ + return TRUE; + + p = (bfd_byte *) +- bfd_malloc (sec->rawsize > sec->size ? sec->rawsize : sec->size); ++ bfd_zmalloc (sec->rawsize > sec->size ? sec->rawsize : sec->size); + if (p == NULL) + return FALSE; + *buf = p; +--- ./bfd/elfcode.h.orig 2009-09-09 23:40:19.000000000 +0200 ++++ ./bfd/elfcode.h 2009-09-10 17:08:49.000000000 +0200 +@@ -1139,6 +1139,24 @@ + + if (i_shdr.contents) + (*process) (i_shdr.contents, i_shdr.sh_size, arg); ++ else ++ { ++ asection *sec; ++ ++ sec = bfd_section_from_elf_index (abfd, count); ++ if (sec != NULL) ++ { ++ if (sec->contents == NULL) ++ { ++ /* Force rereading from file. */ ++ sec->flags &= ~SEC_IN_MEMORY; ++ if (! bfd_malloc_and_get_section (abfd, sec, & sec->contents)) ++ continue; ++ } ++ if (sec->contents != NULL) ++ (*process) (sec->contents, i_shdr.sh_size, arg); ++ } ++ } + } + + return TRUE; --- binutils-2.20.1.orig/debian/patches/149_pr11456.dpatch +++ binutils-2.20.1/debian/patches/149_pr11456.dpatch @@ -0,0 +1,48 @@ +#!/bin/sh -e +## 149_pr11456.dpatch +## +## DP: Description: PR gas/11456: Use memcpy to copy overlap memory. + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +2010-03-30 H.J. Lu + + PR gas/11456 + * input-scrub.c (input_scrub_next_buffer): Use memmove instead + of memcpy to copy overlap memory. + +@DPATCH@ +=================================================================== +RCS file: /cvs/src/src/gas/input-scrub.c,v +retrieving revision 1.22 +retrieving revision 1.23 +diff -u -r1.22 -r1.23 +--- src/gas/input-scrub.c 2009/09/11 15:27:33 1.22 ++++ src/gas/input-scrub.c 2010/03/30 23:20:25 1.23 +@@ -343,8 +343,8 @@ + + if (partial_size) + { +- memcpy (buffer_start + BEFORE_SIZE, partial_where, +- (unsigned int) partial_size); ++ memmove (buffer_start + BEFORE_SIZE, partial_where, ++ (unsigned int) partial_size); + memcpy (buffer_start + BEFORE_SIZE, save_source, AFTER_SIZE); + } + limit = input_file_give_next_buffer (buffer_start --- binutils-2.20.1.orig/debian/patches/155_arm_attribute_support.dpatch +++ binutils-2.20.1/debian/patches/155_arm_attribute_support.dpatch @@ -0,0 +1,430 @@ +#!/bin/sh -e +## 155_arm_attribute_support.dpatch +# DP: Update ARM attribute support for Tag_DIV_use and Tag_MPextension_use + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +bfd/ + +2010-02-18 Matthew Gretton-Dann + + * elf32-arm.c (elf32_arm_merge_eabi_attributes): Add support for + merging Tag_DIV_use, Tag_MPextension_use, and + Tag_MPextension_use_legacy tags. + +binutils/ + +2010-02-18 Matthew Gretton-Dann + + * readelf.c (arm_attr_tag_Advanced_SIMD_arch): Add description of + newly permitted attribute values. + (arm_attr_tag_Virtualization_use): Likewise. + (arm_attr_tag_DIV_use): Add description of new attribute. + (arm_attr_tag_MPextension_use_legacy): Likewise. + +gas/ + +2010-02-18 Matthew Gretton-Dann + + * config/tc-arm.c (arm_convert_symbolic_attribute): Add Tag_DIV_use. + * doc/c-arm.texi: Likewise. + +gas/testsuite/ + +2010-02-18 Matthew Gretton-Dann + + * gas/arm/attr-order.d: Fix test for new names for attribute + values. + + +include/elf/ + +2010-02-18 Matthew Gretton-Dann + + * arm.h (Tag_MPextension_use): Renumber. + (Tag_DIV_use): Add. + (Tag_MPextension_use_legacy): Likewise. + +ld/testsuite/ + +2010-02-18 Matthew Gretton-Dann + + * ld-arm/attr-merge-6.attr: Add new test. Missed off last commit. + +2010-02-18 Matthew Gretton-Dann + + * ld-arm/attr-merge-3.attr: Fix test for new attribute values. + * ld-arm/attr-merge-3b.s: Likewise. + * ld-arm/attr-merge-unknown-1.d: Fix test now that 42 is a recognised + attribute ID. + * ld-arm/attr-merge-unknown-1.s: Likewise. + * ld-arm/attr-merge-6.attr: New test. + * ld-arm/attr-merge-6a.s: Likewise. + * ld-arm/attr-merge-6b.s: Likewise. + * ld-arm/attr-merge-7.attr: Likewise. + * ld-arm/attr-merge-7a.s: Likewise. + * ld-arm/attr-merge-7b.s: Likewise. + * ld-arm/arm-elf.exp: Run the new tests. + +@DPATCH@ +diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c +index 0661369..a0694c1 100644 +--- a/bfd/elf32-arm.c ++++ b/bfd/elf32-arm.c +@@ -9812,11 +9812,33 @@ elf32_arm_merge_eabi_attributes (bfd *ibfd, bfd *obfd) + /* This is the first object. Copy the attributes. */ + _bfd_elf_copy_obj_attributes (ibfd, obfd); + ++ out_attr = elf_known_obj_attributes_proc (obfd); ++ + /* Use the Tag_null value to indicate the attributes have been + initialized. */ +- elf_known_obj_attributes_proc (obfd)[0].i = 1; ++ out_attr[0].i = 1; + +- return TRUE; ++ /* We do not output objects with Tag_MPextension_use_legacy - we move ++ the attribute's value to Tag_MPextension_use. */ ++ if (out_attr[Tag_MPextension_use_legacy].i != 0) ++ { ++ if (out_attr[Tag_MPextension_use].i != 0 ++ && out_attr[Tag_MPextension_use_legacy].i ++ != out_attr[Tag_MPextension_use].i) ++ { ++ _bfd_error_handler ++ (_("Error: %B has both the current and legacy " ++ "Tag_MPextension_use attributes"), ibfd); ++ result = FALSE; ++ } ++ ++ out_attr[Tag_MPextension_use] = ++ out_attr[Tag_MPextension_use_legacy]; ++ out_attr[Tag_MPextension_use_legacy].type = 0; ++ out_attr[Tag_MPextension_use_legacy].i = 0; ++ } ++ ++ return result; + } + + in_attr = elf_known_obj_attributes_proc (ibfd); +@@ -10151,6 +10173,52 @@ elf32_arm_merge_eabi_attributes (bfd *ibfd, bfd *obfd) + out_attr[i].i = in_attr[i].i; + break; + ++ case Tag_DIV_use: ++ /* This tag is set to zero if we can use UDIV and SDIV in Thumb ++ mode on a v7-M or v7-R CPU; to one if we can not use UDIV or ++ SDIV at all; and to two if we can use UDIV or SDIV on a v7-A ++ CPU. We will merge as follows: If the input attribute's value ++ is one then the output attribute's value remains unchanged. If ++ the input attribute's value is zero or two then if the output ++ attribute's value is one the output value is set to the input ++ value, otherwise the output value must be the same as the ++ inputs. */ ++ if (in_attr[i].i != 1 && out_attr[i].i != 1) ++ { ++ if (in_attr[i].i != out_attr[i].i) ++ { ++ _bfd_error_handler ++ (_("DIV usage mismatch between %B and %B"), ++ ibfd, obfd); ++ result = FALSE; ++ } ++ } ++ ++ if (in_attr[i].i != 1) ++ out_attr[i].i = in_attr[i].i; ++ ++ break; ++ ++ case Tag_MPextension_use_legacy: ++ /* We don't output objects with Tag_MPextension_use_legacy - we ++ move the value to Tag_MPextension_use. */ ++ if (in_attr[i].i != 0 && in_attr[Tag_MPextension_use].i != 0) ++ { ++ if (in_attr[Tag_MPextension_use].i != in_attr[i].i) ++ { ++ _bfd_error_handler ++ (_("%B has has both the current and legacy " ++ "Tag_MPextension_use attributes"), ++ ibfd); ++ result = FALSE; ++ } ++ } ++ ++ if (in_attr[i].i > out_attr[Tag_MPextension_use].i) ++ out_attr[Tag_MPextension_use] = in_attr[i]; ++ ++ break; ++ + case Tag_nodefaults: + /* This tag is set if it exists, but the value is unused (and is + typically zero). We don't actually need to do anything here - +diff --git a/binutils/readelf.c b/binutils/readelf.c +index 6994289..b5d766f 100644 +--- a/binutils/readelf.c ++++ b/binutils/readelf.c +@@ -9071,7 +9071,8 @@ static const char * arm_attr_tag_THUMB_ISA_use[] = + static const char * arm_attr_tag_VFP_arch[] = + {"No", "VFPv1", "VFPv2", "VFPv3", "VFPv3-D16", "VFPv4", "VFPv4-D16"}; + static const char * arm_attr_tag_WMMX_arch[] = {"No", "WMMXv1", "WMMXv2"}; +-static const char * arm_attr_tag_Advanced_SIMD_arch[] = {"No", "NEONv1"}; ++static const char * arm_attr_tag_Advanced_SIMD_arch[] = ++ {"No", "NEONv1", "NEONv1 with Fused-MAC"}; + static const char * arm_attr_tag_PCS_config[] = + {"None", "Bare platform", "Linux application", "Linux DSO", "PalmOS 2004", + "PalmOS (reserved)", "SymbianOS 2004", "SymbianOS (reserved)"}; +@@ -9114,10 +9115,17 @@ static const char * arm_attr_tag_VFP_HP_extension[] = + {"Not Allowed", "Allowed"}; + static const char * arm_attr_tag_ABI_FP_16bit_format[] = + {"None", "IEEE 754", "Alternative Format"}; ++static const char * arm_attr_tag_MPextension_use[] = ++ {"Not Allowed", "Allowed"}; ++static const char * arm_attr_tag_DIV_use[] = ++ {"Allowed in Thumb-ISA, v7-R or v7-M", "Not allowed", ++ "Allowed in v7-A with integer division extension"}; + static const char * arm_attr_tag_T2EE_use[] = {"Not Allowed", "Allowed"}; + static const char * arm_attr_tag_Virtualization_use[] = ++ {"Not Allowed", "TrustZone", "Virtualization Extensions", ++ "TrustZone and Virtualization Extensions"}; ++static const char * arm_attr_tag_MPextension_use_legacy[] = + {"Not Allowed", "Allowed"}; +-static const char * arm_attr_tag_MPextension_use[] = {"Not Allowed", "Allowed"}; + + #define LOOKUP(id, name) \ + {id, #name, 0x80 | ARRAY_SIZE(arm_attr_tag_##name), arm_attr_tag_##name} +@@ -9155,12 +9163,14 @@ static arm_attr_public_tag arm_attr_public_tags[] = + LOOKUP(34, CPU_unaligned_access), + LOOKUP(36, VFP_HP_extension), + LOOKUP(38, ABI_FP_16bit_format), ++ LOOKUP(42, MPextension_use), ++ LOOKUP(44, DIV_use), + {64, "nodefaults", 0, NULL}, + {65, "also_compatible_with", 0, NULL}, + LOOKUP(66, T2EE_use), + {67, "conformance", 1, NULL}, + LOOKUP(68, Virtualization_use), +- LOOKUP(70, MPextension_use) ++ LOOKUP(70, MPextension_use_legacy) + }; + #undef LOOKUP + +diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c +index 4706600..04b3f70 100644 +--- a/gas/config/tc-arm.c ++++ b/gas/config/tc-arm.c +@@ -23043,12 +23043,14 @@ arm_convert_symbolic_attribute (const char *name) + T (Tag_CPU_unaligned_access), + T (Tag_VFP_HP_extension), + T (Tag_ABI_FP_16bit_format), ++ T (Tag_MPextension_use), ++ T (Tag_DIV_use), + T (Tag_nodefaults), + T (Tag_also_compatible_with), + T (Tag_conformance), + T (Tag_T2EE_use), + T (Tag_Virtualization_use), +- T (Tag_MPextension_use) ++ /* We deliberately do not include Tag_MPextension_use_legacy. */ + #undef T + }; + unsigned int i; +diff --git a/gas/doc/c-arm.texi b/gas/doc/c-arm.texi +index 69ed6b6..11d7215 100644 +--- a/gas/doc/c-arm.texi ++++ b/gas/doc/c-arm.texi +@@ -587,9 +587,10 @@ The @var{tag} is either an attribute number, or one of the following: + @code{Tag_ABI_optimization_goals}, @code{Tag_ABI_FP_optimization_goals}, + @code{Tag_compatibility}, @code{Tag_CPU_unaligned_access}, + @code{Tag_VFP_HP_extension}, @code{Tag_ABI_FP_16bit_format}, ++@code{Tag_MPextension_use}, @code{Tag_DIV_use}, + @code{Tag_nodefaults}, @code{Tag_also_compatible_with}, + @code{Tag_conformance}, @code{Tag_T2EE_use}, +-@code{Tag_Virtualization_use}, @code{Tag_MPextension_use} ++@code{Tag_Virtualization_use} + + The @var{value} is either a @code{number}, @code{"string"}, or + @code{number, "string"} depending on the tag. +diff --git a/gas/testsuite/gas/arm/attr-order.d b/gas/testsuite/gas/arm/attr-order.d +index 3f10867..83f9f68 100644 +--- a/gas/testsuite/gas/arm/attr-order.d ++++ b/gas/testsuite/gas/arm/attr-order.d +@@ -16,4 +16,4 @@ File Attributes + Tag_unknown_63: "val" + Tag_also_compatible_with: v6-M + Tag_T2EE_use: Allowed +- Tag_Virtualization_use: Allowed ++ Tag_Virtualization_use: TrustZone +diff --git a/include/elf/arm.h b/include/elf/arm.h +index 6011780..94c44d4 100644 +--- a/include/elf/arm.h ++++ b/include/elf/arm.h +@@ -288,13 +288,18 @@ enum + Tag_undefined37, + Tag_ABI_FP_16bit_format, + Tag_undefined39, ++ Tag_undefined40, ++ Tag_undefined41, ++ Tag_MPextension_use, ++ Tag_undefined_43, ++ Tag_DIV_use, + Tag_nodefaults = 64, + Tag_also_compatible_with, + Tag_T2EE_use, + Tag_conformance, + Tag_Virtualization_use, + Tag_undefined69, +- Tag_MPextension_use ++ Tag_MPextension_use_legacy + }; + + #endif +diff --git a/ld/testsuite/ld-arm/arm-elf.exp b/ld/testsuite/ld-arm/arm-elf.exp +index a207a79..ed9cb74 100644 +--- a/ld/testsuite/ld-arm/arm-elf.exp ++++ b/ld/testsuite/ld-arm/arm-elf.exp +@@ -296,6 +296,15 @@ set armeabitests { + {"EABI attribute merging 5" "-r" "" {attr-merge-5.s attr-merge-5.s} + {{readelf -A attr-merge-5.attr}} + "attr-merge-5"} ++ {"EABI attribute merging 6" "-r" "" {attr-merge-6a.s attr-merge-6b.s} ++ {{readelf -A attr-merge-6.attr}} ++ "attr-merge-6"} ++ {"EABI attribute merging 6 reversed" "-r" "" {attr-merge-6b.s attr-merge-6a.s} ++ {{readelf -A attr-merge-6.attr}} ++ "attr-merge-6r"} ++ {"EABI attribute merging 7" "-r" "" {attr-merge-7a.s attr-merge-7b.s} ++ {{readelf -A attr-merge-7.attr}} ++ "attr-merge-7"} + {"EABI attribute arch merging 1" "-r" "" {arch-v6k.s arch-v6t2.s} + {{readelf -A attr-merge-arch-1.attr}} + "attr-merge-arch-1"} +diff --git a/ld/testsuite/ld-arm/attr-merge-3.attr b/ld/testsuite/ld-arm/attr-merge-3.attr +index e4e06e1..b865181 100644 +--- a/ld/testsuite/ld-arm/attr-merge-3.attr ++++ b/ld/testsuite/ld-arm/attr-merge-3.attr +@@ -26,6 +26,6 @@ File Attributes + Tag_ABI_VFP_args: VFP registers + Tag_CPU_unaligned_access: v6 + Tag_VFP_HP_extension: Allowed +- Tag_T2EE_use: Allowed +- Tag_Virtualization_use: Allowed + Tag_MPextension_use: Allowed ++ Tag_T2EE_use: Allowed ++ Tag_Virtualization_use: TrustZone +diff --git a/ld/testsuite/ld-arm/attr-merge-3b.s b/ld/testsuite/ld-arm/attr-merge-3b.s +index b858482..73d6590 100644 +--- a/ld/testsuite/ld-arm/attr-merge-3b.s ++++ b/ld/testsuite/ld-arm/attr-merge-3b.s +@@ -33,6 +33,6 @@ + .eabi_attribute Tag_nodefaults, 1 + @ .eabi_attribute Tag_also_compatible_with, + .eabi_attribute Tag_T2EE_use, 1 +- .eabi_attribute Tag_conformance, "2.07" ++ .eabi_attribute Tag_conformance, "2.08" + .eabi_attribute Tag_Virtualization_use, 1 + .eabi_attribute Tag_MPextension_use, 1 +diff --git a/ld/testsuite/ld-arm/attr-merge-6.attr b/ld/testsuite/ld-arm/attr-merge-6.attr +new file mode 100644 +index 0000000..e996c93 +--- /dev/null ++++ b/ld/testsuite/ld-arm/attr-merge-6.attr +@@ -0,0 +1,9 @@ ++Attribute Section: aeabi ++File Attributes ++ Tag_CPU_name: "CORTEX-A9" ++ Tag_CPU_arch: v7 ++ Tag_CPU_arch_profile: Application ++ Tag_ARM_ISA_use: Yes ++ Tag_THUMB_ISA_use: Thumb-2 ++ Tag_MPextension_use: Allowed ++ +diff --git a/ld/testsuite/ld-arm/attr-merge-6a.s b/ld/testsuite/ld-arm/attr-merge-6a.s +new file mode 100644 +index 0000000..056d8c8 +--- /dev/null ++++ b/ld/testsuite/ld-arm/attr-merge-6a.s +@@ -0,0 +1,4 @@ ++ .cpu cortex-a9 ++ .fpu softvfp ++ .eabi_attribute 70, 1 ++ .file "attr-merge-6a.s" +diff --git a/ld/testsuite/ld-arm/attr-merge-6b.s b/ld/testsuite/ld-arm/attr-merge-6b.s +new file mode 100644 +index 0000000..b9ef4d2 +--- /dev/null ++++ b/ld/testsuite/ld-arm/attr-merge-6b.s +@@ -0,0 +1,3 @@ ++ .cpu cortex-a9 ++ .fpu softvfp ++ .file "attr-merge-6b.s" +diff --git a/ld/testsuite/ld-arm/attr-merge-7.attr b/ld/testsuite/ld-arm/attr-merge-7.attr +new file mode 100644 +index 0000000..e996c93 +--- /dev/null ++++ b/ld/testsuite/ld-arm/attr-merge-7.attr +@@ -0,0 +1,9 @@ ++Attribute Section: aeabi ++File Attributes ++ Tag_CPU_name: "CORTEX-A9" ++ Tag_CPU_arch: v7 ++ Tag_CPU_arch_profile: Application ++ Tag_ARM_ISA_use: Yes ++ Tag_THUMB_ISA_use: Thumb-2 ++ Tag_MPextension_use: Allowed ++ +diff --git a/ld/testsuite/ld-arm/attr-merge-7a.s b/ld/testsuite/ld-arm/attr-merge-7a.s +new file mode 100644 +index 0000000..d875d28 +--- /dev/null ++++ b/ld/testsuite/ld-arm/attr-merge-7a.s +@@ -0,0 +1,4 @@ ++ .cpu cortex-a9 ++ .fpu softvfp ++ .eabi_attribute 70, 1 ++ .file "attr-merge-7a.s" +diff --git a/ld/testsuite/ld-arm/attr-merge-7b.s b/ld/testsuite/ld-arm/attr-merge-7b.s +new file mode 100644 +index 0000000..2e83e71 +--- /dev/null ++++ b/ld/testsuite/ld-arm/attr-merge-7b.s +@@ -0,0 +1,4 @@ ++ .cpu cortex-a9 ++ .fpu softvfp ++ .eabi_attribute Tag_MPextension_use, 1 ++ .file "attr-merge-7b.s" +diff --git a/ld/testsuite/ld-arm/attr-merge-unknown-1.d b/ld/testsuite/ld-arm/attr-merge-unknown-1.d +index 395d2b6..38acff9 100644 +--- a/ld/testsuite/ld-arm/attr-merge-unknown-1.d ++++ b/ld/testsuite/ld-arm/attr-merge-unknown-1.d +@@ -2,4 +2,4 @@ + #source: blank.s + #as: + #ld: +-#error: Unknown mandatory EABI object attribute 42 ++#error: Unknown mandatory EABI object attribute 40 +diff --git a/ld/testsuite/ld-arm/attr-merge-unknown-1.s b/ld/testsuite/ld-arm/attr-merge-unknown-1.s +index 298c673..d2cff1f 100644 +--- a/ld/testsuite/ld-arm/attr-merge-unknown-1.s ++++ b/ld/testsuite/ld-arm/attr-merge-unknown-1.s +@@ -1,3 +1,3 @@ + @ This attrubute is supposed to be unknown. + @ If this number should become known, change it. +- .eabi_attribute 42, 1 ++ .eabi_attribute 40, 1 --- binutils-2.20.1.orig/debian/patches/151_arm_opt_merge_exidx_entries.dpatch +++ binutils-2.20.1/debian/patches/151_arm_opt_merge_exidx_entries.dpatch @@ -0,0 +1,201 @@ +#!/bin/sh -e +## 151_arm_opt_merge_exidx_entries.dpatch +## +## DP: Description: ARM: Add option to disable merging of adjacent exidx +## DP: Description: unwinder entries. + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p0 < $0;; + -unpatch) patch $patch_opts -p0 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +Subject: Patch: ARM disable merging of adjacent exidx unwinder entries + +Merging exidx unwinder entries makes stack unwinding in gcj impossible. +This patch adds a new linker switch, --no-merge-exidx-entries, which +turns it off. I've been quite careful not to affect the anything in +elf32_arm_fix_exidx_coverage except this one thing. + +OK to apply? + +More info at http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40860 + +Andrew. + + +2010-04-15 Andrew Haley + + * emultempl/armelf.em (merge_exidx_entries): New variable. + (OPTION_NO_MERGE_EXIDX_ENTRIES): New definition. + ("no-merge-exidx-entries"): New option. + * ld.texinfo (merge-exidx-entries): Document this option. + +2010-04-15 Andrew Haley + + * bfd-in.h (elf32_arm_fix_exidx_coverage): Add new flag: + merge_exidx_entries. + * bfd-in2.h: Likewise. + * elf32-arm.c (elf32_arm_fix_exidx_coverage): Likewise. Use it to + control merging of exidx entries. + +@DPATCH@ +Index: bfd/bfd-in.h +=================================================================== +RCS file: /cvs/src/src/bfd/bfd-in.h,v +retrieving revision 1.150 +diff -u -r1.150 bfd-in.h +--- bfd/bfd-in.h 26 Mar 2010 08:34:24 -0000 1.150 ++++ bfd/bfd-in.h 15 Apr 2010 17:48:44 -0000 +@@ -906,7 +906,7 @@ + + /* ARM unwind section editing support. */ + extern bfd_boolean elf32_arm_fix_exidx_coverage +- (struct bfd_section **, unsigned int, struct bfd_link_info *); ++(struct bfd_section **, unsigned int, struct bfd_link_info *, bfd_boolean); + + /* PowerPC @tls opcode transform/validate. */ + extern unsigned int _bfd_elf_ppc_at_tls_transform +Index: bfd/bfd-in2.h +=================================================================== +RCS file: /cvs/src/src/bfd/bfd-in2.h,v +retrieving revision 1.511 +diff -u -r1.511 bfd-in2.h +--- bfd/bfd-in2.h 1 Apr 2010 09:47:13 -0000 1.511 ++++ bfd/bfd-in2.h 15 Apr 2010 17:48:45 -0000 +@@ -913,7 +913,7 @@ + + /* ARM unwind section editing support. */ + extern bfd_boolean elf32_arm_fix_exidx_coverage +- (struct bfd_section **, unsigned int, struct bfd_link_info *); ++ (struct bfd_section **, unsigned int, struct bfd_link_info *, bfd_boolean); + + /* PowerPC @tls opcode transform/validate. */ + extern unsigned int _bfd_elf_ppc_at_tls_transform +Index: bfd/elf32-arm.c +=================================================================== +RCS file: /cvs/src/src/bfd/elf32-arm.c,v +retrieving revision 1.231 +diff -u -r1.231 elf32-arm.c +--- bfd/elf32-arm.c 29 Mar 2010 20:42:55 -0000 1.231 ++++ bfd/elf32-arm.c 15 Apr 2010 17:48:46 -0000 +@@ -9215,6 +9215,8 @@ + 2. Duplicate entries are merged together (EXIDX_CANTUNWIND, or unwind + codes which have been inlined into the index). + ++ If MERGE_EXIDX_ENTRIES is false, duplicate entries are not merged. ++ + The edits are applied when the tables are written + (in elf32_arm_write_section). + */ +@@ -9222,7 +9224,8 @@ + bfd_boolean + elf32_arm_fix_exidx_coverage (asection **text_section_order, + unsigned int num_text_sections, +- struct bfd_link_info *info) ++ struct bfd_link_info *info, ++ bfd_boolean merge_exidx_entries) + { + bfd *inp; + unsigned int last_second_word = 0, i; +@@ -9334,7 +9337,8 @@ + /* Inlined unwinding data. Merge if equal to previous. */ + else if ((second_word & 0x80000000) != 0) + { +- if (last_second_word == second_word && last_unwind_type == 1) ++ if (merge_exidx_entries ++ && last_second_word == second_word && last_unwind_type == 1) + elide = 1; + unwind_type = 1; + last_second_word = second_word; +Index: ld/ld.texinfo +=================================================================== +RCS file: /cvs/src/src/ld/ld.texinfo,v +retrieving revision 1.258 +diff -u -r1.258 ld.texinfo +--- ld/ld.texinfo 5 Apr 2010 09:04:08 -0000 1.258 ++++ ld/ld.texinfo 15 Apr 2010 17:48:50 -0000 +@@ -5939,6 +5939,10 @@ + + The erratum only affects Thumb-2 code. Please contact ARM for further details. + ++@kindex --merge-exidx-entries ++@kindex --no-merge-exidx-entries ++The @samp{--no-merge-exidx-entries} switch disables the merging of adjacent exidx entries in debuginfo. ++ + @ifclear GENERIC + @lowersections + @end ifclear +Index: ld/emultempl/armelf.em +=================================================================== +RCS file: /cvs/src/src/ld/emultempl/armelf.em,v +retrieving revision 1.78 +diff -u -r1.78 armelf.em +--- ld/emultempl/armelf.em 5 Feb 2010 13:57:47 -0000 1.78 ++++ ld/emultempl/armelf.em 15 Apr 2010 17:48:50 -0000 +@@ -41,6 +41,7 @@ + static int no_enum_size_warning = 0; + static int no_wchar_size_warning = 0; + static int pic_veneer = 0; ++static int merge_exidx_entries = -1; + + static void + gld${EMULATION_NAME}_before_parse (void) +@@ -314,7 +315,8 @@ + + qsort (sec_list, sec_count, sizeof (asection *), &compare_output_sec_vma); + +- if (elf32_arm_fix_exidx_coverage (sec_list, sec_count, &link_info)) ++ if (elf32_arm_fix_exidx_coverage (sec_list, sec_count, &link_info, ++ merge_exidx_entries)) + need_laying_out = 1; + + free (sec_list); +@@ -526,6 +528,7 @@ + #define OPTION_NO_WCHAR_SIZE_WARNING 313 + #define OPTION_FIX_CORTEX_A8 314 + #define OPTION_NO_FIX_CORTEX_A8 315 ++#define OPTION_NO_MERGE_EXIDX_ENTRIES 316 + ' + + PARSE_AND_LIST_SHORTOPTS=p +@@ -547,6 +550,7 @@ + { "no-wchar-size-warning", no_argument, NULL, OPTION_NO_WCHAR_SIZE_WARNING}, + { "fix-cortex-a8", no_argument, NULL, OPTION_FIX_CORTEX_A8 }, + { "no-fix-cortex-a8", no_argument, NULL, OPTION_NO_FIX_CORTEX_A8 }, ++ { "no-merge-exidx-entries", no_argument, NULL, OPTION_NO_MERGE_EXIDX_ENTRIES }, + ' + + PARSE_AND_LIST_OPTIONS=' +@@ -574,6 +578,8 @@ + the linker should choose suitable defaults.\n" + )); + fprintf (file, _(" --[no-]fix-cortex-a8 Disable/enable Cortex-A8 Thumb-2 branch erratum fix\n")); ++ fprintf (file, _(" --no-merge-exidx-entries Disable merging exidx entries\n")); ++ + ' + + PARSE_AND_LIST_ARGS_CASES=' +@@ -653,6 +659,10 @@ + case OPTION_NO_FIX_CORTEX_A8: + fix_cortex_a8 = 0; + break; ++ ++ case OPTION_NO_MERGE_EXIDX_ENTRIES: ++ merge_exidx_entries = 0; ++ + ' + + # We have our own before_allocation etc. functions, but they call --- binutils-2.20.1.orig/debian/patches/148_pr11426.dpatch +++ binutils-2.20.1/debian/patches/148_pr11426.dpatch @@ -0,0 +1,125 @@ +#!/bin/sh -e +## 148_pr11426.dpatch +## +## DP: Description: PR ld/11426 am33, arm, ia64 + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + + PR ld/11426 + * configure.host (many linux targets ): Remove edits. + (m68*-motorola-sysv ): Use here doc, not echo. + + +@DPATCH@ +Index: ld/configure.host +=================================================================== +RCS file: /cvs/src/src/ld/configure.host,v +retrieving revision 1.47 +diff -u -p -r1.47 configure.host +--- ./ld/configure.host 17 Mar 2009 05:32:59 -0000 1.47 ++++ ./ld/configure.host 25 Mar 2010 03:37:47 -0000 +@@ -85,12 +85,8 @@ case "${host}" in + # No further tweaking needed + ;; + +-am33_2.0-*-linux*) +- HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,ld\[^ \]\*,ld-linux,g"` +- ;; +- + arm*-*-linux-*) +- HOSTING_CRT0='-p '`echo "$HOSTING_CRT0" | sed -e "s,ld\[^ \]\*,ld-linux,g"` ++ HOSTING_CRT0='-p '"$HOSTING_CRT0" + ;; + + hppa*64*-*-hpux11*) +@@ -153,10 +149,6 @@ i[3-7]86-*-mingw*) + HOSTING_LIBS='-L/mingw/lib -lmingw32 -lmoldname -lmingwex -lmsvcrt -luser32 -lkernel32 -ladvapi32 -lshell32 -lmingw32 -lmoldname -lmingwex -lmsvcrt `if [ -f ../gcc/libgcc.a ] ; then echo ../gcc/libgcc.a ; else ${CC} -print-libgcc-file-name; fi`' + ;; + +-ia64-*-linux-*) +- HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,ld\[^ \]*\*,ld-linux-ia64,g"` +- ;; +- + mips*-sgi-irix4* | mips*-sgi-irix5*) + HOSTING_CRT0=/usr/lib/crt1.o + HOSTING_LIBS="$HOSTING_LIBS"' /usr/lib/crtn.o' +@@ -167,17 +159,11 @@ mips*-sgi-irix6*) + HOSTING_LIBS='-L/usr/lib32 '"$HOSTING_LIBS"' `if [ -f ../gcc/crtend.o ]; then echo ../gcc/crtend.o ; else ${CC} -print-file-name=crtend.o; fi` /usr/lib32/crtn.o -init __do_global_ctors -fini __do_global_dtors' + ;; + +-mips*-*-linux-*) +- HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`specs.*\"\\\`,/lib/ld.so.1,"` +- ;; +- +-m68*-*-linux-*) +- HOSTING_CRT0=`echo "$HOSTING_CRT0" | sed -e "s,\\\`specs.*\"\\\`,/lib/ld.so.1,"` +- ;; +- + m68*-motorola-sysv) + HOSTING_CRT0='`if [ -f ../gcc/crt0.o ]; then echo ../gcc/crt0.o; elif [ -f \`${CC} -print-file-name=\`crt0.o ]; then echo \`${CC} -print-file-name=\`crt0.o; else echo /lib/crt0.o; fi`' +- HOSTING_LIBS=`echo "$HOSTING_LIBS" | sed -e "s,-lc,-lc881,"` ++ HOSTING_LIBS=`sed -e 's,-lc,-lc881,' < +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add more documentation about profiling and -fprofile-arcs. + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad binutils-2.16/gprof/gprof.texi /tmp/dpep.NHuhql/binutils-2.16/gprof/gprof.texi +--- binutils-2.16/gprof/gprof.texi 2005-03-03 13:05:12.000000000 +0100 ++++ /tmp/dpep.NHuhql/binutils-2.16/gprof/gprof.texi 2005-05-06 19:14:10.038173569 +0200 +@@ -138,6 +138,10 @@ + If more than one profile file is specified, the @code{gprof} + output shows the sum of the profile information in the given profile files. + ++If you use gcc 2.95.x or 3.0 to compile your binaries, you may need ++to add the @samp{-fprofile-arcs} to the compile command line in order ++for the call graphs to be properly stored in gmon.out. ++ + @code{Gprof} calculates the amount of time spent in each routine. + Next, these times are propagated along the edges of the call graph. + Cycles are discovered, and calls into a cycle are made to share the time +@@ -268,6 +272,11 @@ + options. The same option, @samp{-pg}, alters either compilation or linking + to do what is necessary for profiling. Here are examples: + ++If you use gcc 2.95.x or 3.0.x, you may need to add the ++@samp{-fprofile-arcs} option to the compile line along with @samp{-pg} ++in order to allow the call-graphs to be properly included in the gmon.out ++file. ++ + @example + cc -g -c myprog.c utils.c -pg + cc -o myprog myprog.o utils.o -pg --- binutils-2.20.1.orig/debian/patches/143_pr42602.dpatch +++ binutils-2.20.1/debian/patches/143_pr42602.dpatch @@ -0,0 +1,89 @@ +#!/bin/sh -e +## 143_pr42602.dpatch +## +## DP: Description: Fix PR other/42602: demangling a global constructors symbol + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +2010-01-09 H.J. Lu + + PR other/42602 + * cp-demangle.c (d_make_demangle_mangled_name): New. + (d_demangle_callback): Use it on DCT_GLOBAL_XTORS. + + * testsuite/demangle-expected: Updated. + +@DPATCH@ +diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c +index 43cf34a..878aeae 100644 +--- a/libiberty/cp-demangle.c ++++ b/libiberty/cp-demangle.c +@@ -320,6 +320,9 @@ static struct demangle_component * + d_make_name (struct d_info *, const char *, int); + + static struct demangle_component * ++d_make_demangle_mangled_name (struct d_info *, const char *, int); ++ ++static struct demangle_component * + d_make_builtin_type (struct d_info *, + const struct demangle_builtin_type_info *); + +@@ -864,6 +867,17 @@ d_make_comp (struct d_info *di, enum demangle_component_type type, + return p; + } + ++/* Add a new demangle mangled name component. */ ++ ++static struct demangle_component * ++d_make_demangle_mangled_name (struct d_info *di, const char *s, int len) ++{ ++ if (d_peek_char (di) != '_' || d_peek_next_char (di) != 'Z') ++ return d_make_name (di, s, len); ++ d_advance (di, 2); ++ return d_encoding (di, 0); ++} ++ + /* Add a new name component. */ + + static struct demangle_component * +@@ -4728,7 +4742,8 @@ d_demangle_callback (const char *mangled, int options, + (type == DCT_GLOBAL_CTORS + ? DEMANGLE_COMPONENT_GLOBAL_CONSTRUCTORS + : DEMANGLE_COMPONENT_GLOBAL_DESTRUCTORS), +- d_make_name (&di, d_str (&di), strlen (d_str (&di))), ++ d_make_demangle_mangled_name (&di, d_str (&di), ++ strlen (d_str (&di))), + NULL); + d_advance (&di, strlen (d_str (&di))); + break; +diff --git a/libiberty/testsuite/demangle-expected b/libiberty/testsuite/demangle-expected +index 6798154..578da62 100644 +--- a/libiberty/testsuite/demangle-expected ++++ b/libiberty/testsuite/demangle-expected +@@ -3595,8 +3595,8 @@ std::_Alloc_traits, libcw: + # + --format=gnu-v3 --no-params + _GLOBAL__I__Z2fnv +-global constructors keyed to _Z2fnv +-global constructors keyed to _Z2fnv ++global constructors keyed to fn() ++global constructors keyed to fn() + # + --format=gnu-v3 --no-params + _Z1rM1GFivEMS_KFivES_M1HFivES1_4whatIKS_E5what2IS8_ES3_ --- binutils-2.20.1.orig/debian/patches/003_gprof_see_also_monitor.dpatch +++ binutils-2.20.1/debian/patches/003_gprof_see_also_monitor.dpatch @@ -0,0 +1,37 @@ +#!/bin/sh -e +## 014_gprof_manpage_fix.dpatch by Chris Chimelis +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Don't mention monitor(3) which doesn't exist in Debian. (#160654) + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad /home/james/debian/packages/binutils/binutils-2.14.90.0.6/gprof/gprof.texi binutils-2.14.90.0.6/gprof/gprof.texi +--- /home/james/debian/packages/binutils/binutils-2.14.90.0.6/gprof/gprof.texi 2002-08-02 01:49:32.000000000 +0100 ++++ binutils-2.14.90.0.6/gprof/gprof.texi 2003-09-10 22:42:37.000000000 +0100 +@@ -181,7 +181,7 @@ + @c man end + + @c man begin SEEALSO +-monitor(3), profil(2), cc(1), prof(1), and the Info entry for @file{gprof}. ++cc(1), prof(1), and the Info entry for @file{gprof}. + + ``An Execution Profiler for Modular Programs'', + by S. Graham, P. Kessler, M. McKusick; --- binutils-2.20.1.orig/debian/patches/141_pr10740.dpatch +++ binutils-2.20.1/debian/patches/141_pr10740.dpatch @@ -0,0 +1,295 @@ +#!/bin/sh -e +## 141_pr10740.dpatch +## +## DP: Description: PR gas/10740: Intel syntax far jumps broken + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +gas/ + +2009-10-13 H.J. Lu + + PR gas/10740 + * config/tc-i386-intel.c (i386_intel_operand): Handle call + and jump with 2 immediate operands. + + * config/tc-i386.c (i386_finalize_immediate): Don't generate + error message if operand string is NULL. + +gas/testsuite/ + +2009-10-13 H.J. Lu + + PR gas/10740 + * gas/i386/jump.s: Add new tests. + * gas/i386/jump16.s: Likewise. + + * gas/i386/jump.d: Updated. + * gas/i386/jump16.d: Likewise. + +@DPATCH@ +diff --git a/gas/config/tc-i386-intel.c b/gas/config/tc-i386-intel.c +index 5d5e0c1..df749b8 100644 +--- a/gas/config/tc-i386-intel.c ++++ b/gas/config/tc-i386-intel.c +@@ -721,6 +721,51 @@ i386_intel_operand (char *operand_string, int got_a_float) + if (i.mem_operands + >= 2 - !current_templates->start->opcode_modifier.isstring) + { ++ /* Handle ++ ++ call 0x9090,0x90909090 ++ lcall 0x9090,0x90909090 ++ jmp 0x9090,0x90909090 ++ ljmp 0x9090,0x90909090 ++ */ ++ ++ if ((current_templates->start->opcode_modifier.jumpintersegment ++ || current_templates->start->opcode_modifier.jumpdword ++ || current_templates->start->opcode_modifier.jump) ++ && this_operand == 1 ++ && intel_state.seg == NULL ++ && i.mem_operands == 1 ++ && i.disp_operands == 1 ++ && intel_state.op_modifier == O_absent) ++ { ++ /* Try to process the first operand as immediate, */ ++ this_operand = 0; ++ if (i386_finalize_immediate (exp_seg, i.op[0].imms, ++ intel_state.reloc_types, ++ NULL)) ++ { ++ this_operand = 1; ++ expP = &im_expressions[0]; ++ i.op[this_operand].imms = expP; ++ *expP = exp; ++ ++ /* Try to process the second operand as immediate, */ ++ if (i386_finalize_immediate (exp_seg, expP, ++ intel_state.reloc_types, ++ NULL)) ++ { ++ i.mem_operands = 0; ++ i.disp_operands = 0; ++ i.imm_operands = 2; ++ i.types[0].bitfield.mem = 0; ++ i.types[0].bitfield.disp16 = 0; ++ i.types[0].bitfield.disp32 = 0; ++ i.types[0].bitfield.disp32s = 0; ++ return 1; ++ } ++ } ++ } ++ + as_bad (_("too many memory references for `%s'"), + current_templates->start->name); + return 0; +diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c +index 5c288ea..54edb1b 100644 +--- a/gas/config/tc-i386.c ++++ b/gas/config/tc-i386.c +@@ -6287,8 +6287,9 @@ i386_finalize_immediate (segT exp_seg ATTRIBUTE_UNUSED, expressionS *exp, + { + if (exp->X_op == O_absent || exp->X_op == O_illegal || exp->X_op == O_big) + { +- as_bad (_("missing or invalid immediate expression `%s'"), +- imm_start); ++ if (imm_start) ++ as_bad (_("missing or invalid immediate expression `%s'"), ++ imm_start); + return 0; + } + else if (exp->X_op == O_constant) +@@ -6316,7 +6317,8 @@ i386_finalize_immediate (segT exp_seg ATTRIBUTE_UNUSED, expressionS *exp, + #endif + else if (!intel_syntax && exp->X_op == O_register) + { +- as_bad (_("illegal immediate register operand %s"), imm_start); ++ if (imm_start) ++ as_bad (_("illegal immediate register operand %s"), imm_start); + return 0; + } + else +diff --git a/gas/testsuite/gas/i386/jump.d b/gas/testsuite/gas/i386/jump.d +index 0802785..e53f09d 100644 +--- a/gas/testsuite/gas/i386/jump.d ++++ b/gas/testsuite/gas/i386/jump.d +@@ -36,4 +36,20 @@ Disassembly of section .text: + [ ]*[a-f0-9]+: 90 nop + [ ]*[a-f0-9]+: eb 00 jmp (0x)?7e( <.text(\+0x7e)?>)? + [ ]*[a-f0-9]+: 90 nop ++[ ]*[a-f0-9]+: 9a 90 90 90 90 90 90 lcall \$0x9090,\$0x90909090 ++[ ]*[a-f0-9]+: 9a 90 90 90 90 90 90 lcall \$0x9090,\$0x90909090 ++[ ]*[a-f0-9]+: 9a 00 00 00 00 90 90 lcall \$0x9090,\$0x0 8e: (R_386_)?(dir)?32 xxx ++[ ]*[a-f0-9]+: 9a 00 00 00 00 90 90 lcall \$0x9090,\$0x0 95: (R_386_)?(dir)?32 xxx ++[ ]*[a-f0-9]+: 9a 90 90 90 90 90 90 lcall \$0x9090,\$0x90909090 ++[ ]*[a-f0-9]+: 9a 90 90 90 90 90 90 lcall \$0x9090,\$0x90909090 ++[ ]*[a-f0-9]+: 9a 00 00 00 00 90 90 lcall \$0x9090,\$0x0 aa: (R_386_)?(dir)?32 xxx ++[ ]*[a-f0-9]+: 9a 00 00 00 00 90 90 lcall \$0x9090,\$0x0 b1: (R_386_)?(dir)?32 xxx ++[ ]*[a-f0-9]+: ea 90 90 90 90 90 90 ljmp \$0x9090,\$0x90909090 ++[ ]*[a-f0-9]+: ea 90 90 90 90 90 90 ljmp \$0x9090,\$0x90909090 ++[ ]*[a-f0-9]+: ea 00 00 00 00 90 90 ljmp \$0x9090,\$0x0 c6: (R_386_)?(dir)?32 xxx ++[ ]*[a-f0-9]+: ea 00 00 00 00 90 90 ljmp \$0x9090,\$0x0 cd: (R_386_)?(dir)?32 xxx ++[ ]*[a-f0-9]+: ea 90 90 90 90 90 90 ljmp \$0x9090,\$0x90909090 ++[ ]*[a-f0-9]+: ea 90 90 90 90 90 90 ljmp \$0x9090,\$0x90909090 ++[ ]*[a-f0-9]+: ea 00 00 00 00 90 90 ljmp \$0x9090,\$0x0 e2: (R_386_)?(dir)?32 xxx ++[ ]*[a-f0-9]+: ea 00 00 00 00 90 90 ljmp \$0x9090,\$0x0 e9: (R_386_)?(dir)?32 xxx + #pass +diff --git a/gas/testsuite/gas/i386/jump.s b/gas/testsuite/gas/i386/jump.s +index 71693ce..8ce459f 100644 +--- a/gas/testsuite/gas/i386/jump.s ++++ b/gas/testsuite/gas/i386/jump.s +@@ -35,3 +35,20 @@ + nop + jmp .+2 + nop ++ ++ lcall 0x9090,0x90909090 ++ lcall 0x9090:0x90909090 ++ lcall 0x9090,xxx ++ lcall 0x9090:xxx ++ call 0x9090,0x90909090 ++ call 0x9090:0x90909090 ++ call 0x9090,xxx ++ call 0x9090:xxx ++ ljmp 0x9090,0x90909090 ++ ljmp 0x9090:0x90909090 ++ ljmp 0x9090,xxx ++ ljmp 0x9090:xxx ++ jmp 0x9090,0x90909090 ++ jmp 0x9090:0x90909090 ++ jmp 0x9090,xxx ++ jmp 0x9090:xxx +diff --git a/gas/testsuite/gas/i386/jump16.d b/gas/testsuite/gas/i386/jump16.d +index db5d44a..c91c8ae 100644 +--- a/gas/testsuite/gas/i386/jump16.d ++++ b/gas/testsuite/gas/i386/jump16.d +@@ -7,48 +7,64 @@ Disassembly of section .text: + + 0+ <.text>: + [ ]*[a-f0-9]+: eb fe jmp (0x0|0 <.text>) +-[ ]*[a-f0-9]+: e9 fe ff jmp 0x3 3: R_386_PC16 xxx +-[ ]*[a-f0-9]+: ff 26 00 00 jmp \*0x0 7: R_386_16 xxx ++[ ]*[a-f0-9]+: e9 f(e|b) ff jmp (0x3|0 <.text>) 3: (R_386_PC)?(DISP)?16 xxx ++[ ]*[a-f0-9]+: ff 26 00 00 jmp \*0x0 7: (R_386_)?16 xxx + [ ]*[a-f0-9]+: 66 ff e7 jmpl \*%edi + [ ]*[a-f0-9]+: 67 ff 27 addr32 jmp \*\(%edi\) + [ ]*[a-f0-9]+: 67 ff af 00 00 00 00 addr32 ljmp \*0x0\(%edi\) 12: (R_386_)?(dir)?32 xxx +-[ ]*[a-f0-9]+: ff 2e 00 00 ljmp \*0x0 18: R_386_16 xxx +-[ ]*[a-f0-9]+: ea 00 00 34 12 ljmp \$0x1234,\$0x0 1b: R_386_16 xxx +-[ ]*[a-f0-9]+: 66 e8 db ff ff ff calll 0x0 +-[ ]*[a-f0-9]+: 66 e8 fc ff ff ff calll 0x27 27: (R_386_PC)?(DISP)?32 xxx +-[ ]*[a-f0-9]+: 66 ff 16 00 00 calll \*0x0 2e: R_386_16 xxx ++[ ]*[a-f0-9]+: ff 2e 00 00 ljmp \*0x0 18: (R_386_)?16 xxx ++[ ]*[a-f0-9]+: ea 00 00 34 12 ljmp \$0x1234,\$0x0 1b: (R_386_)?16 xxx ++[ ]*[a-f0-9]+: 66 e8 db ff ff ff calll (0x0|0 <.text>) ++[ ]*[a-f0-9]+: 66 e8 (fc|d5) ff ff ff calll (0x27|0 <.text>) 27: (R_386_PC)?(DISP)?32 xxx ++[ ]*[a-f0-9]+: 66 ff 16 00 00 calll \*0x0 2e: (R_386_)?16 xxx + [ ]*[a-f0-9]+: 66 ff d7 calll \*%edi + [ ]*[a-f0-9]+: 67 66 ff 17 addr32 calll \*\(%edi\) + [ ]*[a-f0-9]+: 67 66 ff 9f 00 00 00 00 addr32 lcalll \*0x0\(%edi\) 3b: (R_386_)?(dir)?32 xxx +-[ ]*[a-f0-9]+: 66 ff 1e 00 00 lcalll \*0x0 42: R_386_16 xxx ++[ ]*[a-f0-9]+: 66 ff 1e 00 00 lcalll \*0x0 42: (R_386_)?16 xxx + [ ]*[a-f0-9]+: 66 9a 00 00 00 00 34 12 lcalll \$0x1234,\$0x0 46: (R_386_)?(dir)?32 xxx + [ ]*[a-f0-9]+: eb b2 jmp (0x0|0 <.text>) +-[ ]*[a-f0-9]+: ff 26 00 00 jmp \*0x0 50: R_386_16 xxx ++[ ]*[a-f0-9]+: ff 26 00 00 jmp \*0x0 50: (R_386_)?16 xxx + [ ]*[a-f0-9]+: ff e7 jmp \*%di + [ ]*[a-f0-9]+: ff 25 jmp \*\(%di\) +-[ ]*[a-f0-9]+: ff ad 00 00 ljmp \*0x0\(%di\) 58: R_386_16 xxx +-[ ]*[a-f0-9]+: 66 ff ad 00 00 ljmpl \*0x0\(%di\) 5d: R_386_16 xxx +-[ ]*[a-f0-9]+: ff 2e 00 00 ljmp \*0x0 61: R_386_16 xxx +-[ ]*[a-f0-9]+: 66 ff 2e 00 00 ljmpl \*0x0 66: R_386_16 xxx +-[ ]*[a-f0-9]+: ea 00 00 34 12 ljmp \$0x1234,\$0x0 69: R_386_16 xxx ++[ ]*[a-f0-9]+: ff ad 00 00 ljmp \*0x0\(%di\) 58: (R_386_)?16 xxx ++[ ]*[a-f0-9]+: 66 ff ad 00 00 ljmpl \*0x0\(%di\) 5d: (R_386_)?16 xxx ++[ ]*[a-f0-9]+: ff 2e 00 00 ljmp \*0x0 61: (R_386_)?16 xxx ++[ ]*[a-f0-9]+: 66 ff 2e 00 00 ljmpl \*0x0 66: (R_386_)?16 xxx ++[ ]*[a-f0-9]+: ea 00 00 34 12 ljmp \$0x1234,\$0x0 69: (R_386_)?16 xxx + [ ]*[a-f0-9]+: e8 90 ff call (0x0|0 <.text>) +-[ ]*[a-f0-9]+: e8 fe ff call 0x71 71: R_386_PC16 xxx +-[ ]*[a-f0-9]+: ff 16 00 00 call \*0x0 75: R_386_16 xxx ++[ ]*[a-f0-9]+: e8 (fe|8d) ff call (0x71|0 <.text>) 71: (R_386_PC)?(DISP)?16 xxx ++[ ]*[a-f0-9]+: ff 16 00 00 call \*0x0 75: (R_386_)?16 xxx + [ ]*[a-f0-9]+: ff d7 call \*%di + [ ]*[a-f0-9]+: ff 15 call \*\(%di\) +-[ ]*[a-f0-9]+: ff 9d 00 00 lcall \*0x0\(%di\) 7d: R_386_16 xxx +-[ ]*[a-f0-9]+: 66 ff 9d 00 00 lcalll \*0x0\(%di\) 82: R_386_16 xxx +-[ ]*[a-f0-9]+: ff 1e 00 00 lcall \*0x0 86: R_386_16 xxx +-[ ]*[a-f0-9]+: 66 ff 1e 00 00 lcalll \*0x0 8b: R_386_16 xxx +-[ ]*[a-f0-9]+: 9a 00 00 34 12 lcall \$0x1234,\$0x0 8e: R_386_16 xxx ++[ ]*[a-f0-9]+: ff 9d 00 00 lcall \*0x0\(%di\) 7d: (R_386_)?16 xxx ++[ ]*[a-f0-9]+: 66 ff 9d 00 00 lcalll \*0x0\(%di\) 82: (R_386_)?16 xxx ++[ ]*[a-f0-9]+: ff 1e 00 00 lcall \*0x0 86: (R_386_)?16 xxx ++[ ]*[a-f0-9]+: 66 ff 1e 00 00 lcalll \*0x0 8b: (R_386_)?16 xxx ++[ ]*[a-f0-9]+: 9a 00 00 34 12 lcall \$0x1234,\$0x0 8e: (R_386_)?16 xxx + [ ]*[a-f0-9]+: ff 17 call \*\(%bx\) + [ ]*[a-f0-9]+: ff 1f lcall \*\(%bx\) + [ ]*[a-f0-9]+: 66 ff 1f lcalll \*\(%bx\) + [ ]*[a-f0-9]+: ff 27 jmp \*\(%bx\) + [ ]*[a-f0-9]+: ff 2f ljmp \*\(%bx\) + [ ]*[a-f0-9]+: 66 ff 2f ljmpl \*\(%bx\) +-[ ]*[a-f0-9]+: eb 00 jmp 0xa2 ++[ ]*[a-f0-9]+: eb 00 jmp (0xa2|a2 <.text\+0xa2>) + [ ]*[a-f0-9]+: 90 nop +-[ ]*[a-f0-9]+: eb 00 jmp 0xa5 ++[ ]*[a-f0-9]+: eb 00 jmp (0xa5|a5 <.text\+0xa5>) + [ ]*[a-f0-9]+: 90 nop ++[ ]*[a-f0-9]+: 9a 10 10 90 90 lcall \$0x9090,\$0x1010 ++[ ]*[a-f0-9]+: 9a 10 10 90 90 lcall \$0x9090,\$0x1010 ++[ ]*[a-f0-9]+: 9a 00 00 90 90 lcall \$0x9090,\$0x0 b1: (R_386_)?16 xxx ++[ ]*[a-f0-9]+: 9a 00 00 90 90 lcall \$0x9090,\$0x0 b6: (R_386_)?16 xxx ++[ ]*[a-f0-9]+: 9a 10 10 90 90 lcall \$0x9090,\$0x1010 ++[ ]*[a-f0-9]+: 9a 10 10 90 90 lcall \$0x9090,\$0x1010 ++[ ]*[a-f0-9]+: 9a 00 00 90 90 lcall \$0x9090,\$0x0 c5: (R_386_)?16 xxx ++[ ]*[a-f0-9]+: 9a 00 00 90 90 lcall \$0x9090,\$0x0 ca: (R_386_)?16 xxx ++[ ]*[a-f0-9]+: ea 10 10 90 90 ljmp \$0x9090,\$0x1010 ++[ ]*[a-f0-9]+: ea 10 10 90 90 ljmp \$0x9090,\$0x1010 ++[ ]*[a-f0-9]+: ea 00 00 90 90 ljmp \$0x9090,\$0x0 d9: (R_386_)?16 xxx ++[ ]*[a-f0-9]+: ea 00 00 90 90 ljmp \$0x9090,\$0x0 de: (R_386_)?16 xxx ++[ ]*[a-f0-9]+: ea 10 10 90 90 ljmp \$0x9090,\$0x1010 ++[ ]*[a-f0-9]+: ea 10 10 90 90 ljmp \$0x9090,\$0x1010 ++[ ]*[a-f0-9]+: ea 00 00 90 90 ljmp \$0x9090,\$0x0 ed: (R_386_)?16 xxx ++[ ]*[a-f0-9]+: ea 00 00 90 90 ljmp \$0x9090,\$0x0 f2: (R_386_)?16 xxx + #pass +diff --git a/gas/testsuite/gas/i386/jump16.s b/gas/testsuite/gas/i386/jump16.s +index 7ad9c6b..f8bc0ea 100644 +--- a/gas/testsuite/gas/i386/jump16.s ++++ b/gas/testsuite/gas/i386/jump16.s +@@ -54,3 +54,20 @@ + nop + jmp .+2 + nop ++ ++ lcall 0x9090,0x1010 ++ lcall 0x9090:0x1010 ++ lcall 0x9090,xxx ++ lcall 0x9090:xxx ++ call 0x9090,0x1010 ++ call 0x9090:0x1010 ++ call 0x9090,xxx ++ call 0x9090:xxx ++ ljmp 0x9090,0x1010 ++ ljmp 0x9090:0x1010 ++ ljmp 0x9090,xxx ++ ljmp 0x9090:xxx ++ jmp 0x9090,0x1010 ++ jmp 0x9090:0x1010 ++ jmp 0x9090,xxx ++ jmp 0x9090:xxx --- binutils-2.20.1.orig/debian/patches/153_gold_pr10893.dpatch +++ binutils-2.20.1/debian/patches/153_gold_pr10893.dpatch @@ -0,0 +1,140 @@ +#!/bin/sh -e +## 153_gold_pr10893.dpatch +## +## DP: Description: PR gold/10893: Add support for ifunc + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +2009-12-07 H.J. Lu + + PR gold/10893 + * i386.cc (Target_i386::Scan::globa): Use is_func instead of + checking elfcpp::STT_FUNC. + (Target_i386::Relocate::relocate): Likewise. + * x86_64.cc (Target_x86_64::Scan::global): Likewise. + + * symtab.cc (Symbol_table::sized_write_symbol): Turn IFUNC + symbols from shared libraries into normal FUNC symbols. + + * symtab.h (Symbol): Add is_func and use it. +--- a/gold/i386.cc ++++ b/gold/i386.cc +@@ -1248,7 +1248,7 @@ Target_i386::Scan::global(Symbol_table* symtab, + } + // Make a dynamic relocation if necessary. + int flags = Symbol::NON_PIC_REF; +- if (gsym->type() == elfcpp::STT_FUNC) ++ if (gsym->is_func()) + flags |= Symbol::FUNCTION_CALL; + if (gsym->needs_dynamic_reloc(flags)) + { +@@ -1727,7 +1727,7 @@ Target_i386::Relocate::relocate(const Relocate_info<32, false>* relinfo, + case elfcpp::R_386_PC32: + { + int ref_flags = Symbol::NON_PIC_REF; +- if (gsym != NULL && gsym->type() == elfcpp::STT_FUNC) ++ if (gsym != NULL && gsym->is_func()) + ref_flags |= Symbol::FUNCTION_CALL; + if (should_apply_static_reloc(gsym, ref_flags, true, output_section)) + Relocate_functions<32, false>::pcrel32(view, object, psymval, address); +@@ -1743,7 +1743,7 @@ Target_i386::Relocate::relocate(const Relocate_info<32, false>* relinfo, + case elfcpp::R_386_PC16: + { + int ref_flags = Symbol::NON_PIC_REF; +- if (gsym != NULL && gsym->type() == elfcpp::STT_FUNC) ++ if (gsym != NULL && gsym->is_func()) + ref_flags |= Symbol::FUNCTION_CALL; + if (should_apply_static_reloc(gsym, ref_flags, false, output_section)) + Relocate_functions<32, false>::pcrel16(view, object, psymval, address); +@@ -1759,7 +1759,7 @@ Target_i386::Relocate::relocate(const Relocate_info<32, false>* relinfo, + case elfcpp::R_386_PC8: + { + int ref_flags = Symbol::NON_PIC_REF; +- if (gsym != NULL && gsym->type() == elfcpp::STT_FUNC) ++ if (gsym != NULL && gsym->is_func()) + ref_flags |= Symbol::FUNCTION_CALL; + if (should_apply_static_reloc(gsym, ref_flags, false, + output_section)) +--- a/gold/symtab.cc ++++ b/gold/symtab.cc +@@ -2810,11 +2810,16 @@ Symbol_table::sized_write_symbol( + osym.put_st_size(0); + else + osym.put_st_size(sym->symsize()); ++ elfcpp::STT type = sym->type(); ++ // Turn IFUNC symbols from shared libraries into normal FUNC symbols. ++ if (type == elfcpp::STT_GNU_IFUNC ++ && sym->is_from_dynobj()) ++ type = elfcpp::STT_FUNC; + // A version script may have overridden the default binding. + if (sym->is_forced_local()) +- osym.put_st_info(elfcpp::elf_st_info(elfcpp::STB_LOCAL, sym->type())); ++ osym.put_st_info(elfcpp::elf_st_info(elfcpp::STB_LOCAL, type)); + else +- osym.put_st_info(elfcpp::elf_st_info(sym->binding(), sym->type())); ++ osym.put_st_info(elfcpp::elf_st_info(sym->binding(), type)); + osym.put_st_other(elfcpp::elf_st_other(sym->visibility(), sym->nonvis())); + osym.put_st_shndx(shndx); + } +--- a/gold/symtab.h ++++ b/gold/symtab.h +@@ -205,6 +205,14 @@ class Symbol + type() const + { return this->type_; } + ++ // Return true for function symbol. ++ bool ++ is_func() const ++ { ++ return (this->type_ == elfcpp::STT_FUNC ++ || this->type_ == elfcpp::STT_GNU_IFUNC); ++ } ++ + // Return the symbol visibility. + elfcpp::STV + visibility() const +@@ -543,7 +551,7 @@ class Symbol + + return (!parameters->doing_static_link() + && !parameters->options().pie() +- && this->type() == elfcpp::STT_FUNC ++ && this->is_func() + && (this->is_from_dynobj() + || this->is_undefined() + || this->is_preemptible())); +@@ -734,7 +742,7 @@ class Symbol + return (!parameters->options().shared() + && parameters->options().copyreloc() + && this->is_from_dynobj() +- && this->type() != elfcpp::STT_FUNC); ++ && !this->is_func()); + } + + protected: +--- a/gold/x86_64.cc ++++ b/gold/x86_64.cc +@@ -1352,7 +1352,7 @@ Target_x86_64::Scan::global(Symbol_table* symtab, + target->make_plt_entry(symtab, layout, gsym); + // Make a dynamic relocation if necessary. + int flags = Symbol::NON_PIC_REF; +- if (gsym->type() == elfcpp::STT_FUNC) ++ if (gsym->is_func()) + flags |= Symbol::FUNCTION_CALL; + if (gsym->needs_dynamic_reloc(flags)) + { --- binutils-2.20.1.orig/debian/patches/200_elflink_%B_fixes.dpatch +++ binutils-2.20.1/debian/patches/200_elflink_%B_fixes.dpatch @@ -0,0 +1,65 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 200_elflink_%B_fixes.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Description: Fixes several msgs; needed for later elflink patches +## DP: Upstream status: submitted upstream for binutils-2_20-branch + +2010-08-07 Kirill Smelkov + + Backport from mainline: + 2009-10-12 Roland McGrath + + * elflink.c (elf_link_add_object_symbols, _bfd_elf_merge_symbol): + Fix %s that should be %B in several message formats. + +@DPATCH@ +diff --git a/bfd/elflink.c b/bfd/elflink.c +index c42c6e1..4a348de 100644 +--- a/bfd/elflink.c ++++ b/bfd/elflink.c +@@ -1110,19 +1110,19 @@ _bfd_elf_merge_symbol (bfd *abfd, + + if (tdef && ntdef) + (*_bfd_error_handler) +- (_("%s: TLS definition in %B section %A mismatches non-TLS definition in %B section %A"), ++ (_("%B: TLS definition in %B section %A mismatches non-TLS definition in %B section %A"), + tbfd, tsec, ntbfd, ntsec, h->root.root.string); + else if (!tdef && !ntdef) + (*_bfd_error_handler) +- (_("%s: TLS reference in %B mismatches non-TLS reference in %B"), ++ (_("%B: TLS reference in %B mismatches non-TLS reference in %B"), + tbfd, ntbfd, h->root.root.string); + else if (tdef) + (*_bfd_error_handler) +- (_("%s: TLS definition in %B section %A mismatches non-TLS reference in %B"), ++ (_("%B: TLS definition in %B section %A mismatches non-TLS reference in %B"), + tbfd, tsec, ntbfd, h->root.root.string); + else + (*_bfd_error_handler) +- (_("%s: TLS reference in %B mismatches non-TLS definition in %B section %A"), ++ (_("%B: TLS reference in %B mismatches non-TLS definition in %B section %A"), + tbfd, ntbfd, ntsec, h->root.root.string); + + bfd_set_error (bfd_error_bad_value); +@@ -4437,7 +4437,7 @@ error_free_dyn: + if ((elf_dyn_lib_class (abfd) & DYN_NO_NEEDED) != 0) + { + (*_bfd_error_handler) +- (_("%s: invalid DSO for symbol `%s' definition"), ++ (_("%B: invalid DSO for symbol `%s' definition"), + abfd, name); + bfd_set_error (bfd_error_bad_value); + goto error_free_vers; +@@ -12495,7 +12495,7 @@ _bfd_elf_get_dynamic_reloc_section (bfd * abfd, + section does not exist it is created and attached to the DYNOBJ + bfd and stored in the SRELOC field of SEC's elf_section_data + structure. +- ++ + ALIGNMENT is the alignment for the newly created section and + IS_RELA defines whether the name should be .rela. + or .rel.. The section name is looked up in the +-- +1.7.2.1.44.g721e7 + --- binutils-2.20.1.orig/debian/patches/006_better_file_error.dpatch +++ binutils-2.20.1/debian/patches/006_better_file_error.dpatch @@ -0,0 +1,43 @@ +#!/bin/sh -e +## 006_better_file_error.dpatch by David Kimdon +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Specify which filename is causing an error if the filename is a +## DP: directory. (#45832) + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c binutils-2.14.90.0.6/bfd/opncls.c +--- /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c 2003-07-23 16:08:09.000000000 +0100 ++++ binutils-2.14.90.0.6/bfd/opncls.c 2003-09-10 22:35:00.000000000 +0100 +@@ -150,6 +150,13 @@ + { + bfd *nbfd; + const bfd_target *target_vec; ++ struct stat s; ++ ++ if (stat (filename, &s) == 0) ++ if (S_ISDIR(s.st_mode)) { ++ bfd_set_error (bfd_error_file_not_recognized); ++ return NULL; ++ } + + nbfd = _bfd_new_bfd (); + if (nbfd == NULL) --- binutils-2.20.1.orig/debian/patches/133_enable_gold.dpatch +++ binutils-2.20.1/debian/patches/133_enable_gold.dpatch @@ -0,0 +1,607 @@ +#!/bin/sh -e +## 133_enable_gold.dpatch +## +## DP: Description: add --enable-gold configure option + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +2009-11-03 Roland McGrath + H.J. Lu + + * configure.ac (--enable-gold): Accept --enable-gold=both to + add gold to configdirs without removing ld. + * configure: Regenerated. + +gold/ + +2009-11-03 H.J. Lu + + * Makefile.am (install-exec-local): Install as @installed_linker@. + Install as ld if "@linker@" == "ld.gold" and @installed_linker@ + != "ld". + * Makefile.in: Regenerated. + + * configure.ac (installed_linker): New substituted variable. Set + by --enable-gold. + (linker): New substituted variable. Set by --enable-gold and + --enable-linker. + * configure: Regenerated. + +ld/ + +2009-11-03 H.J. Lu + + * Makefile.am (transform): Install as @installed_linker@. + (install-exec-local): Depend on install-binPROGRAMS. Install + as @installed_linker@. Install as ld if "@linker@" == "ld.bfd" + and @installed_linker@ != "ld". + * Makefile.in: Regenerated. + + * configure.ac (installed_linker): New substituted variable. Set + by --enable-gold. + (linker): New substituted variable. Set by --enable-gold and + --enable-linker. + * configure: Regenerated. + +@DPATCH@ +diff --git a/configure b/configure +index 1ece75c..e353f63 100755 +--- a/configure ++++ b/configure +@@ -1482,7 +1482,7 @@ Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] +- --enable-gold use gold instead of ld ++ --enable-gold[=ARG] build gold [ARG={yes,both}] + --enable-libada build libada directory + --enable-libssp build libssp directory + --enable-build-with-cxx build with C++ compiler instead of C compiler +@@ -3076,7 +3076,8 @@ else + ENABLE_GOLD=no + fi + +-if test "${ENABLE_GOLD}" = "yes"; then ++case "${ENABLE_GOLD}" in ++yes|both) + # Check for ELF target. + is_elf=no + case "${target}" in +@@ -3096,11 +3097,17 @@ if test "${ENABLE_GOLD}" = "yes"; then + # Check for target supported by gold. + case "${target}" in + i?86-*-* | x86_64-*-* | sparc*-*-* | powerpc*-*-* | arm*-*-*) +- configdirs="`echo " ${configdirs} " | sed -e 's/ ld / gold /'`" ++ if test "${ENABLE_GOLD}" = both; then ++ configdirs="$configdirs gold" ++ else ++ configdirs="`echo " ${configdirs} " | sed -e 's/ ld / gold /'`" ++ fi + ;; + esac + fi +-fi ++ ENABLE_GOLD=yes ++ ;; ++esac + + # Configure extra directories which are host specific + +diff --git a/configure.ac b/configure.ac +index 407ab59..b349633 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -311,10 +311,11 @@ esac + # Handle --enable-gold. + + AC_ARG_ENABLE(gold, +-[ --enable-gold use gold instead of ld], ++[ --enable-gold[[=ARG]] build gold [[ARG={yes,both}]]], + ENABLE_GOLD=$enableval, + ENABLE_GOLD=no) +-if test "${ENABLE_GOLD}" = "yes"; then ++case "${ENABLE_GOLD}" in ++yes|both) + # Check for ELF target. + is_elf=no + case "${target}" in +@@ -334,11 +335,17 @@ if test "${ENABLE_GOLD}" = "yes"; then + # Check for target supported by gold. + case "${target}" in + i?86-*-* | x86_64-*-* | sparc*-*-* | powerpc*-*-* | arm*-*-*) +- configdirs="`echo " ${configdirs} " | sed -e 's/ ld / gold /'`" ++ if test "${ENABLE_GOLD}" = both; then ++ configdirs="$configdirs gold" ++ else ++ configdirs="`echo " ${configdirs} " | sed -e 's/ ld / gold /'`" ++ fi + ;; + esac + fi +-fi ++ ENABLE_GOLD=yes ++ ;; ++esac + + # Configure extra directories which are host specific + +diff --git a/gold/Makefile.am b/gold/Makefile.am +index 8d8b617..85b103b 100644 +--- a/gold/Makefile.am ++++ b/gold/Makefile.am +@@ -163,12 +163,20 @@ check: libgold.a + + install-exec-local: ld-new$(EXEEXT) + $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(tooldir)/bin +- n=`echo ld | sed '$(transform)'`; \ ++ n=`echo @installed_linker@ | sed '$(transform)'`; \ + $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(bindir)/$${n}$(EXEEXT); \ +- if test "$(bindir)" != "$(tooldir)/bin"; then \ +- rm -f $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT); \ +- ln $(DESTDIR)$(bindir)/$${n}$(EXEEXT) $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT) >/dev/null 2>/dev/null \ ++ if test "@linker@" = "ld.gold"; then \ ++ if test "@installed_linker@" != "ld"; then \ ++ ld=`echo ld | sed '$(transform)'`; \ ++ rm -f $(DESTDIR)$(bindir)/$${ld}$(EXEEXT); \ ++ ln $(DESTDIR)$(bindir)/$${n}$(EXEEXT) $(DESTDIR)$(bindir)/$${ld}$(EXEEXT) >/dev/null 2>/dev/null \ ++ || $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(bindir)/$${ld}$(EXEEXT); \ ++ fi; \ ++ if test "$(bindir)" != "$(tooldir)/bin"; then \ ++ rm -f $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT); \ ++ ln $(DESTDIR)$(bindir)/$${n}$(EXEEXT) $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT) >/dev/null 2>/dev/null \ + || $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT); \ ++ fi; \ + fi + + # We want install to imply install-info as per GNU standards, despite +diff --git a/gold/Makefile.in b/gold/Makefile.in +index d4c689b..9b5c860 100644 +--- a/gold/Makefile.in ++++ b/gold/Makefile.in +@@ -303,8 +303,10 @@ htmldir = @htmldir@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ ++installed_linker = @installed_linker@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++linker = @linker@ + localedir = @localedir@ + localstatedir = @localstatedir@ + mandir = @mandir@ +@@ -1200,12 +1202,20 @@ check: libgold.a + + install-exec-local: ld-new$(EXEEXT) + $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(tooldir)/bin +- n=`echo ld | sed '$(transform)'`; \ ++ n=`echo @installed_linker@ | sed '$(transform)'`; \ + $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(bindir)/$${n}$(EXEEXT); \ +- if test "$(bindir)" != "$(tooldir)/bin"; then \ +- rm -f $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT); \ +- ln $(DESTDIR)$(bindir)/$${n}$(EXEEXT) $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT) >/dev/null 2>/dev/null \ ++ if test "@linker@" = "ld.gold"; then \ ++ if test "@installed_linker@" != "ld"; then \ ++ ld=`echo ld | sed '$(transform)'`; \ ++ rm -f $(DESTDIR)$(bindir)/$${ld}$(EXEEXT); \ ++ ln $(DESTDIR)$(bindir)/$${n}$(EXEEXT) $(DESTDIR)$(bindir)/$${ld}$(EXEEXT) >/dev/null 2>/dev/null \ ++ || $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(bindir)/$${ld}$(EXEEXT); \ ++ fi; \ ++ if test "$(bindir)" != "$(tooldir)/bin"; then \ ++ rm -f $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT); \ ++ ln $(DESTDIR)$(bindir)/$${n}$(EXEEXT) $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT) >/dev/null 2>/dev/null \ + || $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT); \ ++ fi; \ + fi + + # We want install to imply install-info as per GNU standards, despite +diff --git a/gold/configure b/gold/configure +index e4eb9fb..407e580 100755 +--- a/gold/configure ++++ b/gold/configure +@@ -682,6 +682,8 @@ PLUGINS_FALSE + PLUGINS_TRUE + THREADS_FALSE + THREADS_TRUE ++linker ++installed_linker + am__untar + am__tar + AMTAR +@@ -759,6 +761,8 @@ ac_subst_files='' + ac_user_opts=' + enable_option_checking + with_sysroot ++enable_gold ++enable_linker + enable_threads + enable_plugins + enable_targets +@@ -1403,6 +1407,8 @@ Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] ++ --enable-gold[=ARG] build gold [ARG={yes,both}] ++ --enable-linker=[ARG] specify the default linker [ARG={bfd,gold}] + --enable-threads multi-threaded linking + --enable-plugins linker plugins + --enable-targets alternative target configurations +@@ -3227,6 +3233,35 @@ cat >>confdefs.h <<_ACEOF + _ACEOF + + ++# Check whether --enable-gold was given. ++if test "${enable_gold+set}" = set; then : ++ enableval=$enable_gold; if test "${enableval}" = "both"; then ++ bfd_linker=ld.bfd ++ installed_linker=ld.gold ++ else ++ bfd_linker=ld.gold ++ installed_linker=ld ++ fi ++else ++ bfd_linker=ld.bfd ++ installed_linker=ld ++fi ++ ++ ++ ++# Check whether --enable-linker was given. ++if test "${enable_linker+set}" = set; then : ++ enableval=$enable_linker; if test "${enableval}" = "gold"; then ++ linker=ld.gold ++ else ++ linker=$bfd_linker ++ fi ++else ++ linker=$bfd_linker ++fi ++ ++ ++ + # Check whether --enable-threads was given. + if test "${enable_threads+set}" = set; then : + enableval=$enable_threads; case "${enableval}" in +diff --git a/gold/configure.ac b/gold/configure.ac +index 85e23f9..10389a9 100644 +--- a/gold/configure.ac ++++ b/gold/configure.ac +@@ -38,6 +38,29 @@ AC_DEFINE_UNQUOTED(TARGET_SYSTEM_ROOT, "$sysroot", + AC_DEFINE_UNQUOTED(TARGET_SYSTEM_ROOT_RELOCATABLE, $sysroot_relocatable, + [Whether the system root can be relocated]) + ++AC_ARG_ENABLE(gold, ++[ --enable-gold[[=ARG]] build gold [[ARG={yes,both}]]], ++[if test "${enableval}" = "both"; then ++ bfd_linker=ld.bfd ++ installed_linker=ld.gold ++ else ++ bfd_linker=ld.gold ++ installed_linker=ld ++ fi], ++[bfd_linker=ld.bfd ++ installed_linker=ld]) ++AC_SUBST(installed_linker) ++ ++AC_ARG_ENABLE(linker, ++[ --enable-linker=[[ARG]] specify the default linker [[ARG={bfd,gold}]]], ++[if test "${enableval}" = "gold"; then ++ linker=ld.gold ++ else ++ linker=$bfd_linker ++ fi], ++[linker=$bfd_linker]) ++AC_SUBST(linker) ++ + dnl For now threads are a configure time option. + AC_ARG_ENABLE([threads], + [ --enable-threads multi-threaded linking], +diff --git a/ld/Makefile.am b/ld/Makefile.am +index c1d3dbf..1930a8b 100644 +--- a/ld/Makefile.am ++++ b/ld/Makefile.am +@@ -95,7 +95,7 @@ CXX_FOR_TARGET = ` \ + fi; \ + fi` + +-transform = s/^ld-new$$/ld/;@program_transform_name@ ++transform = s/^ld-new$$/@installed_linker@/;$(program_transform_name) + bin_PROGRAMS = ld-new + info_TEXINFOS = ld.texinfo + ld_TEXINFOS = configdoc.texi +@@ -1959,13 +1959,21 @@ CLEANFILES = dep.sed DEP DEPA DEP1 DEP2 spu_ovl.s spu_ovl.o spu_icache.s spu_ica + + .PHONY: install-exec-local install-data-local + +-install-exec-local: ld-new$(EXEEXT) ++install-exec-local: ld-new$(EXEEXT) install-binPROGRAMS + $(mkinstalldirs) $(DESTDIR)$(tooldir)/bin +- n=`echo ld | sed '$(transform)'`; \ +- if [ "$(bindir)/$$n$(EXEEXT)" != "$(tooldir)/bin/ld$(EXEEXT)" ]; then \ +- rm -f $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT); \ +- ln $(DESTDIR)$(bindir)/$$n$(EXEEXT) $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT) >/dev/null 2>/dev/null \ +- || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT); \ ++ n=`echo @installed_linker@ | sed '$(transform)'`; \ ++ if test "@linker@" = "ld.bfd"; then \ ++ if test "@installed_linker@" != "ld"; then \ ++ ld=`echo ld | sed '$(transform)'`; \ ++ rm -f $(DESTDIR)$(bindir)/$$ld$(EXEEXT); \ ++ ln $(DESTDIR)$(bindir)/$$n$(EXEEXT) $(DESTDIR)$(bindir)/$$ld$(EXEEXT) >/dev/null 2>/dev/null \ ++ || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(bindir)/$$ld$(EXEEXT); \ ++ fi; \ ++ if test "$(bindir)/$$n$(EXEEXT)" != "$(tooldir)/bin/ld$(EXEEXT)"; then \ ++ rm -f $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT); \ ++ ln $(DESTDIR)$(bindir)/$$n$(EXEEXT) $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT) >/dev/null 2>/dev/null \ ++ || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT); \ ++ fi; \ + fi + + install-data-local: +diff --git a/ld/Makefile.in b/ld/Makefile.in +index 0da0fff..2c5ab4a 100644 +--- a/ld/Makefile.in ++++ b/ld/Makefile.in +@@ -152,7 +152,7 @@ CTAGS = ctags + DEJATOOL = $(PACKAGE) + RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir + DIST_SUBDIRS = $(SUBDIRS) +-transform = s/^ld-new$$/ld/;@program_transform_name@ ++transform = s/^ld-new$$/@installed_linker@/;$(program_transform_name) + ACLOCAL = @ACLOCAL@ + AMTAR = @AMTAR@ + AR = @AR@ +@@ -293,8 +293,10 @@ htmldir = @htmldir@ + includedir = @includedir@ + infodir = @infodir@ + install_sh = @install_sh@ ++installed_linker = @installed_linker@ + libdir = @libdir@ + libexecdir = @libexecdir@ ++linker = @linker@ + localedir = @localedir@ + localstatedir = @localstatedir@ + lt_ECHO = @lt_ECHO@ +@@ -3274,13 +3276,21 @@ mostlyclean-local: + + .PHONY: install-exec-local install-data-local + +-install-exec-local: ld-new$(EXEEXT) ++install-exec-local: ld-new$(EXEEXT) install-binPROGRAMS + $(mkinstalldirs) $(DESTDIR)$(tooldir)/bin +- n=`echo ld | sed '$(transform)'`; \ +- if [ "$(bindir)/$$n$(EXEEXT)" != "$(tooldir)/bin/ld$(EXEEXT)" ]; then \ +- rm -f $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT); \ +- ln $(DESTDIR)$(bindir)/$$n$(EXEEXT) $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT) >/dev/null 2>/dev/null \ +- || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT); \ ++ n=`echo @installed_linker@ | sed '$(transform)'`; \ ++ if test "@linker@" = "ld.bfd"; then \ ++ if test "@installed_linker@" != "ld"; then \ ++ ld=`echo ld | sed '$(transform)'`; \ ++ rm -f $(DESTDIR)$(bindir)/$$ld$(EXEEXT); \ ++ ln $(DESTDIR)$(bindir)/$$n$(EXEEXT) $(DESTDIR)$(bindir)/$$ld$(EXEEXT) >/dev/null 2>/dev/null \ ++ || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(bindir)/$$ld$(EXEEXT); \ ++ fi; \ ++ if test "$(bindir)/$$n$(EXEEXT)" != "$(tooldir)/bin/ld$(EXEEXT)"; then \ ++ rm -f $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT); \ ++ ln $(DESTDIR)$(bindir)/$$n$(EXEEXT) $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT) >/dev/null 2>/dev/null \ ++ || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT); \ ++ fi; \ + fi + + install-data-local: +diff --git a/ld/configure b/ld/configure +index 9eb6a17..088a24d 100755 +--- a/ld/configure ++++ b/ld/configure +@@ -797,6 +797,8 @@ GREP + CPP + NO_WERROR + WARN_CFLAGS ++linker ++installed_linker + TARGET_SYSTEM_ROOT_DEFINE + TARGET_SYSTEM_ROOT + use_sysroot +@@ -901,6 +903,8 @@ with_lib_path + enable_targets + enable_64_bit_bfd + with_sysroot ++enable_gold ++enable_linker + enable_got + enable_werror + enable_build_warnings +@@ -1548,6 +1552,8 @@ Optional Features: + (and sometimes confusing) to the casual installer + --enable-targets alternative target configurations + --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) ++ --enable-gold[=ARG] build gold [ARG={yes,both}] ++ --enable-linker=[ARG] specify the default linker [ARG={bfd,gold}] + --enable-got= GOT handling scheme (target, single, negative, + multigot) + --enable-werror treat compile warnings as errors +@@ -4302,6 +4308,35 @@ fi + + + ++# Check whether --enable-gold was given. ++if test "${enable_gold+set}" = set; then : ++ enableval=$enable_gold; if test "${enableval}" = "both"; then ++ gold_linker=ld.gold ++ installed_linker=ld.bfd ++else ++ gold_linker=ld.bfd ++ installed_linker=ld ++fi ++else ++ gold_linker=ld.bfd ++ installed_linker=ld ++fi ++ ++ ++ ++# Check whether --enable-linker was given. ++if test "${enable_linker+set}" = set; then : ++ enableval=$enable_linker; if test "${enableval}" = "gold"; then ++ linker=$gold_linker ++ else ++ linker=ld.bfd ++ fi ++else ++ linker=ld.bfd ++fi ++ ++ ++ + # Check whether --enable-got was given. + if test "${enable_got+set}" = set; then : + enableval=$enable_got; case "${enableval}" in +@@ -6087,13 +6122,13 @@ if test "${lt_cv_nm_interface+set}" = set; then : + else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext +- (eval echo "\"\$as_me:6090: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:6125: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 +- (eval echo "\"\$as_me:6093: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:6128: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 +- (eval echo "\"\$as_me:6096: output\"" >&5) ++ (eval echo "\"\$as_me:6131: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" +@@ -7298,7 +7333,7 @@ ia64-*-hpux*) + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 7301 "configure"' > conftest.$ac_ext ++ echo '#line 7336 "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -8560,11 +8595,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8563: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8598: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:8567: \$? = $ac_status" >&5 ++ echo "$as_me:8602: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -8899,11 +8934,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8902: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8937: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:8906: \$? = $ac_status" >&5 ++ echo "$as_me:8941: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -9004,11 +9039,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:9007: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9042: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:9011: \$? = $ac_status" >&5 ++ echo "$as_me:9046: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -9059,11 +9094,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:9062: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9097: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:9066: \$? = $ac_status" >&5 ++ echo "$as_me:9101: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -11441,7 +11476,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11444 "configure" ++#line 11479 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11537,7 +11572,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11540 "configure" ++#line 11575 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +diff --git a/ld/configure.in b/ld/configure.in +index c4655f5..9786953 100644 +--- a/ld/configure.in ++++ b/ld/configure.in +@@ -69,6 +69,29 @@ AC_SUBST(use_sysroot) + AC_SUBST(TARGET_SYSTEM_ROOT) + AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) + ++AC_ARG_ENABLE(gold, ++[ --enable-gold[[=ARG]] build gold [[ARG={yes,both}]]], ++[if test "${enableval}" = "both"; then ++ gold_linker=ld.gold ++ installed_linker=ld.bfd ++else ++ gold_linker=ld.bfd ++ installed_linker=ld ++fi], ++[gold_linker=ld.bfd ++ installed_linker=ld]) ++AC_SUBST(installed_linker) ++ ++AC_ARG_ENABLE(linker, ++[ --enable-linker=[[ARG]] specify the default linker [[ARG={bfd,gold}]]], ++[if test "${enableval}" = "gold"; then ++ linker=$gold_linker ++ else ++ linker=ld.bfd ++ fi], ++[linker=ld.bfd]) ++AC_SUBST(linker) ++ + AC_ARG_ENABLE([got], + AS_HELP_STRING([--enable-got=], + [GOT handling scheme (target, single, negative, multigot)]), --- binutils-2.20.1.orig/debian/patches/137_pr11138.dpatch +++ binutils-2.20.1/debian/patches/137_pr11138.dpatch @@ -0,0 +1,169 @@ +#!/bin/sh -e +## 137_pr11138.dpatch.dpatch +## +## DP: Description: PR ld/11138: internal error when DSO is before object files + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +bfd/ + +2010-01-07 H.J. Lu + + PR ld/11138 + * elflink.c (elf_link_check_versioned_symbol): Don't abort if + a symbol referenced by DSO is is defined in a non-shared object + and forced local. + +ld/testsuite/ + +2010-01-07 H.J. Lu + + PR ld/11138 + * ld-elf/pr11138-1.c: New. + * ld-elf/pr11138-1.map: Likewise. + * ld-elf/pr11138-2.c: Likewise. + * ld-elf/pr11138-2.map: Likewise. + * ld-elf/pr11138.out: Likewise. + + * ld-elf/shared.exp (build_tests): Add libpr11138-1.so and + libpr11138-2.o. + (run_tests): Add 2 tests for PR ld/11138. + +@DPATCH@ +diff --git a/bfd/elflink.c b/bfd/elflink.c +index 297d46b..a27dc50 100644 +--- a/bfd/elflink.c ++++ b/bfd/elflink.c +@@ -8492,10 +8492,14 @@ elf_link_check_versioned_symbol (struct bfd_link_info *info, + + _bfd_elf_swap_versym_in (input, ever, &iver); + +- if ((iver.vs_vers & VERSYM_HIDDEN) == 0) ++ if ((iver.vs_vers & VERSYM_HIDDEN) == 0 ++ && !(h->def_regular ++ && h->forced_local)) + { + /* If we have a non-hidden versioned sym, then it should +- have provided a definition for the undefined sym. */ ++ have provided a definition for the undefined sym unless ++ it is defined in a non-shared object and forced local. ++ */ + abort (); + } + +diff --git a/ld/testsuite/ld-elf/pr11138-1.c b/ld/testsuite/ld-elf/pr11138-1.c +new file mode 100644 +index 0000000..2aab815 +--- /dev/null ++++ b/ld/testsuite/ld-elf/pr11138-1.c +@@ -0,0 +1,13 @@ ++#include ++ ++void ++bar (void) ++{ ++ printf ("DSO bar\n"); ++} ++ ++void ++foo (void) ++{ ++ bar (); ++} +diff --git a/ld/testsuite/ld-elf/pr11138-1.map b/ld/testsuite/ld-elf/pr11138-1.map +new file mode 100644 +index 0000000..8676b1f +--- /dev/null ++++ b/ld/testsuite/ld-elf/pr11138-1.map +@@ -0,0 +1,4 @@ ++VERS_1 { ++ global: bar; foo; ++ local: *; ++}; +diff --git a/ld/testsuite/ld-elf/pr11138-2.c b/ld/testsuite/ld-elf/pr11138-2.c +new file mode 100644 +index 0000000..ccca280 +--- /dev/null ++++ b/ld/testsuite/ld-elf/pr11138-2.c +@@ -0,0 +1,17 @@ ++#include ++ ++extern void foo (void); ++ ++void ++bar (void) ++{ ++ printf ("MAIN bar\n"); ++} ++ ++int ++main (void) ++{ ++ bar (); ++ foo (); ++ return 0; ++} +diff --git a/ld/testsuite/ld-elf/pr11138-2.map b/ld/testsuite/ld-elf/pr11138-2.map +new file mode 100644 +index 0000000..1f8fb15 +--- /dev/null ++++ b/ld/testsuite/ld-elf/pr11138-2.map +@@ -0,0 +1,4 @@ ++{ ++ global: main; ++ local: *; ++}; +diff --git a/ld/testsuite/ld-elf/pr11138.out b/ld/testsuite/ld-elf/pr11138.out +new file mode 100644 +index 0000000..6dbdc49 +--- /dev/null ++++ b/ld/testsuite/ld-elf/pr11138.out +@@ -0,0 +1,2 @@ ++MAIN bar ++DSO bar +diff --git a/ld/testsuite/ld-elf/shared.exp b/ld/testsuite/ld-elf/shared.exp +index 3128e05..d0c3478 100644 +--- a/ld/testsuite/ld-elf/shared.exp ++++ b/ld/testsuite/ld-elf/shared.exp +@@ -148,6 +148,12 @@ set build_tests { + {"Build libpr9679.so" + "-shared" "-fPIC -O0" + {pr9679-1.c pr9679-2.c} {{readelf {-s} pr9679.rd}} "libpr9679.so"} ++ {"Build libpr11138-1.so" ++ "-shared -Wl,--version-script=pr11138-1.map" "-fPIC" ++ {pr11138-1.c} {} "libpr11138-1.so"} ++ {"Build libpr11138-2.o" ++ "-r -nostdlib" "" ++ {pr11138-2.c} {} "libpr11138-2.o"} + } + + set run_tests { +@@ -266,6 +272,12 @@ set run_tests { + {"Run with comm1.o libfunc1.so" + "tmpdir/comm1.o tmpdir/libfunc1.so" "" + {dummy.c} "comm1" "pass.out"} ++ {"Run with pr11138-2.c libpr11138-1.so" ++ "--version-script=pr11138-2.map tmpdir/pr11138-2.o tmpdir/libpr11138-1.so" "" ++ {dummy.c} "pr11138a" "pr11138.out"} ++ {"Run with libpr11138-1.so pr11138-2.c" ++ "--version-script=pr11138-2.map tmpdir/libpr11138-1.so tmpdir/pr11138-2.o" "" ++ {dummy.c} "pr11138b" "pr11138.out"} + } + + run_cc_link_tests $build_tests --- binutils-2.20.1.orig/debian/patches/140_gold_pr10979_2.dpatch +++ binutils-2.20.1/debian/patches/140_gold_pr10979_2.dpatch @@ -0,0 +1,212 @@ +#!/bin/sh -e +## 140_gold_pr10979_2.dpatch +## +## DP: Description: PR gold/10979: Fix internal errors + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +2009-12-30 Ian Lance Taylor + + PR 10979 + * common.cc (Sort_commons::operator()): Stabilize sort when both + entries are NULL. + (Symbol_table::do_allocate_commons_list): When allocating common + symbols, skip a symbol which is no longer common. + * symtab.h (Symbol::is_common): Test whether the symbol comes from + an object before checking its type. + * testsuite/common_test_2.c: New file. + * testsuite/common_test_3.c: New file. + * testsuite/Makefile.am (check_PROGRAMS): Add common_test_2. + (common_test_2_SOURCES, common_test_2_DEPENDENCIES): Define. + (common_test_2_LDFLAGS, common_test_2_LDADD): Define. + (common_test_2_pic.o, common_test_2.so): New targets. + (common_test_3_pic.o, common_test_3.so): New targets. + * testsuite/Makefile.in: Rebuild. + +@DPATCH@ +Index: common.cc +=================================================================== +RCS file: /cvs/src/src/gold/common.cc,v +retrieving revision 1.21 +diff -p -u -r1.21 common.cc +--- ./gold/common.cc 31 Dec 2009 01:57:55 -0000 1.21 ++++ ./gold/common.cc 31 Dec 2009 05:04:24 -0000 +@@ -91,7 +91,16 @@ bool + Sort_commons::operator()(const Symbol* pa, const Symbol* pb) const + { + if (pa == NULL) +- return false; ++ { ++ if (pb == NULL) ++ { ++ // Stabilize sort. The order really doesn't matter, because ++ // these entries will be discarded, but we want to return ++ // the same result every time we compare pa and pb. ++ return pa < pb; ++ } ++ return false; ++ } + if (pb == NULL) + return true; + +@@ -312,6 +321,17 @@ Symbol_table::do_allocate_commons_list( + Symbol* sym = *p; + if (sym == NULL) + break; ++ ++ // Because we followed forwarding symbols above, but we didn't ++ // do it reliably before adding symbols to the list, it is ++ // possible for us to have the same symbol on the list twice. ++ // This can happen in the horrible case where a program defines ++ // a common symbol with the same name as a versioned libc ++ // symbol. That will show up here as a symbol which has already ++ // been allocated and is therefore no longer a common symbol. ++ if (!sym->is_common()) ++ continue; ++ + Sized_symbol* ssym = this->get_sized_symbol(sym); + + // Record the symbol in the map file now, before we change its +Index: symtab.h +=================================================================== +RCS file: /cvs/src/src/gold/symtab.h,v +retrieving revision 1.102 +diff -p -u -r1.102 symtab.h +--- ./gold/symtab.h 31 Dec 2009 01:57:55 -0000 1.102 ++++ ./gold/symtab.h 31 Dec 2009 05:04:24 -0000 +@@ -478,10 +478,10 @@ class Symbol + bool + is_common() const + { +- if (this->type_ == elfcpp::STT_COMMON) +- return true; + if (this->source_ != FROM_OBJECT) + return false; ++ if (this->type_ == elfcpp::STT_COMMON) ++ return true; + bool is_ordinary; + unsigned int shndx = this->shndx(&is_ordinary); + return !is_ordinary && Symbol::is_common_shndx(shndx); +Index: testsuite/Makefile.am +=================================================================== +RCS file: /cvs/src/src/gold/testsuite/Makefile.am,v +retrieving revision 1.114 +diff -p -u -r1.114 Makefile.am +--- ./gold/testsuite/Makefile.am 30 Dec 2009 22:35:48 -0000 1.114 ++++ ./gold/testsuite/Makefile.am 31 Dec 2009 05:04:24 -0000 +@@ -407,6 +407,20 @@ common_test_1_DEPENDENCIES = gcctestdir/ + common_test_1_LDFLAGS = -Bgcctestdir/ + common_test_1_LDADD = + ++check_PROGRAMS += common_test_2 ++common_test_2_SOURCES = common_test_1.c ++common_test_2_DEPENDENCIES = common_test_2.so common_test_3.so gcctestdir/ld ++common_test_2_LDFLAGS = -Bgcctestdir/ -Wl,-R,. ++common_test_2_LDADD = common_test_2.so common_test_3.so ++common_test_2_pic.o: common_test_2.c ++ $(COMPILE) -c -fpic -o $@ $< ++common_test_2.so: common_test_2_pic.o common_test_3.so gcctestdir/ld ++ $(LINK) -Bgcctestdir/ -shared common_test_2_pic.o common_test_3.so ++common_test_3_pic.o: common_test_3.c ++ $(COMPILE) -c -fpic -o $@ $< ++common_test_3.so: common_test_3_pic.o ver_test_2.script gcctestdir/ld ++ $(LINK) -Bgcctestdir/ -shared common_test_3_pic.o -Wl,--version-script,$(srcdir)/ver_test_2.script ++ + check_PROGRAMS += exception_test + check_PROGRAMS += exception_static_test + check_PROGRAMS += exception_shared_1_test +Index: testsuite/common_test_2.c +=================================================================== +RCS file: testsuite/common_test_2.c +diff -N testsuite/common_test_2.c +--- /dev/null 1 Jan 1970 00:00:00 -0000 ++++ ./gold/testsuite/common_test_2.c 31 Dec 2009 05:04:25 -0000 +@@ -0,0 +1,33 @@ ++/* common_test_2.c -- test common symbol name conflicts ++ ++ Copyright 2009 Free Software Foundation, Inc. ++ Written by Ian Lance Taylor ++ ++ This file is part of gold. ++ ++ 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. */ ++ ++/* Call a function. The function will come from a shared library. */ ++ ++extern void c1 (void); ++ ++void fn (void); ++ ++void ++fn (void) ++{ ++ c1 (); ++} +Index: testsuite/common_test_3.c +=================================================================== +RCS file: testsuite/common_test_3.c +diff -N testsuite/common_test_3.c +--- /dev/null 1 Jan 1970 00:00:00 -0000 ++++ ./gold/testsuite/common_test_3.c 31 Dec 2009 05:04:25 -0000 +@@ -0,0 +1,32 @@ ++/* common_test_3.c -- test common symbol name conflicts ++ ++ Copyright 2009 Free Software Foundation, Inc. ++ Written by Ian Lance Taylor ++ ++ This file is part of gold. ++ ++ 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. */ ++ ++/* Define a function with a default version whose name is the same as ++ a common symbol. This file will wind up in a shared library. */ ++ ++void c1_v1 (void); ++ ++void ++c1_v1 (void) ++{ ++} ++__asm__ (".symver c1_v1,c1@@VER1"); --- binutils-2.20.1.orig/debian/patches/140_gold_pr10979_1.dpatch +++ binutils-2.20.1/debian/patches/140_gold_pr10979_1.dpatch @@ -0,0 +1,110 @@ +#!/bin/sh -e +## 140_gold_pr10979_1.dpatch +## +## DP: Description: PR gold/10979: Fix internal errors + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +2009-12-30 Ian Lance Taylor + + PR 10979 + * script.cc (read_input_script): If we see a new SECTIONS clause, + and we have added an input section, give an error. + * layout.h (class Layout): Add have_added_input_section function. + Add have_added_input_section_ field. + * layout.cc (Layout::Layout): Initialize + have_added_input_section_. + (Layout::layout): Set have_added_input_section_. + (Layout::layout_eh_frame): Likewise. + +@DPATCH@ +--- ./gold/layout.cc 30 Dec 2009 07:45:32 -0000 1.153 ++++ ./gold/layout.cc 31 Dec 2009 03:46:57 -0000 +@@ -192,6 +192,7 @@ Layout::Layout(int number_of_input_files + debug_info_(NULL), + group_signatures_(), + output_file_size_(-1), ++ have_added_input_section_(false), + sections_are_attached_(false), + input_requires_executable_stack_(false), + input_with_gnu_stack_note_(false), +@@ -610,6 +611,7 @@ Layout::layout(Sized_relobjadd_input_section(object, shndx, name, shdr, reloc_shndx, + this->script_options_->saw_sections_clause()); ++ this->have_added_input_section_ = true; + + return os; + } +@@ -818,6 +820,7 @@ Layout::layout_eh_frame(Sized_relobjscript_options_->saw_sections_clause(); + *off = os->add_input_section(object, shndx, name, shdr, reloc_shndx, + saw_sections_clause); ++ this->have_added_input_section_ = true; + } + + return os; +--- ./gold/layout.h 30 Dec 2009 06:57:17 -0000 1.75 ++++ ./gold/layout.h 31 Dec 2009 03:46:57 -0000 +@@ -433,6 +433,11 @@ class Layout + is_linkonce(const char* name) + { return strncmp(name, ".gnu.linkonce", sizeof(".gnu.linkonce") - 1) == 0; } + ++ // Whether we have added an input section. ++ bool ++ have_added_input_section() const ++ { return this->have_added_input_section_; } ++ + // Return true if a section is a debugging section. + static inline bool + is_debug_info_section(const char* name) +@@ -990,6 +995,8 @@ class Layout + Group_signatures group_signatures_; + // The size of the output file. + off_t output_file_size_; ++ // Whether we have added an input section to an output section. ++ bool have_added_input_section_; + // Whether we have attached the sections to the segments. + bool sections_are_attached_; + // Whether we have seen an object file marked to require an +--- ./gold/script.cc 30 Dec 2009 22:35:48 -0000 1.63 ++++ ./gold/script.cc 31 Dec 2009 03:46:58 -0000 +@@ -1398,6 +1398,9 @@ read_input_script(Workqueue* workqueue, + &lex, + input_file->will_search_for()); + ++ bool old_saw_sections_clause = ++ layout->script_options()->saw_sections_clause(); ++ + if (yyparse(&closure) != 0) + { + if (closure.found_incompatible_target()) +@@ -1411,6 +1414,12 @@ read_input_script(Workqueue* workqueue, + return false; + } + ++ if (!old_saw_sections_clause ++ && layout->script_options()->saw_sections_clause() ++ && layout->have_added_input_section()) ++ gold_error(_("%s: SECTIONS seen after other input files; try -T/--script"), ++ input_file->filename().c_str()); ++ + if (!closure.saw_inputs()) + return true; + --- binutils-2.20.1.orig/debian/patches/127_x86_64_i386_biarch.dpatch +++ binutils-2.20.1/debian/patches/127_x86_64_i386_biarch.dpatch @@ -0,0 +1,42 @@ +#!/bin/sh -e +## 127_x86_64_i386_biarch.dpatch +## +## DP: Description: Add (/usr)/lib32 to the search paths on x86_64. +## DP: Author: Aurelien Jarno +## DP: Upstream status: Debian specific + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +--- ./ld/emulparams/elf_i386.sh~ 2009-07-29 16:59:23.000000000 +0200 ++++ ./ld/emulparams/elf_i386.sh 2009-08-05 10:38:57.000000000 +0200 +@@ -13,3 +13,13 @@ + NO_SMALL_DATA=yes + SEPARATE_GOTPLT=12 + IREL_IN_PLT= ++ ++# Linux modify the default library search path to first include ++# a 32-bit specific directory. ++case "$target" in ++ x86_64*-linux* | i[3-7]86*-linux* | x86_64*-kfreebsd*-gnu | i[3-7]86*-kfreebsd*-gnu) ++ case "$EMULATION_NAME" in ++ *i386*) LIBPATH_SUFFIX=32 ;; ++ esac ++ ;; ++esac --- binutils-2.20.1.orig/debian/patches/012_check_ldrunpath_length.dpatch +++ binutils-2.20.1/debian/patches/012_check_ldrunpath_length.dpatch @@ -0,0 +1,47 @@ +#!/bin/sh -e +## 012_check_ldrunpath_length.dpatch by Chris Chimelis +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Only generate an RPATH entry if LD_RUN_PATH is not empty, for +## DP: cases where -rpath isn't specified. (#151024) + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad binutils-2.16/ld/emultempl/elf32.em /tmp/dpep.u3SQkH/binutils-2.16/ld/emultempl/elf32.em +--- binutils-2.16/ld/emultempl/elf32.em 2005-04-13 19:59:07.000000000 +0200 ++++ /tmp/dpep.u3SQkH/binutils-2.16/ld/emultempl/elf32.em 2005-05-06 19:18:08.236669718 +0200 +@@ -885,6 +885,8 @@ + && command_line.rpath == NULL) + { + lib_path = (const char *) getenv ("LD_RUN_PATH"); ++ if ((lib_path) && (strlen (lib_path) == 0)) ++ lib_path = NULL; + if (gld${EMULATION_NAME}_search_needed (lib_path, &n, + force)) + break; +@@ -1059,6 +1061,8 @@ + rpath = command_line.rpath; + if (rpath == NULL) + rpath = (const char *) getenv ("LD_RUN_PATH"); ++ if ((rpath) && (strlen (rpath) == 0)) ++ rpath = NULL; + if (! (bfd_elf_size_dynamic_sections + (output_bfd, command_line.soname, rpath, + command_line.filter_shlib, --- binutils-2.20.1.orig/debian/patches/000_branch_updates.dpatch +++ binutils-2.20.1/debian/patches/000_branch_updates.dpatch @@ -0,0 +1,24 @@ +#!/bin/sh -e +## 000_branch_updates.dpatch +## +## DP: Description: updates from the binutils 2.20 branch (2010xxyy) + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ --- binutils-2.20.1.orig/debian/patches/145_ld_man_typo.dpatch +++ binutils-2.20.1/debian/patches/145_ld_man_typo.dpatch @@ -0,0 +1,46 @@ +#!/bin/sh -e +## 145_ld_man_typo.dpatch +## +## DP: Description: Fix typo in ld documentation. + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +--- ./ld/ld.texinfo~ 2010-03-08 13:42:15.301086114 +0100 ++++ ./ld/ld.texinfo 2010-03-08 13:45:15.141094088 +0100 +@@ -1340,7 +1340,7 @@ + relocations. See @samp{--entry} and @samp{--undefined}. + + This option can be set when doing a partial link (enabled with option +-@samp{-r}). In this case the root of symbols kept must be explicitely ++@samp{-r}). In this case the root of symbols kept must be explicitly + specified either by an @samp{--entry} or @samp{--undefined} option or by + a @code{ENTRY} command in the linker script. + +--- ./ld/ld.1~ 2009-10-16 13:52:15.000000000 +0200 ++++ ./ld/ld.1 2010-03-08 13:46:21.222335894 +0100 +@@ -1199,7 +1199,7 @@ + relocations. See \fB\-\-entry\fR and \fB\-\-undefined\fR. + .Sp + This option can be set when doing a partial link (enabled with option +-\&\fB\-r\fR). In this case the root of symbols kept must be explicitely ++\&\fB\-r\fR). In this case the root of symbols kept must be explicitly + specified either by an \fB\-\-entry\fR or \fB\-\-undefined\fR option or by + a \f(CW\*(C`ENTRY\*(C'\fR command in the linker script. + .IP "\fB\-\-print\-gc\-sections\fR" 4 --- binutils-2.20.1.orig/debian/patches/131_ld_bootstrap_testsuite.dpatch +++ binutils-2.20.1/debian/patches/131_ld_bootstrap_testsuite.dpatch @@ -0,0 +1,72 @@ +#!/bin/sh -e +## 131_ld_bootstrap_testsuite.dpatch +## +## DP: Description: Fix ld-bootstrap testsuite when configured with --enable-plugins +## DP: Author: Rafael Espindola +## DP: Upstream status: proposed patch + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +Index: ld/testsuite/ld-bootstrap/bootstrap.exp +=================================================================== +RCS file: /cvs/src/src/ld/testsuite/ld-bootstrap/bootstrap.exp,v +retrieving revision 1.18 +diff -u -r1.18 bootstrap.exp +--- ./ld/testsuite/ld-bootstrap/bootstrap.exp 2 Sep 2009 07:25:38 -0000 1.18 ++++ ./ld/testsuite/ld-bootstrap/bootstrap.exp 9 Oct 2009 15:38:50 -0000 +@@ -30,6 +30,15 @@ + return + } + ++remote_exec host "$nm --help" "" "/dev/null" "plugin-support" ++set tmp [file_contents "plugin-support"] ++regexp ".*\(--plugin\).*\n" $tmp foo plugins ++if [info exists plugins] then { ++ set plugins "yes" ++} else { ++ set plugins "no" ++} ++ + # Bootstrap ld. First link the object files together using -r, in + # order to test -r. Then link the result into an executable, ld1, to + # really test -r. Use ld1 to link a fresh ld, ld2. Use ld2 to link a +@@ -61,6 +70,11 @@ + continue + } + ++ if { $flags == "--static" && $plugins == "yes" } then { ++ untested $testname ++ continue ++ } ++ + # If we only have a shared libbfd, we probably can't run the + # --static test. + if { $flags == "--static" && ! [string match "*libbfd.a*" $BFDLIB] } then { +@@ -91,6 +105,10 @@ + } + } + ++ if { $plugins == "yes" } { ++ set extralibs "$extralibs -ldl" ++ } ++ + # On Irix 5, linking with --static only works if all the files are + # compiled using -non_shared. + if {"$flags" == "--static"} { --- binutils-2.20.1.orig/debian/patches/138_gold_asneeded.dpatch +++ binutils-2.20.1/debian/patches/138_gold_asneeded.dpatch @@ -0,0 +1,42 @@ +#!/bin/sh -e +## 138_gold_asneeded.dpatch +## +## DP: Description: PR gold/11042: COPY relocs need for the dynamic object + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +2010-01-07 Ian Lance Taylor + + PR 11042 + * copy-relocs.cc (Copy_relocs::emit_copy_reloc): Mark the dynamic + object as needed. + +@DPATCH@ +--- ./gold/copy-relocs.cc 30 Dec 2009 06:57:17 -0000 1.7 ++++ ./gold/copy-relocs.cc 7 Jan 2010 19:32:05 -0000 +@@ -132,6 +132,9 @@ Copy_relocs:: + while ((value & (addralign - 1)) != 0) + addralign >>= 1; + ++ // Mark the dynamic object as needed for the --as-needed option. ++ sym->object()->set_is_needed(); ++ + if (this->dynbss_ == NULL) + { + this->dynbss_ = new Output_data_space(addralign, "** dynbss"); --- binutils-2.20.1.orig/debian/patches/129_dir_section.dpatch +++ binutils-2.20.1/debian/patches/129_dir_section.dpatch @@ -0,0 +1,154 @@ +#!/bin/sh -e +## 129_dir_section.dpatch +## +## DP: Description: Add directory section for info documents. +## DP: Author: Matthias Klose +## DP: Upstream status: submitted upstream + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +bfd/ +2009-08-27 Matthias Klose + + * bfd.texinfo: Add directory section for info document. + +gas/ +2009-08-27 Matthias Klose + + * doc/as.texinfo: Add directory section for info document. + +gprof/ +2009-08-27 Matthias Klose + + * gprof.texi: Add directory section for info document. + +ld/ +2009-08-27 Matthias Klose + + * ld.texinfo, ldint.texinfo: Add directory section for info document. + +@DPATCH@ +--- ./bfd/doc/bfd.texinfo~ 2008-11-19 17:22:46.000000000 +0100 ++++ ./bfd/doc/bfd.texinfo 2009-08-27 15:59:58.000000000 +0200 +@@ -6,13 +6,12 @@ + @c + @synindex fn cp + +-@ifinfo +-@format +-START-INFO-DIR-ENTRY ++@ifnottex ++@dircategory Software development ++@direntry + * Bfd: (bfd). The Binary File Descriptor library. +-END-INFO-DIR-ENTRY +-@end format +-@end ifinfo ++@end direntry ++@end ifnottex + + @copying + This file documents the BFD library. +--- ./gas/doc/as.texinfo~ 2009-08-06 19:38:02.000000000 +0200 ++++ ./gas/doc/as.texinfo 2009-08-27 15:59:27.000000000 +0200 +@@ -84,14 +84,13 @@ + @c might as well show 'em anyways. + @end ifinfo + +-@ifinfo +-@format +-START-INFO-DIR-ENTRY ++@ifnottex ++@dircategory Software development ++@direntry + * As: (as). The GNU assembler. + * Gas: (as). The GNU assembler. +-END-INFO-DIR-ENTRY +-@end format +-@end ifinfo ++@end direntry ++@end ifnottex + + @finalout + @syncodeindex ky cp +--- ./gprof/gprof.texi~ 2009-08-27 15:26:11.000000000 +0200 ++++ ./gprof/gprof.texi 2009-08-27 16:00:58.000000000 +0200 +@@ -10,15 +10,14 @@ + @include bfdver.texi + @c man end + +-@ifinfo ++@ifnottex + @c This is a dir.info fragment to support semi-automated addition of + @c manuals to an info tree. zoo@cygnus.com is developing this facility. +-@format +-START-INFO-DIR-ENTRY ++@dircategory Software development ++@direntry + * gprof: (gprof). Profiling your program's execution +-END-INFO-DIR-ENTRY +-@end format +-@end ifinfo ++@end direntry ++@end ifnottex + + @copying + This file documents the gprof profiler of the GNU system. +--- ./ld/ld.texinfo~ 2009-07-06 15:48:51.000000000 +0200 ++++ ./ld/ld.texinfo 2009-08-27 15:57:09.000000000 +0200 +@@ -39,13 +39,12 @@ + @end ifset + @c man end + +-@ifinfo +-@format +-START-INFO-DIR-ENTRY ++@ifnottex ++@dircategory Software development ++@direntry + * Ld: (ld). The GNU linker. +-END-INFO-DIR-ENTRY +-@end format +-@end ifinfo ++@end direntry ++@end ifnottex + + @copying + This file documents the @sc{gnu} linker LD +--- ./ld/ldint.texinfo~ 2007-10-01 11:54:57.000000000 +0200 ++++ ./ld/ldint.texinfo 2009-08-27 15:58:50.000000000 +0200 +@@ -4,13 +4,12 @@ + @c 2003, 2007 + @c Free Software Foundation, Inc. + +-@ifinfo +-@format +-START-INFO-DIR-ENTRY ++@ifnottex ++@dircategory Software development ++@direntry + * Ld-Internals: (ldint). The GNU linker internals. +-END-INFO-DIR-ENTRY +-@end format +-@end ifinfo ++@end direntry ++@end ifnottex + + @copying + This file documents the internals of the GNU linker ld. --- binutils-2.20.1.orig/debian/patches/013_bash_in_ld_testsuite.dpatch +++ binutils-2.20.1/debian/patches/013_bash_in_ld_testsuite.dpatch @@ -0,0 +1,49 @@ +#!/bin/sh -e +## 013_bash_in_ld_testsuite.dpatch.dpatch by Matthias Klose +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Explicitely use bash for the ld testsuite. + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +--- ./ld/testsuite/config/default.exp.orig 2009-04-19 21:52:33.000000000 +0200 ++++ ./ld/testsuite/config/default.exp 2009-04-19 21:54:01.000000000 +0200 +@@ -119,10 +119,10 @@ + #makefile rules, with embedded shell variable expansions. + #make wants $$shell_var, we want $shell_var ... + set cmd "host='$target_triplet' && . $srcdir/../configure.host && sed -e 's,\\\$\\\$,\$,g' < +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: From 56093a7c7a72f478f04fcaa975b8f0bb428ea51e Mon Sep 17 00:00:00 2001 +## DP: From: Sebastian Andrzej Siewior +## DP: Date: Tue, 15 Jun 2010 12:26:38 +0200 +## DP: Subject: [PATCH] Mask a few opcodes on e500 +## DP: +## DP: Backport of http://sourceware.org/ml/binutils-cvs/2010-06/msg00070.html: +## DP: |From: Alan Modra +## DP: |Date: Mon, 14 Jun 2010 14:48:03 +0000 +## DP: |Subject: [PATCH] gas/ +## DP: | * config/tc-ppc.c (md_assemble): Emit APUinfo section for +## DP: | PPC_OPCODE_E500. +## DP: | gas/testsuite/ +## DP: | * gas/ppc/e500.s: Add eieio, mbar and lwsync +## DP: | * gas/ppc/e500.d: Likewise. +## DP: | include/opcode/ +## DP: | * ppc.h (PPC_OPCODE_E500): Define. +## DP: | opcodes/ +## DP: | * ppc-dis.c (ppc_opts): Remove PPC_OPCODE_E500MC from e500 and +## DP: | e500x2. Add PPC_OPCODE_E500 to e500 and e500x2 +## DP: | * ppc-opc.c (powerpc_opcodes): Deprecate all opcodes on EFS which +## DP: | touch floating point regs and are enabled by COM, PPC or PPCCOM. +## DP: | Treat sync as msync on e500. Treat eieio as mbar 1 on e500. +## DP: | Treat lwsync as msync on e500. +## DP: +## DP: mfocrf, mtcrf and mtocrf are not PPCEFS. +## DP: +## DP: Signed-off-by: Sebastian Andrzej Siewior +## DP: --- +## DP: gas/ChangeLog | 5 ++ +## DP: gas/config/tc-ppc.c | 2 +- +## DP: gas/testsuite/ChangeLog | 5 ++ +## DP: gas/testsuite/gas/ppc/e500.d | 5 ++ +## DP: gas/testsuite/gas/ppc/e500.s | 9 +++ +## DP: include/opcode/ChangeLog | 4 + +## DP: include/opcode/ppc.h | 3 + +## DP: opcodes/ChangeLog | 9 +++ +## DP: opcodes/ppc-dis.c | 4 +- +## DP: opcodes/ppc-opc.c | 151 ++++++++++++++++++++++-------------------- +## DP: 10 files changed, 122 insertions(+), 75 deletions(-) + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff --git a/gas/ChangeLog b/gas/ChangeLog +index 8e80aaf..9d76754 100644 +--- a/gas/ChangeLog ++++ b/gas/ChangeLog +@@ -1,3 +1,8 @@ ++2010-06-14 Alan Modra ++ ++ * config/tc-ppc.c (md_assemble): Emit APUinfo section for ++ PPC_OPCODE_E500. ++ + 2010-03-01 Tristan Gingold + + * config/tc-score7.c (s7_frag_check): Add ATTRIBUTE_UNUSED. +diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c +index 7713439..cb4c1e6 100644 +--- a/gas/config/tc-ppc.c ++++ b/gas/config/tc-ppc.c +@@ -2897,7 +2897,7 @@ md_assemble (char *str) + + #ifdef OBJ_ELF + /* Do we need/want a APUinfo section? */ +- if ((ppc_cpu & PPC_OPCODE_E500MC) != 0) ++ if ((ppc_cpu & (PPC_OPCODE_E500 | PPC_OPCODE_E500MC)) != 0) + { + /* These are all version "1". */ + if (opcode->flags & PPC_OPCODE_SPE) +diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog +index 39f9e59..14dd7ea 100644 +--- a/gas/testsuite/ChangeLog ++++ b/gas/testsuite/ChangeLog +@@ -1,3 +1,8 @@ ++2010-06-14 Sebastian Andrzej Siewior ++ ++ * gas/ppc/e500.s: Add eieio, mbar and lwsync ++ * gas/ppc/e500.d: Likewise. ++ + 2010-02-08 Christophe Lyon + + * gas/arm/branch-reloc.s, gas/arm/branch-reloc.d, +diff --git a/gas/testsuite/gas/ppc/e500.d b/gas/testsuite/gas/ppc/e500.d +index d338d38..19b17db 100644 +--- a/gas/testsuite/gas/ppc/e500.d ++++ b/gas/testsuite/gas/ppc/e500.d +@@ -49,3 +49,8 @@ Disassembly of section \.text: + 9c: 10 a0 22 f7 efdctsf r5,r4 + a0: 10 a0 22 f6 efdctuf r5,r4 + a4: 10 a0 22 ef efdcfs r5,r4 ++ a8: 7c 20 06 ac mbar 1 ++ ac: 7c 00 06 ac mbar ++ b0: 7c 20 06 ac mbar 1 ++ b4: 7c 00 04 ac msync ++ b8: 7c 00 04 ac msync +diff --git a/gas/testsuite/gas/ppc/e500.s b/gas/testsuite/gas/ppc/e500.s +index e78f251..c506078 100644 +--- a/gas/testsuite/gas/ppc/e500.s ++++ b/gas/testsuite/gas/ppc/e500.s +@@ -45,3 +45,12 @@ start: + efdctsf 5,4 + efdctuf 5,4 + efdcfs 5,4 ++ ++ # eieio handling ++ eieio ++ mbar ++ mbar 1 ++ ++ #sync and lwsync handling ++ sync ++ lwsync +diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog +index fad19ae..620d1e5 100644 +--- a/include/opcode/ChangeLog ++++ b/include/opcode/ChangeLog +@@ -1,3 +1,7 @@ ++2010-06-14 Sebastian Andrzej Siewior ++ ++ * ppc.h (PPC_OPCODE_E500): Define. ++ + 2009-10-02 Peter Bergner + + * ppc.h (PPC_OPCODE_476): Define. +diff --git a/include/opcode/ppc.h b/include/opcode/ppc.h +index eb8293d..c7e716c 100644 +--- a/include/opcode/ppc.h ++++ b/include/opcode/ppc.h +@@ -173,6 +173,9 @@ extern const int powerpc_num_opcodes; + /* Opcode is supported by PowerPC 476 processor. */ + #define PPC_OPCODE_476 0x200000000ULL + ++/* Opcode which is supported by the e500 family */ ++#define PPC_OPCODE_E500 0x800000000ULL ++ + /* A macro to extract the major opcode from an instruction. */ + #define PPC_OP(i) (((i) >> 26) & 0x3f) + +diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog +index 68ef62c..89664f8 100644 +--- a/opcodes/ChangeLog ++++ b/opcodes/ChangeLog +@@ -1,3 +1,12 @@ ++2010-06-14 Sebastian Andrzej Siewior ++ ++ * ppc-dis.c (ppc_opts): Remove PPC_OPCODE_E500MC from e500 and ++ e500x2. Add PPC_OPCODE_E500 to e500 and e500x2 ++ * ppc-opc.c (powerpc_opcodes): Deprecate all opcodes on EFS which ++ touch floating point regs and are enabled by COM, PPC or PPCCOM. ++ Treat sync as msync on e500. Treat eieio as mbar 1 on e500. ++ Treat lwsync as msync on e500. ++ + 2010-02-18 Matthew Gretton-Dann + + * arm-dis.c: Fix mis-applied patch. +diff --git a/opcodes/ppc-dis.c b/opcodes/ppc-dis.c +index 883bb3b..86aa8fb 100644 +--- a/opcodes/ppc-dis.c ++++ b/opcodes/ppc-dis.c +@@ -112,7 +112,7 @@ struct ppc_mopt ppc_opts[] = { + { "e500", (PPC_OPCODE_PPC | PPC_OPCODE_BOOKE | PPC_OPCODE_SPE + | PPC_OPCODE_ISEL | PPC_OPCODE_EFS | PPC_OPCODE_BRLOCK + | PPC_OPCODE_PMR | PPC_OPCODE_CACHELCK | PPC_OPCODE_RFMCI +- | PPC_OPCODE_E500MC), ++ | PPC_OPCODE_E500), + 0 }, + { "e500mc", (PPC_OPCODE_PPC | PPC_OPCODE_BOOKE | PPC_OPCODE_ISEL + | PPC_OPCODE_PMR | PPC_OPCODE_CACHELCK | PPC_OPCODE_RFMCI +@@ -121,7 +121,7 @@ struct ppc_mopt ppc_opts[] = { + { "e500x2", (PPC_OPCODE_PPC | PPC_OPCODE_BOOKE | PPC_OPCODE_SPE + | PPC_OPCODE_ISEL | PPC_OPCODE_EFS | PPC_OPCODE_BRLOCK + | PPC_OPCODE_PMR | PPC_OPCODE_CACHELCK | PPC_OPCODE_RFMCI +- | PPC_OPCODE_E500MC), ++ | PPC_OPCODE_E500), + 0 }, + { "efs", (PPC_OPCODE_PPC | PPC_OPCODE_EFS), + 0 }, +diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c +index 123436c..9495372 100644 +--- a/opcodes/ppc-opc.c ++++ b/opcodes/ppc-opc.c +@@ -1776,6 +1776,9 @@ extract_dm (unsigned long insn, + /* An XL_MASK with the BO, BI and BB fields fixed. */ + #define XLBOBIBB_MASK (XL_MASK | BO_MASK | BI_MASK | BB_MASK) + ++/* An X form mbar instruction with MO field. */ ++#define XMBAR(op, xop, mo) (X ((op), (xop)) | ((((unsigned long)(mo)) & 1) << 21)) ++ + /* An XO form instruction. */ + #define XO(op, xop, oe, rc) \ + (OP (op) | ((((unsigned long)(xop)) & 0x1ff) << 1) | ((((unsigned long)(oe)) & 1) << 10) | (((unsigned long)(rc)) & 1)) +@@ -1935,6 +1938,7 @@ extract_dm (unsigned long insn, + #define PPCRFMCI PPC_OPCODE_RFMCI + #define E500MC PPC_OPCODE_E500MC + #define PPCA2 PPC_OPCODE_A2 ++#define E500 PPC_OPCODE_E500 + + /* The opcode table. + +@@ -4395,7 +4399,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { + {"lwbrx", X(31,534), X_MASK, PPCCOM, PPCNONE, {RT, RA0, RB}}, + {"lbrx", X(31,534), X_MASK, PWRCOM, PPCNONE, {RT, RA, RB}}, + +-{"lfsx", X(31,535), X_MASK, COM, PPCNONE, {FRT, RA0, RB}}, ++{"lfsx", X(31,535), X_MASK, COM, PPCEFS, {FRT, RA0, RB}}, + + {"srw", XRC(31,536,0), X_MASK, PPCCOM, PPCNONE, {RA, RS, RB}}, + {"sr", XRC(31,536,0), X_MASK, PWRCOM, PPCNONE, {RA, RS, RB}}, +@@ -4425,7 +4429,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { + + {"tlbsync", X(31,566), 0xffffffff, PPC, PPCNONE, {0}}, + +-{"lfsux", X(31,567), X_MASK, COM, PPCNONE, {FRT, RAS, RB}}, ++{"lfsux", X(31,567), X_MASK, COM, PPCEFS, {FRT, RAS, RB}}, + + {"lwdx", X(31,579), X_MASK, E500MC, PPCNONE, {RT, RA, RB}}, + +@@ -4438,13 +4442,15 @@ const struct powerpc_opcode powerpc_opcodes[] = { + {"lswi", X(31,597), X_MASK, PPCCOM, PPCNONE, {RT, RA0, NB}}, + {"lsi", X(31,597), X_MASK, PWRCOM, PPCNONE, {RT, RA0, NB}}, + +-{"lwsync", XSYNC(31,598,1), 0xffffffff, PPC, PPCNONE, {0}}, ++{"lwsync", XSYNC(31,598,1), 0xffffffff, PPC, E500, {0}}, + {"ptesync", XSYNC(31,598,2), 0xffffffff, PPC64, PPCNONE, {0}}, + {"sync", X(31,598), XSYNC_MASK, PPCCOM, BOOKE|PPC476, {LS}}, + {"msync", X(31,598), 0xffffffff, BOOKE|PPCA2|PPC476, PPCNONE, {0}}, ++{"sync", X(31,598), 0xffffffff, BOOKE|PPC476, PPCNONE, {0}}, ++{"lwsync", X(31,598), 0xffffffff, E500, PPCNONE, {0}}, + {"dcs", X(31,598), 0xffffffff, PWRCOM, PPCNONE, {0}}, + +-{"lfdx", X(31,599), X_MASK, COM, PPCNONE, {FRT, RA0, RB}}, ++{"lfdx", X(31,599), X_MASK, COM, PPCEFS, {FRT, RA0, RB}}, + + {"mffgpr", XRC(31,607,0), XRA_MASK, POWER6, POWER7, {FRT, RB}}, + {"lfdepx", X(31,607), X_MASK, E500MC|PPCA2, PPCNONE, {FRT, RA, RB}}, +@@ -4463,7 +4469,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { + + {"dclst", X(31,630), XRB_MASK, PWRCOM, PPCNONE, {RS, RA}}, + +-{"lfdux", X(31,631), X_MASK, COM, PPCNONE, {FRT, RAS, RB}}, ++{"lfdux", X(31,631), X_MASK, COM, PPCEFS, {FRT, RAS, RB}}, + + {"stbdx", X(31,643), X_MASK, E500MC, PPCNONE, {RS, RA, RB}}, + +@@ -4490,7 +4496,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { + {"stwbrx", X(31,662), X_MASK, PPCCOM, PPCNONE, {RS, RA0, RB}}, + {"stbrx", X(31,662), X_MASK, PWRCOM, PPCNONE, {RS, RA0, RB}}, + +-{"stfsx", X(31,663), X_MASK, COM, PPCNONE, {FRS, RA0, RB}}, ++{"stfsx", X(31,663), X_MASK, COM, PPCEFS, {FRS, RA0, RB}}, + + {"srq", XRC(31,664,0), X_MASK, M601, PPCNONE, {RA, RS, RB}}, + {"srq.", XRC(31,664,1), X_MASK, M601, PPCNONE, {RA, RS, RB}}, +@@ -4509,7 +4515,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { + + {"stbcx.", XRC(31,694,1), X_MASK, POWER7, PPCNONE, {RS, RA0, RB}}, + +-{"stfsux", X(31,695), X_MASK, COM, PPCNONE, {FRS, RAS, RB}}, ++{"stfsux", X(31,695), X_MASK, COM, PPCEFS, {FRS, RAS, RB}}, + + {"sriq", XRC(31,696,0), X_MASK, M601, PPCNONE, {RA, RS, SH}}, + {"sriq.", XRC(31,696,1), X_MASK, M601, PPCNONE, {RA, RS, SH}}, +@@ -4535,7 +4541,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { + + {"sthcx.", XRC(31,726,1), X_MASK, POWER7, PPCNONE, {RS, RA0, RB}}, + +-{"stfdx", X(31,727), X_MASK, COM, PPCNONE, {FRS, RA0, RB}}, ++{"stfdx", X(31,727), X_MASK, COM, PPCEFS, {FRS, RA0, RB}}, + + {"srlq", XRC(31,728,0), X_MASK, M601, PPCNONE, {RA, RS, RB}}, + {"srlq.", XRC(31,728,1), X_MASK, M601, PPCNONE, {RA, RS, RB}}, +@@ -4571,7 +4577,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { + {"dcba", X(31,758), XRT_MASK, PPC405|PPC7450|BOOKE|PPCA2|PPC476, PPCNONE, {RA, RB}}, + {"dcbal", XOPL(31,758,1), XRT_MASK, E500MC, PPCNONE, {RA, RB}}, + +-{"stfdux", X(31,759), X_MASK, COM, PPCNONE, {FRS, RAS, RB}}, ++{"stfdux", X(31,759), X_MASK, COM, PPCEFS, {FRS, RAS, RB}}, + + {"srliq", XRC(31,760,0), X_MASK, M601, PPCNONE, {RA, RS, SH}}, + {"srliq.", XRC(31,760,1), X_MASK, M601, PPCNONE, {RA, RS, SH}}, +@@ -4641,6 +4647,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { + + {"eieio", X(31,854), 0xffffffff, PPC, BOOKE|PPCA2|PPC476, {0}}, + {"mbar", X(31,854), X_MASK, BOOKE|PPCA2|PPC476, PPCNONE, {MO}}, ++{"eieio", XMBAR(31,854,1),0xffffffff, E500, PPCNONE, {0}}, + {"eieio", X(31,854), 0xffffffff, PPCA2|PPC476, PPCNONE, {0}}, + + {"lfiwax", X(31,855), X_MASK, POWER6|PPCA2|PPC476, PPCNONE, {FRT, RA0, RB}}, +@@ -4731,7 +4738,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { + + {"icbi", X(31,982), XRT_MASK, PPC, PPCNONE, {RA, RB}}, + +-{"stfiwx", X(31,983), X_MASK, PPC, PPCNONE, {FRS, RA0, RB}}, ++{"stfiwx", X(31,983), X_MASK, PPC, PPCEFS, {FRS, RA0, RB}}, + + {"extsw", XRC(31,986,0), XRB_MASK, PPC64, PPCNONE, {RA, RS}}, + {"extsw.", XRC(31,986,1), XRB_MASK, PPC64, PPCNONE, {RA, RS}}, +@@ -4811,21 +4818,21 @@ const struct powerpc_opcode powerpc_opcodes[] = { + {"stmw", OP(47), OP_MASK, PPCCOM, PPCNONE, {RS, D, RA0}}, + {"stm", OP(47), OP_MASK, PWRCOM, PPCNONE, {RS, D, RA0}}, + +-{"lfs", OP(48), OP_MASK, COM, PPCNONE, {FRT, D, RA0}}, ++{"lfs", OP(48), OP_MASK, COM, PPCEFS, {FRT, D, RA0}}, + +-{"lfsu", OP(49), OP_MASK, COM, PPCNONE, {FRT, D, RAS}}, ++{"lfsu", OP(49), OP_MASK, COM, PPCEFS, {FRT, D, RAS}}, + +-{"lfd", OP(50), OP_MASK, COM, PPCNONE, {FRT, D, RA0}}, ++{"lfd", OP(50), OP_MASK, COM, PPCEFS, {FRT, D, RA0}}, + +-{"lfdu", OP(51), OP_MASK, COM, PPCNONE, {FRT, D, RAS}}, ++{"lfdu", OP(51), OP_MASK, COM, PPCEFS, {FRT, D, RAS}}, + +-{"stfs", OP(52), OP_MASK, COM, PPCNONE, {FRS, D, RA0}}, ++{"stfs", OP(52), OP_MASK, COM, PPCEFS, {FRS, D, RA0}}, + +-{"stfsu", OP(53), OP_MASK, COM, PPCNONE, {FRS, D, RAS}}, ++{"stfsu", OP(53), OP_MASK, COM, PPCEFS, {FRS, D, RAS}}, + +-{"stfd", OP(54), OP_MASK, COM, PPCNONE, {FRS, D, RA0}}, ++{"stfd", OP(54), OP_MASK, COM, PPCEFS, {FRS, D, RA0}}, + +-{"stfdu", OP(55), OP_MASK, COM, PPCNONE, {FRS, D, RAS}}, ++{"stfdu", OP(55), OP_MASK, COM, PPCEFS, {FRS, D, RAS}}, + + {"lq", OP(56), OP_MASK, POWER4, PPC476, {RTQ, DQ, RAQ}}, + {"psq_l", OP(56), OP_MASK, PPCPS, PPCNONE, {FRT,PSD,RA,PSW,PSQ}}, +@@ -4845,14 +4852,14 @@ const struct powerpc_opcode powerpc_opcodes[] = { + {"dqua", ZRC(59,3,0), Z2_MASK, POWER6, PPCNONE, {FRT,FRA,FRB,RMC}}, + {"dqua.", ZRC(59,3,1), Z2_MASK, POWER6, PPCNONE, {FRT,FRA,FRB,RMC}}, + +-{"fdivs", A(59,18,0), AFRC_MASK, PPC, PPCNONE, {FRT, FRA, FRB}}, +-{"fdivs.", A(59,18,1), AFRC_MASK, PPC, PPCNONE, {FRT, FRA, FRB}}, ++{"fdivs", A(59,18,0), AFRC_MASK, PPC, PPCEFS, {FRT, FRA, FRB}}, ++{"fdivs.", A(59,18,1), AFRC_MASK, PPC, PPCEFS, {FRT, FRA, FRB}}, + +-{"fsubs", A(59,20,0), AFRC_MASK, PPC, PPCNONE, {FRT, FRA, FRB}}, +-{"fsubs.", A(59,20,1), AFRC_MASK, PPC, PPCNONE, {FRT, FRA, FRB}}, ++{"fsubs", A(59,20,0), AFRC_MASK, PPC, PPCEFS, {FRT, FRA, FRB}}, ++{"fsubs.", A(59,20,1), AFRC_MASK, PPC, PPCEFS, {FRT, FRA, FRB}}, + +-{"fadds", A(59,21,0), AFRC_MASK, PPC, PPCNONE, {FRT, FRA, FRB}}, +-{"fadds.", A(59,21,1), AFRC_MASK, PPC, PPCNONE, {FRT, FRA, FRB}}, ++{"fadds", A(59,21,0), AFRC_MASK, PPC, PPCEFS, {FRT, FRA, FRB}}, ++{"fadds.", A(59,21,1), AFRC_MASK, PPC, PPCEFS, {FRT, FRA, FRB}}, + + {"fsqrts", A(59,22,0), AFRAFRC_MASK, PPC, PPCNONE, {FRT, FRB}}, + {"fsqrts.", A(59,22,1), AFRAFRC_MASK, PPC, PPCNONE, {FRT, FRB}}, +@@ -4862,25 +4869,25 @@ const struct powerpc_opcode powerpc_opcodes[] = { + {"fres.", A(59,24,1), AFRAFRC_MASK, POWER7, PPCNONE, {FRT, FRB}}, + {"fres.", A(59,24,1), AFRALFRC_MASK, PPC, POWER7, {FRT, FRB, A_L}}, + +-{"fmuls", A(59,25,0), AFRB_MASK, PPC, PPCNONE, {FRT, FRA, FRC}}, +-{"fmuls.", A(59,25,1), AFRB_MASK, PPC, PPCNONE, {FRT, FRA, FRC}}, ++{"fmuls", A(59,25,0), AFRB_MASK, PPC, PPCEFS, {FRT, FRA, FRC}}, ++{"fmuls.", A(59,25,1), AFRB_MASK, PPC, PPCEFS, {FRT, FRA, FRC}}, + + {"frsqrtes", A(59,26,0), AFRAFRC_MASK, POWER7, PPCNONE, {FRT, FRB}}, + {"frsqrtes", A(59,26,0), AFRALFRC_MASK, POWER5, POWER7, {FRT, FRB, A_L}}, + {"frsqrtes.", A(59,26,1), AFRAFRC_MASK, POWER7, PPCNONE, {FRT, FRB}}, + {"frsqrtes.", A(59,26,1), AFRALFRC_MASK, POWER5, POWER7, {FRT, FRB, A_L}}, + +-{"fmsubs", A(59,28,0), A_MASK, PPC, PPCNONE, {FRT, FRA, FRC, FRB}}, +-{"fmsubs.", A(59,28,1), A_MASK, PPC, PPCNONE, {FRT, FRA, FRC, FRB}}, ++{"fmsubs", A(59,28,0), A_MASK, PPC, PPCEFS, {FRT, FRA, FRC, FRB}}, ++{"fmsubs.", A(59,28,1), A_MASK, PPC, PPCEFS, {FRT, FRA, FRC, FRB}}, + +-{"fmadds", A(59,29,0), A_MASK, PPC, PPCNONE, {FRT, FRA, FRC, FRB}}, +-{"fmadds.", A(59,29,1), A_MASK, PPC, PPCNONE, {FRT, FRA, FRC, FRB}}, ++{"fmadds", A(59,29,0), A_MASK, PPC, PPCEFS, {FRT, FRA, FRC, FRB}}, ++{"fmadds.", A(59,29,1), A_MASK, PPC, PPCEFS, {FRT, FRA, FRC, FRB}}, + +-{"fnmsubs", A(59,30,0), A_MASK, PPC, PPCNONE, {FRT, FRA, FRC, FRB}}, +-{"fnmsubs.", A(59,30,1), A_MASK, PPC, PPCNONE, {FRT, FRA, FRC, FRB}}, ++{"fnmsubs", A(59,30,0), A_MASK, PPC, PPCEFS, {FRT, FRA, FRC, FRB}}, ++{"fnmsubs.", A(59,30,1), A_MASK, PPC, PPCEFS, {FRT, FRA, FRC, FRB}}, + +-{"fnmadds", A(59,31,0), A_MASK, PPC, PPCNONE, {FRT, FRA, FRC, FRB}}, +-{"fnmadds.", A(59,31,1), A_MASK, PPC, PPCNONE, {FRT, FRA, FRC, FRB}}, ++{"fnmadds", A(59,31,0), A_MASK, PPC, PPCEFS, {FRT, FRA, FRC, FRB}}, ++{"fnmadds.", A(59,31,1), A_MASK, PPC, PPCEFS, {FRT, FRA, FRC, FRB}}, + + {"dmul", XRC(59,34,0), X_MASK, POWER6, PPCNONE, {FRT, FRA, FRB}}, + {"dmul.", XRC(59,34,1), X_MASK, POWER6, PPCNONE, {FRT, FRA, FRB}}, +@@ -5102,7 +5109,7 @@ const struct powerpc_opcode powerpc_opcodes[] = { + {"stdu", DSO(62,1), DS_MASK, PPC64, PPCNONE, {RS, DS, RAS}}, + {"stq", DSO(62,2), DS_MASK, POWER4, PPC476, {RSQ, DS, RA0}}, + +-{"fcmpu", X(63,0), X_MASK|(3<<21), COM, PPCNONE, {BF, FRA, FRB}}, ++{"fcmpu", X(63,0), X_MASK|(3<<21), COM, PPCEFS, {BF, FRA, FRB}}, + + {"daddq", XRC(63,2,0), X_MASK, POWER6, PPCNONE, {FRT, FRA, FRB}}, + {"daddq.", XRC(63,2,1), X_MASK, POWER6, PPCNONE, {FRT, FRA, FRB}}, +@@ -5113,48 +5120,48 @@ const struct powerpc_opcode powerpc_opcodes[] = { + {"fcpsgn", XRC(63,8,0), X_MASK, POWER6|PPCA2|PPC476, PPCNONE, {FRT, FRA, FRB}}, + {"fcpsgn.", XRC(63,8,1), X_MASK, POWER6|PPCA2|PPC476, PPCNONE, {FRT, FRA, FRB}}, + +-{"frsp", XRC(63,12,0), XRA_MASK, COM, PPCNONE, {FRT, FRB}}, +-{"frsp.", XRC(63,12,1), XRA_MASK, COM, PPCNONE, {FRT, FRB}}, ++{"frsp", XRC(63,12,0), XRA_MASK, COM, PPCEFS, {FRT, FRB}}, ++{"frsp.", XRC(63,12,1), XRA_MASK, COM, PPCEFS, {FRT, FRB}}, + +-{"fctiw", XRC(63,14,0), XRA_MASK, PPCCOM, PPCNONE, {FRT, FRB}}, ++{"fctiw", XRC(63,14,0), XRA_MASK, PPCCOM, PPCEFS, {FRT, FRB}}, + {"fcir", XRC(63,14,0), XRA_MASK, POWER2, PPCNONE, {FRT, FRB}}, +-{"fctiw.", XRC(63,14,1), XRA_MASK, PPCCOM, PPCNONE, {FRT, FRB}}, ++{"fctiw.", XRC(63,14,1), XRA_MASK, PPCCOM, PPCEFS, {FRT, FRB}}, + {"fcir.", XRC(63,14,1), XRA_MASK, POWER2, PPCNONE, {FRT, FRB}}, + +-{"fctiwz", XRC(63,15,0), XRA_MASK, PPCCOM, PPCNONE, {FRT, FRB}}, ++{"fctiwz", XRC(63,15,0), XRA_MASK, PPCCOM, PPCEFS, {FRT, FRB}}, + {"fcirz", XRC(63,15,0), XRA_MASK, POWER2, PPCNONE, {FRT, FRB}}, +-{"fctiwz.", XRC(63,15,1), XRA_MASK, PPCCOM, PPCNONE, {FRT, FRB}}, ++{"fctiwz.", XRC(63,15,1), XRA_MASK, PPCCOM, PPCEFS, {FRT, FRB}}, + {"fcirz.", XRC(63,15,1), XRA_MASK, POWER2, PPCNONE, {FRT, FRB}}, + +-{"fdiv", A(63,18,0), AFRC_MASK, PPCCOM, PPCNONE, {FRT, FRA, FRB}}, ++{"fdiv", A(63,18,0), AFRC_MASK, PPCCOM, PPCEFS, {FRT, FRA, FRB}}, + {"fd", A(63,18,0), AFRC_MASK, PWRCOM, PPCNONE, {FRT, FRA, FRB}}, +-{"fdiv.", A(63,18,1), AFRC_MASK, PPCCOM, PPCNONE, {FRT, FRA, FRB}}, ++{"fdiv.", A(63,18,1), AFRC_MASK, PPCCOM, PPCEFS, {FRT, FRA, FRB}}, + {"fd.", A(63,18,1), AFRC_MASK, PWRCOM, PPCNONE, {FRT, FRA, FRB}}, + +-{"fsub", A(63,20,0), AFRC_MASK, PPCCOM, PPCNONE, {FRT, FRA, FRB}}, ++{"fsub", A(63,20,0), AFRC_MASK, PPCCOM, PPCEFS, {FRT, FRA, FRB}}, + {"fs", A(63,20,0), AFRC_MASK, PWRCOM, PPCNONE, {FRT, FRA, FRB}}, +-{"fsub.", A(63,20,1), AFRC_MASK, PPCCOM, PPCNONE, {FRT, FRA, FRB}}, ++{"fsub.", A(63,20,1), AFRC_MASK, PPCCOM, PPCEFS, {FRT, FRA, FRB}}, + {"fs.", A(63,20,1), AFRC_MASK, PWRCOM, PPCNONE, {FRT, FRA, FRB}}, + +-{"fadd", A(63,21,0), AFRC_MASK, PPCCOM, PPCNONE, {FRT, FRA, FRB}}, ++{"fadd", A(63,21,0), AFRC_MASK, PPCCOM, PPCEFS, {FRT, FRA, FRB}}, + {"fa", A(63,21,0), AFRC_MASK, PWRCOM, PPCNONE, {FRT, FRA, FRB}}, +-{"fadd.", A(63,21,1), AFRC_MASK, PPCCOM, PPCNONE, {FRT, FRA, FRB}}, ++{"fadd.", A(63,21,1), AFRC_MASK, PPCCOM, PPCEFS, {FRT, FRA, FRB}}, + {"fa.", A(63,21,1), AFRC_MASK, PWRCOM, PPCNONE, {FRT, FRA, FRB}}, + + {"fsqrt", A(63,22,0), AFRAFRC_MASK, PPCPWR2, PPCNONE, {FRT, FRB}}, + {"fsqrt.", A(63,22,1), AFRAFRC_MASK, PPCPWR2, PPCNONE, {FRT, FRB}}, + +-{"fsel", A(63,23,0), A_MASK, PPC, PPCNONE, {FRT, FRA, FRC, FRB}}, +-{"fsel.", A(63,23,1), A_MASK, PPC, PPCNONE, {FRT, FRA, FRC, FRB}}, ++{"fsel", A(63,23,0), A_MASK, PPC, PPCEFS, {FRT, FRA, FRC, FRB}}, ++{"fsel.", A(63,23,1), A_MASK, PPC, PPCEFS, {FRT, FRA, FRC, FRB}}, + + {"fre", A(63,24,0), AFRAFRC_MASK, POWER7, PPCNONE, {FRT, FRB}}, + {"fre", A(63,24,0), AFRALFRC_MASK, POWER5, POWER7, {FRT, FRB, A_L}}, + {"fre.", A(63,24,1), AFRAFRC_MASK, POWER7, PPCNONE, {FRT, FRB}}, + {"fre.", A(63,24,1), AFRALFRC_MASK, POWER5, POWER7, {FRT, FRB, A_L}}, + +-{"fmul", A(63,25,0), AFRB_MASK, PPCCOM, PPCNONE, {FRT, FRA, FRC}}, ++{"fmul", A(63,25,0), AFRB_MASK, PPCCOM, PPCEFS, {FRT, FRA, FRC}}, + {"fm", A(63,25,0), AFRB_MASK, PWRCOM, PPCNONE, {FRT, FRA, FRC}}, +-{"fmul.", A(63,25,1), AFRB_MASK, PPCCOM, PPCNONE, {FRT, FRA, FRC}}, ++{"fmul.", A(63,25,1), AFRB_MASK, PPCCOM, PPCEFS, {FRT, FRA, FRC}}, + {"fm.", A(63,25,1), AFRB_MASK, PWRCOM, PPCNONE, {FRT, FRA, FRC}}, + + {"frsqrte", A(63,26,0), AFRAFRC_MASK, POWER7, PPCNONE, {FRT, FRB}}, +@@ -5162,27 +5169,27 @@ const struct powerpc_opcode powerpc_opcodes[] = { + {"frsqrte.", A(63,26,1), AFRAFRC_MASK, POWER7, PPCNONE, {FRT, FRB}}, + {"frsqrte.", A(63,26,1), AFRALFRC_MASK, PPC, POWER7, {FRT, FRB, A_L}}, + +-{"fmsub", A(63,28,0), A_MASK, PPCCOM, PPCNONE, {FRT, FRA, FRC, FRB}}, ++{"fmsub", A(63,28,0), A_MASK, PPCCOM, PPCEFS, {FRT, FRA, FRC, FRB}}, + {"fms", A(63,28,0), A_MASK, PWRCOM, PPCNONE, {FRT, FRA, FRC, FRB}}, +-{"fmsub.", A(63,28,1), A_MASK, PPCCOM, PPCNONE, {FRT, FRA, FRC, FRB}}, ++{"fmsub.", A(63,28,1), A_MASK, PPCCOM, PPCEFS, {FRT, FRA, FRC, FRB}}, + {"fms.", A(63,28,1), A_MASK, PWRCOM, PPCNONE, {FRT, FRA, FRC, FRB}}, + +-{"fmadd", A(63,29,0), A_MASK, PPCCOM, PPCNONE, {FRT, FRA, FRC, FRB}}, ++{"fmadd", A(63,29,0), A_MASK, PPCCOM, PPCEFS, {FRT, FRA, FRC, FRB}}, + {"fma", A(63,29,0), A_MASK, PWRCOM, PPCNONE, {FRT, FRA, FRC, FRB}}, +-{"fmadd.", A(63,29,1), A_MASK, PPCCOM, PPCNONE, {FRT, FRA, FRC, FRB}}, ++{"fmadd.", A(63,29,1), A_MASK, PPCCOM, PPCEFS, {FRT, FRA, FRC, FRB}}, + {"fma.", A(63,29,1), A_MASK, PWRCOM, PPCNONE, {FRT, FRA, FRC, FRB}}, + +-{"fnmsub", A(63,30,0), A_MASK, PPCCOM, PPCNONE, {FRT, FRA, FRC, FRB}}, ++{"fnmsub", A(63,30,0), A_MASK, PPCCOM, PPCEFS, {FRT, FRA, FRC, FRB}}, + {"fnms", A(63,30,0), A_MASK, PWRCOM, PPCNONE, {FRT, FRA, FRC, FRB}}, +-{"fnmsub.", A(63,30,1), A_MASK, PPCCOM, PPCNONE, {FRT, FRA, FRC, FRB}}, ++{"fnmsub.", A(63,30,1), A_MASK, PPCCOM, PPCEFS, {FRT, FRA, FRC, FRB}}, + {"fnms.", A(63,30,1), A_MASK, PWRCOM, PPCNONE, {FRT, FRA, FRC, FRB}}, + +-{"fnmadd", A(63,31,0), A_MASK, PPCCOM, PPCNONE, {FRT, FRA, FRC, FRB}}, ++{"fnmadd", A(63,31,0), A_MASK, PPCCOM, PPCEFS, {FRT, FRA, FRC, FRB}}, + {"fnma", A(63,31,0), A_MASK, PWRCOM, PPCNONE, {FRT, FRA, FRC, FRB}}, +-{"fnmadd.", A(63,31,1), A_MASK, PPCCOM, PPCNONE, {FRT, FRA, FRC, FRB}}, ++{"fnmadd.", A(63,31,1), A_MASK, PPCCOM, PPCEFS, {FRT, FRA, FRC, FRB}}, + {"fnma.", A(63,31,1), A_MASK, PWRCOM, PPCNONE, {FRT, FRA, FRC, FRB}}, + +-{"fcmpo", X(63,32), X_MASK|(3<<21), COM, PPCNONE, {BF, FRA, FRB}}, ++{"fcmpo", X(63,32), X_MASK|(3<<21), COM, PPCEFS, {BF, FRA, FRB}}, + + {"dmulq", XRC(63,34,0), X_MASK, POWER6, PPCNONE, {FRT, FRA, FRB}}, + {"dmulq.", XRC(63,34,1), X_MASK, POWER6, PPCNONE, {FRT, FRA, FRB}}, +@@ -5193,8 +5200,8 @@ const struct powerpc_opcode powerpc_opcodes[] = { + {"mtfsb1", XRC(63,38,0), XRARB_MASK, COM, PPCNONE, {BT}}, + {"mtfsb1.", XRC(63,38,1), XRARB_MASK, COM, PPCNONE, {BT}}, + +-{"fneg", XRC(63,40,0), XRA_MASK, COM, PPCNONE, {FRT, FRB}}, +-{"fneg.", XRC(63,40,1), XRA_MASK, COM, PPCNONE, {FRT, FRB}}, ++{"fneg", XRC(63,40,0), XRA_MASK, COM, PPCEFS, {FRT, FRB}}, ++{"fneg.", XRC(63,40,1), XRA_MASK, COM, PPCEFS, {FRT, FRB}}, + + {"mcrfs", X(63,64), XRB_MASK|(3<<21)|(3<<16), COM, PPCNONE, {BF, BFA}}, + +@@ -5207,8 +5214,8 @@ const struct powerpc_opcode powerpc_opcodes[] = { + {"mtfsb0", XRC(63,70,0), XRARB_MASK, COM, PPCNONE, {BT}}, + {"mtfsb0.", XRC(63,70,1), XRARB_MASK, COM, PPCNONE, {BT}}, + +-{"fmr", XRC(63,72,0), XRA_MASK, COM, PPCNONE, {FRT, FRB}}, +-{"fmr.", XRC(63,72,1), XRA_MASK, COM, PPCNONE, {FRT, FRB}}, ++{"fmr", XRC(63,72,0), XRA_MASK, COM, PPCEFS, {FRT, FRB}}, ++{"fmr.", XRC(63,72,1), XRA_MASK, COM, PPCEFS, {FRT, FRB}}, + + {"dscriq", ZRC(63,98,0), Z_MASK, POWER6, PPCNONE, {FRT, FRA, SH16}}, + {"dscriq.", ZRC(63,98,1), Z_MASK, POWER6, PPCNONE, {FRT, FRA, SH16}}, +@@ -5225,8 +5232,8 @@ const struct powerpc_opcode powerpc_opcodes[] = { + {"mtfsfi.", XRC(63,134,1), XWRA_MASK|(3<<21)|(1<<11), POWER6|PPCA2|PPC476, PPCNONE, {BFF, U, W}}, + {"mtfsfi.", XRC(63,134,1), XRA_MASK|(3<<21)|(1<<11), COM, POWER6|PPCA2|PPC476, {BFF, U}}, + +-{"fnabs", XRC(63,136,0), XRA_MASK, COM, PPCNONE, {FRT, FRB}}, +-{"fnabs.", XRC(63,136,1), XRA_MASK, COM, PPCNONE, {FRT, FRB}}, ++{"fnabs", XRC(63,136,0), XRA_MASK, COM, PPCEFS, {FRT, FRB}}, ++{"fnabs.", XRC(63,136,1), XRA_MASK, COM, PPCEFS, {FRT, FRB}}, + + {"fctiwu", XRC(63,142,0), XRA_MASK, POWER7, PPCNONE, {FRT, FRB}}, + {"fctiwu.", XRC(63,142,1), XRA_MASK, POWER7, PPCNONE, {FRT, FRB}}, +@@ -5245,8 +5252,8 @@ const struct powerpc_opcode powerpc_opcodes[] = { + {"dctqpq", XRC(63,258,0), X_MASK, POWER6, PPCNONE, {FRT, FRB}}, + {"dctqpq.", XRC(63,258,1), X_MASK, POWER6, PPCNONE, {FRT, FRB}}, + +-{"fabs", XRC(63,264,0), XRA_MASK, COM, PPCNONE, {FRT, FRB}}, +-{"fabs.", XRC(63,264,1), XRA_MASK, COM, PPCNONE, {FRT, FRB}}, ++{"fabs", XRC(63,264,0), XRA_MASK, COM, PPCEFS, {FRT, FRB}}, ++{"fabs.", XRC(63,264,1), XRA_MASK, COM, PPCEFS, {FRT, FRB}}, + + {"dctfixq", XRC(63,290,0), X_MASK, POWER6, PPCNONE, {FRT, FRB}}, + {"dctfixq.", XRC(63,290,1), X_MASK, POWER6, PPCNONE, {FRT, FRB}}, +@@ -5272,17 +5279,17 @@ const struct powerpc_opcode powerpc_opcodes[] = { + {"ddivq", XRC(63,546,0), X_MASK, POWER6, PPCNONE, {FRT, FRA, FRB}}, + {"ddivq.", XRC(63,546,1), X_MASK, POWER6, PPCNONE, {FRT, FRA, FRB}}, + +-{"mffs", XRC(63,583,0), XRARB_MASK, COM, PPCNONE, {FRT}}, +-{"mffs.", XRC(63,583,1), XRARB_MASK, COM, PPCNONE, {FRT}}, ++{"mffs", XRC(63,583,0), XRARB_MASK, COM, PPCEFS, {FRT}}, ++{"mffs.", XRC(63,583,1), XRARB_MASK, COM, PPCEFS, {FRT}}, + + {"dcmpuq", X(63,642), X_MASK, POWER6, PPCNONE, {BF, FRA, FRB}}, + + {"dtstsfq", X(63,674), X_MASK, POWER6, PPCNONE, {BF, FRA, FRB}}, + + {"mtfsf", XFL(63,711,0), XFL_MASK, POWER6|PPCA2|PPC476, PPCNONE, {FLM, FRB, XFL_L, W}}, +-{"mtfsf", XFL(63,711,0), XFL_MASK, COM, POWER6|PPCA2|PPC476, {FLM, FRB}}, ++{"mtfsf", XFL(63,711,0), XFL_MASK, COM, POWER6|PPCA2|PPC476|PPCEFS, {FLM, FRB}}, + {"mtfsf.", XFL(63,711,1), XFL_MASK, POWER6|PPCA2|PPC476, PPCNONE, {FLM, FRB, XFL_L, W}}, +-{"mtfsf.", XFL(63,711,1), XFL_MASK, COM, POWER6|PPCA2|PPC476, {FLM, FRB}}, ++{"mtfsf.", XFL(63,711,1), XFL_MASK, COM, POWER6|PPCA2|PPC476|PPCEFS, {FLM, FRB}}, + + {"drdpq", XRC(63,770,0), X_MASK, POWER6, PPCNONE, {FRT, FRB}}, + {"drdpq.", XRC(63,770,1), X_MASK, POWER6, PPCNONE, {FRT, FRB}}, +-- +1.5.6.5 + --- binutils-2.20.1.orig/debian/patches/150_loongson-2f.dpatch +++ binutils-2.20.1/debian/patches/150_loongson-2f.dpatch @@ -0,0 +1,501 @@ +#!/bin/sh -e +## 150_loongson-2f.dpatch +## +## DP: Description: http://sourceware.org/ml/binutils-cvs/2010-02/msg00178.html + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +gas/ + +2010-02-25 Wu Zhangjin + + * config/tc-mips.c (mips_fix_loongson2f, mips_fix_loongson2f_nop, + mips_fix_loongson2f_jump): New variables. + (md_longopts): Add New options -mfix-loongson2f-nop/jump, + -mno-fix-loongson2f-nop/jump. + (md_parse_option): Initialize variables via above options. + (options): New enums for the above options. + (md_begin): Initialize nop_insn from LOONGSON2F_NOP_INSN. + (fix_loongson2f, fix_loongson2f_nop, fix_loongson2f_jump): + New functions. + (append_insn): call fix_loongson2f(). + (mips_handle_align): Replace the implicit nops. + * config/tc-mips.h (MAX_MEM_FOR_RS_ALIGN_CODE): Modified + for the new mips_handle_align(). + * doc/c-mips.texi: Document the new options. + +gas/testsuite/ + +2010-02-25 Wu Zhangjin + + * gas/mips/loongson-2f-2.s: New test of -mfix-loongson2f-nop. + * gas/mips/loongson-2f-2.d: Likewise. + * gas/mips/loongson-2f-3.s: New test of -mfix-loongson2f-jump. + * gas/mips/loongson-2f-3.d: Likewise. + * gas/mips/mips.exp: Run the new tests. + +include/opcode/ + +2010-02-25 Wu Zhangjin + + * mips.h: (LOONGSON2F_NOP_INSN): New macro. + +diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c +index 94128fe..f901ae4 100644 +--- a/gas/config/tc-mips.c ++++ b/gas/config/tc-mips.c +@@ -1,6 +1,7 @@ + /* tc-mips.c -- assemble code for a MIPS chip. + Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +- 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ++ 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 ++ Free Software Foundation, Inc. + Contributed by the OSF and Ralph Campbell. + Written by Keith Knowles and Ralph Campbell, working independently. + Modified for ECOFF and R4000 support by Ian Lance Taylor of Cygnus +@@ -751,7 +752,8 @@ static const unsigned int mips16_to_32_reg_map[] = + + /* Classifies the kind of instructions we're interested in when + implementing -mfix-vr4120. */ +-enum fix_vr4120_class { ++enum fix_vr4120_class ++{ + FIX_VR4120_MACC, + FIX_VR4120_DMACC, + FIX_VR4120_MULT, +@@ -761,6 +763,15 @@ enum fix_vr4120_class { + NUM_FIX_VR4120_CLASSES + }; + ++/* ...likewise -mfix-loongson2f-jump. */ ++static bfd_boolean mips_fix_loongson2f_jump; ++ ++/* ...likewise -mfix-loongson2f-nop. */ ++static bfd_boolean mips_fix_loongson2f_nop; ++ ++/* True if -mfix-loongson2f-nop or -mfix-loongson2f-jump passed. */ ++static bfd_boolean mips_fix_loongson2f; ++ + /* Given two FIX_VR4120_* values X and Y, bit Y of element X is set if + there must be at least one other instruction between an instruction + of type X and an instruction of type Y. */ +@@ -1048,8 +1059,9 @@ static struct { + enum mips_regclass { MIPS_GR_REG, MIPS_FP_REG, MIPS16_REG }; + + static void append_insn +- (struct mips_cl_insn *ip, expressionS *p, bfd_reloc_code_real_type *r); ++ (struct mips_cl_insn *, expressionS *, bfd_reloc_code_real_type *); + static void mips_no_prev_insn (void); ++static void macro_build (expressionS *, const char *, const char *, ...); + static void mips16_macro_build + (expressionS *, const char *, const char *, va_list); + static void load_register (int, expressionS *, int); +@@ -1918,6 +1930,8 @@ md_begin (void) + if (nop_insn.insn_mo == NULL && strcmp (name, "nop") == 0) + { + create_insn (&nop_insn, mips_opcodes + i); ++ if (mips_fix_loongson2f_nop) ++ nop_insn.insn_opcode = LOONGSON2F_NOP_INSN; + nop_insn.fixed_p = 1; + } + } +@@ -2731,6 +2745,54 @@ nops_for_insn_or_target (const struct mips_cl_insn *hist, + return nops; + } + ++/* Fix NOP issue: Replace nops by "or at,at,zero". */ ++ ++static void ++fix_loongson2f_nop (struct mips_cl_insn * ip) ++{ ++ if (strcmp (ip->insn_mo->name, "nop") == 0) ++ ip->insn_opcode = LOONGSON2F_NOP_INSN; ++} ++ ++/* Fix Jump Issue: Eliminate instruction fetch from outside 256M region ++ jr target pc &= 'hffff_ffff_cfff_ffff. */ ++ ++static void ++fix_loongson2f_jump (struct mips_cl_insn * ip) ++{ ++ if (strcmp (ip->insn_mo->name, "j") == 0 ++ || strcmp (ip->insn_mo->name, "jr") == 0 ++ || strcmp (ip->insn_mo->name, "jalr") == 0) ++ { ++ int sreg; ++ expressionS ep; ++ ++ if (! mips_opts.at) ++ return; ++ ++ sreg = EXTRACT_OPERAND (RS, *ip); ++ if (sreg == ZERO || sreg == KT0 || sreg == KT1 || sreg == ATREG) ++ return; ++ ++ ep.X_op = O_constant; ++ ep.X_add_number = 0xcfff0000; ++ macro_build (&ep, "lui", "t,u", ATREG, BFD_RELOC_HI16); ++ ep.X_add_number = 0xffff; ++ macro_build (&ep, "ori", "t,r,i", ATREG, ATREG, BFD_RELOC_LO16); ++ macro_build (NULL, "and", "d,v,t", sreg, sreg, ATREG); ++ } ++} ++ ++static void ++fix_loongson2f (struct mips_cl_insn * ip) ++{ ++ if (mips_fix_loongson2f_nop) ++ fix_loongson2f_nop (ip); ++ ++ if (mips_fix_loongson2f_jump) ++ fix_loongson2f_jump (ip); ++} ++ + /* Output an instruction. IP is the instruction information. + ADDRESS_EXPR is an operand of the instruction to be used with + RELOC_TYPE. */ +@@ -2744,6 +2806,9 @@ append_insn (struct mips_cl_insn *ip, expressionS *address_expr, + bfd_boolean relaxed_branch = FALSE; + segment_info_type *si = seg_info (now_seg); + ++ if (mips_fix_loongson2f) ++ fix_loongson2f (ip); ++ + /* Mark instruction labels in mips16 mode. */ + mips16_mark_labels (); + +@@ -11216,6 +11281,10 @@ enum options + OPTION_MNO_7000_HILO_FIX, + OPTION_FIX_24K, + OPTION_NO_FIX_24K, ++ OPTION_FIX_LOONGSON2F_JUMP, ++ OPTION_NO_FIX_LOONGSON2F_JUMP, ++ OPTION_FIX_LOONGSON2F_NOP, ++ OPTION_NO_FIX_LOONGSON2F_NOP, + OPTION_FIX_VR4120, + OPTION_NO_FIX_VR4120, + OPTION_FIX_VR4130, +@@ -11304,6 +11373,10 @@ struct option md_longopts[] = + {"mfix7000", no_argument, NULL, OPTION_M7000_HILO_FIX}, + {"no-fix-7000", no_argument, NULL, OPTION_MNO_7000_HILO_FIX}, + {"mno-fix7000", no_argument, NULL, OPTION_MNO_7000_HILO_FIX}, ++ {"mfix-loongson2f-jump", no_argument, NULL, OPTION_FIX_LOONGSON2F_JUMP}, ++ {"mno-fix-loongson2f-jump", no_argument, NULL, OPTION_NO_FIX_LOONGSON2F_JUMP}, ++ {"mfix-loongson2f-nop", no_argument, NULL, OPTION_FIX_LOONGSON2F_NOP}, ++ {"mno-fix-loongson2f-nop", no_argument, NULL, OPTION_NO_FIX_LOONGSON2F_NOP}, + {"mfix-vr4120", no_argument, NULL, OPTION_FIX_VR4120}, + {"mno-fix-vr4120", no_argument, NULL, OPTION_NO_FIX_VR4120}, + {"mfix-vr4130", no_argument, NULL, OPTION_FIX_VR4130}, +@@ -11571,6 +11644,22 @@ md_parse_option (int c, char *arg) + mips_fix_24k = 0; + break; + ++ case OPTION_FIX_LOONGSON2F_JUMP: ++ mips_fix_loongson2f_jump = TRUE; ++ break; ++ ++ case OPTION_NO_FIX_LOONGSON2F_JUMP: ++ mips_fix_loongson2f_jump = FALSE; ++ break; ++ ++ case OPTION_FIX_LOONGSON2F_NOP: ++ mips_fix_loongson2f_nop = TRUE; ++ break; ++ ++ case OPTION_NO_FIX_LOONGSON2F_NOP: ++ mips_fix_loongson2f_nop = FALSE; ++ break; ++ + case OPTION_FIX_VR4120: + mips_fix_vr4120 = 1; + break; +@@ -11785,6 +11874,8 @@ md_parse_option (int c, char *arg) + return 0; + } + ++ mips_fix_loongson2f = mips_fix_loongson2f_nop || mips_fix_loongson2f_jump; ++ + return 1; + } + +@@ -14790,6 +14881,8 @@ void + mips_handle_align (fragS *fragp) + { + char *p; ++ int bytes, size, excess; ++ valueT opcode; + + if (fragp->fr_type != rs_align_code) + return; +@@ -14797,17 +14890,28 @@ mips_handle_align (fragS *fragp) + p = fragp->fr_literal + fragp->fr_fix; + if (*p) + { +- int bytes; ++ opcode = mips16_nop_insn.insn_opcode; ++ size = 2; ++ } ++ else ++ { ++ opcode = nop_insn.insn_opcode; ++ size = 4; ++ } + +- bytes = fragp->fr_next->fr_address - fragp->fr_address - fragp->fr_fix; +- if (bytes & 1) +- { +- *p++ = 0; +- fragp->fr_fix++; +- } +- md_number_to_chars (p, mips16_nop_insn.insn_opcode, 2); +- fragp->fr_var = 2; ++ bytes = fragp->fr_next->fr_address - fragp->fr_address - fragp->fr_fix; ++ excess = bytes % size; ++ if (excess != 0) ++ { ++ /* If we're not inserting a whole number of instructions, ++ pad the end of the fixed part of the frag with zeros. */ ++ memset (p, 0, excess); ++ p += excess; ++ fragp->fr_fix += excess; + } ++ ++ md_number_to_chars (p, opcode, size); ++ fragp->fr_var = size; + } + + static void +@@ -15519,6 +15623,8 @@ MIPS options:\n\ + -mmt generate MT instructions\n\ + -mno-mt do not generate MT instructions\n")); + fprintf (stream, _("\ ++-mfix-loongson2f-jump work around Loongson2F JUMP instructions\n\ ++-mfix-loongson2f-nop work around Loongson2F NOP errata\n\ + -mfix-vr4120 work around certain VR4120 errata\n\ + -mfix-vr4130 work around VR4130 mflo/mfhi errata\n\ + -mfix-24k insert a nop after ERET and DERET instructions\n\ +diff --git a/gas/config/tc-mips.h b/gas/config/tc-mips.h +index 4bdf807..502fa8e 100644 +--- a/gas/config/tc-mips.h ++++ b/gas/config/tc-mips.h +@@ -1,6 +1,6 @@ + /* tc-mips.h -- header file for tc-mips.c. + Copyright 1993, 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004, +- 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++ 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + Contributed by the OSF and Ralph Campbell. + Written by Keith Knowles and Ralph Campbell, working independently. + Modified for ECOFF support by Ian Lance Taylor of Cygnus Support. +@@ -59,7 +59,7 @@ extern char mips_nop_opcode (void); + extern void mips_handle_align (struct frag *); + #define HANDLE_ALIGN(fragp) mips_handle_align (fragp) + +-#define MAX_MEM_FOR_RS_ALIGN_CODE (1 + 2) ++#define MAX_MEM_FOR_RS_ALIGN_CODE (3 + 4) + + struct insn_label_list; + struct mips_segment_info { +diff --git a/gas/doc/c-mips.texi b/gas/doc/c-mips.texi +index 34fa694..641e60f 100644 +--- a/gas/doc/c-mips.texi ++++ b/gas/doc/c-mips.texi +@@ -1,5 +1,5 @@ + @c Copyright 1991, 1992, 1993, 1994, 1995, 1997, 1999, 2000, 2001, +-@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 ++@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 + @c Free Software Foundation, Inc. + @c This is part of the GAS manual. + @c For copying conditions, see the file as.texinfo. +@@ -78,7 +78,7 @@ VxWorks-style position-independent macro expansions. + @itemx -mips2 + @itemx -mips3 + @itemx -mips4 +-@itemx -mips5 ++@itemx -mips5xo + @itemx -mips32 + @itemx -mips32r2 + @itemx -mips64 +@@ -172,6 +172,20 @@ This tells the assembler to accept MT instructions. + Cause nops to be inserted if the read of the destination register + of an mfhi or mflo instruction occurs in the following two instructions. + ++@item -mfix-loongson2f-jump ++@itemx -mno-fix-loongson2f-jump ++Eliminate instruction fetch from outside 256M region to work around the ++Loongson2F @samp{jump} instructions. Without it, under extreme cases, ++the kernel may crash. The issue has been solved in latest processor ++batches, but this fix has no side effect to them. ++ ++@item -mfix-loongson2f-nop ++@itemx -mno-fix-loongson2f-nop ++Replace nops by @code{or at,at,zero} to work around the Loongson2F ++@samp{nop} errata. Without it, under extreme cases, cpu might ++deadlock. The issue has been solved in latest loongson2f batches, but ++this fix has no side effect to them. ++ + @item -mfix-vr4120 + @itemx -mno-fix-vr4120 + Insert nops to work around certain VR4120 errata. This option is +diff --git a/gas/testsuite/gas/mips/loongson-2f-2.d b/gas/testsuite/gas/mips/loongson-2f-2.d +new file mode 100644 +index 0000000..f5267a8 +--- /dev/null ++++ b/gas/testsuite/gas/mips/loongson-2f-2.d +@@ -0,0 +1,18 @@ ++#as: -mfix-loongson2f-nop ++#objdump: -M reg-names=numeric -dr ++#name: ST Microelectronics Loongson-2F workarounds of nop issue ++ ++.*: file format .* ++ ++ ++Disassembly of section .text: ++ ++00000000 : ++ 0: 00200825 move \$1,\$1 ++ 4: 00200825 move \$1,\$1 ++ 8: 00200825 move \$1,\$1 ++ c: 00200825 move \$1,\$1 ++ 10: 00200825 move \$1,\$1 ++ 14: 00200825 move \$1,\$1 ++ 18: 00200825 move \$1,\$1 ++ 1c: 00200825 move \$1,\$1 +diff --git a/gas/testsuite/gas/mips/loongson-2f-2.s b/gas/testsuite/gas/mips/loongson-2f-2.s +new file mode 100644 +index 0000000..842e157 +--- /dev/null ++++ b/gas/testsuite/gas/mips/loongson-2f-2.s +@@ -0,0 +1,10 @@ ++# Test the work around of the NOP issue of loongson2F ++ .text ++ .set noreorder ++ ++ .align 5 # Test _implicit_ nops ++loongson2f_nop_insn: ++ nop # Test _explicit_ nops ++ ++# align section end to 16-byte boundary for easier testing on multiple targets ++ .p2align 4 +diff --git a/gas/testsuite/gas/mips/loongson-2f-3.d b/gas/testsuite/gas/mips/loongson-2f-3.d +new file mode 100644 +index 0000000..99844d3 +--- /dev/null ++++ b/gas/testsuite/gas/mips/loongson-2f-3.d +@@ -0,0 +1,35 @@ ++#as: -mfix-loongson2f-jump ++#objdump: -M reg-names=numeric -dr ++#name: ST Microelectronics Loongson-2F workarounds of Jump Instruction issue ++ ++.*: file format .* ++ ++ ++Disassembly of section .text: ++ ++00000000 <.text>: ++ 0: 3c01cfff lui \$1,0xcfff ++ 4: 3421ffff ori \$1,\$1,0xffff ++ 8: 03c1f024 and \$30,\$30,\$1 ++ c: 03c00008 jr \$30 ++ 10: 00000000 nop ++ ++ 14: 3c01cfff lui \$1,0xcfff ++ 18: 3421ffff ori \$1,\$1,0xffff ++ 1c: 03e1f824 and \$31,\$31,\$1 ++ 20: 03e00008 jr \$31 ++ 24: 00000000 nop ++ ++ 28: 3c01cfff lui \$1,0xcfff ++ 2c: 3421ffff ori \$1,\$1,0xffff ++ 30: 03c1f024 and \$30,\$30,\$1 ++ 34: 03c0f809 jalr \$30 ++ 38: 00000000 nop ++ ++ 3c: 00200008 jr \$1 ++ 40: 00000000 nop ++ ++ 44: 08000000 j 0x0 ++ 44: R_MIPS_26 external_label ++ 48: 00000000 nop ++ 4c: 00000000 nop +diff --git a/gas/testsuite/gas/mips/loongson-2f-3.s b/gas/testsuite/gas/mips/loongson-2f-3.s +new file mode 100644 +index 0000000..cbb73de +--- /dev/null ++++ b/gas/testsuite/gas/mips/loongson-2f-3.s +@@ -0,0 +1,23 @@ ++# Test the work around of the Jump instruction Issue of Loongson2F ++ .text ++ .set noreorder ++ ++ j $30 # j with register ++ nop ++ ++ jr $31 # jr ++ nop ++ ++ jalr $30 # jalr ++ nop ++ ++ .set noat ++ jr $1 # jr with at register and .set annotation ++ nop ++ .set at ++ ++ j external_label # j with label ++ nop ++ ++# align section end to 16-byte boundary for easier testing on multiple targets ++ .p2align 4 +diff --git a/gas/testsuite/gas/mips/mips.exp b/gas/testsuite/gas/mips/mips.exp +index 14ce5cc..34bb5ea 100644 +--- a/gas/testsuite/gas/mips/mips.exp ++++ b/gas/testsuite/gas/mips/mips.exp +@@ -789,6 +789,8 @@ if { [istarget mips*-*-vxworks*] } { + + run_dump_test "loongson-2e" + run_dump_test "loongson-2f" ++ run_dump_test "loongson-2f-2" ++ run_dump_test "loongson-2f-3" + + run_dump_test_arches "octeon" [mips_arch_list_matching octeon] + run_list_test_arches "octeon-ill" "" \ +diff --git a/include/opcode/mips.h b/include/opcode/mips.h +index 27d10e6..d6b3cf4 100644 +--- a/include/opcode/mips.h ++++ b/include/opcode/mips.h +@@ -1,6 +1,6 @@ + /* mips.h. Mips opcode list for GDB, the GNU debugger. + Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +- 2003, 2004, 2005, 2008, 2009 ++ 2003, 2004, 2005, 2008, 2009, 2010 + Free Software Foundation, Inc. + Contributed by Ralph Campbell and OSF + Commented and modified by Ian Lance Taylor, Cygnus Support +@@ -1106,4 +1106,8 @@ extern int bfd_mips_num_opcodes; + extern const struct mips_opcode mips16_opcodes[]; + extern const int bfd_mips16_num_opcodes; + ++/* A NOP insn impemented as "or at,at,zero". ++ Used to implement -mfix-loongson2f. */ ++#define LOONGSON2F_NOP_INSN 0x00200825 ++ + #endif /* _MIPS_H_ */ +-- +1.7.0.1 + --- binutils-2.20.1.orig/debian/patches/146_arm_readelf_unwind.dpatch +++ binutils-2.20.1/debian/patches/146_arm_readelf_unwind.dpatch @@ -0,0 +1,771 @@ +#!/bin/sh -e +## 146_arm_readelf_unwind.dpatch +## +## DP: Description: Add readelf --unwind support for ARM + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +2010-03-02 Daniel Jacobowitz + + * NEWS: Document .ARM.exidx / .ARM.extab support. + + * dwarf.c (read_leb128): Make non-static. + * dwarf.h (read_leb128): Declare. + * readelf.c (REMOVE_ARCH_BITS): Define. + (find_section_by_address): New. + (read_uleb128): Move higher. Use read_leb128 from dwarf.c. + (find_symbol_for_address): Handle the Thumb bit for ARM, by + using REMOVE_ARCH_BITS. + (struct arm_section, struct arm_unw_aux_info, arm_print_vma_and_name) + (arm_free_section, arm_section_get_word, decode_arm_unwind) + (dump_arm_unwind, arm_process_unwind): New. + (process_unwind): Handle ARM. + +@DPATCH@ +Index: dwarf.c +=================================================================== +RCS file: /cvs/src/src/binutils/dwarf.c,v +retrieving revision 1.62 +diff -u -p -r1.62 dwarf.c +--- ./binutils/dwarf.c 8 Feb 2010 19:27:34 -0000 1.62 ++++ ./binutils/dwarf.c 2 Mar 2010 16:42:56 -0000 +@@ -227,7 +227,7 @@ print_dwarf_vma (dwarf_vma val, unsigned + fputs (buff + (byte_size == 4 ? 8 : 0), stdout); + } + +-static unsigned long int ++unsigned long int + read_leb128 (unsigned char *data, unsigned int *length_return, int sign) + { + unsigned long int result = 0; +Index: dwarf.h +=================================================================== +RCS file: /cvs/src/src/binutils/dwarf.h,v +retrieving revision 1.13 +diff -u -p -r1.13 dwarf.h +--- ./binutils/dwarf.h 3 Dec 2009 12:28:36 -0000 1.13 ++++ ./binutils/dwarf.h 2 Mar 2010 16:42:56 -0000 +@@ -133,3 +133,6 @@ void *xcrealloc (void *, size_t, size_t) + + void error (const char *, ...) ATTRIBUTE_PRINTF_1; + void warn (const char *, ...) ATTRIBUTE_PRINTF_1; ++ ++unsigned long int read_leb128 (unsigned char *data, ++ unsigned int *length_return, int sign); +Index: readelf.c +=================================================================== +RCS file: /cvs/src/src/binutils/readelf.c,v +retrieving revision 1.486 +diff -u -p -r1.486 readelf.c +--- ./binutils/readelf.c 19 Feb 2010 01:36:39 -0000 1.486 ++++ ./binutils/readelf.c 2 Mar 2010 16:42:57 -0000 +@@ -285,6 +285,11 @@ static void (* byte_put) (unsigned char + #define streq(a,b) (strcmp ((a), (b)) == 0) + #define strneq(a,b,n) (strncmp ((a), (b), (n)) == 0) + #define const_strneq(a,b) (strncmp ((a), (b), sizeof (b) - 1) == 0) ++ ++#define REMOVE_ARCH_BITS(ADDR) do { \ ++ if (elf_header.e_machine == EM_ARM) \ ++ (ADDR) &= ~1; \ ++ } while (0) + + static void * + get_data (void * var, FILE * file, long offset, size_t size, size_t nmemb, +@@ -544,6 +549,33 @@ find_section (const char * name) + return NULL; + } + ++/* Return a pointer to a section containing ADDR, or NULL if no such ++ section exists. */ ++ ++static Elf_Internal_Shdr * ++find_section_by_address (bfd_vma addr) ++{ ++ unsigned int i; ++ ++ for (i = 0; i < elf_header.e_shnum; i++) ++ { ++ Elf_Internal_Shdr *sec = section_headers + i; ++ if (addr >= sec->sh_addr && addr < sec->sh_addr + sec->sh_size) ++ return sec; ++ } ++ ++ return NULL; ++} ++ ++/* Read an unsigned LEB128 encoded value from p. Set *PLEN to the number of ++ bytes read. */ ++ ++static unsigned long ++read_uleb128 (unsigned char *data, unsigned int *length_return) ++{ ++ return read_leb128 (data, length_return, 0); ++} ++ + /* Guess the relocation size commonly used by the specific machines. */ + + static int +@@ -5089,16 +5121,22 @@ find_symbol_for_address (Elf_Internal_Sy + Elf_Internal_Sym * best = NULL; + unsigned long i; + ++ REMOVE_ARCH_BITS (addr.offset); ++ + for (i = 0, sym = symtab; i < nsyms; ++i, ++sym) + { ++ bfd_vma value = sym->st_value; ++ ++ REMOVE_ARCH_BITS (value); ++ + if (ELF_ST_TYPE (sym->st_info) == STT_FUNC + && sym->st_name != 0 + && (addr.section == SHN_UNDEF || addr.section == sym->st_shndx) +- && addr.offset >= sym->st_value +- && addr.offset - sym->st_value < dist) ++ && addr.offset >= value ++ && addr.offset - value < dist) + { + best = sym; +- dist = addr.offset - sym->st_value; ++ dist = addr.offset - value; + if (!dist) + break; + } +@@ -5761,6 +5799,579 @@ hppa_process_unwind (FILE * file) + return 1; + } + ++struct arm_section ++{ ++ unsigned char *data; ++ ++ Elf_Internal_Shdr *sec; ++ Elf_Internal_Rela *rela; ++ unsigned long nrelas; ++ unsigned int rel_type; ++ ++ Elf_Internal_Rela *next_rela; ++}; ++ ++struct arm_unw_aux_info ++{ ++ FILE *file; ++ ++ Elf_Internal_Sym *symtab; /* The symbol table. */ ++ unsigned long nsyms; /* Number of symbols. */ ++ char *strtab; /* The string table. */ ++ unsigned long strtab_size; /* Size of string table. */ ++}; ++ ++static const char * ++arm_print_vma_and_name (struct arm_unw_aux_info *aux, ++ bfd_vma fn, struct absaddr addr) ++{ ++ const char *procname; ++ bfd_vma sym_offset; ++ ++ if (addr.section == SHN_UNDEF) ++ addr.offset = fn; ++ ++ find_symbol_for_address (aux->symtab, aux->nsyms, aux->strtab, ++ aux->strtab_size, addr, &procname, ++ &sym_offset); ++ ++ print_vma (fn, PREFIX_HEX); ++ ++ if (procname) ++ { ++ fputs (" <", stdout); ++ fputs (procname, stdout); ++ ++ if (sym_offset) ++ printf ("+0x%lx", (unsigned long) sym_offset); ++ fputc ('>', stdout); ++ } ++ ++ return procname; ++} ++ ++static void ++arm_free_section (struct arm_section *arm_sec) ++{ ++ if (arm_sec->data != NULL) ++ free (arm_sec->data); ++ ++ if (arm_sec->rela != NULL) ++ free (arm_sec->rela); ++} ++ ++static int ++arm_section_get_word (struct arm_unw_aux_info *aux, ++ struct arm_section *arm_sec, ++ Elf_Internal_Shdr *sec, bfd_vma word_offset, ++ unsigned int *wordp, struct absaddr *addr) ++{ ++ Elf_Internal_Rela *rp; ++ Elf_Internal_Sym *sym; ++ const char * relname; ++ unsigned int word; ++ bfd_boolean wrapped; ++ ++ addr->section = SHN_UNDEF; ++ addr->offset = 0; ++ ++ if (sec != arm_sec->sec) ++ { ++ Elf_Internal_Shdr *relsec; ++ ++ arm_free_section (arm_sec); ++ ++ arm_sec->sec = sec; ++ arm_sec->data = get_data (NULL, aux->file, sec->sh_offset, 1, ++ sec->sh_size, _("unwind data")); ++ ++ arm_sec->rela = NULL; ++ arm_sec->nrelas = 0; ++ ++ for (relsec = section_headers; ++ relsec < section_headers + elf_header.e_shnum; ++ ++relsec) ++ { ++ if (relsec->sh_info >= elf_header.e_shnum ++ || section_headers + relsec->sh_info != sec) ++ continue; ++ ++ if (relsec->sh_type == SHT_REL) ++ { ++ if (!slurp_rel_relocs (aux->file, relsec->sh_offset, ++ relsec->sh_size, ++ & arm_sec->rela, & arm_sec->nrelas)) ++ return 0; ++ break; ++ } ++ else if (relsec->sh_type == SHT_RELA) ++ { ++ if (!slurp_rela_relocs (aux->file, relsec->sh_offset, ++ relsec->sh_size, ++ & arm_sec->rela, & arm_sec->nrelas)) ++ return 0; ++ break; ++ } ++ } ++ ++ arm_sec->next_rela = arm_sec->rela; ++ } ++ ++ if (arm_sec->data == NULL) ++ return 0; ++ ++ word = byte_get (arm_sec->data + word_offset, 4); ++ ++ wrapped = FALSE; ++ for (rp = arm_sec->next_rela; rp != arm_sec->rela + arm_sec->nrelas; rp++) ++ { ++ bfd_vma prelval, offset; ++ ++ if (rp->r_offset > word_offset && !wrapped) ++ { ++ rp = arm_sec->rela; ++ wrapped = TRUE; ++ } ++ if (rp->r_offset > word_offset) ++ break; ++ ++ if (rp->r_offset & 3) ++ { ++ warn (_("Skipping unexpected relocation at offset 0x%lx\n"), ++ (unsigned long) rp->r_offset); ++ continue; ++ } ++ ++ if (rp->r_offset < word_offset) ++ continue; ++ ++ relname = elf_arm_reloc_type (ELF32_R_TYPE (rp->r_info)); ++ ++ if (streq (relname, "R_ARM_NONE")) ++ continue; ++ ++ if (! streq (relname, "R_ARM_PREL31")) ++ { ++ warn (_("Skipping unexpected relocation type %s\n"), relname); ++ continue; ++ } ++ ++ sym = aux->symtab + ELF32_R_SYM (rp->r_info); ++ ++ if (arm_sec->rel_type == SHT_REL) ++ { ++ offset = word & 0x7fffffff; ++ if (offset & 0x40000000) ++ offset |= ~ (bfd_vma) 0x7fffffff; ++ } ++ else ++ offset = rp->r_addend; ++ ++ offset += sym->st_value; ++ prelval = offset - (arm_sec->sec->sh_addr + rp->r_offset); ++ ++ word = (word & ~ (bfd_vma) 0x7fffffff) | (prelval & 0x7fffffff); ++ addr->section = sym->st_shndx; ++ addr->offset = offset; ++ break; ++ } ++ ++ *wordp = word; ++ arm_sec->next_rela = rp; ++ ++ return 1; ++} ++ ++static void ++decode_arm_unwind (struct arm_unw_aux_info *aux, ++ unsigned int word, unsigned int remaining, ++ bfd_vma data_offset, Elf_Internal_Shdr *data_sec, ++ struct arm_section *data_arm_sec) ++{ ++ int per_index; ++ unsigned int more_words; ++ struct absaddr addr; ++ ++#define ADVANCE \ ++ if (remaining == 0 && more_words) \ ++ { \ ++ data_offset += 4; \ ++ if (!arm_section_get_word (aux, data_arm_sec, data_sec, \ ++ data_offset, &word, &addr)) \ ++ return; \ ++ remaining = 4; \ ++ more_words--; \ ++ } \ ++ ++#define GET_OP(OP) \ ++ ADVANCE; \ ++ if (remaining) \ ++ { \ ++ remaining--; \ ++ (OP) = word >> 24; \ ++ word <<= 8; \ ++ } \ ++ else \ ++ { \ ++ printf ("[Truncated opcode]\n"); \ ++ return; \ ++ } \ ++ printf (_("0x%02x "), OP) ++ ++ if (remaining == 0) ++ { ++ /* Fetch the first word. */ ++ if (!arm_section_get_word (aux, data_arm_sec, data_sec, data_offset, ++ &word, &addr)) ++ return; ++ remaining = 4; ++ } ++ ++ if ((word & 0x80000000) == 0) ++ { ++ /* Expand prel31 for personality routine. */ ++ bfd_vma fn; ++ const char *procname; ++ ++ fn = word; ++ if (fn & 0x40000000) ++ fn |= ~ (bfd_vma) 0x7fffffff; ++ fn = fn + data_sec->sh_addr + data_offset; ++ ++ printf (_(" Personality routine: ")); ++ procname = arm_print_vma_and_name (aux, fn, addr); ++ fputc ('\n', stdout); ++ ++ /* The GCC personality routines use the standard compact ++ encoding, starting with one byte giving the number of ++ words. */ ++ if (procname != NULL ++ && (const_strneq (procname, "__gcc_personality_v0") ++ || const_strneq (procname, "__gxx_personality_v0") ++ || const_strneq (procname, "__gcj_personality_v0") ++ || const_strneq (procname, "__gnu_objc_personality_v0"))) ++ { ++ remaining = 0; ++ more_words = 1; ++ ADVANCE; ++ if (!remaining) ++ { ++ printf (_(" [Truncated data]\n")); ++ return; ++ } ++ more_words = word >> 24; ++ word <<= 8; ++ remaining--; ++ } ++ else ++ return; ++ } ++ else ++ { ++ ++ per_index = (word >> 24) & 0x7f; ++ if (per_index != 0 && per_index != 1 && per_index != 2) ++ { ++ printf (_(" [reserved compact index %d]\n"), per_index); ++ return; ++ } ++ ++ printf (_(" Compact model %d\n"), per_index); ++ if (per_index == 0) ++ { ++ more_words = 0; ++ word <<= 8; ++ remaining--; ++ } ++ else ++ { ++ more_words = (word >> 16) & 0xff; ++ word <<= 16; ++ remaining -= 2; ++ } ++ } ++ ++ /* Decode the unwinding instructions. */ ++ while (1) ++ { ++ unsigned int op, op2; ++ ++ ADVANCE; ++ if (remaining == 0) ++ break; ++ remaining--; ++ op = word >> 24; ++ word <<= 8; ++ ++ printf (_(" 0x%02x "), op); ++ ++ if ((op & 0xc0) == 0x00) ++ { ++ int offset = ((op & 0x3f) << 2) + 4; ++ printf (_(" vsp = vsp + %d"), offset); ++ } ++ else if ((op & 0xc0) == 0x40) ++ { ++ int offset = ((op & 0x3f) << 2) + 4; ++ printf (_(" vsp = vsp - %d"), offset); ++ } ++ else if ((op & 0xf0) == 0x80) ++ { ++ GET_OP (op2); ++ if (op == 0x80 && op2 == 0) ++ printf (_("Refuse to unwind")); ++ else ++ { ++ unsigned int mask = ((op & 0x0f) << 8) | op2; ++ int first = 1; ++ int i; ++ printf ("pop {"); ++ for (i = 0; i < 12; i++) ++ if (mask & (1 << i)) ++ { ++ if (first) ++ first = 0; ++ else ++ printf (", "); ++ printf ("r%d", 4 + i); ++ } ++ printf ("}"); ++ } ++ } ++ else if ((op & 0xf0) == 0x90) ++ { ++ if (op == 0x9d || op == 0x9f) ++ printf (_(" [Reserved]")); ++ else ++ printf (_(" vsp = r%d"), op & 0x0f); ++ } ++ else if ((op & 0xf0) == 0xa0) ++ { ++ int end = 4 + (op & 0x07); ++ int first = 1; ++ int i; ++ printf (" pop {"); ++ for (i = 4; i <= end; i++) ++ { ++ if (first) ++ first = 0; ++ else ++ printf (", "); ++ printf ("r%d", i); ++ } ++ if (op & 0x08) ++ { ++ if (first) ++ printf (", "); ++ printf ("r14"); ++ } ++ printf ("}"); ++ } ++ else if (op == 0xb0) ++ printf (_(" finish")); ++ else if (op == 0xb1) ++ { ++ GET_OP (op2); ++ if (op2 == 0 || (op2 & 0xf0) != 0) ++ printf (_("[Spare]")); ++ else ++ { ++ unsigned int mask = op2 & 0x0f; ++ int first = 1; ++ int i; ++ printf ("pop {"); ++ for (i = 0; i < 12; i++) ++ if (mask & (1 << i)) ++ { ++ if (first) ++ first = 0; ++ else ++ printf (", "); ++ printf ("r%d", i); ++ } ++ printf ("}"); ++ } ++ } ++ else if (op == 0xb2) ++ { ++ unsigned char buf[5]; ++ unsigned int i, len; ++ unsigned long offset; ++ for (i = 0; i < 9; i++) ++ { ++ GET_OP (buf[i]); ++ if ((buf[i] & 0x80) == 0) ++ break; ++ } ++ assert (i < sizeof (buf)); ++ offset = read_uleb128 (buf, &len); ++ assert (len == i + 1); ++ offset = offset * 4 + 0x204; ++ printf (_("vsp = vsp + %ld"), offset); ++ } ++ else ++ { ++ if (op == 0xb3 || op == 0xc6 || op == 0xc7 || op == 0xc8 || op == 0xc9) ++ { ++ GET_OP (op2); ++ printf (_("[unsupported two-byte opcode]")); ++ } ++ else ++ { ++ printf (_(" [unsupported opcode]")); ++ } ++ } ++ printf ("\n"); ++ } ++ ++ /* Decode the descriptors. Not implemented. */ ++} ++ ++static void ++dump_arm_unwind (struct arm_unw_aux_info *aux, Elf_Internal_Shdr *exidx_sec) ++{ ++ struct arm_section exidx_arm_sec, extab_arm_sec; ++ unsigned int i, exidx_len; ++ ++ memset (&exidx_arm_sec, 0, sizeof (exidx_arm_sec)); ++ memset (&extab_arm_sec, 0, sizeof (extab_arm_sec)); ++ exidx_len = exidx_sec->sh_size / 8; ++ ++ for (i = 0; i < exidx_len; i++) ++ { ++ unsigned int exidx_fn, exidx_entry; ++ struct absaddr fn_addr, entry_addr; ++ bfd_vma fn; ++ ++ fputc ('\n', stdout); ++ ++ if (!arm_section_get_word (aux, &exidx_arm_sec, exidx_sec, ++ 8 * i, &exidx_fn, &fn_addr) ++ || !arm_section_get_word (aux, &exidx_arm_sec, exidx_sec, ++ 8 * i + 4, &exidx_entry, &entry_addr)) ++ { ++ arm_free_section (&exidx_arm_sec); ++ arm_free_section (&extab_arm_sec); ++ return; ++ } ++ ++ fn = exidx_fn & 0x7fffffff; ++ if (fn & 0x40000000) ++ fn |= ~ (bfd_vma) 0x7fffffff; ++ fn = fn + exidx_sec->sh_addr + 8 * i; ++ ++ arm_print_vma_and_name (aux, fn, entry_addr); ++ fputs (": ", stdout); ++ ++ if (exidx_entry == 1) ++ { ++ print_vma (exidx_entry, PREFIX_HEX); ++ fputs (" [cantunwind]\n", stdout); ++ } ++ else if (exidx_entry & 0x80000000) ++ { ++ print_vma (exidx_entry, PREFIX_HEX); ++ fputc ('\n', stdout); ++ decode_arm_unwind (aux, exidx_entry, 4, 0, NULL, NULL); ++ } ++ else ++ { ++ bfd_vma table, table_offset; ++ Elf_Internal_Shdr *table_sec; ++ ++ fputs ("@", stdout); ++ table = exidx_entry; ++ if (table & 0x40000000) ++ table |= ~ (bfd_vma) 0x7fffffff; ++ table = table + exidx_sec->sh_addr + 8 * i + 4; ++ print_vma (table, PREFIX_HEX); ++ printf ("\n"); ++ ++ /* Locate the matching .ARM.extab. */ ++ if (entry_addr.section != SHN_UNDEF ++ && entry_addr.section < elf_header.e_shnum) ++ { ++ table_sec = section_headers + entry_addr.section; ++ table_offset = entry_addr.offset; ++ } ++ else ++ { ++ table_sec = find_section_by_address (table); ++ if (table_sec != NULL) ++ table_offset = table - table_sec->sh_addr; ++ } ++ if (table_sec == NULL) ++ { ++ warn (_("Could not locate .ARM.extab section containing 0x%lx.\n"), ++ (unsigned long) table); ++ continue; ++ } ++ decode_arm_unwind (aux, 0, 0, table_offset, table_sec, ++ &extab_arm_sec); ++ } ++ } ++ ++ printf ("\n"); ++ ++ arm_free_section (&exidx_arm_sec); ++ arm_free_section (&extab_arm_sec); ++} ++ ++static int ++arm_process_unwind (FILE *file) ++{ ++ struct arm_unw_aux_info aux; ++ Elf_Internal_Shdr *unwsec = NULL; ++ Elf_Internal_Shdr *strsec; ++ Elf_Internal_Shdr *sec; ++ unsigned long i; ++ ++ memset (& aux, 0, sizeof (aux)); ++ aux.file = file; ++ ++ if (string_table == NULL) ++ return 1; ++ ++ for (i = 0, sec = section_headers; i < elf_header.e_shnum; ++i, ++sec) ++ { ++ if (sec->sh_type == SHT_SYMTAB && sec->sh_link < elf_header.e_shnum) ++ { ++ aux.nsyms = sec->sh_size / sec->sh_entsize; ++ aux.symtab = GET_ELF_SYMBOLS (file, sec); ++ ++ strsec = section_headers + sec->sh_link; ++ aux.strtab = get_data (NULL, file, strsec->sh_offset, ++ 1, strsec->sh_size, _("string table")); ++ aux.strtab_size = aux.strtab != NULL ? strsec->sh_size : 0; ++ } ++ else if (sec->sh_type == SHT_ARM_EXIDX) ++ unwsec = sec; ++ } ++ ++ if (!unwsec) ++ printf (_("\nThere are no unwind sections in this file.\n")); ++ ++ for (i = 0, sec = section_headers; i < elf_header.e_shnum; ++i, ++sec) ++ { ++ if (sec->sh_type == SHT_ARM_EXIDX) ++ { ++ printf (_("\nUnwind table index '%s' at offset 0x%lx contains %lu entries:\n"), ++ SECTION_NAME (sec), ++ (unsigned long) sec->sh_offset, ++ (unsigned long) (sec->sh_size / (2 * eh_addr_size))); ++ ++ dump_arm_unwind (&aux, sec); ++ } ++ } ++ ++ if (aux.symtab) ++ free (aux.symtab); ++ if (aux.strtab) ++ free ((char *) aux.strtab); ++ ++ return 1; ++} ++ + static int + process_unwind (FILE * file) + { +@@ -5770,6 +6381,7 @@ process_unwind (FILE * file) + int (* handler)(FILE *); + } handlers[] = + { ++ { EM_ARM, arm_process_unwind }, + { EM_IA_64, ia64_process_unwind }, + { EM_PARISC, hppa_process_unwind }, + { 0, 0 } +@@ -9177,33 +9789,6 @@ static arm_attr_public_tag arm_attr_publ + }; + #undef LOOKUP + +-/* Read an unsigned LEB128 encoded value from p. Set *PLEN to the number of +- bytes read. */ +- +-static unsigned int +-read_uleb128 (unsigned char * p, unsigned int * plen) +-{ +- unsigned char c; +- unsigned int val; +- int shift; +- int len; +- +- val = 0; +- shift = 0; +- len = 0; +- do +- { +- c = *(p++); +- len++; +- val |= ((unsigned int)c & 0x7f) << shift; +- shift += 7; +- } +- while (c & 0x80); +- +- *plen = len; +- return val; +-} +- + static unsigned char * + display_arm_attribute (unsigned char * p) + { --- binutils-2.20.1.orig/debian/patches/134_gold_no_spu.dpatch +++ binutils-2.20.1/debian/patches/134_gold_no_spu.dpatch @@ -0,0 +1,35 @@ +#!/bin/sh -e +## 134_gold_no_spu.dpatch +## +## DP: Description: Don't configure gold for spu target. + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +--- ./Makefile.in.orig 2009-10-16 11:50:46.000000000 +0000 ++++ ./Makefile.in 2009-11-11 23:01:20.000000000 +0000 +@@ -20958,7 +20958,7 @@ + srcdiroption="--srcdir=$${topdir}/gold"; \ + libsrcdir="$$s/gold"; \ + $(SHELL) $${libsrcdir}/configure \ +- $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ ++ $$(echo $(HOST_CONFIGARGS) |sed 's/,spu//') --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} $${srcdiroption} \ + || exit 1 + @endif gold --- binutils-2.20.1.orig/debian/patches/147_arm_linking_time.dpatch +++ binutils-2.20.1/debian/patches/147_arm_linking_time.dpatch @@ -0,0 +1,220 @@ +#!/bin/sh -e +## 147_arm_linking_time.dpatch +## +## DP: Description: Reduce ARM linking time (backport from trunk) + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +2010-03-19 Jie Zhang + + * elf32-arm.c (struct section_list): Remove. + (section_list): Remove typedef. + (record_section_with_arm_elf_section_data): Remove. + (find_arm_elf_section_entry): Remove. + (get_arm_elf_section_data): Use is_arm_elf. + (unrecord_section_with_arm_elf_section_data): Remove. + (elf32_arm_new_section_hook): Don't call + record_section_with_arm_elf_section_data. + (elf32_arm_write_section): Set mapcount to -1 when + the map has been used. Don't call + unrecord_section_with_arm_elf_section_data. + (unrecord_section_via_map_over_sections): Remove. + (elf32_arm_close_and_cleanup): Remove. + (elf32_arm_bfd_free_cached_info): Remove. + (bfd_elf32_close_and_cleanup): Don't define. + (bfd_elf32_bfd_free_cached_info): Don't define. + +@DPATCH@ +--- ./bfd/elf32-arm.c.orig 2010-02-22 09:06:48.000000000 +0100 ++++ ./bfd/elf32-arm.c 2010-03-30 13:51:24.754836445 +0200 +@@ -12736,108 +12736,15 @@ + return TRUE; + } + +-/* A structure used to record a list of sections, independently +- of the next and prev fields in the asection structure. */ +-typedef struct section_list +-{ +- asection * sec; +- struct section_list * next; +- struct section_list * prev; +-} +-section_list; +- +-/* Unfortunately we need to keep a list of sections for which +- an _arm_elf_section_data structure has been allocated. This +- is because it is possible for functions like elf32_arm_write_section +- to be called on a section which has had an elf_data_structure +- allocated for it (and so the used_by_bfd field is valid) but +- for which the ARM extended version of this structure - the +- _arm_elf_section_data structure - has not been allocated. */ +-static section_list * sections_with_arm_elf_section_data = NULL; +- +-static void +-record_section_with_arm_elf_section_data (asection * sec) +-{ +- struct section_list * entry; +- +- entry = bfd_malloc (sizeof (* entry)); +- if (entry == NULL) +- return; +- entry->sec = sec; +- entry->next = sections_with_arm_elf_section_data; +- entry->prev = NULL; +- if (entry->next != NULL) +- entry->next->prev = entry; +- sections_with_arm_elf_section_data = entry; +-} +- +-static struct section_list * +-find_arm_elf_section_entry (asection * sec) +-{ +- struct section_list * entry; +- static struct section_list * last_entry = NULL; +- +- /* This is a short cut for the typical case where the sections are added +- to the sections_with_arm_elf_section_data list in forward order and +- then looked up here in backwards order. This makes a real difference +- to the ld-srec/sec64k.exp linker test. */ +- entry = sections_with_arm_elf_section_data; +- if (last_entry != NULL) +- { +- if (last_entry->sec == sec) +- entry = last_entry; +- else if (last_entry->next != NULL +- && last_entry->next->sec == sec) +- entry = last_entry->next; +- } +- +- for (; entry; entry = entry->next) +- if (entry->sec == sec) +- break; +- +- if (entry) +- /* Record the entry prior to this one - it is the entry we are most +- likely to want to locate next time. Also this way if we have been +- called from unrecord_section_with_arm_elf_section_data() we will not +- be caching a pointer that is about to be freed. */ +- last_entry = entry->prev; +- +- return entry; +-} +- + static _arm_elf_section_data * + get_arm_elf_section_data (asection * sec) + { +- struct section_list * entry; +- +- entry = find_arm_elf_section_entry (sec); +- +- if (entry) +- return elf32_arm_section_data (entry->sec); ++ if (sec && sec->owner && is_arm_elf (sec->owner)) ++ return elf32_arm_section_data (sec); + else + return NULL; + } + +-static void +-unrecord_section_with_arm_elf_section_data (asection * sec) +-{ +- struct section_list * entry; +- +- entry = find_arm_elf_section_entry (sec); +- +- if (entry) +- { +- if (entry->prev != NULL) +- entry->prev->next = entry->next; +- if (entry->next != NULL) +- entry->next->prev = entry->prev; +- if (entry == sections_with_arm_elf_section_data) +- sections_with_arm_elf_section_data = entry->next; +- free (entry); +- } +-} +- +- + typedef struct + { + void *finfo; +@@ -13230,8 +13137,6 @@ + sec->used_by_bfd = sdata; + } + +- record_section_with_arm_elf_section_data (sec); +- + return _bfd_elf_new_section_hook (abfd, sec); + } + +@@ -13659,44 +13564,13 @@ + } + + free (map); +- arm_data->mapcount = 0; ++ arm_data->mapcount = -1; + arm_data->mapsize = 0; + arm_data->map = NULL; +- unrecord_section_with_arm_elf_section_data (sec); + + return FALSE; + } + +-static void +-unrecord_section_via_map_over_sections (bfd * abfd ATTRIBUTE_UNUSED, +- asection * sec, +- void * ignore ATTRIBUTE_UNUSED) +-{ +- unrecord_section_with_arm_elf_section_data (sec); +-} +- +-static bfd_boolean +-elf32_arm_close_and_cleanup (bfd * abfd) +-{ +- if (abfd->sections) +- bfd_map_over_sections (abfd, +- unrecord_section_via_map_over_sections, +- NULL); +- +- return _bfd_elf_close_and_cleanup (abfd); +-} +- +-static bfd_boolean +-elf32_arm_bfd_free_cached_info (bfd * abfd) +-{ +- if (abfd->sections) +- bfd_map_over_sections (abfd, +- unrecord_section_via_map_over_sections, +- NULL); +- +- return _bfd_free_cached_info (abfd); +-} +- + /* Display STT_ARM_TFUNC symbols as functions. */ + + static void +@@ -13882,8 +13756,6 @@ + #define bfd_elf32_find_inliner_info elf32_arm_find_inliner_info + #define bfd_elf32_new_section_hook elf32_arm_new_section_hook + #define bfd_elf32_bfd_is_target_special_symbol elf32_arm_is_target_special_symbol +-#define bfd_elf32_close_and_cleanup elf32_arm_close_and_cleanup +-#define bfd_elf32_bfd_free_cached_info elf32_arm_bfd_free_cached_info + #define bfd_elf32_bfd_final_link elf32_arm_final_link + + #define elf_backend_get_symbol_type elf32_arm_get_symbol_type --- binutils-2.20.1.orig/debian/patches/144_no_infunc_symbols_from_shlib.dpatch +++ binutils-2.20.1/debian/patches/144_no_infunc_symbols_from_shlib.dpatch @@ -0,0 +1,134 @@ +#!/bin/sh -e +## 144_no_infunc_symbols_from_shlib.dpatch +## +## DP: Description: Don't set has_ifunc_symbols if the symbol comes from +## DP: a shared library (http://sourceware.org/ml/binutils/2010-02/msg00369.html). + + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +bfd/ + +2010-02-18 H.J. Lu + + * elf32-i386.c (elf_i386_add_symbol_hook): Don't set + has_ifunc_symbols if the symbol comes from a shared library. + * elf32-ppc.c (ppc_elf_add_symbol_hook): Likewise. + * elf64-ppc.c (ppc64_elf_add_symbol_hook): Likewise. + * elf64-x86-64.c (elf64_x86_64_add_symbol_hook): Likewise. + +ld/testsuite/ + +2010-02-18 H.J. Lu + + * ld-ifunc/ifunc.exp: Expect System V OSABI in dynamic + ifunc-using executable. + +@DPATCH@ +diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c +index e2cdbf7..6ec2c2e 100644 +--- a/bfd/elf32-i386.c ++++ b/bfd/elf32-i386.c +@@ -4620,7 +4620,7 @@ elf_i386_hash_symbol (struct elf_link_hash_entry *h) + file. */ + + static bfd_boolean +-elf_i386_add_symbol_hook (bfd * abfd ATTRIBUTE_UNUSED, ++elf_i386_add_symbol_hook (bfd * abfd, + struct bfd_link_info * info ATTRIBUTE_UNUSED, + Elf_Internal_Sym * sym, + const char ** namep ATTRIBUTE_UNUSED, +@@ -4628,7 +4628,8 @@ elf_i386_add_symbol_hook (bfd * abfd ATTRIBUTE_UNUSED, + asection ** secp ATTRIBUTE_UNUSED, + bfd_vma * valp ATTRIBUTE_UNUSED) + { +- if (ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC) ++ if ((abfd->flags & DYNAMIC) == 0 ++ && ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC) + elf_tdata (info->output_bfd)->has_ifunc_symbols = TRUE; + + return TRUE; +diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c +index 3667413..6e4cbc1 100644 +--- a/bfd/elf32-ppc.c ++++ b/bfd/elf32-ppc.c +@@ -3113,7 +3113,8 @@ ppc_elf_add_symbol_hook (bfd *abfd, + *valp = sym->st_size; + } + +- if (ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC) ++ if ((abfd->flags & DYNAMIC) == 0 ++ && ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC) + elf_tdata (info->output_bfd)->has_ifunc_symbols = TRUE; + + return TRUE; +diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c +index 90d1b9f..ffd37dd 100644 +--- a/bfd/elf64-ppc.c ++++ b/bfd/elf64-ppc.c +@@ -4557,7 +4557,7 @@ make_fdh (struct bfd_link_info *info, + function type. */ + + static bfd_boolean +-ppc64_elf_add_symbol_hook (bfd *ibfd ATTRIBUTE_UNUSED, ++ppc64_elf_add_symbol_hook (bfd *ibfd, + struct bfd_link_info *info, + Elf_Internal_Sym *isym, + const char **name ATTRIBUTE_UNUSED, +@@ -4566,7 +4566,10 @@ ppc64_elf_add_symbol_hook (bfd *ibfd ATTRIBUTE_UNUSED, + bfd_vma *value ATTRIBUTE_UNUSED) + { + if (ELF_ST_TYPE (isym->st_info) == STT_GNU_IFUNC) +- elf_tdata (info->output_bfd)->has_ifunc_symbols = TRUE; ++ { ++ if ((ibfd->flags & DYNAMIC) == 0) ++ elf_tdata (info->output_bfd)->has_ifunc_symbols = TRUE; ++ } + else if (ELF_ST_TYPE (isym->st_info) == STT_FUNC) + ; + else if (*sec != NULL +diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c +index 9459b9c..373a8da 100644 +--- a/bfd/elf64-x86-64.c ++++ b/bfd/elf64-x86-64.c +@@ -4257,7 +4257,8 @@ elf64_x86_64_add_symbol_hook (bfd *abfd, + break; + } + +- if (ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC) ++ if ((abfd->flags & DYNAMIC) == 0 ++ && ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC) + elf_tdata (info->output_bfd)->has_ifunc_symbols = TRUE; + + return TRUE; +diff --git a/ld/testsuite/ld-ifunc/ifunc.exp b/ld/testsuite/ld-ifunc/ifunc.exp +index be519ce..38fe2d3 100644 +--- a/ld/testsuite/ld-ifunc/ifunc.exp ++++ b/ld/testsuite/ld-ifunc/ifunc.exp +@@ -258,8 +258,8 @@ if {! [check_osabi tmpdir/static_prog {UNIX - Linux}]} { + fail "Static ifunc-using executable does not have an OS/ABI field of LINUX" + set fails [expr $fails + 1] + } +-if {! [check_osabi tmpdir/dynamic_prog {UNIX - Linux}]} { +- fail "Dynamic ifunc-using executable does not have an OS/ABI field of LINUX" ++if {! [check_osabi tmpdir/dynamic_prog {UNIX - System V}]} { ++ fail "Dynamic ifunc-using executable does not have an OS/ABI field of System V" + set fails [expr $fails + 1] + } + if {! [check_osabi tmpdir/static_nonifunc_prog {UNIX - System V}]} { --- binutils-2.20.1.orig/debian/patches/130_gold_disable_testsuite_build.dpatch +++ binutils-2.20.1/debian/patches/130_gold_disable_testsuite_build.dpatch @@ -0,0 +1,48 @@ +#!/bin/sh -e +## 130_gold_disable_testsuite_build.dpatch +## +## DP: Description: Disable build of gold/testsuite +## DP: Author: Matthias Klose +## DP: Upstream status: local + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi + +[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts +patch_opts="${patch_opts:--f --no-backup-if-mismatch}" + +case "$1" in + -patch) patch $patch_opts -p1 < $0;; + -unpatch) patch $patch_opts -p1 -R < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +--- ./gold/Makefile.am~ 2009-10-06 14:35:04.000000000 +0000 ++++ ./gold/Makefile.am 2009-08-24 05:55:55.000000000 +0000 +@@ -2,7 +2,7 @@ + + AUTOMAKE_OPTIONS = foreign + +-SUBDIRS = po testsuite ++SUBDIRS = po + + tooldir = $(exec_prefix)/$(target_alias) + +--- ./gold/Makefile.in~ 2009-10-06 14:35:19.000000000 +0000 ++++ ./gold/Makefile.in 2009-08-24 05:55:55.000000000 +0000 +@@ -327,7 +327,7 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + AUTOMAKE_OPTIONS = foreign +-SUBDIRS = po testsuite ++SUBDIRS = po + tooldir = $(exec_prefix)/$(target_alias) + ACLOCAL_AMFLAGS = -I ../bfd -I ../config + AM_CFLAGS = $(WARN_CFLAGS) $(LFS_CFLAGS) $(RANDOM_SEED_CFLAGS) --- binutils-2.20.1.orig/debian/source/format +++ binutils-2.20.1/debian/source/format @@ -0,0 +1 @@ +1.0