*** Makefile.original Fri May 18 15:53:08 2001
--- Makefile Fri May 18 17:04:08 2001
***************
*** 40,46 ****
  
  # Selection of languages to be made.
  # This is overridden by configure.
! LANGUAGES = c proto gcov$(exeext)  c++
  
  # Selection of languages to be made during stage1 build.
  # This is overridden by configure.
--- 40,46 ----
  
  # Selection of languages to be made.
  # This is overridden by configure.
! LANGUAGES = c 
  
  # Selection of languages to be made during stage1 build.
  # This is overridden by configure.
***************
*** 62,68 ****
  # TCFLAGS is used for compilations with the GCC just built.
  XCFLAGS =
  TCFLAGS =
! CFLAGS = -g
  BOOT_CFLAGS = -O2 $(CFLAGS)
  WARN_CFLAGS = 
  # These exists to be overridden by the x-* and t-* files, respectively.
--- 62,68 ----
  # TCFLAGS is used for compilations with the GCC just built.
  XCFLAGS =
  TCFLAGS =
! CFLAGS = 
  BOOT_CFLAGS = -O2 $(CFLAGS)
  WARN_CFLAGS = 
  # These exists to be overridden by the x-* and t-* files, respectively.
***************
*** 155,161 ****
  # The GCC to use for compiling libgcc2.a, enquire, and libgcc1-test.
  # Usually the one we just built.
  # Don't use this as a dependency--use $(GCC_PASSES) or $(GCC_PARTS).
! GCC_FOR_TARGET = ./xgcc -B./
  
  # This is used instead of ALL_CFLAGS when compiling with GCC_FOR_TARGET.
  # It omits XCFLAGS, and specifies -B./.
--- 155,161 ----
  # The GCC to use for compiling libgcc2.a, enquire, and libgcc1-test.
  # Usually the one we just built.
  # Don't use this as a dependency--use $(GCC_PASSES) or $(GCC_PARTS).
! GCC_FOR_TARGET = ./xgcc -msoft-float -mc68000 -Wa,-mc68000 -B./
  
  # This is used instead of ALL_CFLAGS when compiling with GCC_FOR_TARGET.
  # It omits XCFLAGS, and specifies -B./.
***************
*** 316,326 ****
  # Specify the rule for actually making libgcc1.a.
  # The value may be empty; that means to do absolutely nothing
  # with or for libgcc1.a.
! LIBGCC1 = libgcc1.a
  
  # Specify the rule for making libgcc1.a for a cross-compiler.
  # The default rule assumes that libgcc1.a is supplied by the user.
! CROSS_LIBGCC1 = libgcc1.cross
  
  # Specify the rule for actually making libgcc2.a.
  LIBGCC2 = libgcc2.a
--- 316,331 ----
  # Specify the rule for actually making libgcc1.a.
  # The value may be empty; that means to do absolutely nothing
  # with or for libgcc1.a.
! LIBGCC1 = libgcc1-asm.a
  
  # Specify the rule for making libgcc1.a for a cross-compiler.
  # The default rule assumes that libgcc1.a is supplied by the user.
! CROSS_LIBGCC1 = libgcc1-asm.a
! LIB1ASMSRC = m68k/lb1sf68.asm
! LIB1ASMFUNCS = _mulsi3 _udivsi3 _divsi3 _umodsi3 _modsi3 \
!    _double _float _floatex \
!    _eqdf2 _nedf2 _gtdf2 _gedf2 _ltdf2 _ledf2 \
!    _eqsf2 _nesf2 _gtsf2 _gesf2 _ltsf2 _lesf2
  
  # Specify the rule for actually making libgcc2.a.
  LIBGCC2 = libgcc2.a
***************
*** 519,531 ****
  # Compile crtbeginS.o and crtendS.o with pic.
  CRTSTUFF_T_CFLAGS_S = -fPIC
  # Compile libgcc2.a with pic.
