diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2a13af21bdf01b636a25abae70169a441cee4b6b..0480a22c92762c11810e29b630dfb52615851e58 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-14  Eric Christopher  <echristo@redhat.com>
+
+	* config/s390/t-tpf (SHLIB_MAPFILES): Remove.
+
 2005-07-14  Steven Bosscher  <stevenb@suse.de>
 
 	PR tree-optimization/22230
diff --git a/gcc/config/s390/t-tpf b/gcc/config/s390/t-tpf
index 3cf0146c84aff4f94e11f02416a63bb5c36057ff..36971679c68d71497a154da7fe46401eb188d41a 100644
--- a/gcc/config/s390/t-tpf
+++ b/gcc/config/s390/t-tpf
@@ -3,10 +3,6 @@ CRTSTUFF_T_CFLAGS_S = $(CRTSTUFF_T_CFLAGS) -fPIC
 # Compile libgcc2.a with pic.
 TARGET_LIBGCC2_CFLAGS = -fPIC
 
-# Override t-slibgcc-elf-ver to export some libgcc symbols with
-# the symbol versions that glibc used.
-SHLIB_MAPFILES += $(srcdir)/config/s390/libgcc-glibc.ver
-
 # Use unwind-dw2-fde.
 LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde.c \
   $(srcdir)/unwind-sjlj.c $(srcdir)/gthr-gnat.c $(srcdir)/unwind-c.c