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

Commit 2af7a1b5 authored by David Srbecky's avatar David Srbecky Committed by Gerrit Code Review
Browse files

Merge "Revert^2 "[strip.sh] Move remaining GNU binutils usage to llvm binutils""

parents 190ba3ea 789fe0fd

cc/builder.go

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ var ( 
		blueprint.RuleParams{

			Depfile:     "${out}.d",

			Deps:        blueprint.DepsGCC,

			Command:     "CROSS_COMPILE=$crossCompile XZ=$xzCmd CLANG_BIN=${config.ClangBin} $stripPath ${args} -i ${in} -o ${out} -d ${out}.d",

			Command:     "XZ=$xzCmd CLANG_BIN=${config.ClangBin} $stripPath ${args} -i ${in} -o ${out} -d ${out}.d",

			CommandDeps: []string{"$stripPath", "$xzCmd"},

			Pool:        darwinStripPool,

		},

scripts/strip.sh

+4 −11
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
# Inputs:

#  Environment:

#   CLANG_BIN: path to the clang bin directory

#   CROSS_COMPILE: prefix added to readelf, objcopy tools

#   XZ: path to the xz binary

#  Arguments:

#   -i ${file}: input file (required)
@@ -69,7 +68,7 @@ do_strip_keep_symbol_list() { 


    KEEP_SYMBOLS="--strip-unneeded-symbol=* --keep-symbols="

    KEEP_SYMBOLS+="${outfile}.symbolList"

    "${CROSS_COMPILE}objcopy" -w "${infile}" "${outfile}.tmp" ${KEEP_SYMBOLS}

    "${CLANG_BIN}/llvm-objcopy" -w "${infile}" "${outfile}.tmp" ${KEEP_SYMBOLS}

}



do_strip_keep_mini_debug_info() {
@@ -78,18 +77,13 @@ do_strip_keep_mini_debug_info() { 
    "${CLANG_BIN}/llvm-strip" --strip-all --keep-section=.ARM.attributes --remove-section=.comment "${infile}" -o "${outfile}.tmp" || fail=true



    if [ -z $fail ]; then

        # Current prebult llvm-objcopy does not support --only-keep-debug flag,

        # and cannot process object files that are produced with the flag. Use

        # GNU objcopy instead for now. (b/141010852)

        "${CROSS_COMPILE}objcopy" --only-keep-debug "${infile}" "${outfile}.debug"

        "${CLANG_BIN}/llvm-objcopy" --only-keep-debug "${infile}" "${outfile}.debug"

        "${CLANG_BIN}/llvm-nm" -D "${infile}" --format=posix --defined-only 2> /dev/null | awk '{ print $1 }' | sort >"${outfile}.dynsyms"

        "${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"

        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" -S --remove-section .gdb_index --remove-section .comment --remove-section .rustc --keep-symbols="${outfile}.keep_symbols" "${outfile}.mini_debuginfo"

        "${CROSS_COMPILE}objcopy" --rename-section saved_debug_frame=.debug_frame "${outfile}.mini_debuginfo"

        "${XZ}" --block-size=64k --threads=0 "${outfile}.mini_debuginfo"

        "${CLANG_BIN}/llvm-objcopy" -S --keep-section .debug_frame --keep-symbols="${outfile}.keep_symbols" "${outfile}.debug" "${outfile}.mini_debuginfo"

        "${XZ}" --keep --block-size=64k --threads=0 "${outfile}.mini_debuginfo"



        "${CLANG_BIN}/llvm-objcopy" --add-section .gnu_debugdata="${outfile}.mini_debuginfo.xz" "${outfile}.tmp"

        rm -f "${outfile}.dynsyms" "${outfile}.funcsyms" "${outfile}.keep_symbols" "${outfile}.debug" "${outfile}.mini_debuginfo" "${outfile}.mini_debuginfo.xz"
@@ -196,7 +190,6 @@ mv "${outfile}.tmp" "${outfile}" 
cat <<EOF > "${depsfile}"

${outfile}: \

  ${infile} \

  ${CROSS_COMPILE}objcopy \

  ${CLANG_BIN}/llvm-nm \

  ${CLANG_BIN}/llvm-objcopy \

  ${CLANG_BIN}/llvm-readelf \