Makefile.in (LANG_LIB2FUNCS): Remove.

        * Makefile.in (LANG_LIB2FUNCS): Remove.
        (LIB2FUNCS): Remove _pure.
        (LIB2ADD): Remove LANG_LIB2FUNCS.
        (stage_a): Don't set LANG_LIB2FUNCS.
        * libgcc2.c (__terminate): Mark noreturn.
        (__pure_virtual): Remove.
        * mklibgcc.in: Remove LIB2ADD .txt processing.

From-SVN: r36817

4 files changed, 25 insertions, 67 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6acf89c..010c412 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2000-10-09  Richard Henderson  <rth@cygnus.com>
+
+	* Makefile.in (LANG_LIB2FUNCS): Remove.
+	(LIB2FUNCS): Remove _pure.
+	(LIB2ADD): Remove LANG_LIB2FUNCS.
+	(stage_a): Don't set LANG_LIB2FUNCS.
+	* libgcc2.c (__terminate): Mark noreturn.
+	(__pure_virtual): Remove.
+	* mklibgcc.in: Remove LIB2ADD .txt processing.
+
 2000-10-09  Richard Earnshaw  <rearnsha@arm.com>
 
 	* arm.md (push_multi): Revert unintended change.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 5761af7..bbfb14e 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -630,7 +630,6 @@ INCLUDES = -I. -I$(srcdir) -I$(srcdir)/config -I$(srcdir)/../include
 LANG_MAKEFILES = @all_lang_makefiles@
 LANG_STAGESTUFF = @all_stagestuff@
 LANG_DIFF_EXCLUDES = @all_diff_excludes@
-LANG_LIB2FUNCS = @all_lib2funcs@
 LANG_EXTRA_HEADERS = @all_headers@
 
 # Flags to pass to recursive makes.
@@ -755,7 +754,7 @@ LIB2FUNCS = _muldi3 _divdi3 _moddi3 _udivdi3 _umoddi3 _negdi2 \
     _fixtfdi _fixunstfdi _floatditf \
     __gcc_bcmp _varargs __dummy _eprintf \
     _bb _shtab _clear_cache _trampoline __main _exit \
-    _ctors _pure
+    _ctors
 
 LIB2FUNCS_EH = _eh
 
@@ -961,7 +960,7 @@ xlimits.h: glimits.h limitx.h limity.h
 #
 # Build libgcc.a.
 
-LIB2ADD = $(LIB2ADDEH) $(LIB2FUNCS_EXTRA) $(LANG_LIB2FUNCS)
+LIB2ADD = $(LIB2ADDEH) $(LIB2FUNCS_EXTRA)
 
 libgcc.mk: config.status Makefile mklibgcc $(LIB2ADD) xgcc$(exeext)
 	objext='$(objext)' \
@@ -2788,7 +2787,7 @@ VOL_FILES=`echo $(BACKEND) $(OBJS) $(C_OBJS) $(LIBCPP_OBJS) *.c *.h gen*`
 # we can guarantee will build with the native compiler, and also it is the
 # only thing useful for building stage2.
 stage_a: 
-	+$(MAKE) CC="$(CC)" libdir=$(libdir) LANGUAGES="$(BOOT_LANGUAGES)" LANG_LIB2FUNCS=
+	+$(MAKE) CC="$(CC)" libdir=$(libdir) LANGUAGES="$(BOOT_LANGUAGES)"
 	touch stage_a
 
 stage_b: stage_a
diff --git a/gcc/libgcc2.c b/gcc/libgcc2.c
index 20e7778..7e8eaf7 100644
--- a/gcc/libgcc2.c
+++ b/gcc/libgcc2.c
@@ -2990,7 +2990,7 @@ __default_terminate (void)
 void (*__terminate_func)(void) __attribute__ ((__noreturn__)) =
   __default_terminate;
 
-void
+void __attribute__((__noreturn__))
 __terminate (void)
 {
   (*__terminate_func)();
@@ -4181,28 +4181,3 @@ __throw ()
 #endif /* IA64_UNWIND_INFO  */
 
 #endif /* L_eh */
-
-#ifdef L_pure
-#ifndef inhibit_libc
-/* This gets us __GNU_LIBRARY__.  */
-#undef NULL /* Avoid errors if stdio.h and our stddef.h mismatch.  */
-#include <stdio.h>
-
-#ifdef __GNU_LIBRARY__
-  /* Avoid forcing the library's meaning of `write' on the user program
-     by using the "internal" name (for use within the library)  */
-#define write(fd, buf, n)	__write((fd), (buf), (n))
-#endif
-#endif /* inhibit_libc */
-
-#define MESSAGE "pure virtual method called\n"
-
-void
-__pure_virtual (void)
-{
-#ifndef inhibit_libc
-  write (2, MESSAGE, sizeof (MESSAGE) - 1);
-#endif
-  __terminate ();
-}
-#endif
diff --git a/gcc/mklibgcc.in b/gcc/mklibgcc.in
index 6e7b061..e19d0ee 100644
--- a/gcc/mklibgcc.in
+++ b/gcc/mklibgcc.in
@@ -225,44 +225,18 @@ for file in $LIB2ADD; do
   name=`echo $file | sed -e 's/[.][cSo]$//' -e 's/[.]asm$//' -e 's/[.]txt$//'`
   oname=`echo $name | sed -e 's,.*/,,'`
 
-  if [ ${name}.txt = ${file} ]; then
-    fprime=`cat $file`
-    for f in $fprime; do
-
-      lastout="stmp-dirs $file"
-      for ml in $MULTILIBS; do
-        dir=`echo ${ml} | sed -e 's/;.*$//' -e 's/=/$(EQ)/g'`
-        flags=`echo ${ml} | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`;
-        out="libgcc/${dir}/${f}"
-
-	# Depend on previous out to serialize all sub-makes of this
-	# target file.  This because ./$f is used as a temporary in
-	# each case before being moved to libgcc/$dir/.
-	echo $out: $lastout
-	echo "	$make_compile" \\
-	echo '	  LIBGCC2_CFLAGS="$(LIBGCC2_CFLAGS)' $flags '" ' \\
-	echo '	  MULTILIB_CFLAGS="'$flags'"' $f
-	echo "	mv $f $out"
-
-	lastout="$out"
-      done
-
-      libgcc2_objs="$libgcc2_objs $f"
-    done
-  else
-    for ml in $MULTILIBS; do
-      dir=`echo ${ml} | sed -e 's/;.*$//' -e 's/=/$(EQ)/g'`
-      flags=`echo ${ml} | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`;
-      out="libgcc/${dir}/${oname}${objext}"
-      if [ ${name}.asm = ${file} ]; then
-	flags="$flags -xassembler-with-cpp"
-      fi
+  for ml in $MULTILIBS; do
+    dir=`echo ${ml} | sed -e 's/;.*$//' -e 's/=/$(EQ)/g'`
+    flags=`echo ${ml} | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`;
+    out="libgcc/${dir}/${oname}${objext}"
+    if [ ${name}.asm = ${file} ]; then
+      flags="$flags -xassembler-with-cpp"
+    fi
 
-      echo $out: stmp-dirs $file
-      echo "	$gcc_compile" $flags -c $file -o $out
-    done
-    libgcc2_objs="$libgcc2_objs ${oname}${objext}"
-  fi
+    echo $out: stmp-dirs $file
+    echo "	$gcc_compile" $flags -c $file -o $out
+  done
+  libgcc2_objs="$libgcc2_objs ${oname}${objext}"
 done
 
 # SHLIB_MKMAP