Remove use_gnu_strip option
This option is no longer used anywhere. Test: presubmit Change-Id: I1a5f2d14e24ecf7c15a437054b8a95ddaf57da2f
This commit is contained in:
parent
dd15afa1ca
commit
ab5e514208
|
@ -27,7 +27,6 @@ type StripProperties struct {
|
||||||
Keep_symbols *bool `android:"arch_variant"`
|
Keep_symbols *bool `android:"arch_variant"`
|
||||||
Keep_symbols_list []string `android:"arch_variant"`
|
Keep_symbols_list []string `android:"arch_variant"`
|
||||||
Keep_symbols_and_debug_frame *bool `android:"arch_variant"`
|
Keep_symbols_and_debug_frame *bool `android:"arch_variant"`
|
||||||
Use_gnu_strip *bool `android:"arch_variant"`
|
|
||||||
} `android:"arch_variant"`
|
} `android:"arch_variant"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -54,9 +53,6 @@ func (stripper *stripper) strip(ctx ModuleContext, in android.Path, out android.
|
||||||
} else if !Bool(stripper.StripProperties.Strip.All) {
|
} else if !Bool(stripper.StripProperties.Strip.All) {
|
||||||
flags.stripKeepMiniDebugInfo = true
|
flags.stripKeepMiniDebugInfo = true
|
||||||
}
|
}
|
||||||
if Bool(stripper.StripProperties.Strip.Use_gnu_strip) {
|
|
||||||
flags.stripUseGnuStrip = true
|
|
||||||
}
|
|
||||||
if ctx.Config().Debuggable() && !flags.stripKeepMiniDebugInfo && !isStaticLib {
|
if ctx.Config().Debuggable() && !flags.stripKeepMiniDebugInfo && !isStaticLib {
|
||||||
flags.stripAddGnuDebuglink = true
|
flags.stripAddGnuDebuglink = true
|
||||||
}
|
}
|
||||||
|
|
|
@ -29,7 +29,6 @@
|
||||||
# --keep-mini-debug-info
|
# --keep-mini-debug-info
|
||||||
# --keep-symbols
|
# --keep-symbols
|
||||||
# --keep-symbols-and-debug-frame
|
# --keep-symbols-and-debug-frame
|
||||||
# --use-gnu-strip
|
|
||||||
# --remove-build-id
|
# --remove-build-id
|
||||||
|
|
||||||
set -o pipefail
|
set -o pipefail
|
||||||
|
@ -44,72 +43,44 @@ Options:
|
||||||
--keep-mini-debug-info Keep compressed debug info in out-file
|
--keep-mini-debug-info Keep compressed debug info in out-file
|
||||||
--keep-symbols Keep symbols in out-file
|
--keep-symbols Keep symbols in out-file
|
||||||
--keep-symbols-and-debug-frame Keep symbols and .debug_frame in out-file
|
--keep-symbols-and-debug-frame Keep symbols and .debug_frame in out-file
|
||||||
--use-gnu-strip Use strip/objcopy instead of llvm-{strip,objcopy}
|
|
||||||
--remove-build-id Remove the gnu build-id section in out-file
|
--remove-build-id Remove the gnu build-id section in out-file
|
||||||
EOF
|
EOF
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
# Without --use-gnu-strip, GNU strip is replaced with llvm-strip to work around
|
|
||||||
# old GNU strip bug on lld output files, b/80093681.
|
|
||||||
# Similary, calls to objcopy are replaced with llvm-objcopy,
|
|
||||||
# with some exceptions.
|
|
||||||
|
|
||||||
do_strip() {
|
do_strip() {
|
||||||
# ${CROSS_COMPILE}strip --strip-all does not strip .ARM.attributes,
|
# GNU strip --strip-all does not strip .ARM.attributes,
|
||||||
# so we tell llvm-strip to keep it too.
|
# so we tell llvm-strip to keep it too.
|
||||||
if [ -z "${use_gnu_strip}" ]; then
|
"${CLANG_BIN}/llvm-strip" --strip-all --keep-section=.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
|
|
||||||
}
|
}
|
||||||
|
|
||||||
do_strip_keep_symbols_and_debug_frame() {
|
do_strip_keep_symbols_and_debug_frame() {
|
||||||
REMOVE_SECTIONS=`"${CROSS_COMPILE}readelf" -S "${infile}" | awk '/.debug_/ {if ($2 != ".debug_frame") {print "--remove-section " $2}}' | xargs`
|
REMOVE_SECTIONS=`"${CLANG_BIN}/llvm-readelf" -S "${infile}" | awk '/.debug_/ {if ($2 != ".debug_frame") {print "--remove-section " $2}}' | xargs`
|
||||||
if [ -z "${use_gnu_strip}" ]; then
|
"${CLANG_BIN}/llvm-objcopy" "${infile}" "${outfile}.tmp" ${REMOVE_SECTIONS}
|
||||||
"${CLANG_BIN}/llvm-objcopy" "${infile}" "${outfile}.tmp" ${REMOVE_SECTIONS}
|
|
||||||
else
|
|
||||||
"${CROSS_COMPILE}objcopy" "${infile}" "${outfile}.tmp" ${REMOVE_SECTIONS}
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
do_strip_keep_symbols() {
|
do_strip_keep_symbols() {
|
||||||
REMOVE_SECTIONS=`"${CROSS_COMPILE}readelf" -S "${infile}" | awk '/.debug_/ {print "--remove-section " $2}' | xargs`
|
REMOVE_SECTIONS=`"${CLANG_BIN}/llvm-readelf" -S "${infile}" | awk '/.debug_/ {print "--remove-section " $2}' | xargs`
|
||||||
if [ -z "${use_gnu_strip}" ]; then
|
"${CLANG_BIN}/llvm-objcopy" "${infile}" "${outfile}.tmp" ${REMOVE_SECTIONS}
|
||||||
"${CLANG_BIN}/llvm-objcopy" "${infile}" "${outfile}.tmp" ${REMOVE_SECTIONS}
|
|
||||||
else
|
|
||||||
"${CROSS_COMPILE}objcopy" "${infile}" "${outfile}.tmp" ${REMOVE_SECTIONS}
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
do_strip_keep_symbol_list() {
|
do_strip_keep_symbol_list() {
|
||||||
echo "${symbols_to_keep}" | tr ',' '\n' > "${outfile}.symbolList"
|
echo "${symbols_to_keep}" | tr ',' '\n' > "${outfile}.symbolList"
|
||||||
|
|
||||||
if [ -z "${use_gnu_strip}" ]; then
|
KEEP_SYMBOLS="--strip-unneeded-symbol=.* --keep-symbols="
|
||||||
KEEP_SYMBOLS="--strip-unneeded-symbol=.* --keep-symbols="
|
KEEP_SYMBOLS+="${outfile}.symbolList"
|
||||||
KEEP_SYMBOLS+="${outfile}.symbolList"
|
"${CLANG_BIN}/llvm-objcopy" --regex "${infile}" "${outfile}.tmp" ${KEEP_SYMBOLS}
|
||||||
"${CLANG_BIN}/llvm-objcopy" --regex "${infile}" "${outfile}.tmp" ${KEEP_SYMBOLS}
|
|
||||||
else
|
|
||||||
KEEP_SYMBOLS="--strip-unneeded-symbol=* --keep-symbols="
|
|
||||||
KEEP_SYMBOLS+="${outfile}.symbolList"
|
|
||||||
"${CROSS_COMPILE}objcopy" -w "${infile}" "${outfile}.tmp" ${KEEP_SYMBOLS}
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
do_strip_keep_mini_debug_info() {
|
do_strip_keep_mini_debug_info() {
|
||||||
rm -f "${outfile}.dynsyms" "${outfile}.funcsyms" "${outfile}.keep_symbols" "${outfile}.debug" "${outfile}.mini_debuginfo" "${outfile}.mini_debuginfo.xz"
|
rm -f "${outfile}.dynsyms" "${outfile}.funcsyms" "${outfile}.keep_symbols" "${outfile}.debug" "${outfile}.mini_debuginfo" "${outfile}.mini_debuginfo.xz"
|
||||||
local fail=
|
local fail=
|
||||||
if [ -z "${use_gnu_strip}" ]; then
|
"${CLANG_BIN}/llvm-strip" --strip-all --keep-section=.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
|
|
||||||
if [ -z $fail ]; then
|
if [ -z $fail ]; then
|
||||||
# Current prebult llvm-objcopy does not support the following flags:
|
# Current prebult llvm-objcopy does not support --only-keep-debug flag,
|
||||||
# --only-keep-debug --rename-section --keep-symbols
|
# and cannot process object files that are produced with the flag. Use
|
||||||
# For the following use cases, ${CROSS_COMPILE}objcopy does fine with lld linked files,
|
# GNU objcopy instead for now. (b/141010852)
|
||||||
# except the --add-section flag.
|
|
||||||
"${CROSS_COMPILE}objcopy" --only-keep-debug "${infile}" "${outfile}.debug"
|
"${CROSS_COMPILE}objcopy" --only-keep-debug "${infile}" "${outfile}.debug"
|
||||||
"${CROSS_COMPILE}nm" -D "${infile}" --format=posix --defined-only 2> /dev/null | awk '{ print $1 }' | sort >"${outfile}.dynsyms"
|
"${CROSS_COMPILE}nm" -D "${infile}" --format=posix --defined-only 2> /dev/null | awk '{ print $1 }' | sort >"${outfile}.dynsyms"
|
||||||
"${CROSS_COMPILE}nm" "${infile}" --format=posix --defined-only | awk '{ if ($2 == "T" || $2 == "t" || $2 == "D") print $1 }' | sort > "${outfile}.funcsyms"
|
"${CROSS_COMPILE}nm" "${infile}" --format=posix --defined-only | awk '{ if ($2 == "T" || $2 == "t" || $2 == "D") print $1 }' | sort > "${outfile}.funcsyms"
|
||||||
|
@ -119,11 +90,8 @@ do_strip_keep_mini_debug_info() {
|
||||||
"${CROSS_COMPILE}objcopy" -S --remove-section .gdb_index --remove-section .comment --keep-symbols="${outfile}.keep_symbols" "${outfile}.mini_debuginfo"
|
"${CROSS_COMPILE}objcopy" -S --remove-section .gdb_index --remove-section .comment --keep-symbols="${outfile}.keep_symbols" "${outfile}.mini_debuginfo"
|
||||||
"${CROSS_COMPILE}objcopy" --rename-section saved_debug_frame=.debug_frame "${outfile}.mini_debuginfo"
|
"${CROSS_COMPILE}objcopy" --rename-section saved_debug_frame=.debug_frame "${outfile}.mini_debuginfo"
|
||||||
"${XZ}" "${outfile}.mini_debuginfo"
|
"${XZ}" "${outfile}.mini_debuginfo"
|
||||||
if [ -z "${use_gnu_strip}" ]; then
|
|
||||||
"${CLANG_BIN}/llvm-objcopy" --add-section .gnu_debugdata="${outfile}.mini_debuginfo.xz" "${outfile}.tmp"
|
"${CLANG_BIN}/llvm-objcopy" --add-section .gnu_debugdata="${outfile}.mini_debuginfo.xz" "${outfile}.tmp"
|
||||||
else
|
|
||||||
"${CROSS_COMPILE}objcopy" --add-section .gnu_debugdata="${outfile}.mini_debuginfo.xz" "${outfile}.tmp"
|
|
||||||
fi
|
|
||||||
rm -f "${outfile}.dynsyms" "${outfile}.funcsyms" "${outfile}.keep_symbols" "${outfile}.debug" "${outfile}.mini_debuginfo" "${outfile}.mini_debuginfo.xz"
|
rm -f "${outfile}.dynsyms" "${outfile}.funcsyms" "${outfile}.keep_symbols" "${outfile}.debug" "${outfile}.mini_debuginfo" "${outfile}.mini_debuginfo.xz"
|
||||||
else
|
else
|
||||||
cp -f "${infile}" "${outfile}.tmp"
|
cp -f "${infile}" "${outfile}.tmp"
|
||||||
|
@ -131,19 +99,11 @@ do_strip_keep_mini_debug_info() {
|
||||||
}
|
}
|
||||||
|
|
||||||
do_add_gnu_debuglink() {
|
do_add_gnu_debuglink() {
|
||||||
if [ -z "${use_gnu_strip}" ]; then
|
"${CLANG_BIN}/llvm-objcopy" --add-gnu-debuglink="${infile}" "${outfile}.tmp"
|
||||||
"${CLANG_BIN}/llvm-objcopy" --add-gnu-debuglink="${infile}" "${outfile}.tmp"
|
|
||||||
else
|
|
||||||
"${CROSS_COMPILE}objcopy" --add-gnu-debuglink="${infile}" "${outfile}.tmp"
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
do_remove_build_id() {
|
do_remove_build_id() {
|
||||||
if [ -z "${use_gnu_strip}" ]; then
|
"${CLANG_BIN}/llvm-strip" --remove-section=.note.gnu.build-id "${outfile}.tmp" -o "${outfile}.tmp.no-build-id"
|
||||||
"${CLANG_BIN}/llvm-strip" --remove-section=.note.gnu.build-id "${outfile}.tmp" -o "${outfile}.tmp.no-build-id"
|
|
||||||
else
|
|
||||||
"${CROSS_COMPILE}strip" --remove-section=.note.gnu.build-id "${outfile}.tmp" -o "${outfile}.tmp.no-build-id"
|
|
||||||
fi
|
|
||||||
rm -f "${outfile}.tmp"
|
rm -f "${outfile}.tmp"
|
||||||
mv "${outfile}.tmp.no-build-id" "${outfile}.tmp"
|
mv "${outfile}.tmp.no-build-id" "${outfile}.tmp"
|
||||||
}
|
}
|
||||||
|
@ -161,7 +121,6 @@ while getopts $OPTSTRING opt; do
|
||||||
keep-symbols) keep_symbols=true ;;
|
keep-symbols) keep_symbols=true ;;
|
||||||
keep-symbols-and-debug-frame) keep_symbols_and_debug_frame=true ;;
|
keep-symbols-and-debug-frame) keep_symbols_and_debug_frame=true ;;
|
||||||
remove-build-id) remove_build_id=true ;;
|
remove-build-id) remove_build_id=true ;;
|
||||||
use-gnu-strip) use_gnu_strip=true ;;
|
|
||||||
*) echo "Unknown option --${OPTARG}"; usage ;;
|
*) echo "Unknown option --${OPTARG}"; usage ;;
|
||||||
esac;;
|
esac;;
|
||||||
?) usage ;;
|
?) usage ;;
|
||||||
|
@ -234,18 +193,13 @@ fi
|
||||||
rm -f "${outfile}"
|
rm -f "${outfile}"
|
||||||
mv "${outfile}.tmp" "${outfile}"
|
mv "${outfile}.tmp" "${outfile}"
|
||||||
|
|
||||||
if [ -z "${use_gnu_strip}" ]; then
|
|
||||||
USED_STRIP_OBJCOPY="${CLANG_BIN}/llvm-strip ${CLANG_BIN}/llvm-objcopy"
|
|
||||||
else
|
|
||||||
USED_STRIP_OBJCOPY="${CROSS_COMPILE}strip"
|
|
||||||
fi
|
|
||||||
|
|
||||||
cat <<EOF > "${depsfile}"
|
cat <<EOF > "${depsfile}"
|
||||||
${outfile}: \
|
${outfile}: \
|
||||||
${infile} \
|
${infile} \
|
||||||
${CROSS_COMPILE}nm \
|
${CROSS_COMPILE}nm \
|
||||||
${CROSS_COMPILE}objcopy \
|
${CROSS_COMPILE}objcopy \
|
||||||
${CROSS_COMPILE}readelf \
|
${CROSS_COMPILE}readelf \
|
||||||
${USED_STRIP_OBJCOPY}
|
${CLANG_BIN}/llvm-strip \
|
||||||
|
${CLANG_BIN}/llvm-objcopy
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
|
|
Loading…
Reference in New Issue