diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7713e3539ff2af217bcbbe1a55346ade45a4bdd4..20b13512aaff3a13cff1bf426acb546a6f4ce892 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,16 @@
+2003-06-11 Roger Sayle <roger@eyesopen.com>
+ Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
+
+ * config/d30v/d30v.h: Delete reference to ASM_FINAL_SPEC.
+ * config/i386/netbsd-elf.h: Likewise.
+ * config/m32r/m32r.h: Likewise.
+ * config/mn10300/mn10300.h: Likewise.
+ * config/stormy16/stormy16.h: Likewise.
+ * config/v850/v850.h: Likewise.
+ * config/vax/netbsd-elf.h: Likewise.
+ * config/xtensa/elf.h: Likewise.
+ * config/xtensa/linux.h: Likewise.
+
2003-06-11 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* config/mips/iris5gas.h (MDEBUG_ASM_SPEC): Override to match
diff --git a/gcc/config/d30v/d30v.h b/gcc/config/d30v/d30v.h
index 0881c54c162891a1d690c38c3b3389343ca02f46..953a7822d6e602d18275f1e3ebb63cda798e4da1 100644
--- a/gcc/config/d30v/d30v.h
+++ b/gcc/config/d30v/d30v.h
@@ -42,9 +42,6 @@
%{!mno-asm-optimize: %{O*: %{!O0: -O} %{O0: %{masm-optimize: -O}}}} \
%{v} %{n} %{T} %{Ym,*} %{Yd,*} %{Wa,*:%*}"
-/* Defined in svr4.h. */
-/* #define ASM_FINAL_SPEC "" */
-
/* Defined in svr4.h. */
#undef LINK_SPEC
#define LINK_SPEC "\
diff --git a/gcc/config/i386/netbsd-elf.h b/gcc/config/i386/netbsd-elf.h
index 3d779499c5fd0181b51d456508a9ca4abde645fb..3bc574e5cb36a83d82d2357f64ee2d2b4bcec250 100644
--- a/gcc/config/i386/netbsd-elf.h
+++ b/gcc/config/i386/netbsd-elf.h
@@ -64,8 +64,6 @@ Boston, MA 02111-1307, USA. */
#undef ASM_APP_OFF
#define ASM_APP_OFF "#NO_APP\n"
-#undef ASM_FINAL_SPEC
-
#undef ASM_COMMENT_START
#define ASM_COMMENT_START "#"
diff --git a/gcc/config/m32r/m32r.h b/gcc/config/m32r/m32r.h
index 7af28e5ade753f6fc658f13a294c0faa6dcd74f3..36bd20643fb30549dc9e6fca0d31399fced6d383 100644
--- a/gcc/config/m32r/m32r.h
+++ b/gcc/config/m32r/m32r.h
@@ -176,8 +176,6 @@ Boston, MA 02111-1307, USA. */
#undef ASM_SPEC
#define ASM_SPEC "%{v} %(asm_cpu) %(relax)"
-#undef ASM_FINAL_SPEC
-
#define LINK_SPEC "%{v} %(link_cpu) %(relax)"
#undef STARTFILE_SPEC
diff --git a/gcc/config/mn10300/mn10300.h b/gcc/config/mn10300/mn10300.h
index 0bde1766d925b6524bf7f4064a239be550a93d4d..88d6fdcd58ebc550d48d773e20ee440e06551735 100644
--- a/gcc/config/mn10300/mn10300.h
+++ b/gcc/config/mn10300/mn10300.h
@@ -23,7 +23,6 @@ Boston, MA 02111-1307, USA. */
#undef ASM_SPEC
-#undef ASM_FINAL_SPEC
#undef LIB_SPEC
#undef ENDFILE_SPEC
#undef LINK_SPEC
diff --git a/gcc/config/stormy16/stormy16.h b/gcc/config/stormy16/stormy16.h
index dc9aea926af80ff4eab8748cb3be9a442bb13667..58fe83560839b80e1e2574f715c079a9a69f1ad8 100644
--- a/gcc/config/stormy16/stormy16.h
+++ b/gcc/config/stormy16/stormy16.h
@@ -23,22 +23,10 @@ Boston, MA 02111-1307, USA. */
/* Driver configuration */
-/* Defined in svr4.h. */
-/* #define SWITCH_TAKES_ARG(CHAR) */
-
-/* Defined in svr4.h. */
-/* #define WORD_SWITCH_TAKES_ARG(NAME) */
-
/* Defined in svr4.h. */
#undef ASM_SPEC
#define ASM_SPEC ""
-/* Defined in svr4.h. */
-/* #define ASM_FINAL_SPEC "" */
-
-/* Defined in svr4.h. */
-/* #define LINK_SPEC "" */
-
/* For xstormy16:
- If -msim is specified, everything is built and linked as for the sim.
- If -T is specified, that linker script is used, and it should provide
diff --git a/gcc/config/v850/v850.h b/gcc/config/v850/v850.h
index 83a39cdd16df9201f8d25d2f80d5742078b84036..e2729a991b135629eb77e985bf23aa1d7821aea3 100644
--- a/gcc/config/v850/v850.h
+++ b/gcc/config/v850/v850.h
@@ -23,8 +23,7 @@
#ifndef GCC_V850_H
#define GCC_V850_H
-/* These are defiend in svr4.h but we want to override them. */
-#undef ASM_FINAL_SPEC
+/* These are defined in svr4.h but we want to override them. */
#undef LIB_SPEC
#undef ENDFILE_SPEC
#undef LINK_SPEC
diff --git a/gcc/config/vax/netbsd-elf.h b/gcc/config/vax/netbsd-elf.h
index efa111205570b635add23ebf3917daf038fda99e..c946fef61f8672a6103685244bdc4db3ca864402 100644
--- a/gcc/config/vax/netbsd-elf.h
+++ b/gcc/config/vax/netbsd-elf.h
@@ -58,4 +58,3 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#undef TARGET_DEFAULT
#define TARGET_DEFAULT 0
-#undef ASM_FINAL_SPEC
diff --git a/gcc/config/xtensa/elf.h b/gcc/config/xtensa/elf.h
index 6c8ebcdc211b576d77bdeb2e948112bba6ea1d24..65b0f6eb3370a26219f3a46a1b7a7efb2ce8093c 100644
--- a/gcc/config/xtensa/elf.h
+++ b/gcc/config/xtensa/elf.h
@@ -51,8 +51,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
%{mlongcalls:--longcalls} \
%{mno-longcalls:--no-longcalls}"
-#undef ASM_FINAL_SPEC
-
#undef LIB_SPEC
#define LIB_SPEC "-lc -lsim -lc -lhandlers-sim -lhal"
diff --git a/gcc/config/xtensa/linux.h b/gcc/config/xtensa/linux.h
index b3281a21d5227afd05723b7193a9435c2b9129d2..d8b230f23371166430013373b204343797a31746 100644
--- a/gcc/config/xtensa/linux.h
+++ b/gcc/config/xtensa/linux.h
@@ -48,8 +48,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
%{mlongcalls:--longcalls} \
%{mno-longcalls:--no-longcalls}"
-#undef ASM_FINAL_SPEC
-
#undef LINK_SPEC
#define LINK_SPEC \
"%{shared:-shared} \