Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41b83d6d authored by Stephen Hines's avatar Stephen Hines
Browse files

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 039675ad)

Change-Id: Ib7b5bb7aae5abcad9ab477a00e368179d0121091
parent 424296a4

core/clang/TARGET_arm.mk

+1 −0
Original line number Diff line number Diff line
@@ -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 :=

core/clang/TARGET_arm64.mk

+1 −0
Original line number Diff line number Diff line
@@ -51,3 +51,4 @@ CLANG_TARGET_GLOBAL_LDFLAGS := \ 
  $(CLANG_CONFIG_arm64_TARGET_EXTRA_LDFLAGS)



RS_TRIPLE := aarch64-linux-android

RS_TRIPLE_CFLAGS :=

core/clang/TARGET_mips.mk

+2 −1
Original line number Diff line number Diff line
@@ -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 :=

core/clang/TARGET_mips64.mk

+2 −1
Original line number Diff line number Diff line
@@ -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 :=

core/clang/TARGET_x86.mk

+2 −1
Original line number Diff line number Diff line
@@ -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__