Use cpplib for cccp.

Wed Jun 10 13:41:23 1998  Dave Brolley  <brolley@cygnus.com>
	* cppmain.c (fatal): New function.
	* configure.in (cpp_main): New configuration variable.
	* configure: Regenerated.
	* Makefile.in (CCCP): Use a configuration variable to select base for cccp.
	(cppmain$(exeext)): Add @extra_cpp_objs@.

From-SVN: r20416

gcc/ChangeLog

+Wed Jun 10 13:41:23 1998  Dave Brolley  <brolley@cygnus.com>
+
+	* cppmain.c (fatal): New function.
+	* configure.in (cpp_main): New configuration variable.
+	* configure: Regenerated.
+	* Makefile.in (CCCP): Use a configuration variable to select base for cccp.
+	(cppmain$(exeext)): Add @extra_cpp_objs@.
+
 Wed Jun 10 13:07:02 1998  Dave Brolley  <brolley@cygnus.com>
 
 	* objc/objc-act.c: Add cpplib declarations.

gcc/Makefile.in

@@ -642,9 +642,7 @@ OBJS = toplev.o version.o tree.o print-tree.o stor-layout.o fold-const.o \
 GEN= genemit genoutput genrecog genextract genflags gencodes genconfig \
  genpeep gengenrtl gencheck
 
-CCCP=cccp
-# Uncomment this line if you want to use cppmain (w/cpplib) as cpp.
-#CCCP=cppmain
+CCCP=@cpp_main@
 
 # Files to be copied away after each stage in building.
 STAGESTUFF = *$(objext) insn-flags.h insn-config.h insn-codes.h \

gcc/configure.in

@@ -85,6 +85,7 @@ AC_DEFINE(ENABLE_CHECKING)
 )
 
 # Enable use of cpplib for C.
+cpp_main=cccp
 AC_ARG_ENABLE(c-cpplib,
 [  --enable-c-cpplib       Use cpplib for C.],
 if [[[ x$enable_c_cpplib != xno ]]]; then
@@ -92,6 +93,7 @@ if [[[ x$enable_c_cpplib != xno ]]]; then
   extra_c_objs="${extra_c_objs} prefix.o"
   extra_cxx_objs="${extra_cxx_objs} ../cpplib.o ../cppexp.o ../cpphash.o ../cpperror.o ../prefix.o"
   extra_c_flags=-DUSE_CPPLIB=1
+  cpp_main=cppmain
 fi)
   
 # Enable Haifa scheduler.
@@ -3520,6 +3522,7 @@ AC_SUBST(all_stagestuff)
 AC_SUBST(all_diff_excludes)
 AC_SUBST(all_lib2funcs)
 AC_SUBST(all_headers)
+AC_SUBST(cpp_main)
 AC_SUBST(extra_passes)
 AC_SUBST(extra_programs)
 AC_SUBST(extra_parts)

gcc/cppmain.c

@@ -40,6 +40,13 @@ cpp_options options;
 #ifdef abort
 /* More 'friendly' abort that prints the line and file.
    config.h can #define abort fancy_abort if you like that sort of thing.  */
+void
+fatal (s)
+     char *s;
+{
+  fputs (s, stderr);
+  exit (FATAL_EXIT_CODE);
+}
 
 void
 fancy_abort ()