diff --git a/binutils-bfd_h.patch b/binutils-bfd_h.patch new file mode 100644 index 0000000..de13c26 --- /dev/null +++ b/binutils-bfd_h.patch @@ -0,0 +1,16 @@ +Remove the #error to avoid issues with legacy not dealing with this + +--- bfd/bfd-in.h.orig 2012-11-30 13:44:35.715871571 +0100 ++++ bfd/bfd-in.h 2012-11-30 13:44:43.428871298 +0100 +@@ -25,11 +25,6 @@ + #ifndef __BFD_H_SEEN__ + #define __BFD_H_SEEN__ + +-/* PR 14072: Ensure that config.h is included first. */ +-#if !defined PACKAGE && !defined PACKAGE_VERSION +-#error config.h must be included before this header +-#endif +- + #ifdef __cplusplus + extern "C" { + #endif diff --git a/binutils.changes b/binutils.changes index df61c64..994ae64 100644 --- a/binutils.changes +++ b/binutils.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Dec 19 10:52:46 UTC 2012 - schwab@suse.de + +- Backport s390 .machinemode pseudo insn + +------------------------------------------------------------------- +Fri Nov 30 12:46:35 UTC 2012 - rguenther@suse.com + +- Revert upstream change to error on bfd.h usage without first + including some config.h + ------------------------------------------------------------------- Wed Nov 28 10:56:12 UTC 2012 - rguenther@suse.com diff --git a/binutils.spec b/binutils.spec index 7673be7..9dc944d 100644 --- a/binutils.spec +++ b/binutils.spec @@ -94,9 +94,11 @@ Patch11: use-hashtype-both-by-default.diff Patch14: binutils-build-as-needed.diff Patch18: gold-depend-on-opcodes.diff Patch21: binutils-2.22-objalloc.patch +Patch22: binutils-bfd_h.patch Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch Patch101: aarch64-biarch.patch +Patch201: s390-machinemode.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: update-alternatives @@ -160,7 +162,9 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch14 %patch18 %patch21 +%patch22 %patch101 -p1 +%patch201 -p1 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h %patch90 diff --git a/cross-aarch64-binutils.changes b/cross-aarch64-binutils.changes index df61c64..994ae64 100644 --- a/cross-aarch64-binutils.changes +++ b/cross-aarch64-binutils.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Dec 19 10:52:46 UTC 2012 - schwab@suse.de + +- Backport s390 .machinemode pseudo insn + +------------------------------------------------------------------- +Fri Nov 30 12:46:35 UTC 2012 - rguenther@suse.com + +- Revert upstream change to error on bfd.h usage without first + including some config.h + ------------------------------------------------------------------- Wed Nov 28 10:56:12 UTC 2012 - rguenther@suse.com diff --git a/cross-aarch64-binutils.spec b/cross-aarch64-binutils.spec index 50a10d5..30015e9 100644 --- a/cross-aarch64-binutils.spec +++ b/cross-aarch64-binutils.spec @@ -97,9 +97,11 @@ Patch11: use-hashtype-both-by-default.diff Patch14: binutils-build-as-needed.diff Patch18: gold-depend-on-opcodes.diff Patch21: binutils-2.22-objalloc.patch +Patch22: binutils-bfd_h.patch Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch Patch101: aarch64-biarch.patch +Patch201: s390-machinemode.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: update-alternatives @@ -163,7 +165,9 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch14 %patch18 %patch21 +%patch22 %patch101 -p1 +%patch201 -p1 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h %patch90 diff --git a/cross-alpha-binutils.changes b/cross-alpha-binutils.changes index df61c64..994ae64 100644 --- a/cross-alpha-binutils.changes +++ b/cross-alpha-binutils.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Dec 19 10:52:46 UTC 2012 - schwab@suse.de + +- Backport s390 .machinemode pseudo insn + +------------------------------------------------------------------- +Fri Nov 30 12:46:35 UTC 2012 - rguenther@suse.com + +- Revert upstream change to error on bfd.h usage without first + including some config.h + ------------------------------------------------------------------- Wed Nov 28 10:56:12 UTC 2012 - rguenther@suse.com diff --git a/cross-alpha-binutils.spec b/cross-alpha-binutils.spec index 9e70368..948c953 100644 --- a/cross-alpha-binutils.spec +++ b/cross-alpha-binutils.spec @@ -97,9 +97,11 @@ Patch11: use-hashtype-both-by-default.diff Patch14: binutils-build-as-needed.diff Patch18: gold-depend-on-opcodes.diff Patch21: binutils-2.22-objalloc.patch +Patch22: binutils-bfd_h.patch Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch Patch101: aarch64-biarch.patch +Patch201: s390-machinemode.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: update-alternatives @@ -163,7 +165,9 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch14 %patch18 %patch21 +%patch22 %patch101 -p1 +%patch201 -p1 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h %patch90 diff --git a/cross-arm-binutils.changes b/cross-arm-binutils.changes index df61c64..994ae64 100644 --- a/cross-arm-binutils.changes +++ b/cross-arm-binutils.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Dec 19 10:52:46 UTC 2012 - schwab@suse.de + +- Backport s390 .machinemode pseudo insn + +------------------------------------------------------------------- +Fri Nov 30 12:46:35 UTC 2012 - rguenther@suse.com + +- Revert upstream change to error on bfd.h usage without first + including some config.h + ------------------------------------------------------------------- Wed Nov 28 10:56:12 UTC 2012 - rguenther@suse.com diff --git a/cross-arm-binutils.spec b/cross-arm-binutils.spec index 7f7361e..8f63165 100644 --- a/cross-arm-binutils.spec +++ b/cross-arm-binutils.spec @@ -97,9 +97,11 @@ Patch11: use-hashtype-both-by-default.diff Patch14: binutils-build-as-needed.diff Patch18: gold-depend-on-opcodes.diff Patch21: binutils-2.22-objalloc.patch +Patch22: binutils-bfd_h.patch Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch Patch101: aarch64-biarch.patch +Patch201: s390-machinemode.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: update-alternatives @@ -163,7 +165,9 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch14 %patch18 %patch21 +%patch22 %patch101 -p1 +%patch201 -p1 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h %patch90 diff --git a/cross-avr-binutils.changes b/cross-avr-binutils.changes index df61c64..994ae64 100644 --- a/cross-avr-binutils.changes +++ b/cross-avr-binutils.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Dec 19 10:52:46 UTC 2012 - schwab@suse.de + +- Backport s390 .machinemode pseudo insn + +------------------------------------------------------------------- +Fri Nov 30 12:46:35 UTC 2012 - rguenther@suse.com + +- Revert upstream change to error on bfd.h usage without first + including some config.h + ------------------------------------------------------------------- Wed Nov 28 10:56:12 UTC 2012 - rguenther@suse.com diff --git a/cross-avr-binutils.spec b/cross-avr-binutils.spec index c112473..45fd5d7 100644 --- a/cross-avr-binutils.spec +++ b/cross-avr-binutils.spec @@ -97,9 +97,11 @@ Patch11: use-hashtype-both-by-default.diff Patch14: binutils-build-as-needed.diff Patch18: gold-depend-on-opcodes.diff Patch21: binutils-2.22-objalloc.patch +Patch22: binutils-bfd_h.patch Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch Patch101: aarch64-biarch.patch +Patch201: s390-machinemode.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: update-alternatives @@ -163,7 +165,9 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch14 %patch18 %patch21 +%patch22 %patch101 -p1 +%patch201 -p1 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h %patch90 diff --git a/cross-hppa-binutils.changes b/cross-hppa-binutils.changes index df61c64..994ae64 100644 --- a/cross-hppa-binutils.changes +++ b/cross-hppa-binutils.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Dec 19 10:52:46 UTC 2012 - schwab@suse.de + +- Backport s390 .machinemode pseudo insn + +------------------------------------------------------------------- +Fri Nov 30 12:46:35 UTC 2012 - rguenther@suse.com + +- Revert upstream change to error on bfd.h usage without first + including some config.h + ------------------------------------------------------------------- Wed Nov 28 10:56:12 UTC 2012 - rguenther@suse.com diff --git a/cross-hppa-binutils.spec b/cross-hppa-binutils.spec index d41dd34..a8166c8 100644 --- a/cross-hppa-binutils.spec +++ b/cross-hppa-binutils.spec @@ -97,9 +97,11 @@ Patch11: use-hashtype-both-by-default.diff Patch14: binutils-build-as-needed.diff Patch18: gold-depend-on-opcodes.diff Patch21: binutils-2.22-objalloc.patch +Patch22: binutils-bfd_h.patch Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch Patch101: aarch64-biarch.patch +Patch201: s390-machinemode.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: update-alternatives @@ -163,7 +165,9 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch14 %patch18 %patch21 +%patch22 %patch101 -p1 +%patch201 -p1 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h %patch90 diff --git a/cross-hppa64-binutils.changes b/cross-hppa64-binutils.changes index df61c64..994ae64 100644 --- a/cross-hppa64-binutils.changes +++ b/cross-hppa64-binutils.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Dec 19 10:52:46 UTC 2012 - schwab@suse.de + +- Backport s390 .machinemode pseudo insn + +------------------------------------------------------------------- +Fri Nov 30 12:46:35 UTC 2012 - rguenther@suse.com + +- Revert upstream change to error on bfd.h usage without first + including some config.h + ------------------------------------------------------------------- Wed Nov 28 10:56:12 UTC 2012 - rguenther@suse.com diff --git a/cross-hppa64-binutils.spec b/cross-hppa64-binutils.spec index ed1774c..e7cff59 100644 --- a/cross-hppa64-binutils.spec +++ b/cross-hppa64-binutils.spec @@ -97,9 +97,11 @@ Patch11: use-hashtype-both-by-default.diff Patch14: binutils-build-as-needed.diff Patch18: gold-depend-on-opcodes.diff Patch21: binutils-2.22-objalloc.patch +Patch22: binutils-bfd_h.patch Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch Patch101: aarch64-biarch.patch +Patch201: s390-machinemode.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: update-alternatives @@ -163,7 +165,9 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch14 %patch18 %patch21 +%patch22 %patch101 -p1 +%patch201 -p1 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h %patch90 diff --git a/cross-i386-binutils.changes b/cross-i386-binutils.changes index df61c64..994ae64 100644 --- a/cross-i386-binutils.changes +++ b/cross-i386-binutils.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Dec 19 10:52:46 UTC 2012 - schwab@suse.de + +- Backport s390 .machinemode pseudo insn + +------------------------------------------------------------------- +Fri Nov 30 12:46:35 UTC 2012 - rguenther@suse.com + +- Revert upstream change to error on bfd.h usage without first + including some config.h + ------------------------------------------------------------------- Wed Nov 28 10:56:12 UTC 2012 - rguenther@suse.com diff --git a/cross-i386-binutils.spec b/cross-i386-binutils.spec index 6abff98..7a5f066 100644 --- a/cross-i386-binutils.spec +++ b/cross-i386-binutils.spec @@ -97,9 +97,11 @@ Patch11: use-hashtype-both-by-default.diff Patch14: binutils-build-as-needed.diff Patch18: gold-depend-on-opcodes.diff Patch21: binutils-2.22-objalloc.patch +Patch22: binutils-bfd_h.patch Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch Patch101: aarch64-biarch.patch +Patch201: s390-machinemode.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: update-alternatives @@ -163,7 +165,9 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch14 %patch18 %patch21 +%patch22 %patch101 -p1 +%patch201 -p1 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h %patch90 diff --git a/cross-ia64-binutils.changes b/cross-ia64-binutils.changes index df61c64..994ae64 100644 --- a/cross-ia64-binutils.changes +++ b/cross-ia64-binutils.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Dec 19 10:52:46 UTC 2012 - schwab@suse.de + +- Backport s390 .machinemode pseudo insn + +------------------------------------------------------------------- +Fri Nov 30 12:46:35 UTC 2012 - rguenther@suse.com + +- Revert upstream change to error on bfd.h usage without first + including some config.h + ------------------------------------------------------------------- Wed Nov 28 10:56:12 UTC 2012 - rguenther@suse.com diff --git a/cross-ia64-binutils.spec b/cross-ia64-binutils.spec index 4480a4e..c4ab3d2 100644 --- a/cross-ia64-binutils.spec +++ b/cross-ia64-binutils.spec @@ -97,9 +97,11 @@ Patch11: use-hashtype-both-by-default.diff Patch14: binutils-build-as-needed.diff Patch18: gold-depend-on-opcodes.diff Patch21: binutils-2.22-objalloc.patch +Patch22: binutils-bfd_h.patch Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch Patch101: aarch64-biarch.patch +Patch201: s390-machinemode.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: update-alternatives @@ -163,7 +165,9 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch14 %patch18 %patch21 +%patch22 %patch101 -p1 +%patch201 -p1 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h %patch90 diff --git a/cross-mips-binutils.changes b/cross-mips-binutils.changes index df61c64..994ae64 100644 --- a/cross-mips-binutils.changes +++ b/cross-mips-binutils.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Dec 19 10:52:46 UTC 2012 - schwab@suse.de + +- Backport s390 .machinemode pseudo insn + +------------------------------------------------------------------- +Fri Nov 30 12:46:35 UTC 2012 - rguenther@suse.com + +- Revert upstream change to error on bfd.h usage without first + including some config.h + ------------------------------------------------------------------- Wed Nov 28 10:56:12 UTC 2012 - rguenther@suse.com diff --git a/cross-mips-binutils.spec b/cross-mips-binutils.spec index e9ba992..978a610 100644 --- a/cross-mips-binutils.spec +++ b/cross-mips-binutils.spec @@ -97,9 +97,11 @@ Patch11: use-hashtype-both-by-default.diff Patch14: binutils-build-as-needed.diff Patch18: gold-depend-on-opcodes.diff Patch21: binutils-2.22-objalloc.patch +Patch22: binutils-bfd_h.patch Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch Patch101: aarch64-biarch.patch +Patch201: s390-machinemode.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: update-alternatives @@ -163,7 +165,9 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch14 %patch18 %patch21 +%patch22 %patch101 -p1 +%patch201 -p1 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h %patch90 diff --git a/cross-ppc-binutils.changes b/cross-ppc-binutils.changes index df61c64..994ae64 100644 --- a/cross-ppc-binutils.changes +++ b/cross-ppc-binutils.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Dec 19 10:52:46 UTC 2012 - schwab@suse.de + +- Backport s390 .machinemode pseudo insn + +------------------------------------------------------------------- +Fri Nov 30 12:46:35 UTC 2012 - rguenther@suse.com + +- Revert upstream change to error on bfd.h usage without first + including some config.h + ------------------------------------------------------------------- Wed Nov 28 10:56:12 UTC 2012 - rguenther@suse.com diff --git a/cross-ppc-binutils.spec b/cross-ppc-binutils.spec index 4dfee97..3bb5b46 100644 --- a/cross-ppc-binutils.spec +++ b/cross-ppc-binutils.spec @@ -97,9 +97,11 @@ Patch11: use-hashtype-both-by-default.diff Patch14: binutils-build-as-needed.diff Patch18: gold-depend-on-opcodes.diff Patch21: binutils-2.22-objalloc.patch +Patch22: binutils-bfd_h.patch Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch Patch101: aarch64-biarch.patch +Patch201: s390-machinemode.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: update-alternatives @@ -163,7 +165,9 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch14 %patch18 %patch21 +%patch22 %patch101 -p1 +%patch201 -p1 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h %patch90 diff --git a/cross-ppc64-binutils.changes b/cross-ppc64-binutils.changes index df61c64..994ae64 100644 --- a/cross-ppc64-binutils.changes +++ b/cross-ppc64-binutils.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Dec 19 10:52:46 UTC 2012 - schwab@suse.de + +- Backport s390 .machinemode pseudo insn + +------------------------------------------------------------------- +Fri Nov 30 12:46:35 UTC 2012 - rguenther@suse.com + +- Revert upstream change to error on bfd.h usage without first + including some config.h + ------------------------------------------------------------------- Wed Nov 28 10:56:12 UTC 2012 - rguenther@suse.com diff --git a/cross-ppc64-binutils.spec b/cross-ppc64-binutils.spec index be91b63..c1aa815 100644 --- a/cross-ppc64-binutils.spec +++ b/cross-ppc64-binutils.spec @@ -97,9 +97,11 @@ Patch11: use-hashtype-both-by-default.diff Patch14: binutils-build-as-needed.diff Patch18: gold-depend-on-opcodes.diff Patch21: binutils-2.22-objalloc.patch +Patch22: binutils-bfd_h.patch Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch Patch101: aarch64-biarch.patch +Patch201: s390-machinemode.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: update-alternatives @@ -163,7 +165,9 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch14 %patch18 %patch21 +%patch22 %patch101 -p1 +%patch201 -p1 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h %patch90 diff --git a/cross-s390-binutils.changes b/cross-s390-binutils.changes index df61c64..994ae64 100644 --- a/cross-s390-binutils.changes +++ b/cross-s390-binutils.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Dec 19 10:52:46 UTC 2012 - schwab@suse.de + +- Backport s390 .machinemode pseudo insn + +------------------------------------------------------------------- +Fri Nov 30 12:46:35 UTC 2012 - rguenther@suse.com + +- Revert upstream change to error on bfd.h usage without first + including some config.h + ------------------------------------------------------------------- Wed Nov 28 10:56:12 UTC 2012 - rguenther@suse.com diff --git a/cross-s390-binutils.spec b/cross-s390-binutils.spec index b1baa62..f583484 100644 --- a/cross-s390-binutils.spec +++ b/cross-s390-binutils.spec @@ -97,9 +97,11 @@ Patch11: use-hashtype-both-by-default.diff Patch14: binutils-build-as-needed.diff Patch18: gold-depend-on-opcodes.diff Patch21: binutils-2.22-objalloc.patch +Patch22: binutils-bfd_h.patch Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch Patch101: aarch64-biarch.patch +Patch201: s390-machinemode.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: update-alternatives @@ -163,7 +165,9 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch14 %patch18 %patch21 +%patch22 %patch101 -p1 +%patch201 -p1 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h %patch90 diff --git a/cross-s390x-binutils.changes b/cross-s390x-binutils.changes index df61c64..994ae64 100644 --- a/cross-s390x-binutils.changes +++ b/cross-s390x-binutils.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Dec 19 10:52:46 UTC 2012 - schwab@suse.de + +- Backport s390 .machinemode pseudo insn + +------------------------------------------------------------------- +Fri Nov 30 12:46:35 UTC 2012 - rguenther@suse.com + +- Revert upstream change to error on bfd.h usage without first + including some config.h + ------------------------------------------------------------------- Wed Nov 28 10:56:12 UTC 2012 - rguenther@suse.com diff --git a/cross-s390x-binutils.spec b/cross-s390x-binutils.spec index c708e95..1cb02b6 100644 --- a/cross-s390x-binutils.spec +++ b/cross-s390x-binutils.spec @@ -97,9 +97,11 @@ Patch11: use-hashtype-both-by-default.diff Patch14: binutils-build-as-needed.diff Patch18: gold-depend-on-opcodes.diff Patch21: binutils-2.22-objalloc.patch +Patch22: binutils-bfd_h.patch Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch Patch101: aarch64-biarch.patch +Patch201: s390-machinemode.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: update-alternatives @@ -163,7 +165,9 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch14 %patch18 %patch21 +%patch22 %patch101 -p1 +%patch201 -p1 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h %patch90 diff --git a/cross-sparc-binutils.changes b/cross-sparc-binutils.changes index df61c64..994ae64 100644 --- a/cross-sparc-binutils.changes +++ b/cross-sparc-binutils.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Dec 19 10:52:46 UTC 2012 - schwab@suse.de + +- Backport s390 .machinemode pseudo insn + +------------------------------------------------------------------- +Fri Nov 30 12:46:35 UTC 2012 - rguenther@suse.com + +- Revert upstream change to error on bfd.h usage without first + including some config.h + ------------------------------------------------------------------- Wed Nov 28 10:56:12 UTC 2012 - rguenther@suse.com diff --git a/cross-sparc-binutils.spec b/cross-sparc-binutils.spec index db88a3d..f155b9a 100644 --- a/cross-sparc-binutils.spec +++ b/cross-sparc-binutils.spec @@ -97,9 +97,11 @@ Patch11: use-hashtype-both-by-default.diff Patch14: binutils-build-as-needed.diff Patch18: gold-depend-on-opcodes.diff Patch21: binutils-2.22-objalloc.patch +Patch22: binutils-bfd_h.patch Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch Patch101: aarch64-biarch.patch +Patch201: s390-machinemode.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: update-alternatives @@ -163,7 +165,9 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch14 %patch18 %patch21 +%patch22 %patch101 -p1 +%patch201 -p1 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h %patch90 diff --git a/cross-sparc64-binutils.changes b/cross-sparc64-binutils.changes index df61c64..994ae64 100644 --- a/cross-sparc64-binutils.changes +++ b/cross-sparc64-binutils.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Dec 19 10:52:46 UTC 2012 - schwab@suse.de + +- Backport s390 .machinemode pseudo insn + +------------------------------------------------------------------- +Fri Nov 30 12:46:35 UTC 2012 - rguenther@suse.com + +- Revert upstream change to error on bfd.h usage without first + including some config.h + ------------------------------------------------------------------- Wed Nov 28 10:56:12 UTC 2012 - rguenther@suse.com diff --git a/cross-sparc64-binutils.spec b/cross-sparc64-binutils.spec index d7eb3bf..b6182e9 100644 --- a/cross-sparc64-binutils.spec +++ b/cross-sparc64-binutils.spec @@ -97,9 +97,11 @@ Patch11: use-hashtype-both-by-default.diff Patch14: binutils-build-as-needed.diff Patch18: gold-depend-on-opcodes.diff Patch21: binutils-2.22-objalloc.patch +Patch22: binutils-bfd_h.patch Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch Patch101: aarch64-biarch.patch +Patch201: s390-machinemode.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: update-alternatives @@ -163,7 +165,9 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch14 %patch18 %patch21 +%patch22 %patch101 -p1 +%patch201 -p1 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h %patch90 diff --git a/cross-spu-binutils.changes b/cross-spu-binutils.changes index df61c64..994ae64 100644 --- a/cross-spu-binutils.changes +++ b/cross-spu-binutils.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Dec 19 10:52:46 UTC 2012 - schwab@suse.de + +- Backport s390 .machinemode pseudo insn + +------------------------------------------------------------------- +Fri Nov 30 12:46:35 UTC 2012 - rguenther@suse.com + +- Revert upstream change to error on bfd.h usage without first + including some config.h + ------------------------------------------------------------------- Wed Nov 28 10:56:12 UTC 2012 - rguenther@suse.com diff --git a/cross-spu-binutils.spec b/cross-spu-binutils.spec index 406e32e..af6f72c 100644 --- a/cross-spu-binutils.spec +++ b/cross-spu-binutils.spec @@ -97,9 +97,11 @@ Patch11: use-hashtype-both-by-default.diff Patch14: binutils-build-as-needed.diff Patch18: gold-depend-on-opcodes.diff Patch21: binutils-2.22-objalloc.patch +Patch22: binutils-bfd_h.patch Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch Patch101: aarch64-biarch.patch +Patch201: s390-machinemode.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: update-alternatives @@ -163,7 +165,9 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch14 %patch18 %patch21 +%patch22 %patch101 -p1 +%patch201 -p1 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h %patch90 diff --git a/cross-x86_64-binutils.changes b/cross-x86_64-binutils.changes index df61c64..994ae64 100644 --- a/cross-x86_64-binutils.changes +++ b/cross-x86_64-binutils.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Dec 19 10:52:46 UTC 2012 - schwab@suse.de + +- Backport s390 .machinemode pseudo insn + +------------------------------------------------------------------- +Fri Nov 30 12:46:35 UTC 2012 - rguenther@suse.com + +- Revert upstream change to error on bfd.h usage without first + including some config.h + ------------------------------------------------------------------- Wed Nov 28 10:56:12 UTC 2012 - rguenther@suse.com diff --git a/cross-x86_64-binutils.spec b/cross-x86_64-binutils.spec index 7fbc16e..c03753c 100644 --- a/cross-x86_64-binutils.spec +++ b/cross-x86_64-binutils.spec @@ -97,9 +97,11 @@ Patch11: use-hashtype-both-by-default.diff Patch14: binutils-build-as-needed.diff Patch18: gold-depend-on-opcodes.diff Patch21: binutils-2.22-objalloc.patch +Patch22: binutils-bfd_h.patch Patch90: cross-avr-nesc-as.patch Patch92: cross-avr-omit_section_dynsym.patch Patch101: aarch64-biarch.patch +Patch201: s390-machinemode.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: update-alternatives @@ -163,7 +165,9 @@ echo "make check will return with %{make_check_handling} in case of testsuite fa %patch14 %patch18 %patch21 +%patch22 %patch101 -p1 +%patch201 -p1 %if "%{TARGET}" == "avr" cp gas/config/tc-avr.h gas/config/tc-avr-nesc.h %patch90 diff --git a/s390-machinemode.patch b/s390-machinemode.patch new file mode 100644 index 0000000..f235017 --- /dev/null +++ b/s390-machinemode.patch @@ -0,0 +1,203 @@ +binutils:e593ec3bee996af0d129eb53b2039d409e6e1d42 + +2012-09-06 Andreas Krebbel + + * config/tc-s390.c (set_highgprs_p): New variable. + (s390_machinemode): New function. + (md_pseudo_table): Add new pseudo command machinemode. + (md_parse_option): Set set_highgprs_p to TRUE if -mzarch was + specified on command line. + (s390_elf_final_processing): Set the highgprs flag in the ELF + header depending on set_highgprs_p. + + * doc/c-s390.texi: Document new pseudo machinemode. + +diff --git a/gas/config/tc-s390.c b/gas/config/tc-s390.c +index 9bc582f..47ec175 100644 +--- a/gas/config/tc-s390.c ++++ b/gas/config/tc-s390.c +@@ -44,6 +44,10 @@ static int s390_arch_size = 0; + static unsigned int current_cpu = S390_OPCODE_MAXCPU - 1; + static unsigned int current_mode_mask = 0; + ++/* Set to TRUE if the highgprs flag in the ELF header needs to be set ++ for the output file. */ ++static bfd_boolean set_highgprs_p = FALSE; ++ + /* Whether to use user friendly register names. Default is TRUE. */ + #ifndef TARGET_REG_NAMES_P + #define TARGET_REG_NAMES_P TRUE +@@ -86,22 +90,24 @@ static void s390_bss (int); + static void s390_insn (int); + static void s390_literals (int); + static void s390_machine (int); ++static void s390_machinemode (int); + + const pseudo_typeS md_pseudo_table[] = + { +- { "align", s_align_bytes, 0 }, ++ { "align", s_align_bytes, 0 }, + /* Pseudo-ops which must be defined. */ +- { "bss", s390_bss, 0 }, +- { "insn", s390_insn, 0 }, ++ { "bss", s390_bss, 0 }, ++ { "insn", s390_insn, 0 }, + /* Pseudo-ops which must be overridden. */ +- { "byte", s390_byte, 0 }, +- { "short", s390_elf_cons, 2 }, +- { "long", s390_elf_cons, 4 }, +- { "quad", s390_elf_cons, 8 }, +- { "ltorg", s390_literals, 0 }, +- { "string", stringer, 8 + 1 }, +- { "machine", s390_machine, 0 }, +- { NULL, NULL, 0 } ++ { "byte", s390_byte, 0 }, ++ { "short", s390_elf_cons, 2 }, ++ { "long", s390_elf_cons, 4 }, ++ { "quad", s390_elf_cons, 8 }, ++ { "ltorg", s390_literals, 0 }, ++ { "string", stringer, 8 + 1 }, ++ { "machine", s390_machine, 0 }, ++ { "machinemode", s390_machinemode, 0 }, ++ { NULL, NULL, 0 } + }; + + +@@ -409,7 +415,11 @@ md_parse_option (int c, char *arg) + current_mode_mask = 1 << S390_OPCODE_ESA; + + else if (arg != NULL && strcmp (arg, "zarch") == 0) +- current_mode_mask = 1 << S390_OPCODE_ZARCH; ++ { ++ if (s390_arch_size == 32) ++ set_highgprs_p = TRUE; ++ current_mode_mask = 1 << S390_OPCODE_ZARCH; ++ } + + else if (arg != NULL && strncmp (arg, "arch=", 5) == 0) + { +@@ -1799,7 +1809,7 @@ s390_literals (int ignore ATTRIBUTE_UNUSED) + + /* The .machine pseudo op allows to switch to a different CPU level in + the asm listing. The current CPU setting can be stored on a stack +- with .machine push and restored with .machined pop. */ ++ with .machine push and restored with .machine pop. */ + + static void + s390_machine (int ignore ATTRIBUTE_UNUSED) +@@ -1863,6 +1873,83 @@ s390_machine (int ignore ATTRIBUTE_UNUSED) + demand_empty_rest_of_line (); + } + ++/* The .machinemode pseudo op allows to switch to a different ++ architecture mode in the asm listing. The current architecture ++ mode setting can be stored on a stack with .machinemode push and ++ restored with .machinemode pop. */ ++ ++static void ++s390_machinemode (int ignore ATTRIBUTE_UNUSED) ++{ ++ char *mode_string; ++#define MAX_HISTORY 100 ++ static unsigned int *mode_history; ++ static int curr_hist; ++ ++ SKIP_WHITESPACE (); ++ ++ if (*input_line_pointer == '"') ++ { ++ int len; ++ mode_string = demand_copy_C_string (&len); ++ } ++ else ++ { ++ char c; ++ mode_string = input_line_pointer; ++ c = get_symbol_end (); ++ mode_string = xstrdup (mode_string); ++ *input_line_pointer = c; ++ } ++ ++ if (mode_string != NULL) ++ { ++ unsigned int old_mode_mask = current_mode_mask; ++ char *p; ++ ++ for (p = mode_string; *p != 0; p++) ++ *p = TOLOWER (*p); ++ ++ if (strcmp (mode_string, "push") == 0) ++ { ++ if (mode_history == NULL) ++ mode_history = xmalloc (MAX_HISTORY * sizeof (*mode_history)); ++ ++ if (curr_hist >= MAX_HISTORY) ++ as_bad (_(".machinemode stack overflow")); ++ else ++ mode_history[curr_hist++] = current_mode_mask; ++ } ++ else if (strcmp (mode_string, "pop") == 0) ++ { ++ if (curr_hist <= 0) ++ as_bad (_(".machinemode stack underflow")); ++ else ++ current_mode_mask = mode_history[--curr_hist]; ++ } ++ else ++ { ++ if (strcmp (mode_string, "esa") == 0) ++ current_mode_mask = 1 << S390_OPCODE_ESA; ++ else if (strcmp (mode_string, "zarch") == 0) ++ { ++ if (s390_arch_size == 32) ++ set_highgprs_p = TRUE; ++ current_mode_mask = 1 << S390_OPCODE_ZARCH; ++ } ++ else if (strcmp (mode_string, "zarch_nohighgprs") == 0) ++ current_mode_mask = 1 << S390_OPCODE_ZARCH; ++ else ++ as_bad (_("invalid machine `%s'"), mode_string); ++ } ++ ++ if (current_mode_mask != old_mode_mask) ++ s390_setup_opcodes (); ++ } ++ ++ demand_empty_rest_of_line (); ++} ++ + char * + md_atof (int type, char *litp, int *sizep) + { +@@ -2381,6 +2468,6 @@ tc_s390_regname_to_dw2regnum (char *regname) + void + s390_elf_final_processing (void) + { +- if (s390_arch_size == 32 && (current_mode_mask & (1 << S390_OPCODE_ZARCH))) ++ if (set_highgprs_p) + elf_elfheader (stdoutput)->e_flags |= EF_S390_HIGH_GPRS; + } +diff --git a/gas/doc/c-s390.texi b/gas/doc/c-s390.texi +index 7971327..76dc144 100644 +--- a/gas/doc/c-s390.texi ++++ b/gas/doc/c-s390.texi +@@ -873,6 +873,19 @@ restored with @code{.machine pop}. Be aware that the cpu string has + to be put into double quotes in case it contains characters not + appropriate for identifiers. So you have to write @code{"z9-109"} + instead of just @code{z9-109}. ++ ++@cindex @code{.machinemode} directive, s390 ++@item .machinemode string ++This directive allows to change the architecture mode for which code ++is being generated. @code{string} may be @code{esa}, @code{zarch}, ++@code{zarch_nohighgprs}, @code{push}, or @code{pop}. ++@code{.machinemode zarch_nohighgprs} can be used to prevent the ++@code{highgprs} flag from being set in the ELF header of the output ++file. This is useful in situations where the code is gated with a ++runtime check which makes sure that the code is only executed on ++kernels providing the @code{highgprs} feature. ++@code{.machinemode push} saves the currently selected mode, which may ++be restored with @code{.machinemode pop}. + @end table + + @node s390 Floating Point