diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2015-06-23 23:39:52 +0545 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-06-23 14:04:49 -0400 |
| commit | b50a153264dae2267e3846772819515c648e3c97 (patch) | |
| tree | 89bcdb65b58d51ce51cc1e8f1e1219265d091448 /sim/arm | |
| parent | 7564fe458c2fe1a77eecfaf5e2f99bec8961d457 (diff) | |
| download | gdb-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.
Diffstat (limited to 'sim/arm')
| -rw-r--r-- | sim/arm/ChangeLog | 7 | ||||
| -rw-r--r-- | sim/arm/armdefs.h | 13 | ||||
| -rw-r--r-- | sim/arm/dbg_hif.h | 6 |
3 files changed, 9 insertions, 17 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); |