diff --git a/sysdeps/hppa/libgcc_s.h b/sysdeps/hppa/libgcc_s.h
deleted file mode 100644
index 8dd1d72..0000000
--- a/sysdeps/hppa/libgcc_s.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Name of libgcc_s library provided by gcc.  */
-#define LIBGCC_S_SO "libgcc_s.so.4"
diff --git a/sysdeps/hppa/shlib-versions b/sysdeps/hppa/shlib-versions
index 5a1a865..6b9225c 100644
--- a/sysdeps/hppa/shlib-versions
+++ b/sysdeps/hppa/shlib-versions
@@ -5,3 +5,5 @@ hppa.*-.*-.*		libc=6			GLIBC_2.2
 hppa.*-.*-.*		ld=ld.so.1		GLIBC_2.2
 
 hppa-.*-.*		libBrokenLocale=1	GLIBC_2.2
+
+hppa.*-.*-.*		libgcc_s=4
diff --git a/sysdeps/m68k/libgcc_s.h b/sysdeps/m68k/libgcc_s.h
deleted file mode 100644
index 8523ad1..0000000
--- a/sysdeps/m68k/libgcc_s.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Name of libgcc_s library provided by gcc, m68k version.  */
-#define LIBGCC_S_SO "libgcc_s.so.2"
diff --git a/sysdeps/m68k/shlib-versions b/sysdeps/m68k/shlib-versions
new file mode 100644
index 0000000..b65b00b
--- /dev/null
+++ b/sysdeps/m68k/shlib-versions
@@ -0,0 +1 @@
+m68k-.*-linux.*		libgcc_s=2
-- 
1.7.7.6