Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a79a075 authored by Rabin Vincent's avatar Rabin Vincent Committed by Jesper Nilsson
Browse files

CRIS: don't make asm/elf.h depend on asm/user.h 



We're going to export asm/elf.h; remove its dependencies on the
non-exported asm/user.h and the unused asm/system.h include.

Signed-off-by: default avatarRabin Vincent <rabin@rab.in>
Signed-off-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
parent 835e4177

arch/cris/include/arch-v10/arch/elf.h

+3 −2
Original line number Original line Diff line number Diff line 
#ifndef __ASMCRIS_ARCH_ELF_H

#ifndef __ASMCRIS_ARCH_ELF_H

#define __ASMCRIS_ARCH_ELF_H

#define __ASMCRIS_ARCH_ELF_H





#include <arch/system.h>



#define ELF_MACH EF_CRIS_VARIANT_ANY_V0_V10

#define ELF_MACH EF_CRIS_VARIANT_ANY_V0_V10





/* Matches struct user_regs_struct */

#define ELF_NGREG 35



/*

/*

 * This is used to ensure we don't load something for the wrong architecture.

 * This is used to ensure we don't load something for the wrong architecture.

 */

 */

arch/cris/include/arch-v32/arch/elf.h

+3 −2
Original line number Original line Diff line number Diff line 
#ifndef _ASM_CRIS_ELF_H

#ifndef _ASM_CRIS_ELF_H

#define _ASM_CRIS_ELF_H

#define _ASM_CRIS_ELF_H





#include <arch/system.h>



#define ELF_CORE_EFLAGS EF_CRIS_VARIANT_V32

#define ELF_CORE_EFLAGS EF_CRIS_VARIANT_V32





/* Matches struct user_regs_struct */

#define ELF_NGREG 32



/*

/*

 * This is used to ensure we don't load something for the wrong architecture.

 * This is used to ensure we don't load something for the wrong architecture.

 */

 */

arch/cris/include/asm/elf.h

+1 −4
Original line number Original line Diff line number Diff line
@@ -5,7 +5,7 @@ 
 * ELF register definitions..

 * ELF register definitions..

 */

 */





#include <asm/user.h>

#include <arch/elf.h>





#define R_CRIS_NONE             0

#define R_CRIS_NONE             0

#define R_CRIS_8                1

#define R_CRIS_8                1
@@ -32,7 +32,6 @@ typedef unsigned long elf_greg_t; 




/* Note that NGREG is defined to ELF_NGREG in include/linux/elfcore.h, and is

/* Note that NGREG is defined to ELF_NGREG in include/linux/elfcore.h, and is

   thus exposed to user-space. */

   thus exposed to user-space. */

#define ELF_NGREG (sizeof (struct user_regs_struct) / sizeof(elf_greg_t))

typedef elf_greg_t elf_gregset_t[ELF_NGREG];

typedef elf_greg_t elf_gregset_t[ELF_NGREG];





/* A placeholder; CRIS does not have any fp regs.  */

/* A placeholder; CRIS does not have any fp regs.  */
@@ -45,8 +44,6 @@ typedef unsigned long elf_fpregset_t; 
#define ELF_DATA	ELFDATA2LSB

#define ELF_DATA	ELFDATA2LSB

#define ELF_ARCH	EM_CRIS

#define ELF_ARCH	EM_CRIS





#include <arch/elf.h>



/* The master for these definitions is {binutils}/include/elf/cris.h:  */

/* The master for these definitions is {binutils}/include/elf/cris.h:  */

/* User symbols in this file have a leading underscore.  */

/* User symbols in this file have a leading underscore.  */

#define EF_CRIS_UNDERSCORE		0x00000001

#define EF_CRIS_UNDERSCORE		0x00000001