* Re: egcs, more system.h cutover patches
@ 1998-03-30 16:18 Kaveh R. Ghazi
0 siblings, 0 replies; 4+ messages in thread
From: Kaveh R. Ghazi @ 1998-03-30 16:18 UTC (permalink / raw)
To: law; +Cc: egcs, wilson
> From: Jeffrey A Law <law@hurl.cygnus.com>
> >
> > Sat Mar 28 21:27:02 1998 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
> >
> > * Makefile.in (choose-temp.o, 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.
> >
> > * choose-temp.c: Include system.h. Add parameters to various
> > function prototypes.
> > * cppalloc.c: Likewise.
> > * 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.
> Looks mostly OK.
>
> Note that choose-temp.c needs to be kept sync'd with the copy in
> libiberty, so I think you need to change both copies at the same
> time (and make sure that it still works in libiberty :-)
>
> You added an include of config.h to cpphash.c, you need to make
> sure that's noted in the ChangeLog.
>
> Also don't mess with the xmalloc, xrealloc, xfree prototypes yet.
> That's an issue I want to revisit later (and fix them all at the
> same time).
>
> jeff
Okay, I installed it without choose-temp.c, added config.h ->
cpphash.c in the ChangeLog and took out the xmalloc, etc, prototype
argument additions.
I'll put in choose-temp.c shortly when I have time to examine
and sync with the copy in libiberty.
--Kaveh
--
Kaveh R. Ghazi Project Manager / Custom Development
ghazi@caip.rutgers.edu Icon CMT Corp.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: egcs, more system.h cutover patches
@ 1998-04-02 11:32 Kaveh R. Ghazi
0 siblings, 0 replies; 4+ messages in thread
From: Kaveh R. Ghazi @ 1998-04-02 11:32 UTC (permalink / raw)
To: law; +Cc: egcs, wilson
> > Sat Mar 28 21:27:02 1998 Kaveh R. Ghazi
> >
> > * Makefile.in (choose-temp.o, 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.
> >
> > * choose-temp.c: Include system.h. Add parameters to various
> > function prototypes.
> > [...]
>
> Looks mostly OK.
>
> Note that choose-temp.c needs to be kept sync'd with the copy in
> libiberty, so I think you need to change both copies at the same
> time (and make sure that it still works in libiberty :-)
>
> jeff
I applied the identical patch to libiberty/choose-temp.c and
recompiled it. Everything looked okay, so I commited it in both
directories.
--Kaveh
--
Kaveh R. Ghazi Project Manager / Custom Development
ghazi@caip.rutgers.edu Icon CMT Corp.
^ permalink raw reply [flat|nested] 4+ messages in thread
* egcs, more system.h cutover patches
@ 1998-03-31 0:46 Kaveh R. Ghazi
1998-03-31 0:20 ` Jeffrey A Law
0 siblings, 1 reply; 4+ messages in thread
From: Kaveh R. Ghazi @ 1998-03-31 0:46 UTC (permalink / raw)
To: law; +Cc: egcs, ghazi
Here is another system.h cutover patch for the gcc directory.
(I made sure to add dependencies at the end of the line in Makefile.in
and its much smaller than my last one. :-) )
Is it okay to install?
--Kaveh
Sat Mar 28 21:27:02 1998 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* Makefile.in (choose-temp.o, 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.
* choose-temp.c: Include system.h. Add parameters to various
function prototypes.
* cppalloc.c: Likewise.
* 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.
diff -rup orig/egcs-980321/gcc/Makefile.in egcs-980321/gcc/Makefile.in
--- orig/egcs-980321/gcc/Makefile.in Sun Mar 29 08:19:14 1998
+++ egcs-980321/gcc/Makefile.in Sun Mar 29 08:16:38 1998
@@ -1271,7 +1271,7 @@ collect2.o : collect2.c $(CONFIG_H) syst
-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
@@ -1311,7 +1311,7 @@ dumpvers: dumpvers.c
version.o: version.c
obstack.o: obstack.c $(CONFIG_H)
-choose-temp.o: choose-temp.c $(CONFIG_H) gansidecl.h
+choose-temp.o: choose-temp.c $(CONFIG_H) gansidecl.h system.h
pexecute.o: pexecute.c $(CONFIG_H) system.h gansidecl.h
prefix.o: prefix.c $(CONFIG_H) system.h gansidecl.h Makefile
$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
@@ -1451,7 +1451,7 @@ mips-tdump: mips-tdump.o version.o $(LIB
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
@@ -1694,7 +1694,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
#\f
@@ -1769,9 +1769,9 @@ cppmain$(exeext): cppmain.o cpplib.o cpp
$(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)\" \
@@ -1781,13 +1781,13 @@ cpplib.o: cpplib.c $(CONFIG_H) cpplib.h
-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).
@@ -1866,7 +1866,7 @@ test-protoize-simple: ./protoize ./unpro
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
gcov: gcov.o $(LIBDEPS)
$(CC) $(ALL_CFLAGS) $(LDFLAGS) gcov.o $(LIBS) -o $@
@@ -1945,10 +1945,10 @@ gen-protos: gen-protos.o scan.o cppalloc
${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
@@ -1966,10 +1966,11 @@ fix-header: fix-header.o scan-decls.o sc
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.
diff -rup orig/egcs-980321/gcc/choose-temp.c egcs-980321/gcc/choose-temp.c
--- orig/egcs-980321/gcc/choose-temp.c Wed Feb 25 18:10:36 1998
+++ egcs-980321/gcc/choose-temp.c Sat Mar 28 22:55:44 1998
@@ -26,12 +26,17 @@ Boston, MA 02111-1307, USA. */
#include "config.h"
#endif
-/* If we are in gcc, or we have a config.h, we assume that
- HAVE_SYS_FILE_H tells us whether to include sys/file.h. However,
- libiberty does not have a config.h, and instead arranges to define
- NO_SYS_FILE_H on the command line when there is no sys/file.h. */
+#ifdef IN_GCC
+#include "system.h"
+#else
+
+/* If we are in gcc, system.h has handled everything. When not in
+ gcc, if we have a config.h we assume that HAVE_SYS_FILE_H tells us
+ whether to include sys/file.h. However, libiberty does not have a
+ config.h, and instead arranges to define NO_SYS_FILE_H on the
+ command line when there is no sys/file.h. */
-#if (defined (IN_GCC) || defined (HAVE_CONFIG_H)) ? defined (HAVE_SYS_FILE_H) : ! defined (NO_SYS_FILE_H)
+#if defined (HAVE_CONFIG_H) ? defined (HAVE_SYS_FILE_H) : ! defined (NO_SYS_FILE_H)
#include <sys/types.h>
#include <sys/file.h> /* May get R_OK, etc. on some systems. */
#endif
@@ -43,10 +48,11 @@ Boston, MA 02111-1307, USA. */
#endif
#include <stdio.h> /* May get P_tmpdir. */
+#endif /* IN_GCC */
#ifdef IN_GCC
#include "gansidecl.h"
-extern char *xmalloc ();
+extern char *xmalloc PROTO ((unsigned));
#else
#include "ansidecl.h"
#include "libiberty.h"
diff -rup orig/egcs-980321/gcc/cppalloc.c egcs-980321/gcc/cppalloc.c
--- orig/egcs-980321/gcc/cppalloc.c Sat Feb 28 02:06:25 1998
+++ egcs-980321/gcc/cppalloc.c Sat Mar 28 22:55:44 1998
@@ -23,10 +23,7 @@ Foundation, 59 Temple Place - Suite 330,
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
diff -rup orig/egcs-980321/gcc/cpperror.c egcs-980321/gcc/cpperror.c
--- orig/egcs-980321/gcc/cpperror.c Sat Feb 28 02:06:26 1998
+++ egcs-980321/gcc/cpperror.c Sat Mar 28 22:55:44 1998
@@ -24,10 +24,12 @@ Foundation, 59 Temple Place - Suite 330,
#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. */
diff -rup orig/egcs-980321/gcc/cppexp.c egcs-980321/gcc/cppexp.c
--- orig/egcs-980321/gcc/cppexp.c Tue Jan 27 17:11:33 1998
+++ egcs-980321/gcc/cppexp.c Sat Mar 28 22:55:44 1998
@@ -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
diff -rup orig/egcs-980321/gcc/cpphash.c egcs-980321/gcc/cpphash.c
--- orig/egcs-980321/gcc/cpphash.c Mon Aug 11 11:57:05 1997
+++ egcs-980321/gcc/cpphash.c Sun Mar 29 08:15:35 1998
@@ -22,6 +22,8 @@ Foundation, 59 Temple Place - Suite 330,
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"
diff -rup orig/egcs-980321/gcc/cpplib.c egcs-980321/gcc/cpplib.c
--- orig/egcs-980321/gcc/cpplib.c Wed Mar 18 02:17:52 1998
+++ egcs-980321/gcc/cpplib.c Sat Mar 28 22:55:44 1998
@@ -19,30 +19,14 @@ along with this program; if not, write t
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,
# 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
@@ -246,53 +195,59 @@ struct cpp_pending {
/* Forward declarations. */
-char *xmalloc ();
+char *xmalloc PARAMS ((unsigned));
void cpp_fatal ();
void cpp_file_line_for_message PARAMS ((cpp_reader *, char *, int, int));
void cpp_hash_cleanup PARAMS ((cpp_reader *));
void cpp_message ();
void cpp_print_containing_files PARAMS ((cpp_reader *));
-static void add_import ();
-static void append_include_chain ();
-static void make_assertion ();
-static void path_include ();
-static void initialize_builtins ();
-static void initialize_char_syntax ();
+static void add_import PARAMS ((cpp_reader *, int, char *));
+static void append_include_chain PARAMS ((cpp_reader *,
+ struct file_name_list *,
+ struct file_name_list *));
+static void make_assertion PARAMS ((cpp_reader *, char *, U_CHAR *));
+static void path_include PARAMS ((cpp_reader *, char *));
+static void initialize_builtins PARAMS ((cpp_reader *));
+static void initialize_char_syntax PARAMS ((struct cpp_options *));
extern void delete_macro ();
#if 0
static void trigraph_pcp ();
#endif
-static int finclude ();
-static void validate_else ();
-static int comp_def_part ();
+static int finclude PARAMS ((cpp_reader *, int, char *, int,
+ struct file_name_list *));
+static void validate_else PARAMS ((cpp_reader *, char *));
+static int comp_def_part PARAMS ((int, U_CHAR *, int, U_CHAR *, int, int));
#ifdef abort
extern void fancy_abort ();
#endif
-static int lookup_import ();
-static int redundant_include_p ();
-static int is_system_include ();
-static struct file_name_map *read_name_map ();
-static char *read_filename_string ();
-static int open_include_file ();
-static int check_macro_name ();
-static int compare_defs ();
-static int compare_token_lists ();
-static HOST_WIDE_INT eval_if_expression ();
-static int change_newlines ();
+static int lookup_import PARAMS ((cpp_reader *, char *,
+ struct file_name_list *));
+static int redundant_include_p PARAMS ((cpp_reader *, char *));
+static int is_system_include PARAMS ((cpp_reader *, char *));
+static struct file_name_map *read_name_map PARAMS ((cpp_reader *, char *));
+static char *read_filename_string PARAMS ((int, FILE *));
+static int open_include_file PARAMS ((cpp_reader *, char *,
+ struct file_name_list *));
+static int check_macro_name PARAMS ((cpp_reader *, U_CHAR *, char *));
+static int compare_defs PARAMS ((cpp_reader *, DEFINITION *, DEFINITION *));
+static int compare_token_lists PARAMS ((struct arglist *, struct arglist *));
+static HOST_WIDE_INT eval_if_expression PARAMS ((cpp_reader *, U_CHAR *, int));
+static int change_newlines PARAMS ((U_CHAR *, int));
extern int hashf ();
-static struct arglist *read_token_list ();
-static void free_token_list ();
-static int safe_read ();
+static struct arglist *read_token_list PARAMS ((cpp_reader *, int *));
+static void free_token_list PARAMS ((struct arglist *));
+static int safe_read PARAMS ((int, char *, int));
static void push_macro_expansion PARAMS ((cpp_reader *,
U_CHAR *, int, HASHNODE *));
static struct cpp_pending *nreverse_pending PARAMS ((struct cpp_pending *));
-extern char *xrealloc ();
-static char *xcalloc ();
-static char *savestring ();
-
-static void conditional_skip ();
-static void skip_if_group ();
+extern char *xrealloc PARAMS ((char *, unsigned));
+static char *xcalloc PARAMS ((unsigned, unsigned));
+static char *savestring PARAMS ((char *));
+
+static void conditional_skip PARAMS ((cpp_reader *, int, enum node_type,
+ U_CHAR *));
+static void skip_if_group PARAMS ((cpp_reader *, int));
/* Last arg to output_line_command. */
enum file_change_code {same_file, enter_file, leave_file};
diff -rup orig/egcs-980321/gcc/cppmain.c egcs-980321/gcc/cppmain.c
--- orig/egcs-980321/gcc/cppmain.c Sun Nov 2 03:39:35 1997
+++ egcs-980321/gcc/cppmain.c Sat Mar 28 22:55:44 1998
@@ -22,12 +22,14 @@ Foundation, 59 Temple Place - Suite 330,
#ifndef EMACS
#include "config.h"
-#endif /* not EMACS */
-
-#include "cpplib.h"
+#include "system.h"
+#else
#include <stdio.h>
extern char *getenv ();
+#endif /* not EMACS */
+
+#include "cpplib.h"
char *progname;
diff -rup orig/egcs-980321/gcc/fix-header.c egcs-980321/gcc/fix-header.c
--- orig/egcs-980321/gcc/fix-header.c Wed Mar 18 02:17:58 1998
+++ egcs-980321/gcc/fix-header.c Sat Mar 28 22:55:44 1998
@@ -70,9 +70,8 @@ Foundation, 59 Temple Place - Suite 330,
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"
diff -rup orig/egcs-980321/gcc/gcov.c egcs-980321/gcc/gcov.c
--- orig/egcs-980321/gcc/gcov.c Sat Dec 20 06:31:36 1997
+++ egcs-980321/gcc/gcov.c Sat Mar 28 22:55:44 1998
@@ -42,29 +42,12 @@ the Free Software Foundation, 675 Mass A
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,12 +213,12 @@ 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 ();
-char * xmalloc ();
+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 PROTO ((unsigned));
int
main (argc, argv)
diff -rup orig/egcs-980321/gcc/gen-protos.c egcs-980321/gcc/gen-protos.c
--- orig/egcs-980321/gcc/gen-protos.c Wed Mar 18 02:18:01 1998
+++ egcs-980321/gcc/gen-protos.c Sat Mar 28 22:55:44 1998
@@ -15,9 +15,8 @@ You should have received a copy of the G
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"
diff -rup orig/egcs-980321/gcc/gengenrtl.c egcs-980321/gcc/gengenrtl.c
--- orig/egcs-980321/gcc/gengenrtl.c Mon Jan 19 05:09:47 1998
+++ egcs-980321/gcc/gengenrtl.c Sat Mar 28 22:55:44 1998
@@ -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
diff -rup orig/egcs-980321/gcc/halfpic.c egcs-980321/gcc/halfpic.c
--- orig/egcs-980321/gcc/halfpic.c Wed Jan 14 18:10:22 1998
+++ egcs-980321/gcc/halfpic.c Sat Mar 28 22:55:45 1998
@@ -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 ();
diff -rup orig/egcs-980321/gcc/hash.c egcs-980321/gcc/hash.c
--- orig/egcs-980321/gcc/hash.c Sat Jan 10 14:57:26 1998
+++ egcs-980321/gcc/hash.c Sat Mar 28 22:55:45 1998
@@ -19,11 +19,10 @@ along with this program; if not, write t
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
@@ -32,10 +31,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. */
diff -rup orig/egcs-980321/gcc/scan-decls.c egcs-980321/gcc/scan-decls.c
--- orig/egcs-980321/gcc/scan-decls.c Wed Mar 18 02:18:06 1998
+++ egcs-980321/gcc/scan-decls.c Sat Mar 28 22:55:45 1998
@@ -17,9 +17,8 @@ Foundation, 59 Temple Place - Suite 330,
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;
diff -rup orig/egcs-980321/gcc/scan.c egcs-980321/gcc/scan.c
--- orig/egcs-980321/gcc/scan.c Tue Jan 27 17:11:47 1998
+++ egcs-980321/gcc/scan.c Sat Mar 28 22:55:45 1998
@@ -15,9 +15,9 @@ You should have received a copy of the G
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;
--
Kaveh R. Ghazi Project Manager / Custom Development
ghazi@caip.rutgers.edu Icon CMT Corp.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: egcs, more system.h cutover patches
1998-03-31 0:46 Kaveh R. Ghazi
@ 1998-03-31 0:20 ` Jeffrey A Law
0 siblings, 0 replies; 4+ messages in thread
From: Jeffrey A Law @ 1998-03-31 0:20 UTC (permalink / raw)
To: Kaveh R. Ghazi; +Cc: egcs, wilson
In message <199803301452.JAA04731@caip.rutgers.edu>you write:
> Here is another system.h cutover patch for the gcc directory.
>
> (I made sure to add dependencies at the end of the line in Makefile.in
> and its much smaller than my last one. :-) )
>
> Is it okay to install?
>
> --Kaveh
>
>
>
> Sat Mar 28 21:27:02 1998 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
>
> * Makefile.in (choose-temp.o, 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.
>
> * choose-temp.c: Include system.h. Add parameters to various
> function prototypes.
> * cppalloc.c: Likewise.
> * 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.
Looks mostly OK.
Note that choose-temp.c needs to be kept sync'd with the copy in
libiberty, so I think you need to change both copies at the same
time (and make sure that it still works in libiberty :-)
You added an include of config.h to cpphash.c, you need to make
sure that's noted in the ChangeLog.
Also don't mess with the xmalloc, xrealloc, xfree prototypes yet.
That's an issue I want to revisit later (and fix them all at the
same time).
jeff
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~1998-04-02 11:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
1998-03-30 16:18 egcs, more system.h cutover patches Kaveh R. Ghazi
1998-03-31 0:46 Kaveh R. Ghazi
1998-03-31 0:20 ` Jeffrey A Law
1998-04-02 11:32 Kaveh R. Ghazi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).