author | Norm Jacobs <Norm.Jacobs@Oracle.COM> |
Wed, 19 Oct 2016 09:53:08 -0500 | |
changeset 7133 | cabdc0719c92 |
parent 5057 | ab1b43bf588f |
permissions | -rw-r--r-- |
5057
ab1b43bf588f
21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
1123
diff
changeset
|
1 |
# struct regs definition conflicts with the struct regs |
ab1b43bf588f
21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
1123
diff
changeset
|
2 |
# declaration from /usr/include/sys/dtrace.h. |
ab1b43bf588f
21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
1123
diff
changeset
|
3 |
# This patch has been submitted to the community. |
ab1b43bf588f
21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
1123
diff
changeset
|
4 |
--- bfd/aoutf1.h 2014-10-14 00:32:02.000000000 -0700 |
ab1b43bf588f
21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
1123
diff
changeset
|
5 |
+++ bfd/aoutf1.h 2015-08-04 11:47:24.254878877 -0700 |
ab1b43bf588f
21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
1123
diff
changeset
|
6 |
@@ -251,7 +251,7 @@ |
1123
cb43164c5dd1
15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
7 |
/* But the reg structure can be gotten from the SPARC processor handbook. |
cb43164c5dd1
15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
8 |
This really should be in a GNU include file though so that gdb can use |
cb43164c5dd1
15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
9 |
the same info. */ |
cb43164c5dd1
15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
10 |
-struct regs |
cb43164c5dd1
15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
11 |
+struct sparc_regs |
cb43164c5dd1
15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
12 |
{ |
cb43164c5dd1
15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
13 |
int r_psr; |
cb43164c5dd1
15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
14 |
int r_pc; |
5057
ab1b43bf588f
21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
1123
diff
changeset
|
15 |
@@ -285,7 +285,7 @@ |
1123
cb43164c5dd1
15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
16 |
int c_magic; /* Corefile magic number. */ |
cb43164c5dd1
15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
17 |
int c_len; /* Sizeof (struct core). */ |
cb43164c5dd1
15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
18 |
#define SPARC_CORE_LEN 432 |
cb43164c5dd1
15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
19 |
- struct regs c_regs; /* General purpose registers -- MACHDEP SIZE. */ |
cb43164c5dd1
15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
20 |
+ struct sparc_regs c_regs; /* General purpose registers -- MACHDEP SIZE. */ |
cb43164c5dd1
15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
21 |
struct external_exec c_aouthdr; /* A.out header. */ |
cb43164c5dd1
15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
22 |
int c_signo; /* Killing signal, if any. */ |
cb43164c5dd1
15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
23 |
int c_tsize; /* Text size (bytes). */ |
5057
ab1b43bf588f
21555668 upgrade binutils to 2.25.1
Stefan Teleman <stefan.teleman@oracle.com>
parents:
1123
diff
changeset
|
24 |
@@ -308,7 +308,7 @@ |
1123
cb43164c5dd1
15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
25 |
int c_magic; /* Corefile magic number. */ |
cb43164c5dd1
15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
26 |
int c_len; /* Sizeof (struct core). */ |
cb43164c5dd1
15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
27 |
#define SOLARIS_BCP_CORE_LEN 456 |
cb43164c5dd1
15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
28 |
- struct regs c_regs; /* General purpose registers -- MACHDEP SIZE. */ |
cb43164c5dd1
15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
29 |
+ struct sparc_regs c_regs; /* General purpose registers -- MACHDEP SIZE. */ |
cb43164c5dd1
15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
30 |
int c_exdata_vp; /* Exdata structure. */ |
cb43164c5dd1
15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
31 |
int c_exdata_tsize; |
cb43164c5dd1
15824357 SUNBT7205968 Upgrade binutils to 2.22
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
32 |
int c_exdata_dsize; |