diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e4a36eafa7..7bbfd468eb 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2003-09-03  Andrew Cagney  <cagney@redhat.com>
+
+	* config/arm/wince.mt (TM_CLIBS): Replace WIN32LIBS.
+	* config/mips/wince.mt (TM_CLIBS): Ditto.
+	* config/sh/wince.mt (TM_CLIBS): Ditto.
+	* config/pa/hppa64.mt (TM_CLIBS): Delete.
+	* config/sparc/sp64.mt (CC): Delete.
+
 2003-09-03  Andrew Cagney  <cagney@redhat.com>
 
 	* defs.h: Do not include "arch-utils.h".
diff --git a/gdb/config/arm/wince.mt b/gdb/config/arm/wince.mt
index 10fe0eb3f3..92a77ae0ad 100644
--- a/gdb/config/arm/wince.mt
+++ b/gdb/config/arm/wince.mt
@@ -2,4 +2,4 @@
 TDEPFILES= arm-tdep.o wince.o
 TM_FILE= tm-wince.h
 MT_CFLAGS=-DARM -U_X86_ -U_M_IX86 -U__i386__ -U__i486__ -U__i586__ -U__i686__ -DUNICODE -D_WIN32_WCE -DWINCE_STUB='"${target_alias}-stub.exe"'
-WIN32LIBS=-lrapi
+TM_CLIBS=-lrapi
diff --git a/gdb/config/mips/wince.mt b/gdb/config/mips/wince.mt
index a404b1cec8..6aa5733808 100644
--- a/gdb/config/mips/wince.mt
+++ b/gdb/config/mips/wince.mt
@@ -2,4 +2,4 @@
 TDEPFILES= mips-tdep.o wince.o
 TM_FILE= tm-wince.h
 MT_CFLAGS=-DMIPS -U_X86_ -U_M_IX86 -U__i386__ -U__i486__ -U__i586__ -U__i686__ -DUNICODE -D_WIN32_WCE -DWINCE_STUB='"${target_alias}-stub.exe"'
-WIN32LIBS=-lrapi
+TM_CLIBS=-lrapi
diff --git a/gdb/config/pa/hppa64.mt b/gdb/config/pa/hppa64.mt
index 9e3e6863a3..10d9fc6712 100644
--- a/gdb/config/pa/hppa64.mt
+++ b/gdb/config/pa/hppa64.mt
@@ -1,4 +1,3 @@
 # Target: HP PA-RISC 2.0 running HPUX 11.00 in wide mode
 TDEPFILES= hppa-tdep.o hppa-hpux-tdep.o
 TM_FILE= tm-hppa64.h
-TM_CLIBS=
diff --git a/gdb/config/sh/wince.mt b/gdb/config/sh/wince.mt
index 237a0bc342..a4e8f58141 100644
--- a/gdb/config/sh/wince.mt
+++ b/gdb/config/sh/wince.mt
@@ -2,4 +2,4 @@
 TDEPFILES= sh-tdep.o wince.o
 TM_FILE= tm-wince.h
 MT_CFLAGS=-DSHx -U_X86_ -U_M_IX86 -U__i386__ -U__i486__ -U__i586__ -U__i686__ -DUNICODE -D_WIN32_WCE -DWINCE_STUB='"${target_alias}-stub.exe"'
-WIN32LIBS=-lrapi
+TM_CLIBS=-lrapi
diff --git a/gdb/config/sparc/sp64.mt b/gdb/config/sparc/sp64.mt
index 8bb1e07ed1..943abfc240 100644
--- a/gdb/config/sparc/sp64.mt
+++ b/gdb/config/sparc/sp64.mt
@@ -4,6 +4,3 @@
 # Then again, having procfs.o in a target makefile fragment seems wrong.
 TDEPFILES = sparc-tdep.o
 TM_FILE= tm-sp64.h
-
-# Need gcc for long long support.
-CC = gcc