Made gdb-add-index respect TOOLCHAIN_PREFIX settings.

build/gdb-add-index

 #!/bin/bash
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 # Saves the gdb index for a given binary and its shared library dependencies.
 #
 # This will run gdb index in parallel on a number of binaries using SIGUSR1
 # as the communication mechanism to simulate a semaphore. Because of the
 # nature of this technique, using "set -e" is very difficult. The SIGUSR1
@@ skipping 20 matching lines @@
     echo done
   fi
 }
 
 # Add index to one binary.
 function index_one_file {
   local file=$1
   local basename=$(basename "$file")
   local should_index="${SHOULD_INDEX}"
 
-  local readelf_out=$(readelf -S "$file")
+  local readelf_out=$(${CROSS_COMPILE}readelf -S "$file")

[cjhopman, 2015/01/08 22:37:23]

To match the naming of this elsewhere (e.g. gyp), I'd call it TOOLCHAIN_PREFIX.

[cleichner, 2015/01/08 22:42:45]

Done.

   if [[ $readelf_out =~ "gdb_index" ]]; then
     if [ "${REMOVE_INDEX}" = 1 ]; then
-      objcopy --remove-section .gdb_index "$file"
+      ${CROSS_COMPILE}objcopy --remove-section .gdb_index "$file"
       echo "Removed index from $basename."
     else
       echo "Skipped $basename -- already contains index."
       should_index=0
     fi
   fi
 
   if [ "${should_index}" = 1 ]; then
     local start=$(date +"%s%N")
     echo "Adding index to $basename..."
 
-    gdb -batch "$file" -ex "save gdb-index $DIRECTORY" -ex "quit"
+    ${CROSS_COMPILE}gdb -batch "$file" -ex "save gdb-index $DIRECTORY" \
+      -ex "quit"
     local index_file="$DIRECTORY/$basename.gdb-index"
     if [ -f "$index_file" ]; then
-      objcopy --add-section .gdb_index="$index_file" \
+      ${CROSS_COMPILE}objcopy --add-section .gdb_index="$index_file" \
         --set-section-flags .gdb_index=readonly "$file" "$file"
       local finish=$(date +"%s%N")
       local elappsed=$(((finish - start)/1000000))

[scottmg, 2015/01/08 22:38:59]

would you mind fixing the spelling of "elapsed" while you're here?

[cleichner, 2015/01/08 22:42:45]

Done.

       echo "   ...$basename indexed. [${elappsed}ms]"
     else
       echo "   ...$basename unindexable."
     fi
   fi
 }
 
 # Functions that when combined, concurrently index all files in FILES_TO_INDEX
 # array. The global FILES_TO_INDEX is declared in the main body of the script.
 function async_index {
@@ skipping 79 matching lines @@
 
 # Do a wait loop. Bash waits that terminate due a trap have an exit
 # code > 128. We also ensure that our subshell's "normal" exit occurs with
 # an exit code > 128. This allows us to do consider a > 128 exit code as
 # an indication that the loop should continue. Unfortunately, it also means
 # we cannot use set -e since technically the "wait" is failing.
 wait
 while (( $? > 128 )); do
   wait
 done