diff options
| author | Tom Rini <trini@konsulko.com> | 2020-05-19 10:51:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-19 10:51:43 -0400 |
| commit | c2279d784e35fa25ee3a9fa28a74a1ba545f8c1e (patch) | |
| tree | 158fd30f3d06142f6a99cbae6ed8ccb0f3be567b /include/elf.h | |
| parent | ed9a3aa6452f57af65eb74f73bd2a54c3a2f4b03 (diff) | |
| parent | cd93d625fd751d55c729c78b10f82109d56a5f1d (diff) | |
Merge branch '2020-05-18-reduce-size-of-common.h'
Bring in the latest round of Simon's changes to reduce what's in
<common.h> overall.
Diffstat (limited to 'include/elf.h')
| -rw-r--r-- | include/elf.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/elf.h b/include/elf.h index e7c51986df8..b04e746d617 100644 --- a/include/elf.h +++ b/include/elf.h @@ -9,7 +9,7 @@ #ifndef _ELF_H #define _ELF_H -#ifndef __ASSEMBLER__ +#ifndef __ASSEMBLY__ #include "compiler.h" /* This version doesn't work for 64-bit ABIs - Erik */ @@ -690,7 +690,7 @@ unsigned long elf_hash(const unsigned char *name); #define R_RISCV_64 2 #define R_RISCV_RELATIVE 3 -#ifndef __ASSEMBLER__ +#ifndef __ASSEMBLY__ int valid_elf_image(unsigned long addr); unsigned long load_elf64_image_phdr(unsigned long addr); unsigned long load_elf64_image_shdr(unsigned long addr); |