From dc049bf460bb1243aaaa48745bb8df64bbb3e1cd Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 19 Feb 2015 04:09:54 -0500 Subject: [PATCH] sim: drop unused headers These look like left over hacks from the days where we had to protect ourselves from the compiler and C library. None of these checks are relevant, and we have common configure logic to do header tests. Punt them all now. --- sim/mcore/ChangeLog | 6 +++ sim/mcore/interp.c | 4 +- sim/mcore/sysdep.h | 94 ---------------------------------------- sim/microblaze/ChangeLog | 6 +++ sim/microblaze/interp.c | 5 ++- sim/microblaze/sysdep.h | 94 ---------------------------------------- sim/moxie/ChangeLog | 6 +++ sim/moxie/interp.c | 4 +- sim/moxie/sysdep.h | 94 ---------------------------------------- 9 files changed, 25 insertions(+), 288 deletions(-) delete mode 100644 sim/mcore/sysdep.h delete mode 100644 sim/microblaze/sysdep.h delete mode 100644 sim/moxie/sysdep.h diff --git a/sim/mcore/ChangeLog b/sim/mcore/ChangeLog index acb0e21b5c1..43aadabe379 100644 --- a/sim/mcore/ChangeLog +++ b/sim/mcore/ChangeLog @@ -1,3 +1,9 @@ +2015-02-20 Mike Frysinger + + * interp.c: Delete sysdep.h and netinet/in.h includes. + Include stdlib.h and string.h. + * sysdep.h: Delete. + 2015-02-19 Mike Frysinger * interp.c (sim_kill): Delete unused func. diff --git a/sim/mcore/interp.c b/sim/mcore/interp.c index e2cafbca191..1b8d2a36782 100644 --- a/sim/mcore/interp.c +++ b/sim/mcore/interp.c @@ -19,10 +19,10 @@ along with this program. If not, see . */ #include "config.h" #include -#include "sysdep.h" +#include +#include #include #include -#include /* for byte ordering macros */ #include #include "bfd.h" #include "gdb/callback.h" diff --git a/sim/mcore/sysdep.h b/sim/mcore/sysdep.h deleted file mode 100644 index 9f690a11253..00000000000 --- a/sim/mcore/sysdep.h +++ /dev/null @@ -1,94 +0,0 @@ -/* System includes and definitions used by the Motorola MCore simulator. - Copyright (C) 1999-2015 Free Software Foundation, Inc. - Contributed by Cygnus Solutions. - -This file is part of GDB, the GNU debugger. - -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 . */ - -#ifndef __SYSDEP_H -#define __SYSDEP_H - -#ifndef hosts_std_host_H -#include -#include -#include -#include -#include -#include -#include -#include -#include "ansidecl.h" - -#ifndef O_ACCMODE -#define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR) -#endif -#ifndef SEEK_SET -#define SEEK_SET 0 -#endif -#ifndef SEEK_CUR -#define SEEK_CUR 1 -#endif -#ifdef STDC_HEADERS -#include -/*#include */ -#else -extern char * mktemp (); -#ifndef memset -extern PTR memset (); -#endif - -#ifndef DONTDECLARE_MALLOC -extern PTR malloc (); -extern PTR realloc (); -#endif - -#ifndef __GNUC__ -extern PTR memcpy (); -#else -/* char * memcpy (); */ -#endif - -#ifdef __STDC__ -extern void free (); -#else -extern int free(); -#endif - -#ifndef strchr -extern char * strchr(); -#endif -extern char * getenv(); -extern PTR memchr(); -extern char * strrchr(); - -extern char * strrchr(); -extern char * ctime(); -extern long atol(); -extern char * getenv(); -#endif /* STDC_HEADERS */ - -#ifndef BYTES_IN_PRINTF_INT -#define BYTES_IN_PRINTF_INT 4 -#endif - -#include "fopen-same.h" -#define hosts_std_host_H -#endif - -#ifdef STDC_HEADERS -#include -#endif /* STDC_HEADERS */ - -#endif /* __SYSDEP_H */ diff --git a/sim/microblaze/ChangeLog b/sim/microblaze/ChangeLog index a023f924582..0a068ffd6b3 100644 --- a/sim/microblaze/ChangeLog +++ b/sim/microblaze/ChangeLog @@ -1,3 +1,9 @@ +2015-02-20 Mike Frysinger + + * interp.c: Delete sysdep.h and netinet/in.h includes. + Include stdlib.h and string.h and unistd.h. + * sysdep.h: Delete. + 2015-02-19 Mike Frysinger * interp.c (sim_kill): Delete unused func. diff --git a/sim/microblaze/interp.c b/sim/microblaze/interp.c index b9349bc070d..64850efd42f 100644 --- a/sim/microblaze/interp.c +++ b/sim/microblaze/interp.c @@ -18,10 +18,11 @@ #include "config.h" #include -#include "sysdep.h" +#include +#include #include #include -#include /* for byte ordering macros */ +#include #include "bfd.h" #include "gdb/callback.h" #include "libiberty.h" diff --git a/sim/microblaze/sysdep.h b/sim/microblaze/sysdep.h deleted file mode 100644 index ebcd1f2cb65..00000000000 --- a/sim/microblaze/sysdep.h +++ /dev/null @@ -1,94 +0,0 @@ -/* System includes and definitions used by the Xilinx MicroBlaze simulator. - Copyright (C) 1999-2015 Free Software Foundation, Inc. - Contributed by Cygnus Solutions. - -This file is part of GDB, the GNU debugger. - -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, 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 . */ - -#ifndef __SYSDEP_H -#define __SYSDEP_H - -#ifndef hosts_std_host_H -#include -#include -#include -#include -#include -#include -#include -#include -#include "ansidecl.h" - -#ifndef O_ACCMODE -#define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR) -#endif -#ifndef SEEK_SET -#define SEEK_SET 0 -#endif -#ifndef SEEK_CUR -#define SEEK_CUR 1 -#endif -#ifdef STDC_HEADERS -#include -/*#include */ -#else -extern char *mktemp (); -#ifndef memset -extern PTR memset (); -#endif - -#ifndef DONTDECLARE_MALLOC -extern PTR malloc (); -extern PTR realloc (); -#endif - -#ifndef __GNUC__ -extern PTR memcpy (); -#else -/* char *memcpy (); */ -#endif - -#ifdef __STDC__ -extern void free (); -#else -extern int free(); -#endif - -#ifndef strchr -extern char *strchr(); -#endif -extern char *getenv(); -extern PTR memchr(); -extern char *strrchr(); - -extern char *strrchr(); -extern char *ctime(); -extern long atol(); -extern char *getenv(); -#endif /* STDC_HEADERS */ - -#ifndef BYTES_IN_PRINTF_INT -#define BYTES_IN_PRINTF_INT 4 -#endif - -#include "fopen-same.h" -#define hosts_std_host_H -#endif - -#ifdef STDC_HEADERS -#include -#endif /* STDC_HEADERS */ - -#endif /* __SYSDEP_H */ diff --git a/sim/moxie/ChangeLog b/sim/moxie/ChangeLog index 3b458ed407f..6e6f736507c 100644 --- a/sim/moxie/ChangeLog +++ b/sim/moxie/ChangeLog @@ -1,3 +1,9 @@ +2015-02-20 Mike Frysinger + + * interp.c: Delete sysdep.h and netinet/in.h includes. + Include string.h and unistd.h. + * sysdep.h: Delete. + 2015-02-19 Mike Frysinger * interp.c (sim_kill): Delete unused func. diff --git a/sim/moxie/interp.c b/sim/moxie/interp.c index 6e4a747f50f..1126552cc14 100644 --- a/sim/moxie/interp.c +++ b/sim/moxie/interp.c @@ -21,10 +21,10 @@ along with this program. If not, see . */ #include #include #include -#include "sysdep.h" +#include #include #include -#include /* for byte ordering macros */ +#include #include "bfd.h" #include "gdb/callback.h" #include "libiberty.h" diff --git a/sim/moxie/sysdep.h b/sim/moxie/sysdep.h deleted file mode 100644 index ba9778ea90a..00000000000 --- a/sim/moxie/sysdep.h +++ /dev/null @@ -1,94 +0,0 @@ -/* System includes and definitions used by the moxie simulator. - Copyright (C) 2008-2015 Free Software Foundation, Inc. - Contributed by Anthony Green - -This file is part of GDB, the GNU debugger. - -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 . */ - -#ifndef __SYSDEP_H -#define __SYSDEP_H - -#ifndef hosts_std_host_H -#include -#include -#include -#include -#include -#include -#include -#include -#include "ansidecl.h" - -#ifndef O_ACCMODE -#define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR) -#endif -#ifndef SEEK_SET -#define SEEK_SET 0 -#endif -#ifndef SEEK_CUR -#define SEEK_CUR 1 -#endif -#ifdef STDC_HEADERS -#include -/*#include */ -#else -extern char * mktemp (); -#ifndef memset -extern PTR memset (); -#endif - -#ifndef DONTDECLARE_MALLOC -extern PTR malloc (); -extern PTR realloc (); -#endif - -#ifndef __GNUC__ -extern PTR memcpy (); -#else -/* char * memcpy (); */ -#endif - -#ifdef __STDC__ -extern void free (); -#else -extern int free(); -#endif - -#ifndef strchr -extern char * strchr(); -#endif -extern char * getenv(); -extern PTR memchr(); -extern char * strrchr(); - -extern char * strrchr(); -extern char * ctime(); -extern long atol(); -extern char * getenv(); -#endif /* STDC_HEADERS */ - -#ifndef BYTES_IN_PRINTF_INT -#define BYTES_IN_PRINTF_INT 4 -#endif - -#include "fopen-same.h" -#define hosts_std_host_H -#endif - -#ifdef STDC_HEADERS -#include -#endif /* STDC_HEADERS */ - -#endif /* __SYSDEP_H */ -- 2.30.2