Update buildroot & docker (#25)
* Update docker & buildroot * Fix * fix versions
This commit is contained in:
@@ -1,372 +0,0 @@
|
||||
From 4d913bb73965fdb9c756e8d5916a829b60aa3a44 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Date: Thu, 4 Aug 2016 23:44:24 +0200
|
||||
Subject: [PATCH] Revert "sim: unify SIM_CPU definition"
|
||||
|
||||
This reverts commit 20bca71d82598a015de0991196e45f0b5f7ead81.
|
||||
|
||||
This change causes a redefinition of SIM_CPU on the Blackfin
|
||||
architecture, as it is defined in both the common sim/common/sim-base.h
|
||||
and the architecture specific sim/bfin/sim-main.h.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
---
|
||||
sim/arm/sim-main.h | 3 +++
|
||||
sim/avr/sim-main.h | 2 ++
|
||||
sim/bfin/sim-main.h | 2 --
|
||||
sim/common/sim-base.h | 2 --
|
||||
sim/cr16/sim-main.h | 2 ++
|
||||
sim/cris/sim-main.h | 5 +++++
|
||||
sim/d10v/sim-main.h | 2 ++
|
||||
sim/frv/sim-main.h | 10 ++++++++++
|
||||
sim/ft32/sim-main.h | 2 ++
|
||||
sim/h8300/sim-main.h | 3 +++
|
||||
sim/iq2000/sim-main.h | 5 +++++
|
||||
sim/lm32/sim-main.h | 5 +++++
|
||||
sim/m32r/sim-main.h | 5 +++++
|
||||
sim/m68hc11/sim-main.h | 3 +++
|
||||
sim/mcore/sim-main.h | 2 ++
|
||||
sim/microblaze/sim-main.h | 3 +++
|
||||
sim/mips/sim-main.h | 3 +++
|
||||
sim/mn10300/sim-main.h | 2 ++
|
||||
sim/moxie/sim-main.h | 3 +++
|
||||
sim/msp430/sim-main.h | 3 +++
|
||||
sim/sh/sim-main.h | 3 +++
|
||||
sim/sh64/sim-main.h | 5 +++++
|
||||
sim/v850/sim-main.h | 3 +++
|
||||
23 files changed, 74 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/sim/arm/sim-main.h b/sim/arm/sim-main.h
|
||||
index 9a37b98..ae622bd 100644
|
||||
--- a/sim/arm/sim-main.h
|
||||
+++ b/sim/arm/sim-main.h
|
||||
@@ -20,6 +20,9 @@
|
||||
#define SIM_MAIN_H
|
||||
|
||||
#include "sim-basics.h"
|
||||
+
|
||||
+typedef struct _sim_cpu SIM_CPU;
|
||||
+
|
||||
#include "sim-base.h"
|
||||
#include "bfd.h"
|
||||
|
||||
diff --git a/sim/avr/sim-main.h b/sim/avr/sim-main.h
|
||||
index e0cac22..52904e3 100644
|
||||
--- a/sim/avr/sim-main.h
|
||||
+++ b/sim/avr/sim-main.h
|
||||
@@ -23,6 +23,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||
|
||||
extern unsigned int pc;
|
||||
|
||||
+typedef struct _sim_cpu SIM_CPU;
|
||||
+
|
||||
#include "sim-base.h"
|
||||
|
||||
struct _sim_cpu {
|
||||
diff --git a/sim/bfin/sim-main.h b/sim/bfin/sim-main.h
|
||||
index 806fe15..53e1774 100644
|
||||
--- a/sim/bfin/sim-main.h
|
||||
+++ b/sim/bfin/sim-main.h
|
||||
@@ -24,8 +24,6 @@
|
||||
#include "sim-basics.h"
|
||||
#include "sim-signal.h"
|
||||
|
||||
-/* TODO: Delete this. Need to convert bu32/etc... to common sim types
|
||||
- and unwind the bfin-sim.h/machs.h include below first though. */
|
||||
typedef struct _sim_cpu SIM_CPU;
|
||||
|
||||
#include "bfin-sim.h"
|
||||
diff --git a/sim/common/sim-base.h b/sim/common/sim-base.h
|
||||
index 21f61f4..e90e07c 100644
|
||||
--- a/sim/common/sim-base.h
|
||||
+++ b/sim/common/sim-base.h
|
||||
@@ -72,8 +72,6 @@ typedef address_word sim_cia;
|
||||
#define INVALID_INSTRUCTION_ADDRESS ((address_word)0 - 1)
|
||||
#endif
|
||||
|
||||
-/* TODO: Probably should just delete SIM_CPU. */
|
||||
-typedef struct _sim_cpu SIM_CPU;
|
||||
typedef struct _sim_cpu sim_cpu;
|
||||
|
||||
#include "sim-module.h"
|
||||
diff --git a/sim/cr16/sim-main.h b/sim/cr16/sim-main.h
|
||||
index a63b93e..1a80229 100644
|
||||
--- a/sim/cr16/sim-main.h
|
||||
+++ b/sim/cr16/sim-main.h
|
||||
@@ -24,6 +24,8 @@
|
||||
typedef long int word;
|
||||
typedef unsigned long int uword;
|
||||
|
||||
+typedef struct _sim_cpu SIM_CPU;
|
||||
+
|
||||
#include "sim-base.h"
|
||||
#include "bfd.h"
|
||||
|
||||
diff --git a/sim/cris/sim-main.h b/sim/cris/sim-main.h
|
||||
index 4dc04a2..fec0039 100644
|
||||
--- a/sim/cris/sim-main.h
|
||||
+++ b/sim/cris/sim-main.h
|
||||
@@ -24,6 +24,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||
#ifndef SIM_MAIN_H
|
||||
#define SIM_MAIN_H
|
||||
|
||||
+#define USING_SIM_BASE_H
|
||||
+
|
||||
+struct _sim_cpu;
|
||||
+typedef struct _sim_cpu SIM_CPU;
|
||||
+
|
||||
#include "symcat.h"
|
||||
#include "sim-basics.h"
|
||||
#include "cgen-types.h"
|
||||
diff --git a/sim/d10v/sim-main.h b/sim/d10v/sim-main.h
|
||||
index 0b87811..a7d59dd 100644
|
||||
--- a/sim/d10v/sim-main.h
|
||||
+++ b/sim/d10v/sim-main.h
|
||||
@@ -24,6 +24,8 @@
|
||||
typedef long int word;
|
||||
typedef unsigned long int uword;
|
||||
|
||||
+typedef struct _sim_cpu SIM_CPU;
|
||||
+
|
||||
#include "sim-base.h"
|
||||
#include "bfd.h"
|
||||
|
||||
diff --git a/sim/frv/sim-main.h b/sim/frv/sim-main.h
|
||||
index d5a67cb..fd12c4f 100644
|
||||
--- a/sim/frv/sim-main.h
|
||||
+++ b/sim/frv/sim-main.h
|
||||
@@ -19,6 +19,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||
|
||||
/* Main header for the frv. */
|
||||
|
||||
+#define USING_SIM_BASE_H /* FIXME: quick hack */
|
||||
+
|
||||
+struct _sim_cpu; /* FIXME: should be in sim-basics.h */
|
||||
+typedef struct _sim_cpu SIM_CPU;
|
||||
+
|
||||
+/* Set the mask of unsupported traces. */
|
||||
+#define WITH_TRACE \
|
||||
+ (~(TRACE_alu | TRACE_decode | TRACE_memory | TRACE_model | TRACE_fpu \
|
||||
+ | TRACE_branch | TRACE_debug))
|
||||
+
|
||||
/* sim-basics.h includes config.h but cgen-types.h must be included before
|
||||
sim-basics.h and cgen-types.h needs config.h. */
|
||||
#include "config.h"
|
||||
diff --git a/sim/ft32/sim-main.h b/sim/ft32/sim-main.h
|
||||
index b27a690..a270a5d 100644
|
||||
--- a/sim/ft32/sim-main.h
|
||||
+++ b/sim/ft32/sim-main.h
|
||||
@@ -25,6 +25,8 @@
|
||||
#include "sim-base.h"
|
||||
#include "bfd.h"
|
||||
|
||||
+typedef struct _sim_cpu SIM_CPU;
|
||||
+
|
||||
#include "ft32-sim.h"
|
||||
|
||||
struct _sim_cpu {
|
||||
diff --git a/sim/h8300/sim-main.h b/sim/h8300/sim-main.h
|
||||
index 6dbc1ac..e95c4d9 100644
|
||||
--- a/sim/h8300/sim-main.h
|
||||
+++ b/sim/h8300/sim-main.h
|
||||
@@ -87,6 +87,9 @@ enum h8_typecodes {
|
||||
};
|
||||
|
||||
#include "sim-basics.h"
|
||||
+
|
||||
+typedef struct _sim_cpu SIM_CPU;
|
||||
+
|
||||
#include "sim-base.h"
|
||||
|
||||
/* Structure used to describe addressing */
|
||||
diff --git a/sim/iq2000/sim-main.h b/sim/iq2000/sim-main.h
|
||||
index 992520a..ce3baba 100644
|
||||
--- a/sim/iq2000/sim-main.h
|
||||
+++ b/sim/iq2000/sim-main.h
|
||||
@@ -4,6 +4,11 @@
|
||||
#ifndef SIM_MAIN_H
|
||||
#define SIM_MAIN_H
|
||||
|
||||
+#define USING_SIM_BASE_H /* FIXME: quick hack */
|
||||
+
|
||||
+struct _sim_cpu; /* FIXME: should be in sim-basics.h */
|
||||
+typedef struct _sim_cpu SIM_CPU;
|
||||
+
|
||||
/* sim-basics.h includes config.h but cgen-types.h must be included before
|
||||
sim-basics.h and cgen-types.h needs config.h. */
|
||||
#include "config.h"
|
||||
diff --git a/sim/lm32/sim-main.h b/sim/lm32/sim-main.h
|
||||
index 4894e8d..210bb8b 100644
|
||||
--- a/sim/lm32/sim-main.h
|
||||
+++ b/sim/lm32/sim-main.h
|
||||
@@ -23,6 +23,11 @@
|
||||
#ifndef SIM_MAIN_H
|
||||
#define SIM_MAIN_H
|
||||
|
||||
+#define USING_SIM_BASE_H /* FIXME: quick hack */
|
||||
+
|
||||
+struct _sim_cpu; /* FIXME: should be in sim-basics.h */
|
||||
+typedef struct _sim_cpu SIM_CPU;
|
||||
+
|
||||
#include "symcat.h"
|
||||
#include "sim-basics.h"
|
||||
#include "cgen-types.h"
|
||||
diff --git a/sim/m32r/sim-main.h b/sim/m32r/sim-main.h
|
||||
index cd39e98..74bb513 100644
|
||||
--- a/sim/m32r/sim-main.h
|
||||
+++ b/sim/m32r/sim-main.h
|
||||
@@ -3,6 +3,11 @@
|
||||
#ifndef SIM_MAIN_H
|
||||
#define SIM_MAIN_H
|
||||
|
||||
+#define USING_SIM_BASE_H /* FIXME: quick hack */
|
||||
+
|
||||
+struct _sim_cpu; /* FIXME: should be in sim-basics.h */
|
||||
+typedef struct _sim_cpu SIM_CPU;
|
||||
+
|
||||
#include "symcat.h"
|
||||
#include "sim-basics.h"
|
||||
#include "cgen-types.h"
|
||||
diff --git a/sim/m68hc11/sim-main.h b/sim/m68hc11/sim-main.h
|
||||
index d1fc582..4f41db9 100644
|
||||
--- a/sim/m68hc11/sim-main.h
|
||||
+++ b/sim/m68hc11/sim-main.h
|
||||
@@ -25,6 +25,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||
#define SIM_HANDLES_LMA 1
|
||||
|
||||
#include "sim-basics.h"
|
||||
+
|
||||
+typedef struct _sim_cpu SIM_CPU;
|
||||
+
|
||||
#include "sim-signal.h"
|
||||
#include "sim-base.h"
|
||||
|
||||
diff --git a/sim/mcore/sim-main.h b/sim/mcore/sim-main.h
|
||||
index be50ec1..25698c1 100644
|
||||
--- a/sim/mcore/sim-main.h
|
||||
+++ b/sim/mcore/sim-main.h
|
||||
@@ -24,6 +24,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||
typedef long int word;
|
||||
typedef unsigned long int uword;
|
||||
|
||||
+typedef struct _sim_cpu SIM_CPU;
|
||||
+
|
||||
#include "sim-base.h"
|
||||
#include "bfd.h"
|
||||
|
||||
diff --git a/sim/microblaze/sim-main.h b/sim/microblaze/sim-main.h
|
||||
index 6781374..6b7b776 100644
|
||||
--- a/sim/microblaze/sim-main.h
|
||||
+++ b/sim/microblaze/sim-main.h
|
||||
@@ -20,6 +20,9 @@
|
||||
|
||||
#include "microblaze.h"
|
||||
#include "sim-basics.h"
|
||||
+
|
||||
+typedef struct _sim_cpu SIM_CPU;
|
||||
+
|
||||
#include "sim-base.h"
|
||||
|
||||
/* The machine state.
|
||||
diff --git a/sim/mips/sim-main.h b/sim/mips/sim-main.h
|
||||
index 8d698ad..9729804 100644
|
||||
--- a/sim/mips/sim-main.h
|
||||
+++ b/sim/mips/sim-main.h
|
||||
@@ -29,6 +29,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||
mips_core_signal ((SD), (CPU), (CIA), (MAP), (NR_BYTES), (ADDR), (TRANSFER), (ERROR))
|
||||
|
||||
#include "sim-basics.h"
|
||||
+
|
||||
+typedef struct _sim_cpu SIM_CPU;
|
||||
+
|
||||
#include "sim-base.h"
|
||||
#include "bfd.h"
|
||||
|
||||
diff --git a/sim/mn10300/sim-main.h b/sim/mn10300/sim-main.h
|
||||
index 847506e..2ddbfb9 100644
|
||||
--- a/sim/mn10300/sim-main.h
|
||||
+++ b/sim/mn10300/sim-main.h
|
||||
@@ -42,6 +42,8 @@
|
||||
#include "itable.h"
|
||||
#include "idecode.h"
|
||||
|
||||
+typedef struct _sim_cpu SIM_CPU;
|
||||
+
|
||||
#define WITH_WATCHPOINTS 1
|
||||
|
||||
#define SIM_CORE_SIGNAL(SD,CPU,CIA,MAP,NR_BYTES,ADDR,TRANSFER,ERROR) \
|
||||
diff --git a/sim/moxie/sim-main.h b/sim/moxie/sim-main.h
|
||||
index b1a64fc..c60437e 100644
|
||||
--- a/sim/moxie/sim-main.h
|
||||
+++ b/sim/moxie/sim-main.h
|
||||
@@ -21,6 +21,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||
#define SIM_MAIN_H
|
||||
|
||||
#include "sim-basics.h"
|
||||
+
|
||||
+typedef struct _sim_cpu SIM_CPU;
|
||||
+
|
||||
#include "sim-base.h"
|
||||
#include "bfd.h"
|
||||
|
||||
diff --git a/sim/msp430/sim-main.h b/sim/msp430/sim-main.h
|
||||
index 19c8cca..37bb42d 100644
|
||||
--- a/sim/msp430/sim-main.h
|
||||
+++ b/sim/msp430/sim-main.h
|
||||
@@ -23,6 +23,9 @@
|
||||
|
||||
#include "sim-basics.h"
|
||||
#include "sim-signal.h"
|
||||
+
|
||||
+typedef struct _sim_cpu SIM_CPU;
|
||||
+
|
||||
#include "msp430-sim.h"
|
||||
#include "sim-base.h"
|
||||
|
||||
diff --git a/sim/sh/sim-main.h b/sim/sh/sim-main.h
|
||||
index e67df28..e2e17d7 100644
|
||||
--- a/sim/sh/sim-main.h
|
||||
+++ b/sim/sh/sim-main.h
|
||||
@@ -20,6 +20,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||
#define SIM_MAIN_H
|
||||
|
||||
#include "sim-basics.h"
|
||||
+
|
||||
+typedef struct _sim_cpu SIM_CPU;
|
||||
+
|
||||
#include "sim-base.h"
|
||||
|
||||
typedef struct
|
||||
diff --git a/sim/sh64/sim-main.h b/sim/sh64/sim-main.h
|
||||
index 7b24ab0..8fb595e 100644
|
||||
--- a/sim/sh64/sim-main.h
|
||||
+++ b/sim/sh64/sim-main.h
|
||||
@@ -3,6 +3,11 @@
|
||||
#ifndef SIM_MAIN_H
|
||||
#define SIM_MAIN_H
|
||||
|
||||
+#define USING_SIM_BASE_H /* FIXME: quick hack */
|
||||
+
|
||||
+struct _sim_cpu; /* FIXME: should be in sim-basics.h */
|
||||
+typedef struct _sim_cpu SIM_CPU;
|
||||
+
|
||||
/* sim-basics.h includes config.h but cgen-types.h must be included before
|
||||
sim-basics.h and cgen-types.h needs config.h. */
|
||||
#include "config.h"
|
||||
diff --git a/sim/v850/sim-main.h b/sim/v850/sim-main.h
|
||||
index 5127d28..16cbd97 100644
|
||||
--- a/sim/v850/sim-main.h
|
||||
+++ b/sim/v850/sim-main.h
|
||||
@@ -16,6 +16,9 @@
|
||||
#include "sim-basics.h"
|
||||
#include "sim-signal.h"
|
||||
#include "sim-fpu.h"
|
||||
+
|
||||
+typedef struct _sim_cpu SIM_CPU;
|
||||
+
|
||||
#include "sim-base.h"
|
||||
|
||||
#include "simops.h"
|
||||
--
|
||||
2.7.4
|
||||
|
||||
@@ -1,155 +0,0 @@
|
||||
From 7a09ed68e203a813d88fb7fc6eeb1e92209561a5 Mon Sep 17 00:00:00 2001
|
||||
From: Mike Frysinger <vapier@gentoo.org>
|
||||
Date: Mon, 8 Aug 2016 13:06:49 +0800
|
||||
Subject: [PATCH] sim: bfin: split out common mach/model defines into arch.h
|
||||
[PR sim/20438]
|
||||
|
||||
The current machs.h mixes common enums with Blackfin-specific defines.
|
||||
This causes us troubles with header inclusion order such that we can't
|
||||
drop the old SIM_CPU typedef (which is duplicated in common code). By
|
||||
splitting the two up, we can unwind this dependency chain, and drop the
|
||||
old typedef. It also fixes building with older gcc versions.
|
||||
|
||||
[Romain: backport from gdb 7.12]
|
||||
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
||||
|
||||
---
|
||||
sim/bfin/ChangeLog | 9 +++++++++
|
||||
sim/bfin/arch.h | 44 ++++++++++++++++++++++++++++++++++++++++++++
|
||||
sim/bfin/machs.h | 20 --------------------
|
||||
sim/bfin/sim-main.h | 8 ++------
|
||||
4 files changed, 55 insertions(+), 26 deletions(-)
|
||||
create mode 100644 sim/bfin/arch.h
|
||||
|
||||
diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog
|
||||
index 3dea7c9..a995436 100644
|
||||
--- a/sim/bfin/ChangeLog
|
||||
+++ b/sim/bfin/ChangeLog
|
||||
@@ -1,3 +1,12 @@
|
||||
+2016-08-13 Mike Frysinger <vapier@gentoo.org>
|
||||
+
|
||||
+ PR sim/20438
|
||||
+ * machs.h (MODEL_TYPE, MACH_ATTR, BFIN_INSN_*): Move ...
|
||||
+ * arch.h: ... to this new header file.
|
||||
+ * sim-main.h (SIM_CPU): Delete.
|
||||
+ Include arch.h before sim-base.h, and move sim-base.h before
|
||||
+ bfin-sim.h.
|
||||
+
|
||||
2016-01-10 Mike Frysinger <vapier@gentoo.org>
|
||||
|
||||
* config.in, configure: Regenerate.
|
||||
diff --git a/sim/bfin/arch.h b/sim/bfin/arch.h
|
||||
new file mode 100644
|
||||
index 0000000..b86d3e9
|
||||
--- /dev/null
|
||||
+++ b/sim/bfin/arch.h
|
||||
@@ -0,0 +1,44 @@
|
||||
+/* Simulator for Analog Devices Blackfin processors.
|
||||
+
|
||||
+ Copyright (C) 2005-2016 Free Software Foundation, Inc.
|
||||
+ Contributed by Analog Devices, Inc.
|
||||
+
|
||||
+ This file is part of simulators.
|
||||
+
|
||||
+ This program is free software; you can redistribute it and/or modify
|
||||
+ it under the terms of the GNU General Public License as published by
|
||||
+ the Free Software Foundation; either version 3 of the License, or
|
||||
+ (at your option) any later version.
|
||||
+
|
||||
+ This program is distributed in the hope that it will be useful,
|
||||
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
+ GNU General Public License for more details.
|
||||
+
|
||||
+ You should have received a copy of the GNU General Public License
|
||||
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||
+
|
||||
+#ifndef BFIN_ARCH_H
|
||||
+#define BFIN_ARCH_H
|
||||
+
|
||||
+typedef enum model_type {
|
||||
+#define P(n) MODEL_BF##n,
|
||||
+#include "proc_list.def"
|
||||
+#undef P
|
||||
+ MODEL_MAX
|
||||
+} MODEL_TYPE;
|
||||
+
|
||||
+typedef enum mach_attr {
|
||||
+ MACH_BASE,
|
||||
+ MACH_BFIN,
|
||||
+ MACH_MAX
|
||||
+} MACH_ATTR;
|
||||
+
|
||||
+enum {
|
||||
+#define I(insn) BFIN_INSN_##insn,
|
||||
+#include "insn_list.def"
|
||||
+#undef I
|
||||
+ BFIN_INSN_MAX
|
||||
+};
|
||||
+
|
||||
+#endif
|
||||
diff --git a/sim/bfin/machs.h b/sim/bfin/machs.h
|
||||
index 0372982..36819ae 100644
|
||||
--- a/sim/bfin/machs.h
|
||||
+++ b/sim/bfin/machs.h
|
||||
@@ -21,19 +21,6 @@
|
||||
#ifndef _BFIN_MACHS_H_
|
||||
#define _BFIN_MACHS_H_
|
||||
|
||||
-typedef enum model_type {
|
||||
-#define P(n) MODEL_BF##n,
|
||||
-#include "proc_list.def"
|
||||
-#undef P
|
||||
- MODEL_MAX
|
||||
-} MODEL_TYPE;
|
||||
-
|
||||
-typedef enum mach_attr {
|
||||
- MACH_BASE,
|
||||
- MACH_BFIN,
|
||||
- MACH_MAX
|
||||
-} MACH_ATTR;
|
||||
-
|
||||
#define CPU_MODEL_NUM(cpu) MODEL_NUM (CPU_MODEL (cpu))
|
||||
|
||||
/* XXX: Some of this probably belongs in CPU_MODEL. */
|
||||
@@ -46,13 +33,6 @@ void bfin_model_cpu_init (SIM_DESC, SIM_CPU *);
|
||||
bu32 bfin_model_get_chipid (SIM_DESC);
|
||||
bu32 bfin_model_get_dspid (SIM_DESC);
|
||||
|
||||
-enum {
|
||||
-#define I(insn) BFIN_INSN_##insn,
|
||||
-#include "insn_list.def"
|
||||
-#undef I
|
||||
- BFIN_INSN_MAX
|
||||
-};
|
||||
-
|
||||
#define BFIN_COREMMR_CEC_BASE 0xFFE02100
|
||||
#define BFIN_COREMMR_CEC_SIZE (4 * 5)
|
||||
#define BFIN_COREMMR_CTIMER_BASE 0xFFE03000
|
||||
diff --git a/sim/bfin/sim-main.h b/sim/bfin/sim-main.h
|
||||
index 51fb87e..34fd153 100644
|
||||
--- a/sim/bfin/sim-main.h
|
||||
+++ b/sim/bfin/sim-main.h
|
||||
@@ -23,17 +23,13 @@
|
||||
|
||||
#include "sim-basics.h"
|
||||
#include "sim-signal.h"
|
||||
-
|
||||
-/* TODO: Delete this. Need to convert bu32/etc... to common sim types
|
||||
- and unwind the bfin-sim.h/machs.h include below first though. */
|
||||
-typedef struct _sim_cpu SIM_CPU;
|
||||
+#include "arch.h"
|
||||
+#include "sim-base.h"
|
||||
|
||||
#include "bfin-sim.h"
|
||||
|
||||
#include "machs.h"
|
||||
|
||||
-#include "sim-base.h"
|
||||
-
|
||||
struct _sim_cpu {
|
||||
/* ... simulator specific members ... */
|
||||
struct bfin_cpu_state state;
|
||||
--
|
||||
2.9.3
|
||||
|
||||
@@ -2,7 +2,6 @@ config BR2_PACKAGE_GDB_ARCH_SUPPORTS
|
||||
bool
|
||||
default y
|
||||
depends on !((BR2_arm || BR2_armeb) && BR2_BINFMT_FLAT)
|
||||
depends on !BR2_bfin
|
||||
depends on !BR2_microblaze
|
||||
depends on !BR2_nios2
|
||||
depends on !BR2_or1k
|
||||
|
||||
@@ -74,7 +74,7 @@ endif
|
||||
# If cross-gdb is not enabled, the latest working version is chosen.
|
||||
config BR2_GDB_VERSION
|
||||
string
|
||||
default "arc-2017.09-release-gdb" if BR2_arc
|
||||
default "arc-2018.03-rc1-gdb" if BR2_arc
|
||||
default "7.10.1" if BR2_GDB_VERSION_7_10
|
||||
default "7.11.1" if BR2_GDB_VERSION_7_11 || !BR2_PACKAGE_HOST_GDB
|
||||
default "7.12.1" if BR2_GDB_VERSION_7_12
|
||||
|
||||
@@ -5,4 +5,4 @@ sha512 0ac8d0a495103611ef41167a08313a010dce6ca4c6d827cbe8558a0c1a1a8a6bfa53f1b7
|
||||
sha512 5eb328910033f0918058be2f92caebf1e8dfc6caa3c730d99d621627e53de3c1b43761c2f683d53555893253c2f06768cbf56cdea051a3d291ffb6cfae87b5e1 gdb-8.0.1.tar.xz
|
||||
|
||||
# Locally calculated (fetched from Github)
|
||||
sha512 e57582766e7d510b26bea63606429e6289414c31c60e28fef24d3d82fa20fb5a1f92b3831fde53e4f7c178c9e099609d3292628cf921a99109e297af4e5f83d9 gdb-arc-2017.09-release-gdb.tar.gz
|
||||
sha512 975f0e09c9fd3ba1ca6aefdeb2da4b2804802606518c0cfdf7abe07c83a61341c1af5c2d2ddfd55ba6112fed420dedc529bc484d0c25b289bbed05edc99d0e72 gdb-arc-2018.03-rc1-gdb.tar.gz
|
||||
|
||||
@@ -109,7 +109,7 @@ GDB_CONF_OPTS = \
|
||||
--without-x \
|
||||
--disable-sim \
|
||||
$(GDB_DISABLE_BINUTILS_CONF_OPTS) \
|
||||
$(if $(BR2_PACKAGE_GDB_SERVER),--enable-gdbserver) \
|
||||
$(if $(BR2_PACKAGE_GDB_SERVER),--enable-gdbserver,--disable-gdbserver) \
|
||||
--with-curses \
|
||||
--without-included-gettext \
|
||||
--disable-werror \
|
||||
@@ -164,6 +164,7 @@ else
|
||||
GDB_CONF_OPTS += --without-zlib
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GDB_PYTHON),)
|
||||
# This removes some unneeded Python scripts and XML target description
|
||||
# files that are not useful for a normal usage of the debugger.
|
||||
define GDB_REMOVE_UNNEEDED_FILES
|
||||
@@ -171,6 +172,7 @@ define GDB_REMOVE_UNNEEDED_FILES
|
||||
endef
|
||||
|
||||
GDB_POST_INSTALL_TARGET_HOOKS += GDB_REMOVE_UNNEEDED_FILES
|
||||
endif
|
||||
|
||||
# This installs the gdbserver somewhere into the $(HOST_DIR) so that
|
||||
# it becomes an integral part of the SDK, if the toolchain generated
|
||||
@@ -215,16 +217,8 @@ else
|
||||
HOST_GDB_CONF_OPTS += --without-python
|
||||
endif
|
||||
|
||||
# workaround a bug if in-tree build is used for bfin sim
|
||||
define HOST_GDB_BFIN_SIM_WORKAROUND
|
||||
$(RM) $(@D)/sim/common/tconfig.h
|
||||
endef
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HOST_GDB_SIM),y)
|
||||
HOST_GDB_CONF_OPTS += --enable-sim
|
||||
ifeq ($(BR2_bfin),y)
|
||||
HOST_GDB_PRE_CONFIGURE_HOOKS += HOST_GDB_BFIN_SIM_WORKAROUND
|
||||
endif
|
||||
else
|
||||
HOST_GDB_CONF_OPTS += --disable-sim
|
||||
endif
|
||||
|
||||
Reference in New Issue
Block a user