diff --git a/SPECS/gcc-libraries.spec b/SPECS/gcc-libraries.spec index e42e6cf2..8be9321e 100644 --- a/SPECS/gcc-libraries.spec +++ b/SPECS/gcc-libraries.spec @@ -7,14 +7,14 @@ %global gcc_release 1 %global mpc_version 0.8.1 %global _unpackaged_files_terminate_build 0 -%global multilib_64_archs sparc64 ppc64 s390x x86_64 +%global multilib_64_archs sparc64 %ifarch s390x %global multilib_32_arch s390 %endif %ifarch sparc64 %global multilib_32_arch sparcv9 %endif -%ifarch ppc64 +%ifarch ppc %global multilib_32_arch ppc %endif %ifarch x86_64 @@ -44,7 +44,7 @@ %global build_libatomic 1 %endif %endif -%if 0%{?rhel} >= 7 +%if 0%{?rhel} > 7 %global build_libitm 0 %else %global build_libitm 1 @@ -152,7 +152,6 @@ ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390 s390x aarch64 %endif %ifarch x86_64 %global oformat OUTPUT_FORMAT(elf64-x86-64) -%global oformat2 OUTPUT_FORMAT(elf32-i386) %endif %ifarch ppc %global oformat OUTPUT_FORMAT(elf32-powerpc) @@ -160,14 +159,12 @@ ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390 s390x aarch64 %endif %ifarch ppc64 %global oformat OUTPUT_FORMAT(elf64-powerpc) -%global oformat2 OUTPUT_FORMAT(elf32-powerpc) %endif %ifarch s390 %global oformat OUTPUT_FORMAT(elf32-s390) %endif %ifarch s390x %global oformat OUTPUT_FORMAT(elf64-s390) -%global oformat2 OUTPUT_FORMAT(elf32-s390) %endif %ifarch ia64 %global oformat OUTPUT_FORMAT(elf64-ia64-little) @@ -206,7 +203,16 @@ Patch1100: gcc7-htm-in-asm.patch %ifarch ppc %global gcc_target_platform ppc64-%{_vendor}-%{_target_os}%{?_gnu} %endif -%ifnarch sparcv9 ppc +%ifarch ppc64 +%global gcc_target_platform ppc64-powerel-%{_target_os} +%endif +%ifarch ppc64le +%global gcc_target_platform ppc64le-powerel-%{_target_os} +%endif +%ifarch x86_64 +%global gcc_target_platform x86_64-powerel-%{_target_os} +%endif +%ifnarch sparcv9 ppc ppc64 ppc64le x86_64 %global gcc_target_platform %{_target_platform} %endif @@ -391,7 +397,7 @@ CC="$CC" CXX="$CXX" CFLAGS="$OPT_FLAGS" \ 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 \ --enable-multilib --disable-libsanitizer \ --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions \ @@ -432,7 +438,10 @@ CC="$CC" CXX="$CXX" CFLAGS="$OPT_FLAGS" \ %ifarch sparc sparcv9 --host=%{gcc_target_platform} --build=%{gcc_target_platform} --target=%{gcc_target_platform} --with-cpu=v7 %endif -%ifarch ppc ppc64 ppc64le ppc64p7 +%ifarch ppc64 ppc64le + --with-cpu-64=power8 --with-tune-64=power8 --disable-multilib \ +%endif +%ifarch ppc %if 0%{?rhel} >= 7 --with-cpu-32=power7 --with-tune-32=power7 --with-cpu-64=power7 --with-tune-64=power7 \ %else @@ -442,14 +451,14 @@ CC="$CC" CXX="$CXX" CFLAGS="$OPT_FLAGS" \ %ifarch ppc --build=%{gcc_target_platform} --target=%{gcc_target_platform} --with-cpu=default32 %endif -%ifarch %{ix86} x86_64 +%ifarch %{ix86} --with-tune=generic \ %endif %ifarch %{ix86} --with-arch=i686 \ %endif %ifarch x86_64 - --with-arch_32=i686 \ + --with-cpu-64=core2 --with-tune-64=core2 \ %endif %ifarch s390 s390x --with-arch=z9-109 --with-tune=z10 --enable-decimal-float \