diff options
| author | Ying Wang <wangying@android.com> | 2013-10-02 15:02:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-02 15:02:52 -0700 |
| commit | 9f61593879325c987fc7593a5410bf3e0a535ff8 (patch) | |
| tree | 1ee83df10ecabf25cd8886bc478bed2ca966c9a9 | |
| parent | ab7b53b8e09e3d346384a5257e8f7a440a53dfc0 (diff) | |
| parent | 9a78828590298001aacc425f9c0c8aae10366493 (diff) | |
| download | build-9f61593879325c987fc7593a5410bf3e0a535ff8.zip build-9f61593879325c987fc7593a5410bf3e0a535ff8.tar.gz build-9f61593879325c987fc7593a5410bf3e0a535ff8.tar.bz2 | |
am 9a788285: Merge "Duplicate i686 target arch options for x86_64."
* commit '9a78828590298001aacc425f9c0c8aae10366493':
Duplicate i686 target arch options for x86_64.
| -rw-r--r-- | core/llvm_config.mk | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/core/llvm_config.mk b/core/llvm_config.mk index c679e42..b870558 100644 --- a/core/llvm_config.mk +++ b/core/llvm_config.mk @@ -83,6 +83,23 @@ ifeq ($(TARGET_ARCH),x86) -mfpmath=sse \ -mbionic endif +ifeq ($(TARGET_ARCH),x86_64) + RS_TRIPLE := x86_64-unknown-linux + CLANG_CONFIG_EXTRA_ASFLAGS += \ + -target x86_64-linux-android \ + -nostdlibinc \ + -B$(TARGET_TOOLCHAIN_ROOT)/x86_64-linux-android/bin + CLANG_CONFIG_EXTRA_CFLAGS += $(CLANG_CONFIG_EXTRA_ASFLAGS) + CLANG_CONFIG_EXTRA_LDFLAGS += \ + -target x86_64-linux-android \ + -B$(TARGET_TOOLCHAIN_ROOT)/x86_64-linux-android/bin + CLANG_CONFIG_UNKNOWN_CFLAGS += \ + -finline-limit=300 \ + -fno-inline-functions-called-once \ + -mfpmath=sse \ + -mbionic +endif + CLANG_CONFIG_EXTRA_TARGET_C_INCLUDES := external/clang/lib/include $(TARGET_OUT_HEADERS)/clang |