The linux/audit.h header uses EM_MICROBLAZE in order to define
AUDIT_ARCH_MICROBLAZE, but it's only available in the microblaze
asm headers. Move it to the common elf-em.h header so that the
define can be used on non-microblaze systems. Otherwise we get
build errors that EM_MICROBLAZE isn't defined when we try to use
the AUDIT_ARCH_MICROBLAZE symbol.
Signed-off-by: Mike Frysinger <[email protected]>
---
arch/microblaze/include/uapi/asm/elf.h | 3 ++-
include/uapi/linux/elf-em.h | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/microblaze/include/uapi/asm/elf.h b/arch/microblaze/include/uapi/asm/elf.h
index be1731d..e9bcdb6 100644
--- a/arch/microblaze/include/uapi/asm/elf.h
+++ b/arch/microblaze/include/uapi/asm/elf.h
@@ -11,12 +11,13 @@
#ifndef _UAPI_ASM_MICROBLAZE_ELF_H
#define _UAPI_ASM_MICROBLAZE_ELF_H
+#include <linux/elf-em.h>
+
/*
* Note there is no "official" ELF designation for Microblaze.
* I've snaffled the value from the microblaze binutils source code
* /binutils/microblaze/include/elf/microblaze.h
*/
-#define EM_MICROBLAZE 189
#define EM_MICROBLAZE_OLD 0xbaab
#define ELF_ARCH EM_MICROBLAZE
diff --git a/include/uapi/linux/elf-em.h b/include/uapi/linux/elf-em.h
index b088296..8c90a79 100644
--- a/include/uapi/linux/elf-em.h
+++ b/include/uapi/linux/elf-em.h
@@ -38,6 +38,7 @@
#define EM_ALTERA_NIOS2 113 /* Altera Nios II soft-core processor */
#define EM_TI_C6000 140 /* TI C6X DSPs */
#define EM_AARCH64 183 /* ARM 64 bit */
+#define EM_MICROBLAZE 189 /* Xilinx MicroBlaze */
#define EM_FRV 0x5441 /* Fujitsu FR-V */
#define EM_AVR32 0x18ad /* Atmel AVR32 */
--
2.4.4
On 08/18/2015 09:28 AM, Mike Frysinger wrote:
> The linux/audit.h header uses EM_MICROBLAZE in order to define
> AUDIT_ARCH_MICROBLAZE, but it's only available in the microblaze
> asm headers. Move it to the common elf-em.h header so that the
> define can be used on non-microblaze systems. Otherwise we get
> build errors that EM_MICROBLAZE isn't defined when we try to use
> the AUDIT_ARCH_MICROBLAZE symbol.
>
> Signed-off-by: Mike Frysinger <[email protected]>
> ---
> arch/microblaze/include/uapi/asm/elf.h | 3 ++-
> include/uapi/linux/elf-em.h | 1 +
> 2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/arch/microblaze/include/uapi/asm/elf.h b/arch/microblaze/include/uapi/asm/elf.h
> index be1731d..e9bcdb6 100644
> --- a/arch/microblaze/include/uapi/asm/elf.h
> +++ b/arch/microblaze/include/uapi/asm/elf.h
> @@ -11,12 +11,13 @@
> #ifndef _UAPI_ASM_MICROBLAZE_ELF_H
> #define _UAPI_ASM_MICROBLAZE_ELF_H
>
> +#include <linux/elf-em.h>
> +
> /*
> * Note there is no "official" ELF designation for Microblaze.
> * I've snaffled the value from the microblaze binutils source code
> * /binutils/microblaze/include/elf/microblaze.h
> */
> -#define EM_MICROBLAZE 189
> #define EM_MICROBLAZE_OLD 0xbaab
> #define ELF_ARCH EM_MICROBLAZE
>
> diff --git a/include/uapi/linux/elf-em.h b/include/uapi/linux/elf-em.h
> index b088296..8c90a79 100644
> --- a/include/uapi/linux/elf-em.h
> +++ b/include/uapi/linux/elf-em.h
> @@ -38,6 +38,7 @@
> #define EM_ALTERA_NIOS2 113 /* Altera Nios II soft-core processor */
> #define EM_TI_C6000 140 /* TI C6X DSPs */
> #define EM_AARCH64 183 /* ARM 64 bit */
> +#define EM_MICROBLAZE 189 /* Xilinx MicroBlaze */
> #define EM_FRV 0x5441 /* Fujitsu FR-V */
> #define EM_AVR32 0x18ad /* Atmel AVR32 */
>
>
Applied.
We should probably also remove EM_MICROBLAZE_OLD which shouldn't be used
now.
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: http://www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform