diff --git a/ChangeLog b/ChangeLog
index 600494c71d..597b24d37b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2000-06-14  Ulrich Drepper  <drepper@redhat.com>
 
+	* login/Makefile (utmpd): Remove rule to build utmpd.
+
+	* csu/Versions: Move libgcc frame handling functions from here...
+	* sysdeps/unix/sysv/linux/alpha/Versions: ...to here...
+	* sysdeps/unix/sysv/linux/arm/Versions: ...to here...
+	* sysdeps/unix/sysv/linux/i386/Versions: ...to here...
+	* sysdeps/unix/sysv/linux/m68k/Versions: ...to here...
+	* sysdeps/unix/sysv/linux/powerpc/Versions: ...to here...
+	* sysdeps/unix/sysv/linux/sparc/sparc32/Versions: ...and here.
+	New file.
+
 	* locale/programs/ld-ctype.c (allocate_arrays): Correct a comment.
 
 	* misc/syslog.c (vsyslog): Initialize msgoff in all cases.
diff --git a/csu/Versions b/csu/Versions
index 7b8d74e530..10c962d9ea 100644
--- a/csu/Versions
+++ b/csu/Versions
@@ -6,11 +6,6 @@ libc {
     # helper functions
     __libc_init_first; __libc_start_main;
 
-    # Exception handling support functions from libgcc
-    __register_frame; __register_frame_table; __deregister_frame;
-    __register_frame_info; __deregister_frame_info; __frame_state_for;
-    __register_frame_info_table;
-
     # variables in normal name space
     errno;
   }
diff --git a/login/Makefile b/login/Makefile
index 942e47efb4..b79c21a9e0 100644
--- a/login/Makefile
+++ b/login/Makefile
@@ -57,8 +57,6 @@ $(inst_libexecdir)/pt_chown: $(objpfx)pt_chown $(+force)
 	$(make-target-directory)
 	-$(INSTALL_PROGRAM) -m 4755 -o root $< $@
 
-$(objpfx)utmpd: $(utmpd-routines:%=$(objpfx)%.o)
-
 # Depend on libc.so so a DT_NEEDED is generated in the shared objects.
 # This ensures they will load libc.so for needed symbols if loaded by
 # a statically-linked program that hasn't already loaded it.
diff --git a/sysdeps/unix/sysv/linux/alpha/Versions b/sysdeps/unix/sysv/linux/alpha/Versions
index 7eee0f76fa..ac21c9f038 100644
--- a/sysdeps/unix/sysv/linux/alpha/Versions
+++ b/sysdeps/unix/sysv/linux/alpha/Versions
@@ -4,6 +4,11 @@ libc {
     _inb; _inw; _inl; _outb; _outw; _outl; _bus_base; _bus_base_sparse;
     _hae_shift;
 
+    # Exception handling support functions from libgcc
+    __register_frame; __register_frame_table; __deregister_frame;
+    __register_frame_info; __deregister_frame_info; __frame_state_for;
+    __register_frame_info_table;
+
     # b*
     bus_base; bus_base_sparse;
 
diff --git a/sysdeps/unix/sysv/linux/arm/Versions b/sysdeps/unix/sysv/linux/arm/Versions
index 7e71a8604d..4ac5b58a9b 100644
--- a/sysdeps/unix/sysv/linux/arm/Versions
+++ b/sysdeps/unix/sysv/linux/arm/Versions
@@ -1,4 +1,10 @@
 libc {
+  GLIBC_2.0 {
+    # Exception handling support functions from libgcc
+    __register_frame; __register_frame_table; __deregister_frame;
+    __register_frame_info; __deregister_frame_info; __frame_state_for;
+    __register_frame_info_table;
+  }
   GLIBC_2.1 {
     ioperm; iopl;
     inb; inw; inl;
diff --git a/sysdeps/unix/sysv/linux/i386/Versions b/sysdeps/unix/sysv/linux/i386/Versions
index 9860ff8def..8dc447ed81 100644
--- a/sysdeps/unix/sysv/linux/i386/Versions
+++ b/sysdeps/unix/sysv/linux/i386/Versions
@@ -1,5 +1,10 @@
 libc {
   GLIBC_2.0 {
+    # Exception handling support functions from libgcc
+    __register_frame; __register_frame_table; __deregister_frame;
+    __register_frame_info; __deregister_frame_info; __frame_state_for;
+    __register_frame_info_table;
+
     ioperm; iopl;
 
     vm86;
diff --git a/sysdeps/unix/sysv/linux/m68k/Versions b/sysdeps/unix/sysv/linux/m68k/Versions
index d996b2478e..b70d1d1c45 100644
--- a/sysdeps/unix/sysv/linux/m68k/Versions
+++ b/sysdeps/unix/sysv/linux/m68k/Versions
@@ -1,5 +1,10 @@
 libc {
   GLIBC_2.0 {
+    # Exception handling support functions from libgcc
+    __register_frame; __register_frame_table; __deregister_frame;
+    __register_frame_info; __deregister_frame_info; __frame_state_for;
+    __register_frame_info_table;
+
     # c*
     cacheflush;
   }
diff --git a/sysdeps/unix/sysv/linux/powerpc/Versions b/sysdeps/unix/sysv/linux/powerpc/Versions
index 80df088a0c..0f2b4c77eb 100644
--- a/sysdeps/unix/sysv/linux/powerpc/Versions
+++ b/sysdeps/unix/sysv/linux/powerpc/Versions
@@ -1,4 +1,10 @@
 libc {
+  GLIBC_2.0 {
+    # Exception handling support functions from libgcc
+    __register_frame; __register_frame_table; __deregister_frame;
+    __register_frame_info; __deregister_frame_info; __frame_state_for;
+    __register_frame_info_table;
+  }
   GLIBC_2.2 {
     # New rlimit interface
     getrlimit; setrlimit; getrlimit64; setrlimit64;
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/Versions b/sysdeps/unix/sysv/linux/sparc/sparc32/Versions
new file mode 100644
index 0000000000..2d3061bad5
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/Versions
@@ -0,0 +1,8 @@
+libc {
+  GLIBC_2.0 {
+    # Exception handling support functions from libgcc
+    __register_frame; __register_frame_table; __deregister_frame;
+    __register_frame_info; __deregister_frame_info; __frame_state_for;
+    __register_frame_info_table;
+  }
+}