Merge branch 'android11-5.4' into 'android11-5.4-lts'

Sync up with android11-5.4 for the following commits:

ae78026f42 ANDROID: Update android/abi_gki_aarch64.xml
a6b9410e5f ANDROID: Update android/abi_gki_aarch64_goldfish
240f2f8f42 ANDROID: generate_initcall_order.pl: Use two dash long options for llvm-nm

Change-Id: I431343a7a0a5fe9b72b88fd07bcb1fb2ba5aeb20
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2021-07-31 08:55:23 +02:00
commit 911bc13b3a

View File

@ -41,7 +41,7 @@ sub find_initcalls {
die "$0: object file $object doesn't exist?" if (! -f $object);
open(my $fh, "\"$nm\" -just-symbol-name -defined-only \"$object\" 2>/dev/null |")
open(my $fh, "\"$nm\" --just-symbol-name --defined-only \"$object\" 2>/dev/null |")
or die "$0: failed to execute \"$nm\": $!";
my $initcalls = {};