diff mbox

[v4,14/22] arm64: make asm/elf.h available to asm files

Message ID 1453828249-14467-15-git-send-email-ard.biesheuvel@linaro.org
State Accepted
Commit 4a2e034e5cdadde4c712f79bdd57d1455c76a3db
Headers show

Commit Message

Ard Biesheuvel Jan. 26, 2016, 5:10 p.m. UTC
This reshuffles some code in asm/elf.h and puts a #ifndef __ASSEMBLY__
around its C definitions so that the CPP defines can be used in asm
source files as well.

Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

---
 arch/arm64/include/asm/elf.h | 22 ++++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

-- 
2.5.0

Comments

Mark Rutland Jan. 26, 2016, 5:42 p.m. UTC | #1
On Tue, Jan 26, 2016 at 06:10:41PM +0100, Ard Biesheuvel wrote:
> This reshuffles some code in asm/elf.h and puts a #ifndef __ASSEMBLY__

> around its C definitions so that the CPP defines can be used in asm

> source files as well.

> 

> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>


Acked-by: Mark Rutland <mark.rutland@arm.com>


Mark.

> ---

>  arch/arm64/include/asm/elf.h | 22 ++++++++++++--------

>  1 file changed, 13 insertions(+), 9 deletions(-)

> 

> diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h

> index faad6df49e5b..435f55952e1f 100644

> --- a/arch/arm64/include/asm/elf.h

> +++ b/arch/arm64/include/asm/elf.h

> @@ -24,15 +24,6 @@

>  #include <asm/ptrace.h>

>  #include <asm/user.h>

>  

> -typedef unsigned long elf_greg_t;

> -

> -#define ELF_NGREG (sizeof(struct user_pt_regs) / sizeof(elf_greg_t))

> -#define ELF_CORE_COPY_REGS(dest, regs)	\

> -	*(struct user_pt_regs *)&(dest) = (regs)->user_regs;

> -

> -typedef elf_greg_t elf_gregset_t[ELF_NGREG];

> -typedef struct user_fpsimd_state elf_fpregset_t;

> -

>  /*

>   * AArch64 static relocation types.

>   */

> @@ -127,6 +118,17 @@ typedef struct user_fpsimd_state elf_fpregset_t;

>   */

>  #define ELF_ET_DYN_BASE	(2 * TASK_SIZE_64 / 3)

>  

> +#ifndef __ASSEMBLY__

> +

> +typedef unsigned long elf_greg_t;

> +

> +#define ELF_NGREG (sizeof(struct user_pt_regs) / sizeof(elf_greg_t))

> +#define ELF_CORE_COPY_REGS(dest, regs)	\

> +	*(struct user_pt_regs *)&(dest) = (regs)->user_regs;

> +

> +typedef elf_greg_t elf_gregset_t[ELF_NGREG];

> +typedef struct user_fpsimd_state elf_fpregset_t;

> +

>  /*

>   * When the program starts, a1 contains a pointer to a function to be

>   * registered with atexit, as per the SVR4 ABI.  A value of 0 means we have no

> @@ -186,4 +188,6 @@ extern int aarch32_setup_vectors_page(struct linux_binprm *bprm,

>  

>  #endif /* CONFIG_COMPAT */

>  

> +#endif /* !__ASSEMBLY__ */

> +

>  #endif

> -- 

> 2.5.0

>
diff mbox

Patch

diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h
index faad6df49e5b..435f55952e1f 100644
--- a/arch/arm64/include/asm/elf.h
+++ b/arch/arm64/include/asm/elf.h
@@ -24,15 +24,6 @@ 
 #include <asm/ptrace.h>
 #include <asm/user.h>
 
-typedef unsigned long elf_greg_t;
-
-#define ELF_NGREG (sizeof(struct user_pt_regs) / sizeof(elf_greg_t))
-#define ELF_CORE_COPY_REGS(dest, regs)	\
-	*(struct user_pt_regs *)&(dest) = (regs)->user_regs;
-
-typedef elf_greg_t elf_gregset_t[ELF_NGREG];
-typedef struct user_fpsimd_state elf_fpregset_t;
-
 /*
  * AArch64 static relocation types.
  */
@@ -127,6 +118,17 @@  typedef struct user_fpsimd_state elf_fpregset_t;
  */
 #define ELF_ET_DYN_BASE	(2 * TASK_SIZE_64 / 3)
 
+#ifndef __ASSEMBLY__
+
+typedef unsigned long elf_greg_t;
+
+#define ELF_NGREG (sizeof(struct user_pt_regs) / sizeof(elf_greg_t))
+#define ELF_CORE_COPY_REGS(dest, regs)	\
+	*(struct user_pt_regs *)&(dest) = (regs)->user_regs;
+
+typedef elf_greg_t elf_gregset_t[ELF_NGREG];
+typedef struct user_fpsimd_state elf_fpregset_t;
+
 /*
  * When the program starts, a1 contains a pointer to a function to be
  * registered with atexit, as per the SVR4 ABI.  A value of 0 means we have no
@@ -186,4 +188,6 @@  extern int aarch32_setup_vectors_page(struct linux_binprm *bprm,
 
 #endif /* CONFIG_COMPAT */
 
+#endif /* !__ASSEMBLY__ */
+
 #endif