From 8fbfc7b6beab9b0ea8f7068fb0c73234bc5e614a Mon Sep 17 00:00:00 2001
From: basebuilder_pel7ppc64bebuilder0 <basebuilder@powerel.org>
Date: Fri, 18 May 2018 01:58:30 +0200
Subject: [PATCH] gcc powerel changes part 1

Signed-off-by: basebuilder_pel7ppc64bebuilder0 <basebuilder@powerel.org>
---
 SPECS/gcc.spec | 79 ++++++++++++++++++++++++--------------------------
 1 file changed, 38 insertions(+), 41 deletions(-)

diff --git a/SPECS/gcc.spec b/SPECS/gcc.spec
index fb073310..6a96f71d 100644
--- a/SPECS/gcc.spec
+++ b/SPECS/gcc.spec
@@ -5,7 +5,7 @@
 %global gcc_release 28
 %global _unpackaged_files_terminate_build 0
 %global _performance_build 1
-%global multilib_64_archs sparc64 ppc64 ppc64p7 s390x x86_64
+%global multilib_64_archs sparc64 s390x x86_64
 %ifarch %{ix86} x86_64 ia64 ppc ppc64 ppc64le ppc64p7 alpha aarch64
 %global build_ada 1
 %else
@@ -21,17 +21,17 @@
 %else
 %global build_go 0
 %endif
-%ifarch %{ix86} x86_64 ia64
+%ifarch %{ix86} x86_64 ia64 ppc64 ppc64le
 %global build_libquadmath 1
 %else
 %global build_libquadmath 0
 %endif
-%ifarch %{ix86} x86_64 ppc ppc64 ppc64p7
+%ifarch %{ix86} x86_64 ppc ppc64 ppc64le
 %global build_libasan 1
 %else
 %global build_libasan 0
 %endif
-%ifarch x86_64
+%ifarch x86_64 ppc64 ppc64le
 %global build_libtsan 1
 %else
 %global build_libtsan 0
@@ -65,7 +65,7 @@
 %ifarch sparc64
 %global multilib_32_arch sparcv9
 %endif
-%ifarch ppc64 ppc64p7
+%ifarch ppc
 %global multilib_32_arch ppc
 %endif
 %ifarch x86_64
@@ -73,11 +73,7 @@
 %endif
 Summary: Various compilers (C, C++, Objective-C, Java, ...)
 Name: gcc
-%if 0%{?rhel} == 7
-%global gcc_version 4.8.2
-%else
 %global gcc_version 4.8.5
-%endif
 Version: 4.8.5
 Release: %{gcc_release}%{?dist}
 %if "%{version}" != "%{gcc_version}"
@@ -1138,7 +1134,7 @@ tar xjf %{SOURCE10}
 %patch1406 -p1 -b .retpolines-6~
 
 sed -i -e 's/4\.8\.5/4.8.5/' gcc/BASE-VER
-echo 'Red Hat %{version}-%{gcc_release}' > gcc/DEV-PHASE
+echo 'PowerEL %{version}-%{gcc_release}' > gcc/DEV-PHASE
 
 %if 0%{?fedora} >= 16 || 0%{?rhel} >= 7
 # Default to -gdwarf-4 -fno-debug-types-section rather than -gdwarf-2
