StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move strip.sh to use llvm-nm instead of GNU nm

Browse Source 
Also fix an issue with deps file introduced in ab5e5142. Now correctly
depends on llvm-readelf insteaf of GNU readelf.

Test: presubmit
Change-Id: Id287e2844626c07917348a62820f8b5edbb22c3d
This commit is contained in:
Yi Kong
2019-09-14 01:39:53 -07:00
parent 4e812550b0
commit eb63f76721
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/strip.sh
View File

@@ -82,8 +82,8 @@ do_strip_keep_mini_debug_info() {
# and cannot process object files that are produced with the flag. Use # and cannot process object files that are produced with the flag. Use
# GNU objcopy instead for now. (b/141010852) # GNU objcopy instead for now. (b/141010852)
"${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" "${CLANG_BIN}/llvm-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" "${CLANG_BIN}/llvm-nm" "${infile}" --format=posix --defined-only | awk '{ if ($2 == "T" || $2 == "t" || $2 == "D") print $1 }' | sort > "${outfile}.funcsyms"
comm -13 "${outfile}.dynsyms" "${outfile}.funcsyms" > "${outfile}.keep_symbols" comm -13 "${outfile}.dynsyms" "${outfile}.funcsyms" > "${outfile}.keep_symbols"
echo >> "${outfile}.keep_symbols" # Ensure that the keep_symbols file is not empty. echo >> "${outfile}.keep_symbols" # Ensure that the keep_symbols file is not empty.
"${CROSS_COMPILE}objcopy" --rename-section .debug_frame=saved_debug_frame "${outfile}.debug" "${outfile}.mini_debuginfo" "${CROSS_COMPILE}objcopy" --rename-section .debug_frame=saved_debug_frame "${outfile}.debug" "${outfile}.mini_debuginfo"
@@ -196,10 +196,10 @@ mv "${outfile}.tmp" "${outfile}"
cat <<EOF > "${depsfile}" cat <<EOF > "${depsfile}"
${outfile}: \ ${outfile}: \
${infile} \ ${infile} \
${CROSS_COMPILE}nm \
${CROSS_COMPILE}objcopy \ ${CROSS_COMPILE}objcopy \
${CROSS_COMPILE}readelf \ ${CLANG_BIN}/llvm-nm \
${CLANG_BIN}/llvm-strip \ ${CLANG_BIN}/llvm-objcopy \
${CLANG_BIN}/llvm-objcopy ${CLANG_BIN}/llvm-readelf \
${CLANG_BIN}/llvm-strip
EOF EOF