arm-linux-gnueabi-toolchain: Update GCC to snapshot from 8 branch

It looks like Fedora 28 will be released before GCC 8. To avoid breaking
the upgrade path from Fedora 27 to Fedora 28, we have to push GCC 8 to
Copr before the Fedora 28 release day.

1 files changed, 22 insertions, 13 deletions

diff --git a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/arm-linux-gnueabi-gcc.spec b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/arm-linux-gnueabi-gcc.spec
index 869b5e5..01ad672 100644
--- a/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/arm-linux-gnueabi-gcc.spec
+++ b/arm-linux-gnueabi-toolchain/arm-linux-gnueabi-gcc/arm-linux-gnueabi-gcc.spec
@@ -28,16 +28,26 @@
 
 %bcond_without ada
 
+%global date 20180429
+%global svnrev 259748
+
 Name:       %{cross_triplet}-gcc%{pkg_suffix}
-Version:    7.3.0
-Release:    2%{?dist}
+Version:    8.0.1
+Release:    1.%{date}svn%{svnrev}%{?dist}
 Summary:    The GNU Compiler Collection (%{cross_triplet})
 
 %global major_version   %(echo %{version} | sed 's/\\..*$//')
 
 License:    GPLv3+ and GPLv3+ with exceptions and GPLv2+ with exceptions and LGPLv2+ and BSD
 URL:        https://gcc.gnu.org
-Source0:    https://ftp.gnu.org/gnu/gcc/gcc-%{version}/gcc-%{version}.tar.xz
+
+# Uncomment this line when GCC 8 is released.
+# Source0:    https://ftp.gnu.org/gnu/gcc/gcc-%{version}/gcc-%{version}.tar.xz
+#
+# Temporarily switch to svn snapshot. The source tarball is generated by:
+# svn export https://gcc.gnu.org/svn/gcc/branches/gcc-8-branch@%%{svnrev} gcc-%%{version}-%%{date}
+# tar -cf - gcc-%%{version}-%%{date} | xz -9e > gcc-%%{version}-%%{date}.tar.xz
+Source0:    gcc-%{version}-%{date}.tar.xz
 
 BuildRequires: texinfo, gettext, flex, bison, zlib-devel, isl-devel
 BuildRequires: gmp-devel, mpfr-devel, libmpc-devel, elfutils-libelf-devel
@@ -72,10 +82,11 @@ Provides:   %{cross_triplet}-gcc-stage3 = %{version}
 
 
 %prep
-%autosetup -p1 -Tb 0 -n gcc-%{version}
+%autosetup -p1 -Tb 0 -n gcc-%{version}-%{date}
 
 
 %build
+./contrib/gcc_update --touch
 mkdir -p %{_builddir}/gcc-build
 cd %{_builddir}/gcc-build
 export AR_FOR_TARGET=%{_bindir}/%{cross_triplet}-ar
@@ -88,7 +99,7 @@ export RANLIB_FOR_TARGET=%{_bindir}/%{cross_triplet}-ranlib
 export STRIP_FOR_TARGET=%{_bindir}/%{cross_triplet}-strip
 export WINDRES_FOR_TARGET=%{_bindir}/%{cross_triplet}-windres
 export WINDMC_FOR_TARGET=%{_bindir}/%{cross_triplet}-windmc
-%global _configure ../gcc-%{version}/configure
+%global _configure ../gcc-%{version}-%{date}/configure
 %global _program_prefix %{cross_triplet}-
 %global _hardening_ldflags \\\
     %(echo "%{_hardening_ldflags}" | sed -e 's/-specs=[^ ]*//g')
@@ -204,7 +215,7 @@ rm -f %{buildroot}%{_libexecdir}/gcc/%{cross_triplet}/%{major_version}/install-t
 rmdir --ignore-fail-on-non-empty %{buildroot}%{_libexecdir}/gcc/%{cross_triplet}/%{major_version}/install-tools
 
 # Don't strip libgcc.a and libgcov.a - based on Fedora Project cross-gcc.spec
-%global __ar_no_strip $RPM_BUILD_DIR/gcc-%{version}/ar-no-strip
+%global __ar_no_strip $RPM_BUILD_DIR/gcc-%{version}-%{date}/ar-no-strip
 cat > %{__ar_no_strip} << EOF
 #!/bin/sh
 f=\$2
@@ -223,7 +234,7 @@ chmod +x %{__ar_no_strip}
 
 %files
 %license COPYING COPYING.LIB COPYING.RUNTIME COPYING3 COPYING3.LIB
-%doc ChangeLog ChangeLog.jit ChangeLog.tree-ssa MAINTAINERS NEWS README
+%doc ChangeLog ChangeLog.jit ChangeLog.tree-ssa MAINTAINERS README
 %{_bindir}/%{cross_triplet}-cpp
 %{_bindir}/%{cross_triplet}-gcc
 %{_bindir}/%{cross_triplet}-gcc-ar
@@ -331,14 +342,9 @@ chmod +x %{__ar_no_strip}
 %{cross_sysroot}/%{lib_dir_name}/libsupc++.a
 %{cross_sysroot}/%{lib_dir_name}/libubsan.a
 %{cross_sysroot}/%{lib_dir_name}/libubsan.so*
-%if %{cross_arch} == "arm"
-%{_prefix}/lib/gcc/%{cross_triplet}/%{major_version}/include/cilk
-%{cross_sysroot}/%{lib_dir_name}/libcilkrts.a
-%{cross_sysroot}/%{lib_dir_name}/libcilkrts.so*
-%{cross_sysroot}/%{lib_dir_name}/libcilkrts.spec
-%endif
 %if %{cross_arch} == "arm64"
 %{cross_sysroot}/%{lib_dir_name}/liblsan.a
+%{cross_sysroot}/%{lib_dir_name}/liblsan_preinit.o
 %{cross_sysroot}/%{lib_dir_name}/liblsan.so*
 %{cross_sysroot}/%{lib_dir_name}/libtsan.a
 %{cross_sysroot}/%{lib_dir_name}/libtsan_preinit.o
@@ -365,6 +371,9 @@ chmod +x %{__ar_no_strip}
 
 
 %changelog
+* Sun Apr 29 2018 Ting-Wei Lan <lantw44@gmail.com> - 8.0.1-1.20180429svn259748
+- Update to GCC 8 snapshot for Fedora 28
+
 * Mon Feb 26 2018 Ting-Wei Lan <lantw44@gmail.com> - 7.3.0-2
 - Remove -fcf-protection from compiler flags because it needs -m options
 - Remove -specs from _hardening_ldflags because it is now used directly