diff --git a/SPECS/gcc.spec b/SPECS/gcc.spec index 762ad917..70dd6e7d 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 s390x x86_64 +%global multilib_64_archs sparc64 s390x %ifarch %{ix86} x86_64 ia64 ppc ppc64 ppc64le ppc64p7 alpha aarch64 %global build_ada 0 %else @@ -46,8 +46,8 @@ %else %global build_libitm 0 %endif -%global build_cloog 1 -%global build_libstdcxx_docs 1 +%global build_cloog 0 +%global build_libstdcxx_docs 0 %ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64 %global attr_ifunc 1 %else @@ -68,9 +68,9 @@ %ifarch ppc %global multilib_32_arch ppc %endif -%ifarch x86_64 -%global multilib_32_arch i686 -%endif +#%ifarch x86_64 +#%global multilib_32_arch i686 +#%endif Summary: Various compilers (C, C++, Objective-C, Java, ...) Name: gcc %global gcc_version 4.8.5 @@ -315,8 +315,8 @@ Patch1406: gcc48-rh1535655-6.patch %global gcc_target_platform ppc64-%{_vendor}-%{_target_os} %endif %ifnarch sparcv9 ppc ppc64p7 -#%global gcc_target_platform %{_target_platform} -%global gcc_target_platform ppc64-powerel-%{_target_os} +%global gcc_target_platform %{_target_platform} +#%global gcc_target_platform x86_64-powerel-%{_target_os} %endif %description @@ -1394,6 +1394,9 @@ CC="$CC" CFLAGS="$OPT_FLAGS" \ %ifarch %{ix86} x86_64 --with-tune=generic \ %endif +%ifarch x86_64 + --disable-multilib \ +%endif %if 0%{?rhel} >= 7 %ifarch %{ix86} --with-arch=x86-64 \ @@ -2533,7 +2536,7 @@ fi %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/fxsrintrin.h %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/xsaveintrin.h %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/xsaveoptintrin.h -%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/pkuintrin.h +#%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/pkuintrin.h %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/mm_malloc.h %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/mm3dnow.h %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/cpuid.h