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

Commit 911bc13b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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



Sync up with android11-5.4 for the following commits:

ae78026f ANDROID: Update android/abi_gki_aarch64.xml
a6b9410e ANDROID: Update android/abi_gki_aarch64_goldfish
240f2f8f ANDROID: generate_initcall_order.pl: Use two dash long options for llvm-nm

Change-Id: I431343a7a0a5fe9b72b88fd07bcb1fb2ba5aeb20
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents fab7e04e ae78026f

scripts/generate_initcall_order.pl

+1 −1
Original line number Diff line number Diff line
@@ -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 = {};