diff options
| author | Stephen Hines <srhines@google.com> | 2014-08-29 14:43:53 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2014-09-02 09:41:03 -0700 |
| commit | 41b83d6d3c4baa19d2a34cef5eef730b59555cfa (patch) | |
| tree | 8740622ba68b46be248033da71ffe51648ea385b /core/clang | |
| parent | 424296a4e811f57ada27be68d60aeb5fcb1bb45b (diff) | |
| download | build-41b83d6d3c4baa19d2a34cef5eef730b59555cfa.zip build-41b83d6d3c4baa19d2a34cef5eef730b59555cfa.tar.gz build-41b83d6d3c4baa19d2a34cef5eef730b59555cfa.tar.bz2 | |
Fix RS_TRIPLE and RS_TRIPLE_CFLAGS.
Bug: 17333374
Add RS_TRIPLE_CFLAGS to ensure that we build with the proper defines on
targets like x86. This also changes all build targets to use the
proper 32/64-bit triples when creating their runtime libraries.
(cherry picked from commit 039675adb8882b21e770edac1bd167d7fb489052)
Change-Id: Ib7b5bb7aae5abcad9ab477a00e368179d0121091
Diffstat (limited to 'core/clang')
| -rw-r--r-- | core/clang/TARGET_arm.mk | 1 | ||||
| -rw-r--r-- | core/clang/TARGET_arm64.mk | 1 | ||||
| -rw-r--r-- | core/clang/TARGET_mips.mk | 3 | ||||
| -rw-r--r-- | core/clang/TARGET_mips64.mk | 3 | ||||
| -rw-r--r-- | core/clang/TARGET_x86.mk | 3 | ||||
| -rw-r--r-- | core/clang/TARGET_x86_64.mk | 3 |
6 files changed, 10 insertions, 4 deletions
diff --git a/core/clang/TARGET_arm.mk b/core/clang/TARGET_arm.mk index 595fb56..575b9f9 100644 --- a/core/clang/TARGET_arm.mk +++ b/core/clang/TARGET_arm.mk @@ -53,3 +53,4 @@ $(clang_2nd_arch_prefix)CLANG_TARGET_GLOBAL_LDFLAGS := \ $(CLANG_CONFIG_arm_TARGET_EXTRA_LDFLAGS) $(clang_2nd_arch_prefix)RS_TRIPLE := armv7-none-linux-gnueabi +$(clang_2nd_arch_prefix)RS_TRIPLE_CFLAGS := diff --git a/core/clang/TARGET_arm64.mk b/core/clang/TARGET_arm64.mk index 98bbeb2..0264321 100644 --- a/core/clang/TARGET_arm64.mk +++ b/core/clang/TARGET_arm64.mk @@ -51,3 +51,4 @@ CLANG_TARGET_GLOBAL_LDFLAGS := \ $(CLANG_CONFIG_arm64_TARGET_EXTRA_LDFLAGS) RS_TRIPLE := aarch64-linux-android +RS_TRIPLE_CFLAGS := diff --git a/core/clang/TARGET_mips.mk b/core/clang/TARGET_mips.mk index 0107519..011c2a6 100644 --- a/core/clang/TARGET_mips.mk +++ b/core/clang/TARGET_mips.mk @@ -50,4 +50,5 @@ $(clang_2nd_arch_prefix)CLANG_TARGET_GLOBAL_LDFLAGS := \ $(call $(clang_2nd_arch_prefix)convert-to-clang-flags,$($(clang_2nd_arch_prefix)TARGET_GLOBAL_LDFLAGS)) \ $(CLANG_CONFIG_mips_TARGET_EXTRA_LDFLAGS) -$(clang_2nd_arch_prefix)RS_TRIPLE := mipsel-unknown-linux +$(clang_2nd_arch_prefix)RS_TRIPLE := armv7-none-linux-gnueabi +$(clang_2nd_arch_prefix)RS_TRIPLE_CFLAGS := diff --git a/core/clang/TARGET_mips64.mk b/core/clang/TARGET_mips64.mk index b2e536c..a5e29d2 100644 --- a/core/clang/TARGET_mips64.mk +++ b/core/clang/TARGET_mips64.mk @@ -50,4 +50,5 @@ CLANG_TARGET_GLOBAL_LDFLAGS := \ $(call convert-to-clang-flags,$(TARGET_GLOBAL_LDFLAGS)) \ $(CLANG_CONFIG_mips64_TARGET_EXTRA_LDFLAGS) -RS_TRIPLE := mips64el-unknown-linux +RS_TRIPLE := aarch64-linux-android +RS_TRIPLE_CFLAGS := diff --git a/core/clang/TARGET_x86.mk b/core/clang/TARGET_x86.mk index 70cb252..da7a223 100644 --- a/core/clang/TARGET_x86.mk +++ b/core/clang/TARGET_x86.mk @@ -52,4 +52,5 @@ $(clang_2nd_arch_prefix)CLANG_TARGET_GLOBAL_LDFLAGS := \ $(call $(clang_2nd_arch_prefix)convert-to-clang-flags,$($(clang_2nd_arch_prefix)TARGET_GLOBAL_LDFLAGS)) \ $(CLANG_CONFIG_x86_TARGET_EXTRA_LDFLAGS) -$(clang_2nd_arch_prefix)RS_TRIPLE := i686-unknown-linux +$(clang_2nd_arch_prefix)RS_TRIPLE := armv7-none-linux-gnueabi +$(clang_2nd_arch_prefix)RS_TRIPLE_CFLAGS := -D__i386__ diff --git a/core/clang/TARGET_x86_64.mk b/core/clang/TARGET_x86_64.mk index 14944bd..cc1f59f 100644 --- a/core/clang/TARGET_x86_64.mk +++ b/core/clang/TARGET_x86_64.mk @@ -50,4 +50,5 @@ CLANG_TARGET_GLOBAL_LDFLAGS := \ $(call convert-to-clang-flags,$(TARGET_GLOBAL_LDFLAGS)) \ $(CLANG_CONFIG_x86_64_TARGET_EXTRA_LDFLAGS) -RS_TRIPLE := x86_64-unknown-linux +RS_TRIPLE := aarch64-linux-android +RS_TRIPLE_CFLAGS := -D__x86_64__ |