diff --git a/arm-none-eabi-gcc-cs.spec b/arm-none-eabi-gcc-cs.spec index 9d33bfc..6343ee8 100644 --- a/arm-none-eabi-gcc-cs.spec +++ b/arm-none-eabi-gcc-cs.spec @@ -1,16 +1,16 @@ %global processor_arch arm %global target %{processor_arch}-none-eabi -%global gcc_ver 6.2.0 -%global gcc_short_ver 6.2 +%global gcc_ver 7.1.0 +%global gcc_short_ver 7.1 # we need newlib to compile complete gcc, but we need gcc to compile newlib, # so compile minimal gcc first -%global bootstrap 0 +%global bootstrap 1 Name: %{target}-gcc-cs Epoch: 1 -Version: 6.2.0 -Release: 3%{?dist} +Version: %{gcc_ver} +Release: 1%{?dist} Summary: GNU GCC for cross-compilation for %{target} target Group: Development/Tools @@ -31,7 +31,6 @@ Source0: gcc-%{gcc_ver}.tar.bz2 Source1: README.fedora Source2: bootstrapexplain -Patch1: enable-with-multilib-list-for-arm.patch BuildRequires: %{target}-binutils >= 2.21, zlib-devel gmp-devel mpfr-devel libmpc-devel flex autogen %if ! %{bootstrap} @@ -63,7 +62,6 @@ compile c++ code for the %{target} platform, instead of for the native %prep %setup -q -c pushd gcc-%{gcc_ver} -%patch1 -p2 -b .arm contrib/gcc_update --touch popd @@ -103,26 +101,25 @@ CC="%{__cc} ${RPM_OPT_FLAGS} -fno-stack-protector" \ --with-bugurl="https://bugzilla.redhat.com/" \ --infodir=%{_infodir} --target=%{target} \ --enable-interwork --enable-multilib \ - --with-python-dir=%{target}/share/gcc-%{version}/python \ - --with-multilib-list=armv6-m,armv7-m,armv7e-m,armv7-r \ - --enable-plugins \ - --disable-decimal-float \ - --disable-libffi \ - --disable-libgomp \ - --disable-libmudflap \ - --disable-libquadmath \ - --disable-libssp \ - --disable-libstdcxx-pch \ - --disable-nls \ - --disable-shared \ - --disable-threads \ - --disable-tls \ + --with-python-dir=share/%{target}/gcc-%{version}/python \ + --with-multilib-list=rmprofile \ + --enable-plugins \ + --disable-decimal-float \ + --disable-libffi \ + --disable-libgomp \ + --disable-libmudflap \ + --disable-libquadmath \ + --disable-libssp \ + --disable-libstdcxx-pch \ + --disable-nls \ + --disable-shared \ + --disable-threads \ + --disable-tls \ %if %{bootstrap} --enable-languages=c --with-newlib --disable-nls --disable-shared --disable-threads --with-gnu-as --with-gnu-ld --with-gmp --with-mpfr --with-mpc --without-headers --with-system-zlib %else - --enable-languages=c,c++ --with-newlib --disable-nls --disable-shared --disable-threads --with-gnu-as --with-gnu-ld --with-gmp --with-mpfr --with-mpc --with-headers=/usr/%{target}/include --with-system-zlib + --enable-languages=c,c++ --with-newlib --disable-nls --disable-shared --disable-threads --with-gnu-as --with-gnu-ld --with-gmp --with-mpfr --with-mpc --with-headers=yes --with-system-zlib --with-sysroot=/usr/%{target} %endif -# --enable-lto \ %if %{bootstrap} make all-gcc INHIBIT_LIBC_CFLAGS='-DUSE_TM_CLONE_REGISTRY=0' @@ -147,22 +144,22 @@ CC="%{__cc} ${RPM_OPT_FLAGS} -fno-stack-protector " \ --with-bugurl="https://bugzilla.redhat.com/" \ --infodir=%{_infodir} --target=%{target} \ --enable-interwork --enable-multilib \ - --with-python-dir=%{target}/share/gcc-%{version}/python \ - --with-multilib-list=armv6-m,armv7-m,armv7e-m,armv7-r \ - --enable-plugins \ - --disable-decimal-float \ - --disable-libffi \ - --disable-libgomp \ - --disable-libmudflap \ - --disable-libquadmath \ - --disable-libssp \ - --disable-libstdcxx-pch \ - --disable-nls \ - --disable-shared \ - --disable-threads \ - --disable-tls \ - --enable-languages=c,c++ --with-newlib --disable-nls --disable-shared --disable-threads --with-gnu-as --with-gnu-ld --with-gmp --with-mpfr --with-mpc --with-headers=/usr/%{target}/include --with-system-zlib -# --enable-lto \ + --with-python-dir=share/%{target}/gcc-%{version}/python \ + --with-multilib-list=rmprofile \ + --enable-plugins \ + --disable-decimal-float \ + --disable-libffi \ + --disable-libgomp \ + --disable-libmudflap \ + --disable-libquadmath \ + --disable-libssp \ + --disable-libstdcxx-pch \ + --disable-nls \ + --disable-shared \ + --disable-threads \ + --disable-tls \ + --with-sysroot=/usr/%{target} \ + --enable-languages=c,c++ --with-newlib --disable-nls --disable-shared --disable-threads --with-gnu-as --with-gnu-ld --with-gmp --with-mpfr --with-mpc --with-headers=yes --with-system-zlib make INHIBIT_LIBC_CFLAGS='-DUSE_TM_CLONE_REGISTRY=0' popd %endif @@ -267,7 +264,7 @@ popd %{_mandir}/man1/%{target}-*.1.gz %if ! %{bootstrap} /usr/%{target}/lib/ -%dir /usr/%{target}/share/gcc-%{gcc_ver}/python/ +%dir /usr/share/%{target}/gcc-%{gcc_ver}/python/ %exclude %{_bindir}/%{target}-?++ %exclude %{_libexecdir}/gcc/%{target}/%{gcc_ver}/cc1plus %exclude %{_mandir}/man1/%{target}-g++.1.gz @@ -279,11 +276,14 @@ popd %if ! %{bootstrap} %{_libexecdir}/gcc/%{target}/%{gcc_ver}/cc1plus /usr/%{target}/include/c++/ -/usr/%{target}/share/gcc-%{gcc_ver}/python/libstdcxx/ +/usr/share/%{target}/gcc-%{gcc_ver}/python/libstdcxx/ %{_mandir}/man1/%{target}-g++.1.gz %endif %changelog +* Thu Jun 22 2017 Michal Hlavinka - 1:7.1.0-1 +- bootstrap build for 7.1.0 + * Fri Feb 10 2017 Fedora Release Engineering - 1:6.2.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/enable-with-multilib-list-for-arm.patch b/enable-with-multilib-list-for-arm.patch deleted file mode 100644 index 2ea2fab..0000000 --- a/enable-with-multilib-list-for-arm.patch +++ /dev/null @@ -1,189 +0,0 @@ -diff -up arm-none-eabi-gcc-cs-4.9.2/gcc-5.1.0/gcc/config/arm/t-mlibs.arm arm-none-eabi-gcc-cs-4.9.2/gcc-5.1.0/gcc/config/arm/t-mlibs ---- arm-none-eabi-gcc-cs-4.9.2/gcc-5.1.0/gcc/config/arm/t-mlibs.arm 2015-05-31 22:31:12.089990426 +0200 -+++ arm-none-eabi-gcc-cs-4.9.2/gcc-5.1.0/gcc/config/arm/t-mlibs 2015-05-31 22:31:12.089990426 +0200 -@@ -0,0 +1,89 @@ -+# A set of predefined MULTILIB which can be used for different ARM targets. -+# Via the configure option --with-multilib-list, user can customize the -+# final MULTILIB implementation. -+ -+comma := , -+space := -+space += -+ -+MULTILIB_OPTIONS = mthumb/marm -+MULTILIB_DIRNAMES = thumb arm -+MULTILIB_OPTIONS += march=armv6s-m/march=armv7-m/march=armv7e-m/march=armv7 -+MULTILIB_DIRNAMES += armv6-m armv7-m armv7e-m armv7-ar -+MULTILIB_OPTIONS += mfloat-abi=softfp/mfloat-abi=hard -+MULTILIB_DIRNAMES += softfp fpu -+MULTILIB_OPTIONS += mfpu=fpv4-sp-d16/mfpu=vfpv3-d16 -+MULTILIB_DIRNAMES += fpv4-sp-d16 vfpv3-d16 -+ -+MULTILIB_MATCHES = march?armv6s-m=mcpu?cortex-m0 -+MULTILIB_MATCHES += march?armv6s-m=mcpu?cortex-m0plus -+MULTILIB_MATCHES += march?armv6s-m=mcpu?cortex-m1 -+MULTILIB_MATCHES += march?armv6s-m=march?armv6-m -+MULTILIB_MATCHES += march?armv7-m=mcpu?cortex-m3 -+MULTILIB_MATCHES += march?armv7e-m=mcpu?cortex-m4 -+MULTILIB_MATCHES += march?armv7e-m=mcpu?cortex-m7 -+MULTILIB_MATCHES += march?armv7=march?armv7-r -+MULTILIB_MATCHES += march?armv7=march?armv7-a -+MULTILIB_MATCHES += march?armv7=mcpu?cortex-r4 -+MULTILIB_MATCHES += march?armv7=mcpu?cortex-r4f -+MULTILIB_MATCHES += march?armv7=mcpu?cortex-r5 -+MULTILIB_MATCHES += march?armv7=mcpu?cortex-r7 -+MULTILIB_MATCHES += march?armv7=mcpu?cortex-a5 -+MULTILIB_MATCHES += march?armv7=mcpu?cortex-a7 -+MULTILIB_MATCHES += march?armv7=mcpu?cortex-a8 -+MULTILIB_MATCHES += march?armv7=mcpu?cortex-a9 -+MULTILIB_MATCHES += march?armv7=mcpu?cortex-a15 -+MULTILIB_MATCHES += mfpu?fpv4-sp-d16=mfpu?fpv5-sp-d16 -+MULTILIB_MATCHES += mfpu?fpv4-sp-d16=mfpu?fpv5-d16 -+MULTILIB_MATCHES += mfpu?vfpv3-d16=mfpu?vfpv3 -+MULTILIB_MATCHES += mfpu?vfpv3-d16=mfpu?vfpv3-fp16 -+MULTILIB_MATCHES += mfpu?vfpv3-d16=mfpu?vfpv3-d16-fp16 -+MULTILIB_MATCHES += mfpu?vfpv3-d16=mfpu?vfpv3xd -+MULTILIB_MATCHES += mfpu?vfpv3-d16=mfpu?vfpv3xd-fp16 -+MULTILIB_MATCHES += mfpu?vfpv3-d16=mfpu?vfpv4 -+MULTILIB_MATCHES += mfpu?vfpv3-d16=mfpu?vfpv4-d16 -+MULTILIB_MATCHES += mfpu?vfpv3-d16=mfpu?neon -+MULTILIB_MATCHES += mfpu?vfpv3-d16=mfpu?neon-fp16 -+MULTILIB_MATCHES += mfpu?vfpv3-d16=mfpu?neon-vfpv4 -+ -+MULTILIB_EXCEPTIONS = -+MULTILIB_REUSE = -+ -+MULTILIB_REQUIRED = mthumb -+MULTILIB_REQUIRED += marm -+MULTILIB_REQUIRED += mfloat-abi=hard -+ -+MULTILIB_OSDIRNAMES = mthumb=!thumb -+MULTILIB_OSDIRNAMES += marm=!arm -+MULTILIB_OSDIRNAMES += mfloat-abi.hard=!fpu -+ -+ifneq (,$(findstring armv6-m,$(subst $(comma),$(space),$(with_multilib_list)))) -+MULTILIB_REQUIRED += mthumb/march=armv6s-m -+MULTILIB_OSDIRNAMES += mthumb/march.armv6s-m=!armv6-m -+endif -+ -+ifneq (,$(findstring armv7-m,$(subst $(comma),$(space),$(with_multilib_list)))) -+MULTILIB_REQUIRED += mthumb/march=armv7-m -+MULTILIB_OSDIRNAMES += mthumb/march.armv7-m=!armv7-m -+endif -+ -+ifneq (,$(findstring armv7e-m,$(subst $(comma),$(space),$(with_multilib_list)))) -+MULTILIB_REQUIRED += mthumb/march=armv7e-m -+MULTILIB_REQUIRED += mthumb/march=armv7e-m/mfloat-abi=softfp/mfpu=fpv4-sp-d16 -+MULTILIB_REQUIRED += mthumb/march=armv7e-m/mfloat-abi=hard/mfpu=fpv4-sp-d16 -+MULTILIB_OSDIRNAMES += mthumb/march.armv7e-m=!armv7e-m -+MULTILIB_OSDIRNAMES += mthumb/march.armv7e-m/mfloat-abi.hard/mfpu.fpv4-sp-d16=!armv7e-m/fpu -+MULTILIB_OSDIRNAMES += mthumb/march.armv7e-m/mfloat-abi.softfp/mfpu.fpv4-sp-d16=!armv7e-m/softfp -+endif -+ -+ifneq (,$(filter armv7 armv7-r armv7-a,$(subst $(comma),$(space),$(with_multilib_list)))) -+MULTILIB_REQUIRED += mthumb/march=armv7 -+MULTILIB_REQUIRED += mthumb/march=armv7/mfloat-abi=softfp/mfpu=vfpv3-d16 -+MULTILIB_REQUIRED += mthumb/march=armv7/mfloat-abi=hard/mfpu=vfpv3-d16 -+MULTILIB_OSDIRNAMES += mthumb/march.armv7=!armv7-ar/thumb -+MULTILIB_OSDIRNAMES += mthumb/march.armv7/mfloat-abi.hard/mfpu.vfpv3-d16=!armv7-ar/thumb/fpu -+MULTILIB_OSDIRNAMES += mthumb/march.armv7/mfloat-abi.softfp/mfpu.vfpv3-d16=!armv7-ar/thumb/softfp -+MULTILIB_REUSE += mthumb/march.armv7=marm/march.armv7 -+MULTILIB_REUSE += mthumb/march.armv7/mfloat-abi.softfp/mfpu.vfpv3-d16=marm/march.armv7/mfloat-abi.softfp/mfpu.vfpv3-d16 -+MULTILIB_REUSE += mthumb/march.armv7/mfloat-abi.hard/mfpu.vfpv3-d16=marm/march.armv7/mfloat-abi.hard/mfpu.vfpv3-d16 -+endif -diff -up arm-none-eabi-gcc-cs-4.9.2/gcc-5.1.0/gcc/config.gcc.arm arm-none-eabi-gcc-cs-4.9.2/gcc-5.1.0/gcc/config.gcc ---- arm-none-eabi-gcc-cs-4.9.2/gcc-5.1.0/gcc/config.gcc.arm 2015-03-10 10:50:41.000000000 +0100 -+++ arm-none-eabi-gcc-cs-4.9.2/gcc-5.1.0/gcc/config.gcc 2015-05-31 22:31:12.093990352 +0200 -@@ -1072,7 +1072,7 @@ arm*-*-eabi* | arm*-*-symbianelf* | arm* - case ${target} in - arm*-*-eabi*) - tm_file="$tm_file newlib-stdint.h" -- tmake_file="${tmake_file} arm/t-bpabi" -+ tmake_file="${tmake_file} arm/t-bpabi arm/t-mlibs" - use_gcc_stdint=wrap - ;; - arm*-*-rtems*) -@@ -3684,42 +3684,6 @@ case "${target}" in - exit 1 - fi - -- # Add extra multilibs -- if test "x$with_multilib_list" != x; then -- arm_multilibs=`echo $with_multilib_list | sed -e 's/,/ /g'` -- for arm_multilib in ${arm_multilibs}; do -- case ${arm_multilib} in -- aprofile) -- # Note that arm/t-aprofile is a -- # stand-alone make file fragment to be -- # used only with itself. We do not -- # specifically use the -- # TM_MULTILIB_OPTION framework because -- # this shorthand is more -- # pragmatic. Additionally it is only -- # designed to work without any -- # with-cpu, with-arch with-mode -- # with-fpu or with-float options. -- if test "x$with_arch" != x \ -- || test "x$with_cpu" != x \ -- || test "x$with_float" != x \ -- || test "x$with_fpu" != x \ -- || test "x$with_mode" != x ; then -- echo "Error: You cannot use any of --with-arch/cpu/fpu/float/mode with --with-multilib-list=aprofile" 1>&2 -- exit 1 -- fi -- tmake_file="${tmake_file} arm/t-aprofile" -- break -- ;; -- default) -- ;; -- *) -- echo "Error: --with-multilib-list=${with_multilib_list} not supported." 1>&2 -- exit 1 -- ;; -- esac -- done -- fi - ;; - - fr*-*-*linux*) -diff -up arm-none-eabi-gcc-cs-4.9.2/gcc-5.1.0/gcc/configure.ac.arm arm-none-eabi-gcc-cs-4.9.2/gcc-5.1.0/gcc/configure.ac ---- arm-none-eabi-gcc-cs-4.9.2/gcc-5.1.0/gcc/configure.ac.arm 2015-03-11 19:51:09.000000000 +0100 -+++ arm-none-eabi-gcc-cs-4.9.2/gcc-5.1.0/gcc/configure.ac 2015-05-31 22:31:12.148989339 +0200 -@@ -925,6 +925,7 @@ AC_ARG_WITH(multilib-list, - [AS_HELP_STRING([--with-multilib-list], [select multilibs (AArch64, SH and x86-64 only)])], - :, - with_multilib_list=default) -+AC_SUBST(with_multilib_list) - - # ------------------------- - # Checks for other programs -diff -up arm-none-eabi-gcc-cs-4.9.2/gcc-5.1.0/gcc/configure.arm arm-none-eabi-gcc-cs-4.9.2/gcc-5.1.0/gcc/configure ---- arm-none-eabi-gcc-cs-4.9.2/gcc-5.1.0/gcc/configure.arm 2015-04-10 08:43:52.000000000 +0200 -+++ arm-none-eabi-gcc-cs-4.9.2/gcc-5.1.0/gcc/configure 2015-05-31 22:34:33.304282725 +0200 -@@ -763,6 +763,7 @@ SET_MAKE - accel_dir_suffix - real_target_noncanonical - enable_as_accelerator -+with_multilib_list - REPORT_BUGS_TEXI - REPORT_BUGS_TO - PKGVERSION -@@ -7462,6 +7463,7 @@ else - fi - - -+ - # ------------------------- - # Checks for other programs - # ------------------------- -diff -up arm-none-eabi-gcc-cs-4.9.2/gcc-5.1.0/gcc/Makefile.in.arm arm-none-eabi-gcc-cs-4.9.2/gcc-5.1.0/gcc/Makefile.in ---- arm-none-eabi-gcc-cs-4.9.2/gcc-5.1.0/gcc/Makefile.in.arm 2015-03-31 07:31:57.000000000 +0200 -+++ arm-none-eabi-gcc-cs-4.9.2/gcc-5.1.0/gcc/Makefile.in 2015-05-31 22:31:12.167988989 +0200 -@@ -535,6 +535,7 @@ lang_opt_files=@lang_opt_files@ $(srcdir - lang_specs_files=@lang_specs_files@ - lang_tree_files=@lang_tree_files@ - target_cpu_default=@target_cpu_default@ -+with_multilib_list=@with_multilib_list@ - OBJC_BOEHM_GC=@objc_boehm_gc@ - extra_modes_file=@extra_modes_file@ - extra_opt_files=@extra_opt_files@