More cutover to system.h:

* Makefile.in (cppalloc.o, cpperror.o, cppexp.o, cpphash.o,
        cpplib.o, cppmain.o, fix-header.o, gcov.o, gen-protos.o,
        gengenrtl.o, halfpic.o, hash.o, scan-decls.o, scan.o): Depend on
        system.h.
        * cpphash.c: Include config.h.
        * cppalloc.c: Include system.h.  Add parameters to various
        function prototypes.
        * cpperror.c: Likewise.
        * cppexp.c: Likewise.
        * cpphash.c: Likewise.
        * cpplib.c: Likewise.
        * cppmain.c: Likewise.
        * fix-header.c: Likewise.
        * gcov.c: Likewise.
        * gen-protos.c: Likewise.
        * gengenrtl.c: Likewise.
        * halfpic.c: Likewise.
        * hash.c: Likewise.
        * scan-decls.c: Likewise.
        * scan.c: Likewise.

From-SVN: r18911
This commit is contained in:
Kaveh R. Ghazi 1998-03-30 12:05:54 +00:00 committed by Kaveh Ghazi
parent 1aa5d112c8
commit b04cd50711
16 changed files with 72 additions and 156 deletions

View File

@ -1,3 +1,27 @@
Mon Mar 30 14:43:20 1998 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* Makefile.in (cppalloc.o, cpperror.o, cppexp.o, cpphash.o,
cpplib.o, cppmain.o, fix-header.o, gcov.o, gen-protos.o,
gengenrtl.o, halfpic.o, hash.o, scan-decls.o, scan.o): Depend on
system.h.
* cpphash.c: Include config.h.
* cppalloc.c: Include system.h. Add parameters to various
function prototypes.
* cpperror.c: Likewise.
* cppexp.c: Likewise.
* cpphash.c: Likewise.
* cpplib.c: Likewise.
* cppmain.c: Likewise.
* fix-header.c: Likewise.
* gcov.c: Likewise.
* gen-protos.c: Likewise.
* gengenrtl.c: Likewise.
* halfpic.c: Likewise.
* hash.c: Likewise.
* scan-decls.c: Likewise.
* scan.c: Likewise.
Mon Mar 30 11:06:45 1998 Jim Wilson <wilson@cygnus.com>
* README.gnat: Add lang_print_xnode definition.

View File

