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

This reverts commit 88276ddbfea753ac13da5a64c2020b7b0a06617f.
The original change relanded.

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 53684d4..f0602a7 100644 (file)
--- 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",
     ]