@@ -1330,7 +1326,7 @@ CC="$CC" CFLAGS="$OPT_FLAGS" \
 		  | sed 's/ -Werror=format-security / -Wformat -Werror=format-security /'`" \
 	XCFLAGS="$OPT_FLAGS" TCFLAGS="$OPT_FLAGS" GCJFLAGS="$OPT_FLAGS" \
 	../configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \
-	--with-bugurl=http://bugzilla.redhat.com/bugzilla --enable-bootstrap \
+	--with-bugurl=http://bugzilla.powerel.org/bugzilla --enable-bootstrap \
 	--enable-shared --enable-threads=posix --enable-checking=release \
 	--with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions \
 	--enable-gnu-unique-object --enable-linker-build-id --with-linker-hash-style=gnu \
@@ -1353,11 +1349,9 @@ CC="$CC" CFLAGS="$OPT_FLAGS" \
 %else
 	--without-isl --without-cloog \
 %endif
-%if 0%{?fedora} >= 21 || 0%{?rhel} >= 7
 %if %{attr_ifunc}
 	--enable-gnu-indirect-function \
 %endif
-%endif
 %ifarch %{arm}
 	--disable-sjlj-exceptions \
 %endif
@@ -1367,6 +1361,9 @@ CC="$CC" CFLAGS="$OPT_FLAGS" \
 %ifarch sparc sparcv9 sparc64 ppc ppc64 ppc64le ppc64p7 s390 s390x alpha
 	--with-long-double-128 \
 %endif
+%ifarch ppc64
+	--enable-targets=powerpc-linux --disable-multilib \
+%endif
 %ifarch ppc64le
 	--enable-targets=powerpcle-linux --disable-multilib \
 %endif
@@ -1379,12 +1376,12 @@ CC="$CC" CFLAGS="$OPT_FLAGS" \
 %ifarch sparc sparcv9
 	--host=%{gcc_target_platform} --build=%{gcc_target_platform} --target=%{gcc_target_platform} --with-cpu=v7
 %endif
-%ifarch ppc64le
-       --with-cpu-64=power8 --with-tune-64=power8 \
+%ifarch ppc64 ppc64le
+	--with-cpu-64=power8 --with-tune-64=power8 \
 %endif
-%ifarch ppc ppc64 ppc64p7
+%ifarch ppc
 %if 0%{?rhel} >= 7
-	--with-cpu-32=power7 --with-tune-32=power7 --with-cpu-64=power7 --with-tune-64=power7 \
+	--with-cpu-32=power6 --with-tune-32=power6 --with-cpu-64=power7 --with-tune-64=power7 \
 %endif
 %if 0%{?rhel} == 6
 	--with-cpu-32=power4 --with-tune-32=power6 --with-cpu-64=power4 --with-tune-64=power6 \
@@ -1616,7 +1613,7 @@ find ../rpm.doc/libstdc++-v3 -name \*~ | xargs rm
 ln -f %{buildroot}%{_prefix}/bin/%{gcc_target_platform}-gcc \
   %{buildroot}%{_prefix}/bin/sparc-%{_vendor}-%{_target_os}-gcc
 %endif
-%ifarch ppc ppc64 ppc64p7
+%ifarch ppc
 ln -f %{buildroot}%{_prefix}/bin/%{gcc_target_platform}-gcc \
   %{buildroot}%{_prefix}/bin/ppc-%{_vendor}-%{_target_os}-gcc
 %endif
@@ -1624,7 +1621,7 @@ ln -f %{buildroot}%{_prefix}/bin/%{gcc_target_platform}-gcc \
 %ifarch sparcv9 ppc
 FULLLPATH=$FULLPATH/lib32
 %endif
-%ifarch sparc64 ppc64 ppc64p7
+%ifarch sparc64
 FULLLPATH=$FULLPATH/lib64
 %endif
 if [ -n "$FULLLPATH" ]; then
@@ -1671,7 +1668,7 @@ echo '/* GNU ld script
 OUTPUT_FORMAT(elf32-powerpc)
 GROUP ( /lib/libgcc_s.so.1 libgcc.a )' > $FULLPATH/libgcc_s.so
 %endif
-%ifarch ppc64 ppc64p7
+%ifarch ppc
 rm -f $FULLPATH/32/libgcc_s.so
 echo '/* GNU ld script
    Use the shared library, but some functions are only in
@@ -2650,7 +2647,7 @@ fi
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/libasan_preinit.o
 %endif
 %endif
-%ifarch sparcv9 sparc64 ppc ppc64 ppc64p7
+%ifarch sparcv9 sparc64 ppc
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflap.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflapth.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflap.so
@@ -2746,7 +2743,7 @@ fi
 %ifarch sparcv9 ppc %{multilib_64_archs}
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libstdc++.so
 %endif
-%ifarch sparcv9 sparc64 ppc ppc64 ppc64p7
+%ifarch sparcv9 sparc64 ppc
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libstdc++.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libsupc++.a
 %endif
@@ -2806,7 +2803,7 @@ fi
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libstdc++.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libsupc++.a
 %endif
-%ifnarch sparcv9 sparc64 ppc ppc64 ppc64p7
+%ifnarch sparcv9 sparc64 ppc
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libstdc++.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libsupc++.a
 %endif
@@ -2891,7 +2888,7 @@ fi
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgfortran.spec
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgfortranbegin.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libcaf_single.a
-%ifarch sparcv9 sparc64 ppc ppc64 ppc64p7
+%ifarch sparcv9 sparc64 ppc
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgfortran.a
 %endif
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgfortran.so
@@ -2931,7 +2928,7 @@ fi
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libgfortran.a
 %endif
-%ifnarch sparcv9 sparc64 ppc ppc64 ppc64p7
+%ifnarch sparcv9 sparc64 ppc
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgfortran.a
 %endif
 
@@ -2964,7 +2961,7 @@ fi
 %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/jvgenmain
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgcj.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgcj-tools.so
-%ifarch sparcv9 sparc64 ppc ppc64 ppc64p7
+%ifarch sparcv9 sparc64 ppc
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgcj_bc.so
 %endif
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgij.so
@@ -3067,7 +3064,7 @@ fi
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libgcj_bc.so
 %endif
-%ifnarch sparcv9 sparc64 ppc ppc64 ppc64p7
+%ifnarch sparcv9 sparc64 ppc
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgcj_bc.so
 %endif
 %dir %{_prefix}/include/c++
@@ -3120,7 +3117,7 @@ fi
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/adainclude
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/32/adalib
 %endif
-%ifarch sparcv9 sparc64 ppc ppc64 ppc64p7
+%ifarch sparcv9 sparc64 ppc
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/adainclude
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/adalib
 %endif
@@ -3154,7 +3151,7 @@ fi
 %exclude %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/adalib/libgnat.a
 %exclude %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/adalib/libgnarl.a
 %endif
-%ifnarch sparcv9 sparc64 ppc ppc64 ppc64p7
+%ifnarch sparcv9 sparc64 ppc
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/adainclude
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/adalib
 %exclude %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/adalib/libgnat.a
@@ -3181,7 +3178,7 @@ fi
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/adalib/libgnat.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/adalib/libgnarl.a
 %endif
-%ifnarch sparcv9 sparc64 ppc ppc64 ppc64p7
+%ifnarch sparcv9 sparc64 ppc
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/adalib
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/adalib/libgnat.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/adalib/libgnarl.a
@@ -3209,7 +3206,7 @@ fi
 %endif
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/mf-runtime.h
-%ifnarch sparcv9 sparc64 ppc ppc64 ppc64p7
+%ifnarch sparcv9 sparc64 ppc
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflap.so
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflapth.so
 %endif
@@ -3233,7 +3230,7 @@ fi
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libmudflap.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libmudflapth.a
 %endif
-%ifnarch sparcv9 sparc64 ppc ppc64 ppc64p7
+%ifnarch sparcv9 sparc64 ppc
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflap.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflapth.a
 %endif
@@ -3256,7 +3253,7 @@ fi
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/quadmath.h
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/quadmath_weak.h
-%ifnarch sparcv9 sparc64 ppc ppc64 ppc64p7
+%ifnarch sparcv9 sparc64 ppc
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libquadmath.so
 %endif
 %doc rpm.doc/libquadmath/ChangeLog*
@@ -3277,7 +3274,7 @@ fi
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libquadmath.a
 %endif
-%ifnarch sparcv9 sparc64 ppc ppc64 ppc64p7
+%ifnarch sparcv9 sparc64 ppc
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libquadmath.a
 %endif
 %endif
@@ -3299,7 +3296,7 @@ fi
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include
 #%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/itm.h
 #%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/itm_weak.h
-%ifnarch sparcv9 sparc64 ppc ppc64 ppc64p7
+%ifnarch sparcv9 sparc64 ppc
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libitm.so
 %endif
 %doc rpm.doc/libitm/ChangeLog*
@@ -3320,7 +3317,7 @@ fi
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libitm.a
 %endif
-%ifnarch sparcv9 sparc64 ppc ppc64 ppc64p7
+%ifnarch sparcv9 sparc64 ppc
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libitm.a
 %endif
 %endif
@@ -3346,7 +3343,7 @@ fi
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libatomic.a
 %endif
-%ifnarch sparcv9 sparc64 ppc ppc64 ppc64p7
+%ifnarch sparcv9 sparc64 ppc
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libatomic.a
 %endif
 %doc rpm.doc/changelogs/libatomic/ChangeLog*
@@ -3373,7 +3370,7 @@ fi
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libasan.a
 %endif
-%ifnarch sparcv9 sparc64 ppc ppc64 ppc64p7
+%ifnarch sparcv9 sparc64 ppc
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libasan.a
 %endif
 %doc rpm.doc/changelogs/libsanitizer/ChangeLog* libsanitizer/LICENSE.TXT
@@ -3429,7 +3426,7 @@ fi
 %ifarch sparcv9 ppc %{multilib_64_archs}
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgo.so
 %endif
-%ifarch sparcv9 sparc64 ppc ppc64 ppc64p7
+%ifarch sparcv9 sparc64 ppc
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgo.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgobegin.a
 %endif
@@ -3469,7 +3466,7 @@ fi
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libgobegin.a
 %endif
-%ifnarch sparcv9 sparc64 ppc ppc64 ppc64p7
+%ifnarch sparcv9 sparc64 ppc
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgobegin.a
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgo.so
 %endif
@@ -3490,7 +3487,7 @@ fi
 %dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/lib64/libgo.a
 %endif
-%ifnarch sparcv9 sparc64 ppc ppc64 ppc64p7
+%ifnarch sparcv9 sparc64 ppc
 %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgo.a
 %endif
 %endif