Move x86-specific sources to x86-specific source lists.

[nemanjai]

Thank you for doing this. These were causing warnings with some compilers when built on PowerPC because the sources were just empty (macro-guarded). Not compiling them at all is a much cleaner solution.
LGTM but I am far from an authority on this part of the code so I'll let the approval come from one of the other reviewers.

[aheejin]

Looks OK to me, but I haven't worked on this part of code either, so I think someone else should approve it.

[mgorny]

Also, I think that if you're splitting them up, it'd also logical to move them into a subdirectory, x86-common maybe.

compiler-rt/lib/builtins/CMakeLists.txt

219

This and the following files have only:

#if !_ARCH_PPC

so I suppose it's currently included on more targets than x86. If it's really not useful there, I think it'd be better to update the #ifs first (and preferably get the author to review).

[saugustine]

I've cleaned up this patch a bit. Now the only files that are in the x86_ARCH group are those that require 80 bits floats and cpu_model.c. Tests for all of these were already disabled on arm and powerpc (because neither has 80-bit floats), so we knew these library functions don't work on arm, but we compiled them anyway. It makes more sense to just not compile them at all if we know they require something the target architecture doesn't support.

I'm cc'ing some relevant people on this. The arm folks can comment on this patch (and I will add them to review) if there is a problem.

In D36555#839829, @mgorny wrote:

Also, I think that if you're splitting them up, it'd also logical to move them into a subdirectory, x86-common maybe.

I'm reluctant to do this because that would require adding another layer to the file the filtering code around line 526, and that already has some special casing and is a bit hard to follow. Nevertheless, if you insist, I will.

[saugustine]

Thanks for the various comments. Please take another look.

[saugustine]

compiler-rt/lib/builtins/CMakeLists.txt

219

As discussed in D36764, these all assume 80-bit floats, and therefore are only useful on x86 (and ancient 68ks)--and, in fact, the tests for these functions are disabled for everything but x86. I have left these #ifs in for now, but will remove them after this patch gets submitted (and add comments about them needing 80-bit floats). Otherwise, powerpc builds will be broken.

[saugustine]

Remove two files inadvertantly included in last patch.

[weimingz]

LGTM. Adding Renato and Saleem to approve.

[weimingz]

compiler-rt/lib/builtins/CMakeLists.txt

483

why these files were not used before? should the change be in a separate patch? or update the patch title/summary as well?

[mgorny]

compiler-rt/lib/builtins/CMakeLists.txt

219

Please do not remove the guards. We're using them in other arch-specific files as well. Instead, update them to state the correct targets.

[compnerd]

Would be nice to split up the PPC fixes into its own commit.

[mgorny]

I'm not going to block this but I agree with others that the PPC changes look like they belong in a separate commit.

[saugustine]

Committed as R319464.

compiler-rt/cmake/Modules/CompilerRTUtils.cmake

 macro(detect_target_arch)
   check_symbol_exists(__arm__ "" __ARM)
   check_symbol_exists(__aarch64__ "" __AARCH64)
   check_symbol_exists(__x86_64__ "" __X86_64)
   check_symbol_exists(__i686__ "" __I686)
   check_symbol_exists(__i386__ "" __I386)
   check_symbol_exists(__mips__ "" __MIPS)
   check_symbol_exists(__mips64__ "" __MIPS64)
+  check_symbol_exists(__powerpc64__ "" __PPC64)
+  check_symbol_exists(__powerpc64le__ "" __PPC64LE)
   check_symbol_exists(__s390x__ "" __S390X)
   check_symbol_exists(__wasm32__ "" __WEBASSEMBLY32)
   check_symbol_exists(__wasm64__ "" __WEBASSEMBLY64)
   if(__ARM)
     add_default_target_arch(arm)
   elseif(__AARCH64)
     add_default_target_arch(aarch64)
   elseif(__X86_64)
     add_default_target_arch(x86_64)
   elseif(__I686)
     add_default_target_arch(i686)
   elseif(__I386)
     add_default_target_arch(i386)
   elseif(__MIPS64) # must be checked before __MIPS
     add_default_target_arch(mips64)
   elseif(__MIPS)
     add_default_target_arch(mips)
+  elseif(__PPC64)
+    add_default_target_arch(powerpc64)
+  elseif(__PPC64LE)
+    add_default_target_arch(powerpc64le)
   elseif(__S390X)
     add_default_target_arch(s390x)
   elseif(__WEBASSEMBLY32)
     add_default_target_arch(wasm32)
   elseif(__WEBASSEMBLY64)
     add_default_target_arch(wasm64)
   endif()
 endmacro()

compiler-rt/cmake/builtin-config-ix.cmake

 
 if(APPLE)
   set(ARM64 arm64)
   set(ARM32 armv7 armv7k armv7s)
   set(X86_64 x86_64 x86_64h)
 endif()
 
 set(ALL_BUILTIN_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64}
-    ${MIPS32} ${MIPS64} ${WASM32} ${WASM64})
+    ${MIPS32} ${MIPS64} ${PPC64} ${WASM32} ${WASM64})
 
 include(CompilerRTUtils)
 include(CompilerRTDarwinUtils)
 
 if(APPLE)
 
   find_darwin_sdk_dir(DARWIN_osx_SYSROOT macosx)
   find_darwin_sdk_dir(DARWIN_iossim_SYSROOT iphonesimulator)

compiler-rt/lib/builtins/CMakeLists.txt

