[llvm] 601cc29 - Revert "Revert "gn build: (manually) try to merge 1689ad27af""

[Nico Weber via llvm-commits]

Author: Nico Weber
Date: 2019-11-27T21:12:46-05:00
New Revision: 601cc29a57d14a229fed9505a3b28e194b6b316f

URL: https://github.com/llvm/llvm-project/commit/601cc29a57d14a229fed9505a3b28e194b6b316f
DIFF: https://github.com/llvm/llvm-project/commit/601cc29a57d14a229fed9505a3b28e194b6b316f.diff

LOG: Revert "Revert "gn build: (manually) try to merge 1689ad27af""

This reverts commit 88276ddbfea753ac13da5a64c2020b7b0a06617f.
The original change relanded.

Added: 
    

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

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/secondary/compiler-rt/lib/builtins/BUILD.gn b/llvm/utils/gn/secondary/compiler-rt/lib/builtins/BUILD.gn
index 53684d412163..f0602a7d97c3 100644
--- a/llvm/utils/gn/secondary/compiler-rt/lib/builtins/BUILD.gn
+++ b/llvm/utils/gn/secondary/compiler-rt/lib/builtins/BUILD.gn
@@ -216,6 +216,7 @@ static_library("builtins") {
   }
 
   if (current_cpu == "x86" || current_cpu == "x64") {
+    sources -= [ "fp_mode.c" ]
     sources += [
       "cpu_model.c",
       "divxc3.c",
@@ -228,6 +229,7 @@ static_library("builtins") {
       "floattixf.c",
       "floatundixf.c",
       "floatuntixf.c",
+      "i386/fp_mode.c",
       "mulxc3.c",
       "powixf2.c",
     ]