From fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:14:29 +0200 Subject: Merging upstream version 125.0.1. Signed-off-by: Daniel Baumann --- build/moz.configure/lto-pgo.configure | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'build/moz.configure/lto-pgo.configure') diff --git a/build/moz.configure/lto-pgo.configure b/build/moz.configure/lto-pgo.configure index ab6a527fe4..5048b367e2 100644 --- a/build/moz.configure/lto-pgo.configure +++ b/build/moz.configure/lto-pgo.configure @@ -148,7 +148,10 @@ def pgo_flags( use_ldflags = [] if orderfile: if compiler.type == "clang-cl": - use_ldflags += ["-ORDER:@" + orderfile] + use_ldflags += [ + "-ORDER:@" + orderfile, + "/ignore:4037", # Disable warn missing order symbol + ] elif linker.KIND == "ld64" or (linker.KIND == "lld" and target.os == "OSX"): use_ldflags += ["-Wl,-order_file", orderfile] elif linker.KIND == "lld": @@ -316,7 +319,6 @@ def lto( if ( target.kernel == "Darwin" - and target.os == "OSX" and "cross" in values and select_linker.KIND == "ld64" and not ld64_known_good @@ -392,7 +394,7 @@ def lto( # (For hot functions, PGO will put a multiplier on this limit.) if target.os == "WINNT": ldflags.append("-mllvm:-import-instr-limit=10") - elif target.os == "OSX": + elif target.kernel == "Darwin": ldflags.append("-Wl,-mllvm,-import-instr-limit=10") elif c_compiler.type == "clang": ldflags.append("-Wl,-plugin-opt=-import-instr-limit=10") @@ -406,7 +408,7 @@ def lto( ldflags.append("-opt:ltonewpassmanager") if c_compiler.version >= "12.0.0": ldflags.append("-mllvm:-import-hot-multiplier=30") - elif target.os == "OSX": + elif target.kernel == "Darwin": ldflags.append("-Wl,-mllvm,-import-hot-multiplier=30") else: if c_compiler.version < "13.0.0": -- cgit v1.2.3