From 967511a4e844e439ab18cf0e77f2d406cc88d3be Mon Sep 17 00:00:00 2001 From: Peter Collingbourne Date: Tue, 19 Mar 2019 21:39:54 -0700 Subject: [PATCH] Pass -hwasan-allow-ifunc when building with hwasan. Now that the toolchain and bionic both support ifuncs in static executables, we can turn this on. Reduces size of walleye_hwasan-userdebug system.img by 11MB. Change-Id: I2f19b22518153328eee3fdca79d0c851cc513c3a --- cc/sanitize.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cc/sanitize.go b/cc/sanitize.go index e6df44f3c..26418addc 100644 --- a/cc/sanitize.go +++ b/cc/sanitize.go @@ -35,7 +35,11 @@ var ( asanLdflags = []string{"-Wl,-u,__asan_preinit"} asanLibs = []string{"libasan"} - hwasanCflags = []string{"-fno-omit-frame-pointer", "-Wno-frame-larger-than=", "-mllvm", "-hwasan-create-frame-descriptions=0"} + // TODO(pcc): Stop passing -hwasan-allow-ifunc here once it has been made + // the default. + hwasanCflags = []string{"-fno-omit-frame-pointer", "-Wno-frame-larger-than=", + "-mllvm", "-hwasan-create-frame-descriptions=0", + "-mllvm", "-hwasan-allow-ifunc"} cfiCflags = []string{"-flto", "-fsanitize-cfi-cross-dso", "-fsanitize-blacklist=external/compiler-rt/lib/cfi/cfi_blacklist.txt"}