! TARGET_LIBGCC2_CFLAGS = -fPIC
  
  # Do not build libgcc1. Let gcc generate those functions. The GNU/Linux
  # C library can handle them.
! LIBGCC1 = 
! CROSS_LIBGCC1 =
! LIBGCC1_TEST =
  # On GNU/Linux we can print long double
  ENQUIRE_CFLAGS = -DNO_MEM -O0
  
--- 524,536 ----
  # Compile crtbeginS.o and crtendS.o with pic.
  CRTSTUFF_T_CFLAGS_S = -fPIC
  # Compile libgcc2.a with pic.
! TARGET_LIBGCC2_CFLAGS = -fPIC -Dinhibit_libc
  
  # Do not build libgcc1. Let gcc generate those functions. The GNU/Linux
  # C library can handle them.
! #LIBGCC1 = 
! #CROSS_LIBGCC1 =
! #LIBGCC1_TEST =
  # On GNU/Linux we can print long double
  ENQUIRE_CFLAGS = -DNO_MEM -O0
  
***************
*** 739,749 ****
     _eqsf2 _nesf2 _gtsf2 _gesf2 _ltsf2 _lesf2
  
  # Library members defined in libgcc2.c.
  LIB2FUNCS = _muldi3 _divdi3 _moddi3 _udivdi3 _umoddi3 _negdi2 \
       _lshrdi3 _ashldi3 _ashrdi3 _ffsdi2 \
      _udiv_w_sdiv _udivmoddi4 _cmpdi2 _ucmpdi2 _floatdidf _floatdisf \
      _fixunsdfsi _fixunssfsi _fixunsdfdi _fixdfdi _fixunssfdi _fixsfdi \
!     _fixxfdi _fixunsxfdi _floatdixf _fixunsxfsi \
      _fixtfdi _fixunstfdi _floatditf \
      __gcc_bcmp _varargs __dummy _eprintf \
      _bb _shtab _clear_cache _trampoline __main _exit \
--- 744,755 ----
     _eqsf2 _nesf2 _gtsf2 _gesf2 _ltsf2 _lesf2
  
  # Library members defined in libgcc2.c.
+ LIB2TRICKY = _floatdixf
  LIB2FUNCS = _muldi3 _divdi3 _moddi3 _udivdi3 _umoddi3 _negdi2 \
       _lshrdi3 _ashldi3 _ashrdi3 _ffsdi2 \
      _udiv_w_sdiv _udivmoddi4 _cmpdi2 _ucmpdi2 _floatdidf _floatdisf \
      _fixunsdfsi _fixunssfsi _fixunsdfdi _fixdfdi _fixunssfdi _fixsfdi \
!     _fixxfdi _fixunsxfdi _fixunsxfsi \
      _fixtfdi _fixunstfdi _floatditf \
      __gcc_bcmp _varargs __dummy _eprintf \
      _bb _shtab _clear_cache _trampoline __main _exit \
***************
*** 1360,1365 ****
--- 1366,1380 ----
  	do \
  	  echo $${name}; \
  	  $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(INCLUDES) -c -DL$${name} libgcc1.S; \
+ 	  if [ $$? -eq 0 ] ; then true; else exit 1; fi; \
+ 	  mv libgcc1$(objext) $${name}$(objext); \
+ 	  $(AR) $(AR_FLAGS) tmplibgcc1.a $${name}$(objext); \
+ 	  rm -f $${name}$(objext); \
+ 	done
+ 	for name in _truncdfsf2 _extendsfdf2 _fixdfsi _fixsfsi _floatsidf _floatsisf; \
+ 	do \
+ 	  echo $${name}; \
+ 	  $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) $(INCLUDES) -c -DL$${name} $(srcdir)/libgcc1.c; \
  	  if [ $$? -eq 0 ] ; then true; else exit 1; fi; \
  	  mv libgcc1$(objext) $${name}$(objext); \
  	  $(AR) $(AR_FLAGS) tmplibgcc1.a $${name}$(objext); \