diff options
| author | Chih-hung Hsieh <chh@google.com> | 2016-08-19 18:13:07 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-08-19 18:13:07 +0000 |
| commit | dc809737f2eb598bfd8d78f96595753c44f4b8bc (patch) | |
| tree | 97d2746c8b0255f1661a69ef517a23e35f2fbe7d | |
| parent | 8d766563516205c2989e49cc5c895bcc64cd26c4 (diff) | |
| parent | 72a1ff03a1b73eb192a55d1709dc60ecfb23b461 (diff) | |
| download | valgrind-dc809737f2eb598bfd8d78f96595753c44f4b8bc.tar.gz | |
Merge "Revert "Fix clang compiled memset recursive call problem."" am: 474a9af0b4 am: 232946f5a9
am: 72a1ff03a1
Change-Id: Ib61e9c5e59fbdd1e0b7820eebc9cb3cad9861a0a
| -rw-r--r-- | Android.build_host.mk | 6 | ||||
| -rw-r--r-- | Android.build_one.mk | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Android.build_host.mk b/Android.build_host.mk index ee07d2de3..77d11ba4d 100644 --- a/Android.build_host.mk +++ b/Android.build_host.mk @@ -23,8 +23,10 @@ else vg_local_arch := amd64 endif -# Do not call (builtin) memset from VG(memset). -LOCAL_CLANG_CFLAGS += -fno-builtin-memset +# TODO: This workaround is to avoid calling memset from VG(memset) +# wrapper because of invalid clang optimization; This seems to be +# limited to amd64/x86 codegen(?); +LOCAL_CLANG := false LOCAL_MODULE := $(vg_local_module)-$(vg_local_arch)-linux diff --git a/Android.build_one.mk b/Android.build_one.mk index 16ea662bb..cb5de0748 100644 --- a/Android.build_one.mk +++ b/Android.build_one.mk @@ -23,15 +23,13 @@ LOCAL_MULTILIB := first vg_local_arch := $(vg_arch) endif -# For arm and arm64 targets, clang compiled module has other -# undefined errors, see bug 28454823. +# TODO: This workaround is to avoid calling memset from VG(memset) +# wrapper because of invalid clang optimization; This seems to be +# limited to amd64/x86 codegen(?); ifeq ($(filter $TARGET_ARCH,x86 x86_64),) LOCAL_CLANG := false endif -# Do not call (builtin) memset from VG(memset). -LOCAL_CLANG_CFLAGS += -fno-builtin-memset - LOCAL_MODULE := $(vg_local_module)-$(vg_local_arch)-linux LOCAL_MODULE_TARGET_ARCH := $(vg_local_arch) |