Fri Aug 18 01:00:02 2023 UTC ()
gdb/ppc: Resolve static v.s. extern confusion found in upstream. NFC.


(rin)
diff -r1.3 -r1.4 src/external/gpl3/gdb/dist/gdb/ppc-netbsd-tdep.c
diff -r1.1.1.1 -r1.2 src/external/gpl3/gdb/dist/gdb/ppc-netbsd-tdep.h
cvs diff -r1.3 -r1.4 src/external/gpl3/gdb/dist/gdb/ppc-netbsd-tdep.c (expand / switch to unified diff)

--- src/external/gpl3/gdb/dist/gdb/ppc-netbsd-tdep.c 2023/08/17 05:53:45 1.3
+++ src/external/gpl3/gdb/dist/gdb/ppc-netbsd-tdep.c 2023/08/18 01:00:02 1.4
@@ -24,27 +24,27 @@ @@ -24,27 +24,27 @@
24#include "osabi.h" 24#include "osabi.h"
25#include "regcache.h" 25#include "regcache.h"
26#include "regset.h" 26#include "regset.h"
27#include "trad-frame.h" 27#include "trad-frame.h"
28#include "tramp-frame.h" 28#include "tramp-frame.h"
29 29
30#include "ppc-tdep.h" 30#include "ppc-tdep.h"
31#include "netbsd-tdep.h" 31#include "netbsd-tdep.h"
32#include "ppc-netbsd-tdep.h" 32#include "ppc-netbsd-tdep.h"
33#include "ppc-tdep.h" 33#include "ppc-tdep.h"
34#include "solib-svr4.h" 34#include "solib-svr4.h"
35 35
36/* Register offsets from <machine/reg.h>. */ 36/* Register offsets from <machine/reg.h>. */
37ppc_reg_offsets ppcnbsd_reg_offsets; 37static ppc_reg_offsets ppcnbsd_reg_offsets;
38  38
39 39
40/* Core file support. */ 40/* Core file support. */
41 41
42/* NetBSD/powerpc register sets. */ 42/* NetBSD/powerpc register sets. */
43 43
44const struct regset ppcnbsd_gregset = 44const struct regset ppcnbsd_gregset =
45{ 45{
46 &ppcnbsd_reg_offsets, 46 &ppcnbsd_reg_offsets,
47 ppc_supply_gregset 47 ppc_supply_gregset
48}; 48};
49 49
50const struct regset ppcnbsd_fpregset = 50const struct regset ppcnbsd_fpregset =
cvs diff -r1.1.1.1 -r1.2 src/external/gpl3/gdb/dist/gdb/ppc-netbsd-tdep.h (expand / switch to unified diff)

--- src/external/gpl3/gdb/dist/gdb/ppc-netbsd-tdep.h 2023/07/30 22:44:44 1.1.1.1
+++ src/external/gpl3/gdb/dist/gdb/ppc-netbsd-tdep.h 2023/08/18 01:00:02 1.2
@@ -12,21 +12,18 @@ @@ -12,21 +12,18 @@
12 This program is distributed in the hope that it will be useful, 12 This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 15 GNU General Public License for more details.
16 16
17 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
18 along with this program. If not, see <http://www.gnu.org/licenses/>. */ 18 along with this program. If not, see <http://www.gnu.org/licenses/>. */
19 19
20#ifndef PPC_NBSD_TDEP_H 20#ifndef PPC_NBSD_TDEP_H
21#define PPC_NBSD_TDEP_H 21#define PPC_NBSD_TDEP_H
22 22
23struct regset; 23struct regset;
24 24
25/* Register offsets for NetBSD/powerpc. */ 
26extern struct ppc_reg_offsets ppcnbsd_reg_offsets; 
27 
28/* Register sets for NetBSD/powerpc. */ 25/* Register sets for NetBSD/powerpc. */
29extern const struct regset ppcnbsd_gregset; 26extern const struct regset ppcnbsd_gregset;
30extern const struct regset ppcnbsd_fpregset; 27extern const struct regset ppcnbsd_fpregset;
31 28
32#endif /* PPC_NBSD_TDEP_H */ 29#endif /* PPC_NBSD_TDEP_H */