aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2015-06-23 23:39:52 +0545
committerMike Frysinger <vapier@gentoo.org>2015-06-23 14:04:49 -0400
commitb50a153264dae2267e3846772819515c648e3c97 (patch)
tree89bcdb65b58d51ce51cc1e8f1e1219265d091448
parent7564fe458c2fe1a77eecfaf5e2f99bec8961d457 (diff)
downloadgdb-b50a153264dae2267e3846772819515c648e3c97.zip
gdb-b50a153264dae2267e3846772819515c648e3c97.tar.gz
gdb-b50a153264dae2267e3846772819515c648e3c97.tar.bz2
sim: assume recentish compiler/systems
Assume the build system supports stdint.h/stdarg.h as those have been around long enough and we don't care about pre-stdc compilers anymore.
-rw-r--r--sim/arm/ChangeLog7
-rw-r--r--sim/arm/armdefs.h13
-rw-r--r--sim/arm/dbg_hif.h6
-rw-r--r--sim/common/ChangeLog5
-rw-r--r--sim/common/cgen-trace.c8
-rw-r--r--sim/common/sim-trace.c18
6 files changed, 14 insertions, 43 deletions
diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
index 4cc45a0..22b74db 100644
--- a/sim/arm/ChangeLog
+++ b/sim/arm/ChangeLog
@@ -1,3 +1,10 @@
+2015-06-23 Mike Frysinger <vapier@gentoo.org>
+
+ * armdefs.h: Always include stdint.h.
+ [!__STDC__]: Delete.
+ [!HAVE_STDINT_H]: Delete.
+ * dbg_hif.h [!__STDC__]: Delete.
+
2015-06-12 Mike Frysinger <vapier@gentoo.org>
* configure: Regenerate.
diff --git a/sim/arm/armdefs.h b/sim/arm/armdefs.h
index 50a0619..08a61f2 100644
--- a/sim/arm/armdefs.h
+++ b/sim/arm/armdefs.h
@@ -17,6 +17,7 @@
#include "config.h"
#include <stdio.h>
#include <stdlib.h>
+#include <stdint.h>
#define FALSE 0
#define TRUE 1
@@ -25,22 +26,10 @@
#define LOWHIGH 1
#define HIGHLOW 2
-#ifndef __STDC__
-typedef char *VoidStar;
-#endif
-
-#ifdef HAVE_STDINT_H
-#include <stdint.h>
typedef uint32_t ARMword;
typedef int32_t ARMsword;
typedef uint64_t ARMdword;
typedef int64_t ARMsdword;
-#else
-typedef unsigned int ARMword; /* must be 32 bits wide */
-typedef signed int ARMsword;
-typedef unsigned long long ARMdword; /* Must be at least 64 bits wide. */
-typedef signed long long ARMsdword;
-#endif
typedef struct ARMul_State ARMul_State;
typedef unsigned ARMul_CPInits (ARMul_State * state);
diff --git a/sim/arm/dbg_hif.h b/sim/arm/dbg_hif.h
index 3c6261a..686ed30 100644
--- a/sim/arm/dbg_hif.h
+++ b/sim/arm/dbg_hif.h
@@ -14,11 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, see <http://www.gnu.org/licenses/>. */
-#ifdef __STDC__
-# include <stdarg.h>
-#else
-# include <varargs.h>
-#endif
+#include <stdarg.h>
typedef void Hif_DbgPrint (void *arg, const char *format, va_list ap);
typedef void Hif_DbgPause (void *arg);
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog
index 722ad98..0f0773d 100644
--- a/sim/common/ChangeLog
+++ b/sim/common/ChangeLog
@@ -1,3 +1,8 @@
+2015-06-23 Mike Frysinger <vapier@gentoo.org>
+
+ * cgen-trace.c [!__STDC__]: Delete.
+ * sim-trace.h [!__STDC__]: Likewise.
+
2015-06-21 Mike Frysinger <vapier@gentoo.org>
* sim-model.c (sim_model_init): Assert model is not NULL.
diff --git a/sim/common/cgen-trace.c b/sim/common/cgen-trace.c
index 566f2e6..f163a6e 100644
--- a/sim/common/cgen-trace.c
+++ b/sim/common/cgen-trace.c
@@ -302,18 +302,10 @@ cgen_trace_printf (SIM_CPU *cpu, char *fmt, ...)
int
sim_disasm_sprintf (SFILE *f, const char *format, ...)
{
-#ifndef __STDC__
- SFILE *f;
- const char *format;
-#endif
int n;
va_list args;
va_start (args, format);
-#ifndef __STDC__
- f = va_arg (args, SFILE *);
- format = va_arg (args, char *);
-#endif
vsprintf (f->current, format, args);
f->current += n = strlen (f->current);
va_end (args);
diff --git a/sim/common/sim-trace.c b/sim/common/sim-trace.c
index f00fe9b..f5ee678 100644
--- a/sim/common/sim-trace.c
+++ b/sim/common/sim-trace.c
@@ -1294,19 +1294,9 @@ trace_one_insn (SIM_DESC sd, sim_cpu *cpu, address_word pc,
void
trace_printf (SIM_DESC sd, sim_cpu *cpu, const char *fmt, ...)
{
-#if !defined __STDC__ && !defined ALMOST_STDC
- SIM_DESC sd;
- sim_cpu *cpu;
- const char *fmt;
-#endif
va_list ap;
va_start (ap, fmt);
-#if !defined __STDC__ && !defined ALMOST_STDC
- sd = va_arg (ap, SIM_DESC);
- cpu = va_arg (ap, sim_cpu *);
- fmt = va_arg (ap, const char *);
-#endif
trace_vprintf (sd, cpu, fmt, ap);
@@ -1316,17 +1306,9 @@ trace_printf (SIM_DESC sd, sim_cpu *cpu, const char *fmt, ...)
void
debug_printf (sim_cpu *cpu, const char *fmt, ...)
{
-#if !defined __STDC__ && !defined ALMOST_STDC
- sim_cpu *cpu;
- const char *fmt;
-#endif
va_list ap;
va_start (ap, fmt);
-#if !defined __STDC__ && !defined ALMOST_STDC
- cpu = va_arg (ap, sim_cpu *);
- fmt = va_arg (ap, const char *);
-#endif
if (CPU_DEBUG_FILE (cpu) == NULL)
(* STATE_CALLBACK (CPU_STATE (cpu))->evprintf_filtered)