@ -1271,7 +1271,7 @@ collect2.o : collect2.c $(CONFIG_H) system.h gansidecl.h gstab.h obstack.h \
-c `echo $(srcdir)/collect2.c | sed 's,^\./,,'`
tlink.o: tlink.c $(DEMANGLE_H) hash.h $(CONFIG_H) system.h
hash.o: hash.c hash.h
hash.o: hash.c hash.h system.h
cplus-dem.o: cplus-dem.c $(DEMANGLE_H)
underscore.c: stamp-under ; @true
@ -1452,7 +1452,7 @@ mips-tdump: mips-tdump.o version.o $(LIBDEPS)
mips-tdump.o : mips-tdump.c $(CONFIG_H) $(RTL_H)
# Build file to support OSF/rose half-pic format.
halfpic.o: halfpic.c $(CONFIG_H) $(RTL_H) $(TREE_H)
halfpic.o: halfpic.c $(CONFIG_H) $(RTL_H) $(TREE_H) system.h
# Normally this target is not used; but it is used if you
# define ALLOCA=alloca.o. In that case, you must get a suitable alloca.c
@ -1695,7 +1695,7 @@ gengenrtl : gengenrtl.o $(HOST_LIBDEPS)
$(HOST_CC) $(HOST_CFLAGS) $(HOST_LDFLAGS) -o $@ \
gengenrtl.o $(HOST_LIBS)
gengenrtl.o : gengenrtl.c $(RTL_BASE_H)
gengenrtl.o : gengenrtl.c $(RTL_BASE_H) system.h
$(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(srcdir)/gengenrtl.c
#
@ -1770,9 +1770,9 @@ cppmain$(exeext): cppmain.o cpplib.o cpphash.o cppalloc.o cpperror.o cppexp.o \
$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ cppmain.o cpplib.o cpphash.o \
cppalloc.o cpperror.o cppexp.o prefix.o version.o $(LIBS)
cppmain.o: cppmain.c $(CONFIG_H) cpplib.h
cppmain.o: cppmain.c $(CONFIG_H) cpplib.h system.h
cpplib.o: cpplib.c $(CONFIG_H) cpplib.h cpphash.h config.status
cpplib.o: cpplib.c $(CONFIG_H) cpplib.h cpphash.h config.status system.h
$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
-DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
-DGPLUSPLUS_INCLUDE_DIR=\"$(gxx_include_dir)\" \
@ -1782,13 +1782,13 @@ cpplib.o: cpplib.c $(CONFIG_H) cpplib.h cpphash.h config.status
-DTOOL_INCLUDE_DIR=\"$(tooldir)/include\" \
-c `echo $(srcdir)/cpplib.c | sed 's,^\./,,'`
cpperror.o: cpperror.c $(CONFIG_H) cpplib.h
cpperror.o: cpperror.c $(CONFIG_H) cpplib.h system.h
cppexp.o: cppexp.c $(CONFIG_H) cpplib.h
cppexp.o: cppexp.c $(CONFIG_H) cpplib.h system.h
cpphash.o: cpphash.c cpplib.h cpphash.h
cpphash.o: cpphash.c cpplib.h cpphash.h $(CONFIG_H) system.h
cppalloc.o: cppalloc.c $(CONFIG_H)
cppalloc.o: cppalloc.c $(CONFIG_H) cpplib.h system.h
# Note for the stamp targets, we run the program `true' instead of
# having an empty command (nothing following the semicolon).
@ -1867,7 +1867,7 @@ test-protoize-simple: ./protoize ./unprotoize $(GCC_PASSES)
diff $(srcdir)/protoize.c tmp-proto.c | cat
-rm -f tmp-proto.[cs] tmp-proto$(objext)
gcov.o: gcov.c gcov-io.h
gcov.o: gcov.c gcov-io.h system.h
# Only one of 'gcov' or 'gcov.exe' is actually built, depending
# upon whether $(exeext) is empty or not.
@ -1951,10 +1951,10 @@ gen-protos: gen-protos.o scan.o cppalloc.o $(HOST_LIBDEPS)
${HOST_CC} $(HOST_CFLAGS) $(HOST_LDFLAGS) -o $@ \
gen-protos.o scan.o cppalloc.o $(HOST_LIBS)
gen-protos.o: gen-protos.c scan.h $(build_xm_file)
gen-protos.o: gen-protos.c scan.h $(build_xm_file) system.h
$(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(srcdir)/gen-protos.c
scan.o: scan.c scan.h $(build_xm_file)
scan.o: scan.c scan.h $(build_xm_file) system.h
$(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(srcdir)/scan.c
xsys-protos.h: $(GCC_PASSES) $(srcdir)/sys-protos.h deduced.h gen-protos Makefile
@ -1972,10 +1972,11 @@ fix-header: fix-header.o scan-decls.o scan.o xsys-protos.h $(HOST_LIBDEPS) \
scan-decls.o scan.o cpplib.o cpphash.o cppalloc.o prefix.o \
version.o cppexp.o $(HOST_LIBS)
fix-header.o: fix-header.c obstack.h scan.h xsys-protos.h $(build_xm_file)
fix-header.o: fix-header.c obstack.h scan.h xsys-protos.h $(build_xm_file) \
system.h
$(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(srcdir)/fix-header.c
scan-decls.o: scan-decls.c scan.h cpplib.h $(build_xm_file)
scan-decls.o: scan-decls.c scan.h cpplib.h $(build_xm_file) system.h
$(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(srcdir)/scan-decls.c
# stmp-fixproto depends on this, not on fix-header directly.

View File

@ -23,10 +23,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
what you give them. Help stamp out software-hoarding! */
#include "config.h"
#include <stdio.h>
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
#include "system.h"
#include "cpplib.h"
static void

View File

@ -24,10 +24,12 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef EMACS
#include "config.h"
#include "system.h"
#else
#include <stdio.h>
#endif /* not EMACS */
#include "cpplib.h"
#include <stdio.h>
/* Print the file names and line numbers of the #include
commands which led to the current file. */

View File

@ -25,32 +25,17 @@ Written by Per Bothner 1994. */
/* Parse a C expression from text in a string */
#include "config.h"
#include "system.h"
#include "cpplib.h"
#include "gansidecl.h"
extern char *xmalloc PARAMS ((unsigned));
extern char *xrealloc PARAMS ((void *, unsigned));
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
#ifdef MULTIBYTE_CHARS
#include <locale.h>
#endif
#if HAVE_LIMITS_H
# include <limits.h>
#endif
#ifdef HAVE_STRING_H
#include <string.h>
#else
#ifdef HAVE_STRINGS_H
#include <strings.h>
#endif
#endif
#include <stdio.h>
/* This is used for communicating lists of keywords with cccp.c. */
struct arglist {
struct arglist *next;
@ -59,26 +44,6 @@ struct arglist {
int argno;
};
/* Define a generic NULL if one hasn't already been defined. */
#ifndef NULL
#define NULL 0
#endif
#ifndef GENERIC_PTR
#if defined (USE_PROTOTYPES) ? USE_PROTOTYPES : defined (__STDC__)
#define GENERIC_PTR void *
#else
#define GENERIC_PTR char *
#endif
#endif
#ifndef NULL_PTR
#define NULL_PTR ((GENERIC_PTR) 0)
#endif
extern char *xmalloc ();
#ifndef CHAR_TYPE_SIZE
#define CHAR_TYPE_SIZE BITS_PER_UNIT
#endif
@ -115,9 +80,9 @@ extern char *xmalloc ();
number with SUM's sign, where A, B, and SUM are all C integers. */
#define possible_sum_sign(a, b, sum) ((((a) ^ (b)) | ~ ((a) ^ (sum))) < 0)
static void integer_overflow ();
static long left_shift ();
static long right_shift ();
static void integer_overflow PARAMS ((cpp_reader *));
static long left_shift PARAMS ((cpp_reader *, long, int, unsigned long));
static long right_shift PARAMS ((cpp_reader *, long, int, unsigned long));
#define ERROR 299
#define OROR 300

View File

@ -22,6 +22,8 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
You are forbidden to forbid anyone else to use, share and improve
what you give them. Help stamp out software-hoarding! */
#include "config.h"
#include "system.h"
#include "cpplib.h"
#include "cpphash.h"
#include "gansidecl.h"

View File

@ -19,30 +19,14 @@ along with this program; if not, write to the Free Software
Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include "config.h"
#include "system.h"
#ifndef STDC_VALUE
#define STDC_VALUE 1
#endif
#include <ctype.h>
#include <stdio.h>
#include <signal.h>
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
#ifdef TIME_WITH_SYS_TIME
# include <sys/time.h>
# include <time.h>
#else
# if HAVE_SYS_TIME_H
# include <sys/time.h>
# else
# include <time.h>
#endif
#endif
#ifdef HAVE_SYS_TIMES_H
#include <sys/times.h>
#endif
@ -51,45 +35,10 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
# include <sys/resource.h>
#endif
#ifdef HAVE_FCNTL_H
# include <fcntl.h>
#endif
#if HAVE_LIMITS_H
# include <limits.h>
#endif
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#ifdef HAVE_STRING_H
# include <string.h>
# else
# ifdef HAVE_STRINGS_H
# include <strings.h>
#endif
#endif
/* This defines "errno" properly for VMS, and gives us EACCES. */
#include <errno.h>
#include "cpplib.h"
#include "cpphash.h"
#include "gansidecl.h"
#ifdef NEED_DECLARATION_INDEX
extern char *index ();
#endif
#ifdef NEED_DECLARATION_RINDEX
extern char *rindex ();
#endif
#ifdef NEED_DECLARATION_GETENV
extern char *getenv ();
#endif
extern char *update_path ();
#ifndef O_RDONLY

View File

@ -1,5 +1,5 @@
/* CPP main program, using CPP Library.
Copyright (C) 1995 Free Software Foundation, Inc.
Copyright (C) 1995, 1997 Free Software Foundation, Inc.
Written by Per Bothner, 1994-95.
This program is free software; you can redistribute it and/or modify it
@ -20,14 +20,16 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
You are forbidden to forbid anyone else to use, share and improve
what you give them. Help stamp out software-hoarding! */
#include "cpplib.h"
#include <stdio.h>
#ifndef EMACS
#include "config.h"
#endif /* not EMACS */
#include "system.h"
#else
#include <stdio.h>
extern char *getenv ();
#endif /* not EMACS */
#include "cpplib.h"
char *progname;

View File

@ -70,9 +70,8 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
Written by Per Bothner <bothner@cygnus.com>, July 1993. */
#include <stdio.h>
#include <ctype.h>
#include "hconfig.h"
#include "system.h"
#include "obstack.h"
#include "scan.h"
#include "cpplib.h"

View File

@ -42,29 +42,12 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
only get execution counts for one or the other of the including files. */
#include "config.h"
#include <stdio.h>
#include "gansidecl.h"
#include <sys/types.h>
#include "system.h"
#include <sys/stat.h>
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
#ifdef HAVE_STRING_H
#include <string.h>
#else
#ifdef HAVE_STRINGS_H
#include <strings.h>
#endif
#endif
#include "gansidecl.h"
#include "gcov-io.h"
#ifdef NEED_DECLARATION_RINDEX
extern char *rindex ();
#endif
/* The .bb file format consists of several lists of 4-byte integers
which are the line numbers of each basic block in the file. Each
list is terminated by a zero. These lists correspond to the basic
@ -230,11 +213,11 @@ static int output_function_summary = 0;
static char *object_directory = 0;
/* Forward declarations. */
static void process_args ();
static void open_files ();
static void read_files ();
static void scan_for_source_files ();
static void output_data ();
static void process_args PROTO ((int, char **));
static void open_files PROTO ((void));
static void read_files PROTO ((void));
static void scan_for_source_files PROTO ((void));
static void output_data PROTO ((void));
char * xmalloc ();
int

View File

@ -15,9 +15,8 @@ You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include <stdio.h>
#include <ctype.h>
#include "hconfig.h"
#include "system.h"
#include "scan.h"
#include "cpplib.h"
#include "cpphash.h"

View File

@ -20,7 +20,7 @@ Boston, MA 02111-1307, USA. */
#include "hconfig.h"
#include <stdio.h>
#include "system.h"
#include "obstack.h"
#define obstack_chunk_alloc xmalloc

View File

@ -32,7 +32,7 @@ Boston, MA 02111-1307, USA. */
#ifdef HALF_PIC_INIT
#include <stdio.h>
#include "system.h"
#include "tree.h"
#include "rtl.h"
#include "obstack.h"
@ -41,7 +41,6 @@ Boston, MA 02111-1307, USA. */
#define obstack_chunk_free free
extern char *xmalloc ();
extern void free ();
extern rtx eliminate_constant_term ();
extern void assemble_name ();
extern void output_addr_const ();

View File

@ -19,11 +19,10 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#include "config.h"
#include "system.h"
#include "hash.h"
#include "obstack.h"
extern void free PARAMS ((PTR));
/* Obstack allocation and deallocation routines. */
#define obstack_chunk_alloc xmalloc
#define obstack_chunk_free free
@ -33,10 +32,6 @@ extern char * xmalloc ();
/* The default number of entries to use when creating a hash table. */
#define DEFAULT_SIZE (1009)
#ifndef NULL
#define NULL 0
#endif
/* Create a new hash table, given a number of entries. */
boolean

View File

@ -17,9 +17,8 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
Written by Per Bothner <bothner@cygnus.com>, July 1993. */
#include <stdio.h>
#include <ctype.h>
#include "hconfig.h"
#include "system.h"
#include "cpplib.h"
int brace_nesting = 0;

View File

@ -15,9 +15,9 @@ You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include "scan.h"
#include "hconfig.h"
#include <ctype.h>
#include "system.h"
#include "scan.h"
int lineno = 1;
int source_lineno = 1;