diff -u gcc-9-9.1.0/debian/changelog gcc-9-9.1.0/debian/changelog --- gcc-9-9.1.0/debian/changelog +++ gcc-9-9.1.0/debian/changelog @@ -1,3 +1,16 @@ +gcc-9 (9.1.0-10+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from gcc-8 8-20180207-2+rpi1 by Peter Michael Green at Sat, 17 Feb 2018 00:20:23 +0000] + * Don't pass -march=armv7+fp to compiler when building libatomic. + + [changes introduced in gcc-8 8.2.0-16+rpi1 by Peter Michael Green] + * Disable testsuite (build seems to hang after testsuite completes). + + [changes introduced in gcc-9 9.1.0-10+rpi1 by Peter Michael Green] + * Update symbols file for raspbian. + + -- Peter Michael Green Sat, 27 Jul 2019 19:09:15 +0000 + gcc-9 (9.1.0-10) unstable; urgency=medium * Fix typo in libstdc++ symbols file. diff -u gcc-9-9.1.0/debian/libstdc++6.symbols.common gcc-9-9.1.0/debian/libstdc++6.symbols.common --- gcc-9-9.1.0/debian/libstdc++6.symbols.common +++ gcc-9-9.1.0/debian/libstdc++6.symbols.common @@ -1531,13 +1531,13 @@ _ZNSt12__basic_fileIcE9showmanycEv@GLIBCXX_3.4 4.1.1 _ZNSt12__basic_fileIcED1Ev@GLIBCXX_3.4 4.1.1 _ZNSt12__basic_fileIcED2Ev@GLIBCXX_3.4 4.1.1 - _ZNSt12__shared_ptrINSt10filesystem28recursive_directory_iterator10_Dir_stackELN9__gnu_cxx12_Lock_policyE2EEC1EOS5_@GLIBCXX_3.4.26 9 - _ZNSt12__shared_ptrINSt10filesystem28recursive_directory_iterator10_Dir_stackELN9__gnu_cxx12_Lock_policyE2EEC1Ev@GLIBCXX_3.4.26 9 - _ZNSt12__shared_ptrINSt10filesystem28recursive_directory_iterator10_Dir_stackELN9__gnu_cxx12_Lock_policyE2EEC2Ev@GLIBCXX_3.4.27 9.1 - _ZNSt12__shared_ptrINSt10filesystem4_DirELN9__gnu_cxx12_Lock_policyE2EEC1EOS4_@GLIBCXX_3.4.26 9 - _ZNSt12__shared_ptrINSt10filesystem4_DirELN9__gnu_cxx12_Lock_policyE2EEC1Ev@GLIBCXX_3.4.26 9 - _ZNSt12__shared_ptrINSt10filesystem4_DirELN9__gnu_cxx12_Lock_policyE2EEC2Ev@GLIBCXX_3.4.27 9.1 - _ZNSt12__shared_ptrINSt10filesystem4_DirELN9__gnu_cxx12_Lock_policyE2EEaSEOS4_@GLIBCXX_3.4.26 9 + (optional=disappearedinraspbian)_ZNSt12__shared_ptrINSt10filesystem28recursive_directory_iterator10_Dir_stackELN9__gnu_cxx12_Lock_policyE2EEC1EOS5_@GLIBCXX_3.4.26 9 + (optional=disappearedinraspbian)_ZNSt12__shared_ptrINSt10filesystem28recursive_directory_iterator10_Dir_stackELN9__gnu_cxx12_Lock_policyE2EEC1Ev@GLIBCXX_3.4.26 9 + (optional=disappearedinraspbian)_ZNSt12__shared_ptrINSt10filesystem28recursive_directory_iterator10_Dir_stackELN9__gnu_cxx12_Lock_policyE2EEC2Ev@GLIBCXX_3.4.27 9.1 + (optional=disappearedinraspbian)_ZNSt12__shared_ptrINSt10filesystem4_DirELN9__gnu_cxx12_Lock_policyE2EEC1EOS4_@GLIBCXX_3.4.26 9 + (optional=disappearedinraspbian)_ZNSt12__shared_ptrINSt10filesystem4_DirELN9__gnu_cxx12_Lock_policyE2EEC1Ev@GLIBCXX_3.4.26 9 + (optional=disappearedinraspbian)_ZNSt12__shared_ptrINSt10filesystem4_DirELN9__gnu_cxx12_Lock_policyE2EEC2Ev@GLIBCXX_3.4.27 9.1 + (optional=disappearedinraspbian)_ZNSt12__shared_ptrINSt10filesystem4_DirELN9__gnu_cxx12_Lock_policyE2EEaSEOS4_@GLIBCXX_3.4.26 9 (optional=abi_c++11)_ZNSt12__shared_ptrINSt10filesystem7__cxx1128recursive_directory_iterator10_Dir_stackELN9__gnu_cxx12_Lock_policyE2EEC1EOS6_@GLIBCXX_3.4.26 9 (optional=abi_c++11)_ZNSt12__shared_ptrINSt10filesystem7__cxx1128recursive_directory_iterator10_Dir_stackELN9__gnu_cxx12_Lock_policyE2EEC1Ev@GLIBCXX_3.4.26 9 (optional=abi_c++11)_ZNSt12__shared_ptrINSt10filesystem7__cxx1128recursive_directory_iterator10_Dir_stackELN9__gnu_cxx12_Lock_policyE2EEC2Ev@GLIBCXX_3.4.27 9.1 diff -u gcc-9-9.1.0/debian/rules.defs gcc-9-9.1.0/debian/rules.defs --- gcc-9-9.1.0/debian/rules.defs +++ gcc-9-9.1.0/debian/rules.defs @@ -1519,7 +1519,7 @@ # run testsuite --------------- with_check := yes # if you don't want to run the gcc testsuite, uncomment the next line -#with_check := disabled by hand +with_check := disabled by plugwash ifeq ($(with_base_only),yes) with_check := no endif diff -u gcc-9-9.1.0/debian/rules.patch gcc-9-9.1.0/debian/rules.patch --- gcc-9-9.1.0/debian/rules.patch +++ gcc-9-9.1.0/debian/rules.patch @@ -85,6 +85,10 @@ # libstdc++-nothumb-check \ hardening_patches = + +debian_patches += \ + raspbian-disable-libatomic-march \ + ifneq (,$(filter $(derivative),Ubuntu)) ifneq (,$(findstring gcc-9, $(PKGSOURCE))) hardening_patches += \ only in patch2: unchanged: --- gcc-9-9.1.0.orig/debian/patches/raspbian-disable-libatomic-march.diff +++ gcc-9-9.1.0/debian/patches/raspbian-disable-libatomic-march.diff @@ -0,0 +1,26 @@ +Common subdirectories: gcc-8-8-20180207/src/libatomic/config and gcc-8-8-20180207.new/src/libatomic/config +diff -u gcc-8-8-20180207/src/libatomic/Makefile.am gcc-8-8-20180207.new/src/libatomic/Makefile.am +--- gcc-8-8-20180207/src/libatomic/Makefile.am 2018-01-04 13:44:36.000000000 +0000 ++++ gcc-8-8-20180207.new/src/libatomic/Makefile.am 2018-02-17 00:14:40.003950159 +0000 +@@ -127,7 +127,7 @@ + libatomic_la_LIBADD += $(foreach s,$(SIZES),$(addsuffix _$(s)_1_.lo,$(SIZEOBJS))) + endif + if ARCH_ARM_LINUX +-IFUNC_OPTIONS = -march=armv7-a+fp -DHAVE_KERNEL64 ++IFUNC_OPTIONS = -DHAVE_KERNEL64 + libatomic_la_LIBADD += $(foreach s,$(SIZES),$(addsuffix _$(s)_1_.lo,$(SIZEOBJS))) + libatomic_la_LIBADD += $(addsuffix _8_2_.lo,$(SIZEOBJS)) + endif +diff -u gcc-8-8-20180207/src/libatomic/Makefile.in gcc-8-8-20180207.new/src/libatomic/Makefile.in +--- gcc-8-8-20180207/src/libatomic/Makefile.in 2018-01-04 13:44:46.000000000 +0000 ++++ gcc-8-8-20180207.new/src/libatomic/Makefile.in 2018-02-17 00:14:24.819805316 +0000 +@@ -351,7 +351,7 @@ + _$(s)_.lo,$(SIZEOBJS))) $(am__append_1) $(am__append_2) \ + $(am__append_3) $(am__append_4) + @ARCH_AARCH64_LINUX_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=armv8-a+lse +-@ARCH_ARM_LINUX_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=armv7-a+fp -DHAVE_KERNEL64 ++@ARCH_ARM_LINUX_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -DHAVE_KERNEL64 + @ARCH_I386_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -march=i586 + @ARCH_X86_64_TRUE@@HAVE_IFUNC_TRUE@IFUNC_OPTIONS = -mcx16 + libatomic_convenience_la_SOURCES = $(libatomic_la_SOURCES) +Common subdirectories: gcc-8-8-20180207/src/libatomic/testsuite and gcc-8-8-20180207.new/src/libatomic/testsuite