|
@@ -136,13 +136,14 @@ my %text_sections = (
|
|
|
".text.unlikely" => 1,
|
|
|
);
|
|
|
|
|
|
-$objdump = "objdump" if ((length $objdump) == 0);
|
|
|
-$objcopy = "objcopy" if ((length $objcopy) == 0);
|
|
|
-$cc = "gcc" if ((length $cc) == 0);
|
|
|
-$ld = "ld" if ((length $ld) == 0);
|
|
|
-$nm = "nm" if ((length $nm) == 0);
|
|
|
-$rm = "rm" if ((length $rm) == 0);
|
|
|
-$mv = "mv" if ((length $mv) == 0);
|
|
|
+# Note: we are nice to C-programmers here, thus we skip the '||='-idiom.
|
|
|
+$objdump = 'objdump' if (!$objdump);
|
|
|
+$objcopy = 'objcopy' if (!$objcopy);
|
|
|
+$cc = 'gcc' if (!$cc);
|
|
|
+$ld = 'ld' if (!$ld);
|
|
|
+$nm = 'nm' if (!$nm);
|
|
|
+$rm = 'rm' if (!$rm);
|
|
|
+$mv = 'mv' if (!$mv);
|
|
|
|
|
|
#print STDERR "running: $P '$arch' '$objdump' '$objcopy' '$cc' '$ld' " .
|
|
|
# "'$nm' '$rm' '$mv' '$inputfile'\n";
|
|
@@ -194,12 +195,8 @@ sub check_objcopy
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-if ($arch eq "x86") {
|
|
|
- if ($bits == 64) {
|
|
|
- $arch = "x86_64";
|
|
|
- } else {
|
|
|
- $arch = "i386";
|
|
|
- }
|
|
|
+if ($arch eq 'x86') {
|
|
|
+ $arch = ($bits == 64) ? 'x86_64' : 'i386';
|
|
|
}
|
|
|
|
|
|
#
|
|
@@ -476,11 +473,7 @@ while (<IN>) {
|
|
|
$read_headers = 0;
|
|
|
|
|
|
# Only record text sections that we know are safe
|
|
|
- if (defined($text_sections{$1})) {
|
|
|
- $read_function = 1;
|
|
|
- } else {
|
|
|
- $read_function = 0;
|
|
|
- }
|
|
|
+ $read_function = defined($text_sections{$1});
|
|
|
# print out any recorded offsets
|
|
|
update_funcs();
|
|
|
|