[llvm] r371102 - gn build: (manually) merge r358706

[Nico Weber via llvm-commits]

Author: nico
Date: Thu Sep  5 11:03:18 2019
New Revision: 371102

URL: http://llvm.org/viewvc/llvm-project?rev=371102&view=rev
Log:
gn build: (manually) merge r358706

Modified:
    llvm/trunk/utils/gn/secondary/compiler-rt/lib/builtins/BUILD.gn

Modified: llvm/trunk/utils/gn/secondary/compiler-rt/lib/builtins/BUILD.gn
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/gn/secondary/compiler-rt/lib/builtins/BUILD.gn?rev=371102&r1=371101&r2=371102&view=diff
==============================================================================
--- llvm/trunk/utils/gn/secondary/compiler-rt/lib/builtins/BUILD.gn (original)
+++ llvm/trunk/utils/gn/secondary/compiler-rt/lib/builtins/BUILD.gn Thu Sep  5 11:03:18 2019
@@ -191,6 +191,30 @@ static_library("builtins") {
     ]
   }
 
+  if ((target_cpu == "x64" && target_os != "win") || target_cpu == "arm64") {
+    # GENERIC_TF_SOURCES
+    sources += [
+      "comparetf2.c",
+      "extenddftf2.c",
+      "extendsftf2.c",
+      "fixtfdi.c",
+      "fixtfsi.c",
+      "fixtfti.c",
+      "fixunstfdi.c",
+      "fixunstfsi.c",
+      "fixunstfti.c",
+      "floatditf.c",
+      "floatsitf.c",
+      "floattitf.c",
+      "floatunditf.c",
+      "floatunsitf.c",
+      "floatuntitf.c",
+      "multc3.c",
+      "trunctfdf2.c",
+      "trunctfsf2.c",
+    ]
+  }
+
   if (target_cpu == "x86" || target_cpu == "x64") {
     sources += [
       "cpu_model.c",
@@ -336,24 +360,6 @@ static_library("builtins") {
   if (target_cpu == "arm64") {
     sources += [
       "aarch64/fp_mode.c",
-      "comparetf2.c",
-      "extenddftf2.c",
-      "extendsftf2.c",
-      "fixtfdi.c",
-      "fixtfsi.c",
-      "fixtfti.c",
-      "fixunstfdi.c",
-      "fixunstfsi.c",
-      "fixunstfti.c",
-      "floatditf.c",
-      "floatsitf.c",
-      "floattitf.c",
-      "floatunditf.c",
-      "floatunsitf.c",
-      "floatuntitf.c",
-      "multc3.c",
-      "trunctfdf2.c",
-      "trunctfsf2.c",
     ]
     if (target_os == "mingw") {
       sources += [