diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-13 23:04:18 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-13 23:04:18 +0300 |
| commit | 25cbda46779418e5ae435707675a312c99a16dff (patch) | |
| tree | 1dbe252ac15ec4cbc5f897b1b9c5bfdab33791dc /scripts | |
| parent | 8cc8e6aaf27db47985f9e1c24ac2f7393390971e (diff) | |
| parent | ade9679c159d5bbe14fb7e59e97daf6062872e2b (diff) | |
| download | linux-25cbda46779418e5ae435707675a312c99a16dff.tar.xz | |
Merge branch 'akpm' (patches from Andrew)
Merge fixes from Andrew Morton:
"6 patches.
Subsystems affected by this patch series: mm/pagemap, scripts,
MAINTAINERS, and h8300"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
h8300: fix PREEMPTION build, TI_PRE_COUNT undefined
MAINTAINERS: add Andrey Konovalov to KASAN reviewers
MAINTAINERS: update Andrey Konovalov's email address
MAINTAINERS: update KASAN file list
scripts/recordmcount.pl: support big endian for ARCH sh
m68k: make __pfn_to_phys() and __phys_to_pfn() available for !MMU
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/recordmcount.pl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl index 56c801502b9a..867860ea57da 100755 --- a/scripts/recordmcount.pl +++ b/scripts/recordmcount.pl @@ -265,7 +265,11 @@ if ($arch eq "x86_64") { # force flags for this arch $ld .= " -m shlelf_linux"; - $objcopy .= " -O elf32-sh-linux"; + if ($endian eq "big") { + $objcopy .= " -O elf32-shbig-linux"; + } else { + $objcopy .= " -O elf32-sh-linux"; + } } elsif ($arch eq "powerpc") { my $ldemulation; |