Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[SPARC]: Merge asm-sparc{,64}/a.out.h
Signed-off-by: David S. Miller <davem@davemloft.net>
+19
-12
include/asm-sparc/a.out.h
+19
-12
include/asm-sparc/a.out.h
···
1
-
/* $Id: a.out.h,v 1.13 2000/01/09 10:46:53 anton Exp $ */
2
1
#ifndef __SPARC_A_OUT_H__
3
2
#define __SPARC_A_OUT_H__
4
3
5
4
#define SPARC_PGSIZE 0x2000 /* Thanks to the sun4 architecture... */
6
5
#define SEGMENT_SIZE SPARC_PGSIZE /* whee... */
7
6
7
+
#ifndef __ASSEMBLY__
8
+
8
9
struct exec {
9
10
unsigned char a_dynamic:1; /* A __DYNAMIC is in this image */
10
11
unsigned char a_toolversion:7;
11
12
unsigned char a_machtype;
12
13
unsigned short a_info;
13
-
unsigned long a_text; /* length of text, in bytes */
14
-
unsigned long a_data; /* length of data, in bytes */
15
-
unsigned long a_bss; /* length of bss, in bytes */
16
-
unsigned long a_syms; /* length of symbol table, in bytes */
17
-
unsigned long a_entry; /* where program begins */
18
-
unsigned long a_trsize;
19
-
unsigned long a_drsize;
14
+
unsigned int a_text; /* length of text, in bytes */
15
+
unsigned int a_data; /* length of data, in bytes */
16
+
unsigned int a_bss; /* length of bss, in bytes */
17
+
unsigned int a_syms; /* length of symbol table, in bytes */
18
+
unsigned int a_entry; /* where program begins */
19
+
unsigned int a_trsize;
20
+
unsigned int a_drsize;
20
21
};
22
+
23
+
#endif /* !__ASSEMBLY__ */
21
24
22
25
/* Where in the file does the text information begin? */
23
26
#define N_TXTOFF(x) (N_MAGIC(x) == ZMAGIC ? 0 : sizeof (struct exec))
···
31
28
(x).a_drsize)
32
29
33
30
/* Where does text segment go in memory after being loaded? */
34
-
#define N_TXTADDR(x) (((N_MAGIC(x) == ZMAGIC) && \
31
+
#define N_TXTADDR(x) (unsigned long)(((N_MAGIC(x) == ZMAGIC) && \
35
32
((x).a_entry < SPARC_PGSIZE)) ? \
36
33
0 : SPARC_PGSIZE)
37
34
38
35
/* And same for the data segment.. */
39
36
#define N_DATADDR(x) (N_MAGIC(x)==OMAGIC ? \
40
37
(N_TXTADDR(x) + (x).a_text) \
41
-
: (_N_SEGMENT_ROUND (_N_TXTENDADDR(x))))
38
+
: (unsigned long) (_N_SEGMENT_ROUND (_N_TXTENDADDR(x))))
42
39
43
40
#define N_TRSIZE(a) ((a).a_trsize)
44
41
#define N_DRSIZE(a) ((a).a_drsize)
45
42
#define N_SYMSIZE(a) ((a).a_syms)
43
+
44
+
#ifndef __ASSEMBLY__
46
45
47
46
/*
48
47
* Sparc relocation types
···
82
77
*/
83
78
struct relocation_info /* used when header.a_machtype == M_SPARC */
84
79
{
85
-
unsigned long r_address; /* relocation addr */
80
+
unsigned int r_address; /* relocation addr */
86
81
unsigned int r_index:24; /* segment index or symbol index */
87
82
unsigned int r_extern:1; /* if F, r_index==SEG#; if T, SYM idx */
88
83
unsigned int r_pad:2; /* <unused> */
89
84
enum reloc_type r_type:5; /* type of relocation to perform */
90
-
long r_addend; /* addend for relocation value */
85
+
int r_addend; /* addend for relocation value */
91
86
};
92
87
93
88
#define N_RELOCATION_INFO_DECLARED 1
89
+
90
+
#endif /* !(__ASSEMBLY__) */
94
91
95
92
#endif /* __SPARC_A_OUT_H__ */
+1
-98
include/asm-sparc64/a.out.h
+1
-98
include/asm-sparc64/a.out.h
···
1
-
/* $Id: a.out.h,v 1.8 2002/02/09 19:49:31 davem Exp $ */
2
-
#ifndef __SPARC64_A_OUT_H__
3
-
#define __SPARC64_A_OUT_H__
4
-
5
-
#define SPARC_PGSIZE 0x2000 /* Thanks to the sun4 architecture... */
6
-
#define SEGMENT_SIZE SPARC_PGSIZE /* whee... */
7
-
8
-
#ifndef __ASSEMBLY__
9
-
10
-
struct exec {
11
-
unsigned char a_dynamic:1; /* A __DYNAMIC is in this image */
12
-
unsigned char a_toolversion:7;
13
-
unsigned char a_machtype;
14
-
unsigned short a_info;
15
-
unsigned int a_text; /* length of text, in bytes */
16
-
unsigned int a_data; /* length of data, in bytes */
17
-
unsigned int a_bss; /* length of bss, in bytes */
18
-
unsigned int a_syms; /* length of symbol table, in bytes */
19
-
unsigned int a_entry; /* where program begins */
20
-
unsigned int a_trsize;
21
-
unsigned int a_drsize;
22
-
};
23
-
24
-
#endif /* !__ASSEMBLY__ */
25
-
26
-
/* Where in the file does the text information begin? */
27
-
#define N_TXTOFF(x) (N_MAGIC(x) == ZMAGIC ? 0 : sizeof (struct exec))
28
-
29
-
/* Where do the Symbols start? */
30
-
#define N_SYMOFF(x) (N_TXTOFF(x) + (x).a_text + \
31
-
(x).a_data + (x).a_trsize + \
32
-
(x).a_drsize)
33
-
34
-
/* Where does text segment go in memory after being loaded? */
35
-
#define N_TXTADDR(x) (unsigned long)(((N_MAGIC(x) == ZMAGIC) && \
36
-
((x).a_entry < SPARC_PGSIZE)) ? \
37
-
0 : SPARC_PGSIZE)
38
-
39
-
/* And same for the data segment.. */
40
-
#define N_DATADDR(x) (N_MAGIC(x)==OMAGIC ? \
41
-
(N_TXTADDR(x) + (x).a_text) \
42
-
: (unsigned long)(_N_SEGMENT_ROUND (_N_TXTENDADDR(x))))
43
-
44
-
#define N_TRSIZE(a) ((a).a_trsize)
45
-
#define N_DRSIZE(a) ((a).a_drsize)
46
-
#define N_SYMSIZE(a) ((a).a_syms)
47
-
48
-
#ifndef __ASSEMBLY__
49
-
50
-
/*
51
-
* Sparc relocation types
52
-
*/
53
-
enum reloc_type
54
-
{
55
-
RELOC_8,
56
-
RELOC_16,
57
-
RELOC_32, /* simplest relocs */
58
-
RELOC_DISP8,
59
-
RELOC_DISP16,
60
-
RELOC_DISP32, /* Disp's (pc-rel) */
61
-
RELOC_WDISP30,
62
-
RELOC_WDISP22, /* SR word disp's */
63
-
RELOC_HI22,
64
-
RELOC_22, /* SR 22-bit relocs */
65
-
RELOC_13,
66
-
RELOC_LO10, /* SR 13&10-bit relocs */
67
-
RELOC_SFA_BASE,
68
-
RELOC_SFA_OFF13, /* SR S.F.A. relocs */
69
-
RELOC_BASE10,
70
-
RELOC_BASE13,
71
-
RELOC_BASE22, /* base_relative pic */
72
-
RELOC_PC10,
73
-
RELOC_PC22, /* special pc-rel pic */
74
-
RELOC_JMP_TBL, /* jmp_tbl_rel in pic */
75
-
RELOC_SEGOFF16, /* ShLib offset-in-seg */
76
-
RELOC_GLOB_DAT,
77
-
RELOC_JMP_SLOT,
78
-
RELOC_RELATIVE /* rtld relocs */
79
-
};
80
-
81
-
/*
82
-
* Format of a relocation datum.
83
-
*/
84
-
struct relocation_info /* used when header.a_machtype == M_SPARC */
85
-
{
86
-
unsigned int r_address; /* relocation addr */
87
-
unsigned int r_index:24; /* segment index or symbol index */
88
-
unsigned int r_extern:1; /* if F, r_index==SEG#; if T, SYM idx */
89
-
unsigned int r_pad:2; /* <unused> */
90
-
enum reloc_type r_type:5; /* type of relocation to perform */
91
-
int r_addend; /* addend for relocation value */
92
-
};
93
-
94
-
#define N_RELOCATION_INFO_DECLARED 1
95
-
96
-
#endif /* !(__ASSEMBLY__) */
97
-
98
-
#endif /* !(__SPARC64_A_OUT_H__) */
1
+
#include <asm-sparc/a.out.h>