Roll SwiftShader from c8b6ec0024bb to 65498c15ca60 (8 revisions)
https://swiftshader.googlesource.com/SwiftShader.git/+log/c8b6ec0024bb..65498c15ca60
If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/swiftshader-android
Please CC swiftshader-team@google.com on the revert to ensure that a human
is aware of the problem.
To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug
Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
Test: Presubmit checks will test this change.
Exempt-From-Owner-Approval: The autoroll bot does not require owner approval.
Change-Id: I827cb0edf0cff16ccd1c59cfc973efa7c9e8ac68
diff --git a/BUILD.gn b/BUILD.gn
index 50c16e3..dafc50d 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -12,14 +12,17 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import("//build/config/c++/c++.gni")
import("//build/config/compiler/compiler.gni")
-import("//build/config/mips.gni")
-import("//build/config/sysroot.gni")
import("src/Reactor/reactor.gni")
config("swiftshader_config") {
+ cflags = []
defines = []
+ ldflags = []
+
+ if (!is_debug) {
+ defines += [ "ANGLE_DISABLE_TRACE" ]
+ }
if (is_win) {
defines += [
@@ -31,10 +34,6 @@
"_ENABLE_EXTENDED_ALIGNED_STORAGE",
]
- if (!is_debug) {
- defines += [ "ANGLE_DISABLE_TRACE" ]
- }
-
# Diable some MSVC warnings.
if (!is_clang) {
cflags += [
@@ -46,81 +45,17 @@
cflags_cc = [ "/std:c++17" ]
} else {
- cflags = [ "-fno-operator-names" ]
+ cflags += [ "-fno-operator-names" ]
cflags_cc = [ "-std=c++17" ]
- # On macOS for the ARM architecture, some C++17 features require version
- # 10.14, while Chrome must support 10.11 (El Capitan). However, the first
- # 'Apple Silicon' devices launched with macOS 11.0 (Big Sur).
- # TODO(b/174843857): Remove once Chrome demands macOS 10.14.
- if (is_mac && current_cpu == "arm64") {
- cflags += [
- "-isysroot",
- rebase_path(sysroot, root_build_dir),
- "-mmacosx-version-min=10.14.0",
- ]
- }
-
defines +=
[ "NO_SANITIZE_FUNCTION=__attribute__((no_sanitize(\"function\")))" ]
if (!is_debug) {
- cflags += [
- "-fomit-frame-pointer",
- "-Os",
- ]
-
- defines += [ "ANGLE_DISABLE_TRACE" ]
- }
-
- if (current_cpu == "x64") { # 64 bit version
- cflags += [
- "-m64",
- "-fPIC",
- "-march=x86-64",
- "-mtune=generic",
- ]
- } else if (current_cpu == "x86") { # 32 bit version
- cflags += [
- "-m32",
- "-mfpmath=sse",
- "-march=pentium4",
- "-mtune=generic",
- ]
- } else if (target_cpu == "mipsel" && current_cpu == target_cpu) {
- cflags += [
- "-EL",
- "-fPIC",
- "-mhard-float",
- "-mfp32",
- "-mxgot",
- ]
- if (mips_arch_variant == "r1") {
- cflags += [ "-march=mips32" ]
- } else {
- cflags += [ "-march=mips32r2" ]
- }
- } else if (target_cpu == "mips64el" && current_cpu == target_cpu) {
- cflags += [
- "-EL",
- "-arch=mips64r2",
- "-mabi=64",
- "-fPIC",
- "-mxgot",
- ]
+ cflags += [ "-Os" ]
}
if (is_linux || is_chromeos) {
- if (current_cpu == "mipsel") {
- if (mips_arch_variant == "r1") {
- ldflags += [ "-mips32" ]
- } else {
- ldflags += [ "-mips32r2" ]
- }
- } else if (current_cpu == "mips64el") {
- ldflags += [ "-mips64r2" ]
- }
-
# 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" ]
diff --git a/src/Reactor/BUILD.gn b/src/Reactor/BUILD.gn
index afd22f1..e0d624c 100644
--- a/src/Reactor/BUILD.gn
+++ b/src/Reactor/BUILD.gn
@@ -148,10 +148,6 @@
"-Wno-unused-function",
]
}
-
- if (is_fuchsia) {
- cflags += [ "-Wno-error" ]
- }
}
config("swiftshader_reactor_with_subzero_private_config") {
@@ -184,10 +180,6 @@
if (is_clang) {
cflags += [ "-Wno-header-hygiene" ]
}
-
- if (is_fuchsia) {
- cflags += [ "-Wno-error" ]
- }
}
swiftshader_source_set("swiftshader_subzero") {