set(GENERIC_SOURCES
   bswapsi2.c
   clzdi2.c
   clzsi2.c
   clzti2.c
   cmpdi2.c
   cmpti2.c
   comparedf2.c
   comparesf2.c
-  cpu_model.c
   ctzdi2.c
   ctzsi2.c
   ctzti2.c
   divdc3.c
   divdf3.c
   divdi3.c
   divmoddi4.c
   divmodsi4.c
   divsc3.c
   divsf3.c
   divsi3.c
   divtc3.c
   divti3.c
   divtf3.c
-  divxc3.c
   extendsfdf2.c
   extendhfsf2.c
   ffsdi2.c
   ffssi2.c
   ffsti2.c
   fixdfdi.c
   fixdfsi.c
   fixdfti.c
   fixsfdi.c
   fixsfsi.c
   fixsfti.c
   fixunsdfdi.c
   fixunsdfsi.c
   fixunsdfti.c
   fixunssfdi.c
   fixunssfsi.c
   fixunssfti.c
-  fixunsxfdi.c
-  fixunsxfsi.c
-  fixunsxfti.c
-  fixxfdi.c
-  fixxfti.c
   floatdidf.c
   floatdisf.c
-  floatdixf.c
   floatsidf.c
   floatsisf.c
   floattidf.c
   floattisf.c
-  floattixf.c
   floatundidf.c
   floatundisf.c
-  floatundixf.c
   floatunsidf.c
   floatunsisf.c
   floatuntidf.c
   floatuntisf.c
-  floatuntixf.c
   int_util.c
   lshrdi3.c
   lshrti3.c
   moddi3.c
   modsi3.c
   modti3.c
   muldc3.c
   muldf3.c
   muldi3.c
   mulodi4.c
   mulosi4.c
   muloti4.c
   mulsc3.c
   mulsf3.c
   multi3.c
   multf3.c
   mulvdi3.c
   mulvsi3.c
   mulvti3.c
-  mulxc3.c
   negdf2.c
   negdi2.c
   negsf2.c
   negti2.c
   negvdi2.c
   negvsi2.c
   negvti2.c
   os_version_check.c
   paritydi2.c
   paritysi2.c
   parityti2.c
   popcountdi2.c
   popcountsi2.c
   popcountti2.c
   powidf2.c
   powisf2.c
   powitf2.c
-  powixf2.c
   subdf3.c
   subsf3.c
   subvdi3.c
   subvsi3.c
   subvti3.c
   subtf3.c
   trampoline_setup.c
   truncdfhf2.c

 endif ()
 
 if (NOT FUCHSIA)
   set(GENERIC_SOURCES
     ${GENERIC_SOURCES}
     clear_cache.c)
 endif()
 
+# These sources work on all x86 variants, but only x86 variants.
+set(x86_ARCH_SOURCES
+  cpu_model.c
+  divxc3.c
+  fixxfdi.c
+  fixxfti.c
+  fixunsxfdi.c
+  fixunsxfsi.c
+  fixunsxfti.c
+  floatdixf.c
+  floattixf.c
+  floatundixf.c
+  floatuntixf.c
+  mulxc3.c
+  powixf2.c
+)
+
 if (NOT MSVC)
   set(x86_64_SOURCES
       x86_64/chkstk.S
       x86_64/chkstk2.S
       x86_64/floatdidf.c
       x86_64/floatdisf.c
       x86_64/floatdixf.c
       x86_64/floatundidf.S
set(x86_64_SOURCES
       x86_64/floatdisf.c
       x86_64/floatdixf.c
       ${GENERIC_SOURCES})
   set(x86_64h_SOURCES ${x86_64_SOURCES})
   set(i386_SOURCES ${GENERIC_SOURCES})
   set(i686_SOURCES ${i386_SOURCES})
 endif () # if (NOT MSVC)
 
+set(x86_64h_SOURCES ${x86_64h_SOURCES} ${x86_ARCH_SOURCES})
+set(x86_64_SOURCES ${x86_64_SOURCES} ${x86_ARCH_SOURCES})
+set(i386_SOURCES ${i386_SOURCES} ${x86_ARCH_SOURCES})
+set(i686_SOURCES ${i686_SOURCES} ${x86_ARCH_SOURCES})
+
 set(arm_SOURCES
   arm/bswapdi2.S
   arm/bswapsi2.S
   arm/clzdi2.S
   arm/clzsi2.S
   arm/comparesf2.S
   arm/divmodsi4.S
   arm/divsi3.S

 
 set(mips_SOURCES ${GENERIC_SOURCES})
 set(mipsel_SOURCES ${mips_SOURCES})
 set(mips64_SOURCES ${GENERIC_TF_SOURCES}
                    ${mips_SOURCES})
 set(mips64el_SOURCES ${GENERIC_TF_SOURCES}
                      ${mips_SOURCES})
 
+set(powerpc64_SOURCES
+  ppc/divtc3.c
+  ppc/fixtfdi.c
+  ppc/fixunstfdi.c
+  ppc/floatditf.c
+  ppc/floatunditf.c
+  ppc/gcc_qadd.c
+  ppc/gcc_qdiv.c
+  ppc/gcc_qmul.c
+  ppc/gcc_qsub.c
+  ppc/multc3.c
+  ${GENERIC_SOURCES})
+set(powerpc64le_SOURCES ${powerpc64_SOURCES})
+
 set(wasm32_SOURCES ${GENERIC_SOURCES})
 set(wasm64_SOURCES ${GENERIC_SOURCES})
 
 add_custom_target(builtins)
 set_target_properties(builtins PROPERTIES FOLDER "Compiler-RT Misc")
 
 if (APPLE)
   add_subdirectory(Darwin-excludes)