summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Rostedt <rostedt@goodmis.org>2008-08-15 11:40:24 -0400
committerIngo Molnar <mingo@elte.hu>2008-10-14 10:35:56 +0200
commitd74fcd1e4e8842d5302cd303ef25cef7e67f68b4 (patch)
tree71b65e0b54f918ec47f8d9813a00c0d3d47e39fd
parent6a4917e3ae5194a10e0723f96edc854c381e3063 (diff)
downloadop-kernel-dev-d74fcd1e4e8842d5302cd303ef25cef7e67f68b4.zip
op-kernel-dev-d74fcd1e4e8842d5302cd303ef25cef7e67f68b4.tar.gz
ftrace: update recordmount.pl arch changes
I'm trying to keep all the arch changes in recordmcount.pl in one place. I moved your code into that area, by adding the flags to the commands that were passed in. Signed-off-by: Steven Rostedt <srostedt@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rwxr-xr-xscripts/recordmcount.pl28
1 files changed, 14 insertions, 14 deletions
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
index e4922a6..36c8355 100755
--- a/scripts/recordmcount.pl
+++ b/scripts/recordmcount.pl
@@ -108,20 +108,6 @@ if ($#ARGV < 6) {
my ($arch, $objdump, $objcopy, $cc, $ld, $nm, $rm, $mv, $inputfile) = @ARGV;
-if ($arch eq "i386") {
- $ld = "ld -m elf_i386";
- $objdump = "objdump -M i386";
- $objcopy = "objcopy -O elf32-i386";
- $cc = "gcc -m32";
-}
-
-if ($arch eq "x86_64") {
- $ld = "ld -m elf_x86_64";
- $objdump = "objdump -M x86-64";
- $objcopy = "objcopy -O elf64-x86-64";
- $cc = "gcc -m64";
-}
-
$objdump = "objdump" if ((length $objdump) == 0);
$objcopy = "objcopy" if ((length $objcopy) == 0);
$cc = "gcc" if ((length $cc) == 0);
@@ -146,11 +132,25 @@ if ($arch eq "x86_64") {
$function_regex = "<(.*?)>:";
$mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\smcount([+-]0x[0-9a-zA-Z]+)?\$";
$type = ".quad";
+
+ # force flags for this arch
+ $ld .= " -m elf_x86_64";
+ $objdump .= " -M x86-64";
+ $objcopy .= " -O elf64-x86-64";
+ $cc .= " -m64";
+
} elsif ($arch eq "i386") {
$section_regex = "Disassembly of section";
$function_regex = "<(.*?)>:";
$mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\smcount\$";
$type = ".long";
+
+ # force flags for this arch
+ $ld .= " -m elf_i386";
+ $objdump .= " -M i386";
+ $objcopy .= " -O elf32-i386";
+ $cc .= " -m32";
+
} else {
die "Arch $arch is not supported with CONFIG_FTRACE_MCOUNT_RECORD";
}
OpenPOWER on IntegriCloud