mirror of
https://github.com/torvalds/linux.git
synced 2024-11-27 22:51:35 +00:00
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: Rabin Vincent <rabin@rab.in> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
This commit is contained in:
parent
835e417728
commit
3a79a07537
@ -1,10 +1,11 @@
|
||||
#ifndef __ASMCRIS_ARCH_ELF_H
|
||||
#define __ASMCRIS_ARCH_ELF_H
|
||||
|
||||
#include <arch/system.h>
|
||||
|
||||
#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.
|
||||
*/
|
||||
|
@ -1,10 +1,11 @@
|
||||
#ifndef _ASM_CRIS_ELF_H
|
||||
#define _ASM_CRIS_ELF_H
|
||||
|
||||
#include <arch/system.h>
|
||||
|
||||
#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.
|
||||
*/
|
||||
|
@ -5,7 +5,7 @@
|
||||
* ELF register definitions..
|
||||
*/
|
||||
|
||||
#include <asm/user.h>
|
||||
#include <arch/elf.h>
|
||||
|
||||
#define R_CRIS_NONE 0
|
||||
#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
|
||||
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];
|
||||
|
||||
/* 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_ARCH EM_CRIS
|
||||
|
||||
#include <arch/elf.h>
|
||||
|
||||
/* The master for these definitions is {binutils}/include/elf/cris.h: */
|
||||
/* User symbols in this file have a leading underscore. */
|
||||
#define EF_CRIS_UNDERSCORE 0x00000001
|
||||
|
Loading…
Reference in New Issue
Block a user