diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-02-20 14:54:53 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-02-20 14:54:53 -0500 |
| commit | 4c971aa78314253cce914ed29e3d90df3326d646 (patch) | |
| tree | a9dcf0b1fdc9e1aacff90afb5b3ab79983115dcc /scripts | |
| parent | 4ba24fef3eb3b142197135223b90ced2f319cd53 (diff) | |
| parent | 290b799c390d77d27effee3ce312203aaa32ee74 (diff) | |
Merge branch 'next' into for-linus
Second round of updates for 3.20.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/recordmcount.pl | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl index 56ea99a12ab7..537c38ca2e1c 100755 --- a/scripts/recordmcount.pl +++ b/scripts/recordmcount.pl | |||
| @@ -255,7 +255,6 @@ if ($arch eq "x86_64") { | |||
| 255 | # force flags for this arch | 255 | # force flags for this arch |
| 256 | $ld .= " -m shlelf_linux"; | 256 | $ld .= " -m shlelf_linux"; |
| 257 | $objcopy .= " -O elf32-sh-linux"; | 257 | $objcopy .= " -O elf32-sh-linux"; |
| 258 | $cc .= " -m32"; | ||
| 259 | 258 | ||
| 260 | } elsif ($arch eq "powerpc") { | 259 | } elsif ($arch eq "powerpc") { |
| 261 | $local_regex = "^[0-9a-fA-F]+\\s+t\\s+(\\.?\\S+)"; | 260 | $local_regex = "^[0-9a-fA-F]+\\s+t\\s+(\\.?\\S+)"; |