diff options
| author | Tim Murray <timmurray@google.com> | 2014-04-02 19:13:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-02 19:13:20 +0000 |
| commit | 92e3f69b3f498f1d48e1f31d72fc7205b781ed45 (patch) | |
| tree | 1c782022aeb5ca9e1236aecfd6a71853825d62e8 | |
| parent | 8c517664df4a2ea1770d77cfee9254d3d13ee5a9 (diff) | |
| parent | c4b495138646347154a45bf5524d8a936153c4bc (diff) | |
| download | external_llvm-92e3f69b3f498f1d48e1f31d72fc7205b781ed45.zip external_llvm-92e3f69b3f498f1d48e1f31d72fc7205b781ed45.tar.gz external_llvm-92e3f69b3f498f1d48e1f31d72fc7205b781ed45.tar.bz2 | |
Merge "Revert "Make LLVM compile with prebuilt clang.""
| -rw-r--r-- | llvm-device-build.mk | 5 | ||||
| -rw-r--r-- | llvm-host-build.mk | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/llvm-device-build.mk b/llvm-device-build.mk index 7464c98..70c9a84 100644 --- a/llvm-device-build.mk +++ b/llvm-device-build.mk @@ -1,7 +1,5 @@ LOCAL_MODULE_TARGET_ARCH := $(LLVM_SUPPORTED_ARCH) -LOCAL_CLANG := true - LOCAL_CFLAGS := \ -D_GNU_SOURCE \ -D__STDC_LIMIT_MACROS \ @@ -13,14 +11,15 @@ LOCAL_CFLAGS := \ -W \ -Wno-unused-parameter \ -Wwrite-strings \ - -Dsprintf=sprintf \ $(LOCAL_CFLAGS) # The three inline options together reduce libbcc.so almost 1MB. # We move them from global build/core/combo/TARGET_linux-arm.mk # to here. LOCAL_CFLAGS := -DANDROID_TARGET_BUILD \ + -finline-limit=64 \ -finline-functions \ + -fno-inline-functions-called-once \ $(LOCAL_CFLAGS) ifeq ($(TARGET_BUILD_VARIANT),eng) diff --git a/llvm-host-build.mk b/llvm-host-build.mk index e8fd066..afe6b4c 100644 --- a/llvm-host-build.mk +++ b/llvm-host-build.mk @@ -1,5 +1,3 @@ -LOCAL_CLANG := true - LOCAL_CFLAGS := \ -D_GNU_SOURCE \ -D__STDC_LIMIT_MACROS \ @@ -9,7 +7,6 @@ LOCAL_CFLAGS := \ -W \ -Wno-unused-parameter \ -Wwrite-strings \ - -Dsprintf=sprintf \ $(LOCAL_CFLAGS) ifeq ($(LLVM_ENABLE_ASSERTION),true) |