diff options
author | Jeff Brown <jeffbrown@google.com> | 2011-07-11 22:12:00 -0700 |
---|---|---|
committer | Jeff Brown <jeffbrown@google.com> | 2011-07-11 22:12:00 -0700 |
commit | 8aca41132270925dfb55502ea2126e2c464ac0eb (patch) | |
tree | 7cb525d6f8f8859605a23e07cdcb2b8f1d7e8aa6 | |
parent | c74ddd87e032de966f9190296e72209e15084bda (diff) | |
download | external_llvm-8aca41132270925dfb55502ea2126e2c464ac0eb.zip external_llvm-8aca41132270925dfb55502ea2126e2c464ac0eb.tar.gz external_llvm-8aca41132270925dfb55502ea2126e2c464ac0eb.tar.bz2 |
Remove the simulator target from all makefiles.
Bug: 5010576
Change-Id: Ia82a523b49d44a2d806867d0ff931a15a10f980b
-rw-r--r-- | llvm-device-build.mk | 11 | ||||
-rw-r--r-- | llvm-host-build.mk | 6 |
2 files changed, 2 insertions, 15 deletions
diff --git a/llvm-device-build.mk b/llvm-device-build.mk index 83fc5ef..e1ce56d 100644 --- a/llvm-device-build.mk +++ b/llvm-device-build.mk @@ -10,7 +10,6 @@ LOCAL_CFLAGS := \ -Wwrite-strings \ $(LOCAL_CFLAGS) -ifneq ($(TARGET_SIMULATOR),true) # The three inline options together reduce libbcc.so almost 1MB. # We move them from global build/core/combo/TARGET_linux-arm.mk # to here. @@ -19,7 +18,6 @@ LOCAL_CFLAGS := -DANDROID_TARGET_BUILD \ -finline-functions \ -fno-inline-functions-called-once \ $(LOCAL_CFLAGS) -endif ifeq ($(LLVM_ENABLE_ASSERTION),true) LOCAL_CFLAGS := \ @@ -49,18 +47,13 @@ LOCAL_CPPFLAGS := \ # Make sure bionic is first so we can include system headers. LOCAL_C_INCLUDES := \ + bionic \ + external/stlport/stlport \ $(LLVM_ROOT_PATH) \ $(LLVM_ROOT_PATH)/include \ $(LLVM_ROOT_PATH)/device/include \ $(LOCAL_C_INCLUDES) -ifneq ($(TARGET_SIMULATOR),true) -LOCAL_C_INCLUDES := \ - bionic \ - external/stlport/stlport \ - $(LOCAL_C_INCLUDES) -endif - ########################################################### ## Commands for running tblgen to compile a td file ########################################################### diff --git a/llvm-host-build.mk b/llvm-host-build.mk index d7ef682..5219efd 100644 --- a/llvm-host-build.mk +++ b/llvm-host-build.mk @@ -17,12 +17,6 @@ LOCAL_CFLAGS := \ $(LOCAL_CFLAGS) endif -# force 32 bit code for sim build -ifeq ($(TARGET_SIMULATOR),true) -LOCAL_CFLAGS += -m32 -LOCAL_LDFLAGS += -m32 -endif - ifneq ($(REQUIRES_EH),1) LOCAL_CFLAGS += -fno-exceptions else |