Mon Dec 7 15:38:25 1998 Dave Brolley <brolley@cygnus.com>

	* gcc.c (default_compilers): Fix typo in USE_CPPLIB spec for cc1.
Mon Dec  7 15:38:25 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
        * c-aux-info.c (concat): Wrap function definition in !USE_CPPLIB.
        * cppalloc.c: Move function `xcalloc' from cpplib.c to here.
        * cpplib.c: Move function `xcalloc' from here to cppalloc.c.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@24152 138bc75d-0d04-0410-961f-82ee72b054a4

5 files changed, 27 insertions, 12 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d637a4ed30f..84a79ba5cd8 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+Mon Dec  7 15:38:25 1998  Dave Brolley  <brolley@cygnus.com>
+
+	* gcc.c (default_compilers): Fix typo in USE_CPPLIB spec for cc1.
+
+Mon Dec  7 15:38:25 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+        * c-aux-info.c (concat): Wrap function definition in !USE_CPPLIB.
+        * cppalloc.c: Move function `xcalloc' from cpplib.c to here.
+        * cpplib.c: Move function `xcalloc' from here to cppalloc.c.
+
 Mon Dec  7 11:30:49 1998  Nick Clifton  <nickc@cygnus.com>
 
 	* final.c (output_asm_name): Use tabs to seperate comments from
diff --git a/gcc/c-aux-info.c b/gcc/c-aux-info.c
index e6737c995dc..d86d44539fb 100644
--- a/gcc/c-aux-info.c
+++ b/gcc/c-aux-info.c
@@ -48,6 +48,10 @@ static char *gen_decl			PROTO((tree, int, formals_style));
 
    This function is based on the one in libiberty.  */
 
+/* This definition will conflict with the one from prefix.c in
+   libcpp.a when linking cc1 and cc1obj.  So only provide it if we are
+   not using libcpp.a */
+#ifndef USE_CPPLIB
 char *
 concat VPROTO((const char *first, ...))
 {
@@ -99,6 +103,7 @@ concat VPROTO((const char *first, ...))
 
   return (newstr);
 }
+#endif /* ! USE_CPPLIB */
 
 /* Given a string representing an entire type or an entire declaration
    which only lacks the actual "data-type" specifier (at its left end),
diff --git a/gcc/cppalloc.c b/gcc/cppalloc.c
index 3cd72ee1fa2..a852d00cb15 100644
--- a/gcc/cppalloc.c
+++ b/gcc/cppalloc.c
@@ -46,6 +46,16 @@ xmalloc (size)
 }
 
 PTR
+xcalloc (number, size)
+  size_t number, size;
+{
+  register PTR ptr = (PTR) calloc (number, size);
+  if (ptr == 0)
+    memory_full ();
+  return ptr;
+}
+
+PTR
 xrealloc (old, size)
   PTR old;
   size_t size;
diff --git a/gcc/cpplib.c b/gcc/cpplib.c
index 828bcf9a0a7..a9bb550bb55 100644
--- a/gcc/cpplib.c
+++ b/gcc/cpplib.c
@@ -6429,20 +6429,10 @@ free_token_list (tokens)
   }
 }
 
-/* FIXME: savestring() should be renamed strdup() and both should
+/* FIXME: savestring() should be renamed strdup() and should
    be moved into cppalloc.c.  We can't do that right now because
    then we'd get multiple-symbol clashes with toplev.c and several
    other people. */
-PTR
-xcalloc (number, size)
-  size_t number, size;
-{
-  register unsigned total = number * size;
-  register PTR ptr = (PTR) xmalloc (total);
-  bzero (ptr, total);
-  return ptr;
-}
-
 char *
 savestring (input)
      char *input;
diff --git a/gcc/gcc.c b/gcc/gcc.c
index 7b67bd369f6..438304529a7 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -581,7 +581,7 @@ static struct compiler default_compilers[] =
   {"@c",
    {
 #if USE_CPPLIB
-     "%{E|M|MM:cpp -lang-c %(ansi:-std=c89} %{std*} %{nostdinc*}\
+     "%{E|M|MM:cpp -lang-c %{ansi:-std=c89} %{std*} %{nostdinc*}\
 	%{C} %{v} %{A*} %{I*} %{P} %I\
 	%{C:%{!E:%eGNU C does not support -C without using -E}}\
 	%{M} %{MM} %{MD:-MD %b.d} %{MMD:-MMD %b.d} %{MG}\