diff options
author | Tobias Bosch <tbosch@google.com> | 2019-08-20 10:05:33 -0700 |
---|---|---|
committer | Tobias Bosch <tbosch@google.com> | 2019-08-20 17:49:11 +0000 |
commit | 1cd5f84a902cb5f26a7ea5a0b1816c38dee6ba90 (patch) | |
tree | cdb211f0c3f541d2ee35a3c02e8ce50488f1f233 /compiler_wrapper/testdata/cros_nonhardened_golden | |
parent | a50a9c16b6a3b2522bea3b6562d023a7b87dbd49 (diff) | |
download | toolchain-utils-1cd5f84a902cb5f26a7ea5a0b1816c38dee6ba90.tar.gz |
Match old wrapper for ordering of -mthumb and -fno-stack-protector
BUG=chromium:773875
TEST=golden tests and compare to old wrapper
Change-Id: Iac9f45390cbe6076d3e3851da85de7d27fe11ed7
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/1762376
Reviewed-by: George Burgess <gbiv@chromium.org>
Reviewed-by: Luis Lozano <llozano@chromium.org>
Tested-by: Tobias Bosch <tbosch@google.com>
Diffstat (limited to 'compiler_wrapper/testdata/cros_nonhardened_golden')
-rw-r--r-- | compiler_wrapper/testdata/cros_nonhardened_golden/clang_sysroot_wrapper_common.json | 42 | ||||
-rw-r--r-- | compiler_wrapper/testdata/cros_nonhardened_golden/gcc_sysroot_wrapper_common.json | 36 |
2 files changed, 78 insertions, 0 deletions
diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sysroot_wrapper_common.json b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sysroot_wrapper_common.json index 7f9760d1..d0788a6b 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sysroot_wrapper_common.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/clang_sysroot_wrapper_common.json @@ -187,6 +187,48 @@ "wd": "/tmp/stable", "wrapper": { "cmd": { + "path": "./armv7a-cros-linux-gnueabihf-clang", + "args": [ + "-D__KERNEL__", + "main.cc" + ] + } + }, + "cmds": [ + { + "cmd": { + "path": "/usr/bin/ccache", + "args": [ + "../../usr/bin/clang", + "--sysroot=/usr/armv7a-cros-linux-gnueabihf", + "-Qunused-arguments", + "-Wno-tautological-constant-compare", + "-Wno-tautological-unsigned-enum-zero-compare", + "-Wno-unknown-warning-option", + "-Wno-section", + "-static-libgcc", + "-mthumb", + "-fno-stack-protector", + "-D__KERNEL__", + "main.cc", + "-B../../bin", + "-target", + "armv7a-cros-linux-gnueabihf" + ], + "env_updates": [ + "CCACHE_BASEDIR=/usr/armv7a-cros-linux-gnueabihf", + "CCACHE_DIR=/var/cache/distfiles/ccache", + "CCACHE_UMASK=002", + "CCACHE_CPP2=yes" + ] + } + } + ] + }, + { + "wd": "/tmp/stable", + "wrapper": { + "cmd": { "path": "./x86_64-cros-linux-gnu-clang", "args": [ "--sysroot=xyz", diff --git a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_sysroot_wrapper_common.json b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_sysroot_wrapper_common.json index 26481cb5..a3cfc34a 100644 --- a/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_sysroot_wrapper_common.json +++ b/compiler_wrapper/testdata/cros_nonhardened_golden/gcc_sysroot_wrapper_common.json @@ -168,6 +168,42 @@ "wd": "/tmp/stable", "wrapper": { "cmd": { + "path": "./armv7a-cros-linux-gnueabihf-gcc", + "args": [ + "-D__KERNEL__", + "main.cc" + ] + } + }, + "cmds": [ + { + "cmd": { + "path": "/usr/bin/ccache", + "args": [ + "./armv7a-cros-linux-gnueabihf-gcc.real", + "--sysroot=/usr/armv7a-cros-linux-gnueabihf", + "-Wno-maybe-uninitialized", + "-Wno-unused-local-typedefs", + "-Wno-deprecated-declarations", + "-Wtrampolines", + "-mthumb", + "-fno-stack-protector", + "-D__KERNEL__", + "main.cc" + ], + "env_updates": [ + "CCACHE_BASEDIR=/usr/armv7a-cros-linux-gnueabihf", + "CCACHE_DIR=/var/cache/distfiles/ccache", + "CCACHE_UMASK=002" + ] + } + } + ] + }, + { + "wd": "/tmp/stable", + "wrapper": { + "cmd": { "path": "./x86_64-cros-linux-gnu-gcc", "args": [ "--sysroot=xyz", |