t-c4x (LIBGCC2_CFLAGS): Delete.

	* config/c4x/t-c4x  (LIBGCC2_CFLAGS): Delete.
	(TARGET_LIBGCC2_CFLAGS): Define.

From-SVN: r25085

gcc/ChangeLog

+Tue Feb  9 10:10:31 1999  Michael Hayes  <m.hayes@elec.canterbury.ac.nz>
+
+	* config/c4x/t-c4x  (LIBGCC2_CFLAGS): Delete.
+	(TARGET_LIBGCC2_CFLAGS): Define.
+	
 1999-02-08  Nick Clifton  <nickc@cygnus.com>
 
 	* config/v850/v850.md: Enforce TARGET_LONG_CALLS option.
@@ -584,6 +589,7 @@ Thu Jan 28 09:41:11 1999  Jeffrey A Law  (law@cygnus.com)
 	* configure.in (hppa1.0-hp-hpux10*): Use t-pa.
 	* configure: Rebuilt.
 
+>>>>>>> 1.2856
 Wed Jan 27 23:39:53 1999  J"orn Rennecke <amylaar@cygnus.co.uk>
 
 	* rtl.h (insn_first_p): Declare.
@@ -620,6 +626,7 @@ Wed Jan 27 23:39:53 1999  J"orn Rennecke <amylaar@cygnus.co.uk>
 	Set derived_regs for givs.
 	* Makefile.in (stmt.o, loop.o, unroll.o): Depend on loop.h .
 
+>>>>>>> 1.2855
 Wed Jan 27 19:31:36 1999  J"orn Rennecke <amylaar@cygnus.co.uk>
 
 	* function.c (purge_addressof_1): Handle case when a register
@@ -687,6 +694,7 @@ Tue Jan 26 13:41:38 1999  David Edelsohn  <edelsohn@mhpcc.edu>
 	throughout, and invert sense.  Put cpp_warning_with_line back
 	in and export it.
 
+>>>>>>> 1.2854
 Tue Jan 26 23:21:49 1999  Michael Hayes  <m.hayes@elec.canterbury.ac.nz>
 
 	* config/c4x/c4x.h (COUNTER_REGS): New register class.
@@ -720,6 +728,7 @@ Tue Jan 26 23:21:49 1999  Michael Hayes  <m.hayes@elec.canterbury.ac.nz>
 	Move `string' label just after case '"' so that wide strings
 	don't crash the preprocessor.
 
+>>>>>>> 1.2847
 Sun Jan 24 20:13:45 1999  David Edelsohn  <edelsohn@mhpcc.edu>
 
 	* rs6000.md (left shift + set cr patterns): Add missing '#' to
@@ -818,6 +827,7 @@ Sat Jan 23 22:34:57 1999  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* varasm.c (assemble_string): Likewise.
 
+>>>>>>> 1.2844
 Sat Jan 23 01:37:36 1999  Jeffrey A Law  (law@cygnus.com)
 
 	* configure.in (gcc_tooldir): Handle case where exec_prefix has
@@ -875,6 +885,7 @@ Fri Jan 22 07:43:01 1999  Jeffrey A Law  (law@cygnus.com)
 
 	* Makefile.in (tooldir): Replace with gcc_tooldir.
 
+>>>>>>> 1.2836
 Thu Jan 21 23:21:57 1999  Jeffrey A Law  (law@cygnus.com)
 
 	* m68k.md (ashldi_const): Disable for !TARGET_5200.  Fix indention.

gcc/config/c4x/t-c4x

@@ -6,9 +6,7 @@ LIB1ASMFUNCS = _divqf3 _divqi3 _udivqi3 _umodqi3 _modqi3 _mulqi3 \
 	_fix_truncqfhi2 _ufix_truncqfhi2 _floathiqf2 _ufloathiqf2 \
 	_floathihf2 _ufloathihf2 _fix_trunchfhi2 _ufix_trunchfhi2 _ffs
 
-# We do not have DF or DI types (or SF and SI for that matter),
-# so fake out the libgcc2 compilation.
-LIBGCC2_CFLAGS = -O2 -Dexit=unused_exit $(GCC_CFLAGS) $(LIBGCC2_INCLUDES) -DDF=HF -DDI=HI -DSF=QF -DSI=QI -Dinhibit_libc
+TARGET_LIBGCC2_CFLAGS = -Dexit=unused_exit -DDF=HF -DDI=HI -DSF=QF -DSI=QI -Dinhibit_libc
 
 MULTILIB_OPTIONS = m30 msmall mmemparm
 MULTILIB_DIRNAMES = c3x small mem