From 08df240f94438467560cb464ea62ebce32d31531 Mon Sep 17 00:00:00 2001 From: Pirama Arumuga Nainar Date: Tue, 26 Jul 2016 11:37:14 -0700 Subject: [PATCH] RenderScript-specific build updates for LLVM rebase Bug: http://b/31320715 Use LLVM's RenderScript triples: upstream LLVM now has 32-bit and 64-bit RenderScript triples. Update RS_TRIPLE build variables to use the new triples. Switch prebuilt clang used for building RenderScript runtime library to the latest prebuilts. Test: Run RenderScript tests (slang, bcc host tests, RsTest, CTS) Change-Id: I308f6a2183350cfc380228a1eed07ec118d93a46 --- core/clang/TARGET_arm.mk | 2 +- core/clang/TARGET_arm64.mk | 2 +- core/clang/TARGET_mips.mk | 2 +- core/clang/TARGET_mips64.mk | 2 +- core/clang/TARGET_x86.mk | 2 +- core/clang/TARGET_x86_64.mk | 2 +- core/clang/config.mk | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/clang/TARGET_arm.mk b/core/clang/TARGET_arm.mk index 30313f975..9c1a8368f 100644 --- a/core/clang/TARGET_arm.mk +++ b/core/clang/TARGET_arm.mk @@ -1,4 +1,4 @@ -$(clang_2nd_arch_prefix)RS_TRIPLE := armv7-linux-androideabi +$(clang_2nd_arch_prefix)RS_TRIPLE := renderscript32-linux-androideabi $(clang_2nd_arch_prefix)RS_TRIPLE_CFLAGS := $(clang_2nd_arch_prefix)RS_COMPAT_TRIPLE := armv7-none-linux-gnueabi diff --git a/core/clang/TARGET_arm64.mk b/core/clang/TARGET_arm64.mk index d50460076..9a67b6b15 100644 --- a/core/clang/TARGET_arm64.mk +++ b/core/clang/TARGET_arm64.mk @@ -1,4 +1,4 @@ -RS_TRIPLE := aarch64-linux-android +RS_TRIPLE := renderscript64-linux-android RS_TRIPLE_CFLAGS := RS_COMPAT_TRIPLE := aarch64-linux-android diff --git a/core/clang/TARGET_mips.mk b/core/clang/TARGET_mips.mk index df96c5a5f..dfd99b281 100644 --- a/core/clang/TARGET_mips.mk +++ b/core/clang/TARGET_mips.mk @@ -1,4 +1,4 @@ -$(clang_2nd_arch_prefix)RS_TRIPLE := armv7-linux-androideabi +$(clang_2nd_arch_prefix)RS_TRIPLE := renderscript32-linux-androideabi $(clang_2nd_arch_prefix)RS_TRIPLE_CFLAGS := RS_COMPAT_TRIPLE := mipsel-linux-android diff --git a/core/clang/TARGET_mips64.mk b/core/clang/TARGET_mips64.mk index 785752a52..a3684cc3d 100644 --- a/core/clang/TARGET_mips64.mk +++ b/core/clang/TARGET_mips64.mk @@ -1,4 +1,4 @@ -RS_TRIPLE := aarch64-linux-android +RS_TRIPLE := renderscript64-linux-android RS_TRIPLE_CFLAGS := RS_COMPAT_TRIPLE := mips64el-linux-android diff --git a/core/clang/TARGET_x86.mk b/core/clang/TARGET_x86.mk index f00eb4102..1b9c78c91 100644 --- a/core/clang/TARGET_x86.mk +++ b/core/clang/TARGET_x86.mk @@ -1,4 +1,4 @@ -$(clang_2nd_arch_prefix)RS_TRIPLE := armv7-linux-androideabi +$(clang_2nd_arch_prefix)RS_TRIPLE := renderscript32-linux-androideabi $(clang_2nd_arch_prefix)RS_TRIPLE_CFLAGS := -D__i386__ $(clang_2nd_arch_prefix)RS_COMPAT_TRIPLE := i686-linux-android diff --git a/core/clang/TARGET_x86_64.mk b/core/clang/TARGET_x86_64.mk index 0d615f290..0d3ee3fbb 100644 --- a/core/clang/TARGET_x86_64.mk +++ b/core/clang/TARGET_x86_64.mk @@ -1,4 +1,4 @@ -RS_TRIPLE := aarch64-linux-android +RS_TRIPLE := renderscript64-linux-android RS_TRIPLE_CFLAGS := -D__x86_64__ RS_COMPAT_TRIPLE := x86_64-linux-android diff --git a/core/clang/config.mk b/core/clang/config.mk index a71f110fc..60e064173 100644 --- a/core/clang/config.mk +++ b/core/clang/config.mk @@ -15,7 +15,7 @@ LLVM_TBLGEN := $(BUILD_OUT_EXECUTABLES)/llvm-tblgen$(BUILD_EXECUTABLE_SUFFIX) # RenderScript-specific tools # These are tied to the version of LLVM directly in external/, so they might # trail the host prebuilts being used for the rest of the build process. -RS_LLVM_PREBUILTS_VERSION := clang-2812033 +RS_LLVM_PREBUILTS_VERSION := clang-3289846 RS_LLVM_PREBUILTS_BASE := prebuilts/clang/host RS_LLVM_PREBUILTS_PATH := $(RS_LLVM_PREBUILTS_BASE)/$(BUILD_OS)-x86/$(RS_LLVM_PREBUILTS_VERSION)/bin RS_CLANG := $(RS_LLVM_PREBUILTS_PATH)/clang$(BUILD_EXECUTABLE_SUFFIX)