diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 85b6bd7437e..ea773b77642 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+Wed Dec 19 11:01:21 2001  Jeffrey A Law  (law@redhat.com)
+
+	* config/pa/t-hpux-shlib: New file.
+	* config.gcc (hpux10, hpux11): Include t-hpux-shlib in tmake_file
+	for 32bit hpux10 & hpux11 configurations.
+
 2001-12-19  Nick Clifton  <nickc@cambridge.redhat.com>
 
 	* config/arm/xscale-elf.h (SUBTARGET_EXTRA_ASM_SPEC): Pass
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 9fb298dd4f7..0e25c7fc92a 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -842,7 +842,7 @@ hppa1.1-*-hpux10* | hppa2*-*-hpux10*)
 	tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h pa/som.h pa/pa-hpux.h pa/pa-hpux10.h"
 	float_format=i128
 	xm_defines=POSIX
-	tmake_file="pa/t-pa pa/t-pa-hpux"
+	tmake_file="pa/t-pa pa/t-pa-hpux pa/t-hpux-shlib"
 	if test x$enable_threads = x; then
 	    enable_threads=$have_pthread_h
 	fi
@@ -858,7 +858,7 @@ hppa1.0-*-hpux10*)
 	tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h pa/som.h pa/pa-hpux.h pa/pa-hpux10.h"
 	float_format=i128
 	xm_defines=POSIX
-	tmake_file="pa/t-pa pa/t-pa-hpux"
+	tmake_file="pa/t-pa pa/t-pa-hpux pa/t-hpux-shlib"
 	if test x$enable_threads = x; then
 	    enable_threads=$have_pthread_h
 	fi
@@ -893,7 +893,7 @@ hppa1.1-*-hpux11* | hppa2*-*-hpux11*)
 	tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h pa/som.h pa/pa-hpux.h pa/pa-hpux11.h"
 	float_format=i128
 	xm_defines=POSIX
-	tmake_file="pa/t-pa pa/t-pa-hpux"
+	tmake_file="pa/t-pa pa/t-pa-hpux pa/t-hpux-shlib"
 #	if test x$enable_threads = x; then
 #	    enable_threads=$have_pthread_h
 #	fi
@@ -908,7 +908,7 @@ hppa1.0-*-hpux11*)
 	tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h pa/som.h pa/pa-hpux.h pa/pa-hpux11.h"
 	float_format=i128
 	xm_defines=POSIX
-	tmake_file=pa/t-pa-hpux
+	tmake_file="pa/t-pa pa/t-pa-hpux pa/t-hpux-shlib"
 #	if test x$enable_threads = x; then
 #	    enable_threads=$have_pthread_h
 #	fi
diff --git a/gcc/config/pa/t-hpux-shlib b/gcc/config/pa/t-hpux-shlib
new file mode 100644
index 00000000000..52c3fd90c4f
--- /dev/null
+++ b/gcc/config/pa/t-hpux-shlib
@@ -0,0 +1,19 @@
+# Build a shared libgcc library.
+SHLIB_EXT = .sl
+SHLIB_NAME = @shlib_base_name@.sl
+SHLIB_SONAME = @shlib_base_name@.1
+SHLIB_OBJS = @shlib_objs@
+
+SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared  -nodefaultlibs \
+	-o $(SHLIB_NAME) @multilib_flags@ $(SHLIB_OBJS) -lc && \
+        rm -f $(SHLIB_SONAME) && \
+        $(LN_S) $(SHLIB_NAME) $(SHLIB_SONAME)
+
+
+# $(slibdir) double quoted to protect it from expansion while building
+# libgcc.mk.  We want this delayed until actual install time.
+SHLIB_INSTALL = $(INSTALL_DATA) -m 555 $(SHLIB_NAME) \
+	$$(slibdir)/$(SHLIB_SONAME); \
+        rm -f $$(slibdir)/$(SHLIB_NAME); \
+        $(LN_S) $(SHLIB_SONAME) $$(slibdir)/$(SHLIB_NAME)
+