diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-12-11 10:36:34 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-12-11 10:36:34 +1100 |
commit | 19db6a8c9d4605cba8efa348223aa6ebef5be5ee (patch) | |
tree | 7ee64287686c28849b856a2e079563fb8be60b5e /scripts | |
parent | 767fcd8b12681d41cbf693fa6aaaa78fb97ab429 (diff) | |
parent | 6b8e7b6fc81155b71d85d74a0f1f8a212d4cabdc (diff) |
Merge remote branch 'mips/mips-for-linux-next'
Conflicts:
arch/mips/Kconfig
arch/mips/Makefile
arch/mips/include/asm/ftrace.h
arch/mips/kernel/ftrace.c
arch/mips/kernel/mcount.S
drivers/pcmcia/Makefile
scripts/recordmcount.pl
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/Makefile.build | 1 | ||||
-rwxr-xr-x | scripts/recordmcount.pl | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 341b58902ffc..0b94d2fa3a88 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -207,6 +207,7 @@ endif ifdef CONFIG_FTRACE_MCOUNT_RECORD cmd_record_mcount = set -e ; perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \ + "$(if $(CONFIG_CPU_BIG_ENDIAN),big,little)" \ "$(if $(CONFIG_64BIT),64,32)" \ "$(OBJDUMP)" "$(OBJCOPY)" "$(CC)" "$(LD)" "$(NM)" "$(RM)" "$(MV)" \ "$(if $(part-of-module),1,0)" "$(@)"; diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl index 8f779ffddb1d..d51ffff75fa1 100755 --- a/scripts/recordmcount.pl +++ b/scripts/recordmcount.pl @@ -113,13 +113,13 @@ $P =~ s@.*/@@g; my $V = '0.1'; -if ($#ARGV != 10) { - print "usage: $P arch bits objdump objcopy cc ld nm rm mv is_module inputfile\n"; +if ($#ARGV != 11) { + print "usage: $P arch endian bits objdump objcopy cc ld nm rm mv is_module inputfile\n"; print "version: $V\n"; exit(1); } -my ($arch, $bits, $objdump, $objcopy, $cc, +my ($arch, $endian, $bits, $objdump, $objcopy, $cc, $ld, $nm, $rm, $mv, $is_module, $inputfile) = @ARGV; # This file refers to mcount and shouldn't be ftraced, so lets' ignore it @@ -295,6 +295,7 @@ if ($arch eq "x86_64") { $ld .= " -m elf64_sparc"; $cc .= " -m64"; $objcopy .= " -O elf64-sparc"; + } elsif ($arch eq "mips") { # To enable module support, we need to enable the -mlong-calls option # of gcc for module, after using this option, we can not get the real @@ -350,6 +351,7 @@ if ($arch eq "x86_64") { } elsif ($arch eq "microblaze") { # Microblaze calls '_mcount' instead of plain 'mcount'. $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s_mcount\$"; + } else { die "Arch $arch is not supported with CONFIG_FTRACE_MCOUNT_RECORD"; } |