diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 50c813b162b41081be0c1b3a2ab45ca523c66ea5..00d1d67ebd432c9ab54aa82dbd2e32cd561f914e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Thu Mar  9 18:10:02 2000  Jeffrey A Law  (law@cygnus.com)
+
+        * config/pa/pa-hpux10.h (LIB_SPEC): Correct typo in !p case.
+        (MD_STARTFILE_PREFIX_1): New macro.
+
 2000-03-09  Robert Lipe  <robertl@sco.com>
 
 	* config/ia64/ia64.c: Include system.h.
diff --git a/gcc/config/pa/pa-hpux10.h b/gcc/config/pa/pa-hpux10.h
index 9540a9743f0bdd806ab2d7a6a333444e2ffe5a5e..22223e10c7353394805ea9b7c65cd89ed57270e1 100644
--- a/gcc/config/pa/pa-hpux10.h
+++ b/gcc/config/pa/pa-hpux10.h
@@ -1,5 +1,5 @@
 /* Definitions of target machine for GNU compiler, for HP PA-RISC 1.1
-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 2000 Free Software Foundation, Inc.
    Contributed by Tim Moore (moore@defmacro.cs.utah.edu)
 
 This file is part of GNU CC.
@@ -34,12 +34,11 @@ Boston, MA 02111-1307, USA.  */
 #undef LIB_SPEC
 #define LIB_SPEC \
   "%{!shared:\
-     %{!p:\
-       %{!pg:\
-         %{!threads:-lc}\
-         %{threads:-lcma -lc_r}}\
-       %{p: -L/lib/libp/ -lc}\
-       %{pg: -L/lib/libp/ -lc}}}"
+     %{!p:%{!pg:\
+       %{!threads:-lc}\
+       %{threads:-lcma -lc_r}}}\
+     %{p: -L/lib/libp/ -lc}\
+     %{pg: -L/lib/libp/ -lc}}"
 
 /* Under hpux10, the normal location of the `ld' and `as' programs is the
    /usr/ccs/bin directory.  */
@@ -49,12 +48,14 @@ Boston, MA 02111-1307, USA.  */
 #define MD_EXEC_PREFIX "/usr/ccs/bin/"
 #endif
 
-/* Under hpux10, the normal location of the various *crt*.o files is the
-   /usr/ccs/lib directory.  */
+/* Under hpux10, the normal location of the various *crt*.o files is
+   the /usr/ccs/lib directory.  However, the profiling files are in
+   /opt/langtools/lib.  */
 
 #ifndef CROSS_COMPILE
 #undef MD_STARTFILE_PREFIX
 #define MD_STARTFILE_PREFIX "/usr/ccs/lib/"
+#define MD_STARTFILE_PREFIX_1 "/opt/langtools/lib/"
 #endif
 
 /* hpux10 has the new HP assembler.  It's still lousy, but it's a whole lot