diff options
| author | John Baldwin <jhb@FreeBSD.org> | 2018-03-23 19:31:52 +0000 |
|---|---|---|
| committer | John Baldwin <jhb@FreeBSD.org> | 2018-03-23 19:31:52 +0000 |
| commit | 8356a9abbbc6e607150a70527e9172c2dc389e03 (patch) | |
| tree | 8942dc6968e5c4ad44977910877af21c3d336c9e /sys | |
| parent | c0cea51b46f9d8b1f262b800266593af6f73faf6 (diff) | |
| download | src-8356a9abbbc6e607150a70527e9172c2dc389e03.tar.gz src-8356a9abbbc6e607150a70527e9172c2dc389e03.zip | |
Move remaining EF_MIPS_* flags to <sys/elf_common.h>.
Reviewed by: brooks
Sponsored by: DARPA / AFRL
Differential Revision: https://reviews.freebsd.org/D14789
Notes
Notes:
svn path=/head/; revision=331459
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/mips/include/elf.h | 20 | ||||
| -rw-r--r-- | sys/sys/elf_common.h | 14 |
2 files changed, 14 insertions, 20 deletions
diff --git a/sys/mips/include/elf.h b/sys/mips/include/elf.h index 1944000a16ea..c971f5b2175c 100644 --- a/sys/mips/include/elf.h +++ b/sys/mips/include/elf.h @@ -243,24 +243,4 @@ __ElfType(Auxinfo); #define R_MIPS_COPY 126 #define R_MIPS_JUMP_SLOT 127 -/* - * ELF Flags - */ - -#define EF_MIPS_ARCH_1 0x00000000 /* -mips1 code */ -#define EF_MIPS_ARCH_2 0x10000000 /* -mips2 code */ -#define EF_MIPS_ARCH_3 0x20000000 /* -mips3 code */ -#define EF_MIPS_ARCH_4 0x30000000 /* -mips4 code */ -#define EF_MIPS_ARCH_5 0x40000000 /* -mips5 code */ -#define EF_MIPS_ARCH_32 0x50000000 /* -mips32 code */ -#define EF_MIPS_ARCH_64 0x60000000 /* -mips64 code */ -#define EF_MIPS_ARCH_32R2 0x70000000 /* -mips32r2 code */ -#define EF_MIPS_ARCH_64R2 0x80000000 /* -mips64r2 code */ - -#define EF_MIPS_ABI 0x0000f000 -#define EF_MIPS_ABI_O32 0x00001000 -#define EF_MIPS_ABI_O64 0x00002000 -#define EF_MIPS_ABI_EABI32 0x00003000 -#define EF_MIPS_ABI_EABI64 0x00004000 - #endif /* __MIPS_ELF_H */ diff --git a/sys/sys/elf_common.h b/sys/sys/elf_common.h index b27eb78f2e92..2a05abf0b33a 100644 --- a/sys/sys/elf_common.h +++ b/sys/sys/elf_common.h @@ -344,10 +344,24 @@ typedef struct { #define EF_MIPS_UCODE 0x00000010 #define EF_MIPS_ABI2 0x00000020 /* N32 */ #define EF_MIPS_OPTIONS_FIRST 0x00000080 +#define EF_MIPS_ABI 0x0000F000 +#define EF_MIPS_ABI_O32 0x00001000 +#define EF_MIPS_ABI_O64 0x00002000 +#define EF_MIPS_ABI_EABI32 0x00003000 +#define EF_MIPS_ABI_EABI64 0x00004000 #define EF_MIPS_ARCH_ASE 0x0F000000 /* Architectural extensions */ #define EF_MIPS_ARCH_ASE_MDMX 0x08000000 /* MDMX multimedia extension */ #define EF_MIPS_ARCH_ASE_M16 0x04000000 /* MIPS-16 ISA extensions */ #define EF_MIPS_ARCH 0xF0000000 /* Architecture field */ +#define EF_MIPS_ARCH_1 0x00000000 /* -mips1 code */ +#define EF_MIPS_ARCH_2 0x10000000 /* -mips2 code */ +#define EF_MIPS_ARCH_3 0x20000000 /* -mips3 code */ +#define EF_MIPS_ARCH_4 0x30000000 /* -mips4 code */ +#define EF_MIPS_ARCH_5 0x40000000 /* -mips5 code */ +#define EF_MIPS_ARCH_32 0x50000000 /* -mips32 code */ +#define EF_MIPS_ARCH_64 0x60000000 /* -mips64 code */ +#define EF_MIPS_ARCH_32R2 0x70000000 /* -mips32r2 code */ +#define EF_MIPS_ARCH_64R2 0x80000000 /* -mips64r2 code */ #define EF_PPC_EMB 0x80000000 #define EF_PPC_RELOCATABLE 0x00010000 |