commit 02834d41a934f5707300a9f15f83214169242369
author Nico Weber <thakis@chromium.org> Fri Jul 09 09:58:58 2021 -0400
committer swiftshader-scoped@luci-project-accounts.iam.gserviceaccount.com <swiftshader-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Jul 09 15:03:22 2021 +0000
tree 0425e60475fc06fc4d3f87d1f55731c585ecf0ec
parent 65498c15ca60362b11673a023d326d60db1f6e9b

Remove workaround for 32-bit gold ICF bug

We switched to lld long ago, and 32-bit builds are even more rare
than they were in 2017 when this workaround was added. So this is
likely no longer needed.

Bug: chromium:729532
Change-Id: Idda0359e52a8cd07de8fc7ca80f151205e567e76
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/55690
Reviewed-by: Nico Weber <thakis@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Kokoro-Result: kokoro <noreply+kokoro@google.com>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index dafc50d..769fddc 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -12,13 +12,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("//build/config/compiler/compiler.gni")
 import("src/Reactor/reactor.gni")
 
 config("swiftshader_config") {
   cflags = []
   defines = []
-  ldflags = []
 
   if (!is_debug) {
     defines += [ "ANGLE_DISABLE_TRACE" ]
@@ -54,13 +52,6 @@
     if (!is_debug) {
       cflags += [ "-Os" ]
     }
-
-    if (is_linux || is_chromeos) {
-      # A bug in the gold linker prevents using ICF on 32-bit (crbug.com/729532)
-      if (use_gold && (current_cpu == "x86" || current_cpu == "mipsel")) {
-        ldflags += [ "-Wl,--icf=none" ]
-      }
-    }
   }
 }