aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPirama Arumuga Nainar <pirama@google.com>2019-01-17 11:53:03 -0800
committerPirama Arumuga Nainar <pirama@google.com>2019-01-31 16:32:34 +0000
commit03b58e2210c4ac7eb30527cc5f4396ae4a49a601 (patch)
treed884b5664f49a82635b86681060510a7730fbfdb
parent05f9055505f5d42d8d13d77ec379846c15eb8179 (diff)
downloadbuild_soong-03b58e2210c4ac7eb30527cc5f4396ae4a49a601.tar.gz
build_soong-03b58e2210c4ac7eb30527cc5f4396ae4a49a601.tar.bz2
build_soong-03b58e2210c4ac7eb30527cc5f4396ae4a49a601.zip
Switch to clang-r349610
Bug: http://b/122481018 The '-keep' option of llvm-strip has changed to '-keep-section'. Update scripts/strip.sh accordingly. Test: Tested on various targets in AOSP and internal branch. Googlers see http://go/clang-r349610-testing Change-Id: Ibfc97ecdcdc305c97a4169cead1e1e3cddda9c4c
-rw-r--r--cc/config/global.go4
-rwxr-xr-xscripts/strip.sh4
2 files changed, 4 insertions, 4 deletions
diff --git a/cc/config/global.go b/cc/config/global.go
index e3d36bdb..689b315b 100644
--- a/cc/config/global.go
+++ b/cc/config/global.go
@@ -120,8 +120,8 @@ var (
// prebuilts/clang default settings.
ClangDefaultBase = "prebuilts/clang/host"
- ClangDefaultVersion = "clang-r346389c"
- ClangDefaultShortVersion = "8.0.7"
+ ClangDefaultVersion = "clang-r349610"
+ ClangDefaultShortVersion = "8.0.8"
// Directories with warnings from Android.bp files.
WarningAllowedProjects = []string{
diff --git a/scripts/strip.sh b/scripts/strip.sh
index 4634c188..d826e57c 100755
--- a/scripts/strip.sh
+++ b/scripts/strip.sh
@@ -54,7 +54,7 @@ do_strip() {
# ${CROSS_COMPILE}strip --strip-all does not strip .ARM.attributes,
# so we tell llvm-strip to keep it too.
if [ ! -z "${use_llvm_strip}" ]; then
- "${CLANG_BIN}/llvm-strip" --strip-all -keep=.ARM.attributes "${infile}" -o "${outfile}.tmp"
+ "${CLANG_BIN}/llvm-strip" --strip-all -keep-section=.ARM.attributes "${infile}" -o "${outfile}.tmp"
else
"${CROSS_COMPILE}strip" --strip-all "${infile}" -o "${outfile}.tmp"
fi
@@ -75,7 +75,7 @@ do_strip_keep_mini_debug_info() {
rm -f "${outfile}.dynsyms" "${outfile}.funcsyms" "${outfile}.keep_symbols" "${outfile}.debug" "${outfile}.mini_debuginfo" "${outfile}.mini_debuginfo.xz"
local fail=
if [ ! -z "${use_llvm_strip}" ]; then
- "${CLANG_BIN}/llvm-strip" --strip-all -keep=.ARM.attributes -remove-section=.comment "${infile}" -o "${outfile}.tmp" || fail=true
+ "${CLANG_BIN}/llvm-strip" --strip-all -keep-section=.ARM.attributes -remove-section=.comment "${infile}" -o "${outfile}.tmp" || fail=true
else
"${CROSS_COMPILE}strip" --strip-all -R .comment "${infile}" -o "${outfile}.tmp" || fail=true
fi