aboutsummaryrefslogtreecommitdiffhomepage
path: root/gn
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2016-09-15 12:07:48 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2016-09-15 12:07:48 -0700
commit1fbdf98d0e9a9e5e720c77fd896a0655074e31cb (patch)
tree25c3d2ffe7d8d3fe9312263509edfcfb0b18af2e /gn
parentab00f4222c9fff8c08873e1218e79f49845f95a1 (diff)
GN: support 32-bit x86 builds
Take over Ubuntu -x86- bots. Note the change to Build-Win-MSVC-x86-Release-GN.json, which is not incidental. We'll want target_cpu="x86" there too. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2340463008 Committed: https://skia.googlesource.com/skia/+/1949386ae00485ae92dd5608a2614b9dee417542 CQ_INCLUDE_TRYBOTS=master.client.skia.compile:Build-Ubuntu-Clang-x86-Debug-GN_Android-Trybot,Build-Ubuntu-GCC-x86-Release-Trybot Review-Url: https://codereview.chromium.org/2340463008
Diffstat (limited to 'gn')
-rw-r--r--gn/BUILD.gn11
1 files changed, 10 insertions, 1 deletions
diff --git a/gn/BUILD.gn b/gn/BUILD.gn
index 13fdb907fa..aee8faebb4 100644
--- a/gn/BUILD.gn
+++ b/gn/BUILD.gn
@@ -39,6 +39,7 @@ config("debug_symbols") {
}
config("default") {
+ asmflags = []
cflags = [
"-O1",
"-fstrict-aliasing",
@@ -77,10 +78,18 @@ config("default") {
"-march=mips32r2",
"-mdspr2",
]
+ } else if (current_cpu == "x86") {
+ asmflags += [ "-m32" ]
+ cflags += [
+ "-m32",
+ "-msse2",
+ "-mfpmath=sse",
+ ]
+ ldflags += [ "-m32" ]
}
if (is_android) {
- asmflags = [
+ asmflags += [
"--target=$ndk_target",
"-B$ndk/toolchains/$ndk_gccdir-4.9/prebuilt/$ndk_host/$ndk_target/bin",
]