diff options
| author | Mark Brown <broonie@linaro.org> | 2014-05-15 20:29:29 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-15 20:29:29 +0100 |
| commit | a5d53ad243dc3178fa9001d8ab1f19c63f8debd5 (patch) | |
| tree | 0139239f56b2dea497a003b4512a4ba849591306 /scripts | |
| parent | 15fdd2469e03d44975d548a73e689a725e76a5ee (diff) | |
| parent | 8751cf9a6c5f5bf02a2de8a4c025e09b38556df4 (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-misc' into linux-linaro-lsk
Conflicts:
Documentation/arm64/tagged-pointers.txt
arch/arm64/Kconfig
arch/arm64/boot/dts/Makefile
arch/arm64/include/asm/arch_timer.h
arch/arm64/include/asm/elf.h
arch/arm64/include/asm/spinlock.h
arch/arm64/kernel/smp.c
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/sortextable.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/sortextable.c b/scripts/sortextable.c index 1f10e89d15b4..f9ce1160419b 100644 --- a/scripts/sortextable.c +++ b/scripts/sortextable.c @@ -31,6 +31,10 @@ #include <tools/be_byteshift.h> #include <tools/le_byteshift.h> +#ifndef EM_AARCH64 +#define EM_AARCH64 183 +#endif + static int fd_map; /* File descriptor for file being modified. */ static int mmap_failed; /* Boolean flag. */ static void *ehdr_curr; /* current ElfXX_Ehdr * for resource cleanup */ @@ -249,6 +253,7 @@ do_file(char const *const fname) custom_sort = sort_relative_table; break; case EM_ARM: + case EM_AARCH64: case EM_MIPS: break; } /* end switch */ |