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

Commit 01005e74 authored by Chris Snook's avatar Chris Snook Committed by Thomas Gleixner
Browse files

x86: unify a.out{,_32,_64}.h 



Unify x86 a.out_32.h and a.out_64.h

[ tglx: Kbuild fixup ]

Signed-off-by: default avatarChris Snook <csnook@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 62a31a03

include/asm-x86/Kbuild

+0 −2
Original line number Diff line number Diff line
@@ -11,8 +11,6 @@ header-y += sigcontext32.h 
header-y += ucontext.h

header-y += vsyscall32.h



unifdef-y += a.out_32.h

unifdef-y += a.out_64.h

unifdef-y += byteorder_32.h

unifdef-y += byteorder_64.h

unifdef-y += e820.h

include/asm-x86/a.out.h

+25 −8
Original line number Diff line number Diff line 
#ifndef _ASM_X86_A_OUT_H

#define _ASM_X86_A_OUT_H



struct exec

{

	unsigned int a_info;	/* Use macros N_MAGIC, etc for access */

	unsigned a_text;	/* length of text, in bytes */

	unsigned a_data;	/* length of data, in bytes */

	unsigned a_bss;		/* length of uninitialized data area for file, in bytes */

	unsigned a_syms;	/* length of symbol table data in file, in bytes */

	unsigned a_entry;	/* start address */

	unsigned a_trsize;	/* length of relocation info for text, in bytes */

	unsigned a_drsize;	/* length of relocation info for data, in bytes */

};



#define N_TRSIZE(a)	((a).a_trsize)

#define N_DRSIZE(a)	((a).a_drsize)

#define N_SYMSIZE(a)	((a).a_syms)



#ifdef __KERNEL__

# include <linux/thread_info.h>

# define STACK_TOP	TASK_SIZE

# ifdef CONFIG_X86_32

#  include "a.out_32.h"

#  define STACK_TOP_MAX	STACK_TOP

# else

#  include "a.out_64.h"

# endif

#else

# ifdef __i386__

#  include "a.out_32.h"

# else

#  include "a.out_64.h"

#  define STACK_TOP_MAX	TASK_SIZE64

# endif

#endif



#endif /* _ASM_X86_A_OUT_H */

include/asm-x86/a.out_32.h

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
#ifndef __I386_A_OUT_H__

#define __I386_A_OUT_H__



struct exec

{

  unsigned long a_info;		/* Use macros N_MAGIC, etc for access */

  unsigned a_text;		/* length of text, in bytes */

  unsigned a_data;		/* length of data, in bytes */

  unsigned a_bss;		/* length of uninitialized data area for file, in bytes */

  unsigned a_syms;		/* length of symbol table data in file, in bytes */

  unsigned a_entry;		/* start address */

  unsigned a_trsize;		/* length of relocation info for text, in bytes */

  unsigned a_drsize;		/* length of relocation info for data, in bytes */

};



#define N_TRSIZE(a)	((a).a_trsize)

#define N_DRSIZE(a)	((a).a_drsize)

#define N_SYMSIZE(a)	((a).a_syms)



#ifdef __KERNEL__



#define STACK_TOP	TASK_SIZE

#define STACK_TOP_MAX	STACK_TOP



#endif



#endif /* __A_OUT_GNU_H__ */

include/asm-x86/a.out_64.h

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
#ifndef __X8664_A_OUT_H__

#define __X8664_A_OUT_H__



/* 32bit a.out */



struct exec

{

  unsigned int a_info;		/* Use macros N_MAGIC, etc for access */

  unsigned a_text;		/* length of text, in bytes */

  unsigned a_data;		/* length of data, in bytes */

  unsigned a_bss;		/* length of uninitialized data area for file, in bytes */

  unsigned a_syms;		/* length of symbol table data in file, in bytes */

  unsigned a_entry;		/* start address */

  unsigned a_trsize;		/* length of relocation info for text, in bytes */

  unsigned a_drsize;		/* length of relocation info for data, in bytes */

};



#define N_TRSIZE(a)	((a).a_trsize)

#define N_DRSIZE(a)	((a).a_drsize)

#define N_SYMSIZE(a)	((a).a_syms)



#ifdef __KERNEL__

#include <linux/thread_info.h>

#define STACK_TOP	TASK_SIZE

#define STACK_TOP_MAX	TASK_SIZE64

#endif



#endif /* __A_OUT_GNU_H__ */