* Makefile.in: Exterminate all references to assert.h.

	* cross-make: Likewise.
	* assert.h: Delete.
	* configure.in: Correct commentary.
	* configure: Regenerate.
	* po/POTFILES.in: Remove assert.h.

	* libgcc-std.ver, libgcc2.c, libgcc2.h, sys-protos.h:
	Remove __eprintf.

	* config/t-freebsd, config/t-linux, config/t-linux-aout,
	config/t-netbsd, config/t-rtems, config/x-linux,
	config/i386/t-beos, config/mcore/t-mcore, config/mcore/t-mcore-pe:
	No need to override INSTALL_ASSERT_H.

	* fixinc/fixinc.dgux, fixinc/fixinc.interix, fixinc/fixinc.ptx,
	fixinc/fixinc.svr4, fixinc/fixinc.winnt, fixinc/fixinc.wrap,
	fixinc/fixincl.sh: Don't install assert.h into objdir/include.


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

gcc/fixinc/fixinc.wrap

@@ -133,12 +133,4 @@ fi
 
 done
 
-if [ x${INSTALL_ASSERT_H} != x ]
-then
-  cd ${ORIG_DIR}
-  rm -f include/assert.h
-  cp ${srcdir}/assert.h include/assert.h || exit 1
-  chmod a+r include/assert.h
-fi
-
 exit 0

gcc/fixinc/fixincl.sh

@@ -470,11 +470,3 @@ then echo fixincludes is done ; fi
 done
 #
 # # # # # # # # # # # # # # # # # # # # #
-
-if [ x${INSTALL_ASSERT_H} != x ] && [ -f ${srcdir}/assert.h ]
-then
-  cd $ORIGDIR
-  rm -f include/assert.h
-  cp ${srcdir}/assert.h include/assert.h || exit 1
-  chmod a+r include/assert.h
-fi

gcc/libgcc-std.ver

@@ -107,7 +107,6 @@ GCC_3.0 {
 
   # ??? Symbols that perhaps unused should be nuked.
   __clear_cache
-  __eprintf
   __gcc_bcmp
 
   # EH symbols

gcc/libgcc2.c

@@ -1237,24 +1237,6 @@ __gcc_bcmp (const unsigned char *s1, const unsigned char *s2, size_t size)
   return 0;
 }
 
-#endif
-
-#ifdef L_eprintf
-#ifndef inhibit_libc
-
-#undef NULL /* Avoid errors if stdio.h and our stddef.h mismatch.  */
-#include <stdio.h>
-/* This is used by the `assert' macro.  */
-void
-__eprintf (const char *string, const char *expression,
-	   unsigned int line, const char *filename)
-{
-  fprintf (stderr, string, expression, line, filename);
-  fflush (stderr);
-  abort ();
-}
-
-#endif
 #endif
 
 #ifdef L_bb

gcc/libgcc2.h

@@ -24,8 +24,6 @@ Boston, MA 02111-1307, USA.  */
 
 extern int __gcc_bcmp (const unsigned char *, const unsigned char *, size_t);
 extern void __clear_cache (char *, char *);
-extern void __eprintf (const char *, const char *, unsigned int, const char *)
-  __attribute__ ((__noreturn__));
 
 struct bb;
 extern void __bb_exit_func (void);

gcc/po/ChangeLog

+2001-05-11  Zack Weinberg  <zackw@stanford.edu>
+
+	* POTFILES.in: Remove assert.h.
+
 2001-05-07  Zack Weinberg  <zackw@stanford.edu>
 
 	* POTFILES.in: Remove config/i386/sco.h, config/i386/sco4.h,

gcc/po/POTFILES.in

@@ -50,7 +50,6 @@
 
 acconfig.h
 alias.c
-assert.h
 basic-block.h
 bb-reorder.c
 bitmap.c

gcc/scan-decls.c

@@ -187,8 +187,12 @@ scan_decls (pfile, argc, argv)
 		  skip_to_closing_brace (pfile);
 		  goto new_statement;
 		}
-	      if (token.type == CPP_SEMICOLON)
-		goto new_statement;
+
+	      /* skip a possible __attribute__ or throw expression after the
+		 parameter list */
+	      while (token.type != CPP_SEMICOLON && token.type != CPP_EOF)
+		cpp_get_token (pfile, &token);
+	      goto new_statement;
 	    }
 	  break;
 	case CPP_NAME:

gcc/sys-protos.h

@@ -16,7 +16,6 @@ extern int                    __aread(int, int, char *, uint, ecb_t *);
 extern void                   __assert(const char *, const char *, int);
 extern int                    __asyncio(int, aioop_t *, int);
 extern int                    __awrite(int, int, char *, uint, ecb_t *);
-extern void                   __eprintf(const char *);
 extern int                    __evcntl(evver_t, evcntlcmds_t, long int, long int);
 extern int                    __evexit(evver_t, idtype_t, id_t, const ecb_t *);
 extern int                    __evexitset(evver_t, const procset_t *, hostid_t, const ecb_t *);