diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a804a8cc1e248742e4b0a395ca1a5725a6fec5c3..6a59bd51ae1373f3ee192f95e08add45fd293322 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2009-12-04  Matthias Klose  <doko@ubuntu.com>
+	    John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+	PR target/40134
+        * config.gcc (hppa*-*-linux*): Use config/t-slibgcc-libgcc.
+	* config/pa/pa-linux.h (LIB_SPEC): Remove.
+
 2009-12-03  Sebastian Pop  <sebastian.pop@amd.com>
 	    Richard Henderson  <rth@redhat.com>
 
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 90aa7a7cbfb4373908fd07c88611ed31b8f0d3ef..f7b23aabed4563a647d5e4a47819d57994038020 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -933,7 +933,7 @@ hppa*-*-linux*)
 	target_cpu_default="MASK_PA_11|MASK_NO_SPACE_REGS"
 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h glibc-stdint.h pa/pa-linux.h \
 		 pa/pa32-regs.h pa/pa32-linux.h"
-	tmake_file="${tmake_file} pa/t-linux"
+	tmake_file="${tmake_file} pa/t-linux t-slibgcc-libgcc"
 	# Set the libgcc version number
 	if test x$sjlj = x1; then
 	    tmake_file="$tmake_file pa/t-slibgcc-sjlj-ver"
diff --git a/gcc/config/pa/pa-linux.h b/gcc/config/pa/pa-linux.h
index f698f3fbe42a082f79681a762cf2b6bce8ddb1fa..cd467900d228462e571036e6e4742225a2dc0972 100644
--- a/gcc/config/pa/pa-linux.h
+++ b/gcc/config/pa/pa-linux.h
@@ -31,12 +31,6 @@ along with GCC; see the file COPYING3.  If not see
 #undef CPP_SPEC
 #define CPP_SPEC "%{posix:-D_POSIX_SOURCE}"
 
-#undef	LIB_SPEC
-#define LIB_SPEC \
-  "%{pthread:-lpthread} \
-   %{shared:-lgcc -lc} \
-   %{!shared:%{mieee-fp:-lieee} %{shared-libgcc:-lgcc} %{profile:-lc_p}%{!profile:-lc}}"
-
 #undef ASM_SPEC
 #define ASM_SPEC \
   "%{v:-V} %{n} %{T} %{Ym,*} %{Yd,*} %{Wa,*:%*}"