diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e8ce30a4ad1f427db8d5b0f9b67631cbffeff8f9..c369d44114e258501f27737ab6be0bc3c1c816d2 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -7,6 +7,13 @@
 	* Makefile.in (unstrap, restrap): New targets.
 	(bootstrap): Mention restrap.
 
+2002-06-19  Matt Kraai  <kraai@alumni.cmu.edu>
+
+	* except.c (ehl_free): Remove.
+
+	* doc/tm.texi (TARGET_CPU_CPP_BUILTINS): Correct misnamings of
+	builtin_define and builtin_define_std.
+
 2002-06-19  Ian Dall  <ian@sibyl.beware.dropbear.id.au>
 
 	* config/ns32k/ns32k.md: Give "*xxx" names to all unnamed insn's.
diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi
index 446d2327d7424379b185b6df7b4fba30b125010a..2d54603cbcff33777b5134e81d7b9847fae1556c 100644
--- a/gcc/doc/tm.texi
+++ b/gcc/doc/tm.texi
@@ -595,12 +595,12 @@ results freely.
 
 @code{builtin_assert} takes a string in the form you pass to the
 command-line option @option{-A}, such as @code{cpu=mips}, and creates
-the assertion.  @code{builtin_macro} takes a string in the form
+the assertion.  @code{builtin_define} takes a string in the form
 accepted by option @option{-D} and unconditionally defines the macro.
 
-@code{builtin_macro_std} takes a string representing the name of an
+@code{builtin_define_std} takes a string representing the name of an
 object-like macro.  If it doesn't lie in the user's namespace,
-@code{builtin_macro_std} defines it unconditionally.  Otherwise, it
+@code{builtin_define_std} defines it unconditionally.  Otherwise, it
 defines a version with two leading underscores, and another version
 with two leading and trailing underscores, and defines the original
 only if an ISO standard was not requested on the command line.  For