diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7c4dd2b8810..f37b85acce4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,18 +1,25 @@
+Wed Jun  2 12:25:55 1999  Richard Henderson  <rth@cygnus.com>
+
+	* alpha.c (override_options): Thinko in last patch.
+
+	* alpha/osf.h (CPP_SUBTARGET_SPEC): Define.
+	(LIB_SPEC): Recognize -pthread.
+
 Wed Jun  2 08:42:55 1999  Nick Clifton  <nickc@cygnus.com>
 
 	* config/arm/tcoff.h (USER_LABEL_PREFIX): Synchronise with
 	definition in config/arm/coff.h
 	* config/arm/coff.h: Add comment about USER_LABEL_PREFIX.
 
-Wed Jun  2 07:07 1999 Bruce Korb <ddsinc09@ix.netcom.com
+Wed Jun  2 07:07 1999 Bruce Korb <ddsinc09@ix.netcom.com>
 
-	*fixinc/fixincl.c(global def): Add FD_SHELL_SCRIPT to mark
+	* fixinc/fixincl.c(global def): Add FD_SHELL_SCRIPT to mark
 	fixes that need "file=xxx\n" prepended before invocation
 	(start_fixer - new): starting the fixer process is complex enough
 	to warrent its own routine.  It prepends the "file=xxx\n" stuff.
 	(process): uses the new routine; omit usage of putenv()
-	*fixinc/fixincl.tpl: mark shell scripts with FD_SHELL_SCRIPT
-	*fixinc/fixincl.x: regenerate
+	* fixinc/fixincl.tpl: mark shell scripts with FD_SHELL_SCRIPT
+	* fixinc/fixincl.x: regenerate
 
 Wed Jun  2 02:29:07 1999  Jeffrey A Law  (law@cygnus.com)
 
diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c
index 6e899f20f82..acbd549fb40 100644
--- a/gcc/config/alpha/alpha.c
+++ b/gcc/config/alpha/alpha.c
@@ -243,7 +243,7 @@ override_options ()
   /* Do some sanity checks on the above options. */
 
   if ((alpha_fptm == ALPHA_FPTM_SU || alpha_fptm == ALPHA_FPTM_SUI)
-      && (alpha_tp != ALPHA_TP_INSN || alpha_cpu == PROCESSOR_EV6))
+      && alpha_tp != ALPHA_TP_INSN && alpha_cpu != PROCESSOR_EV6)
     {
       warning ("fp software completion requires -mtrap-precision=i");
       alpha_tp = ALPHA_TP_INSN;
diff --git a/gcc/config/alpha/osf.h b/gcc/config/alpha/osf.h
index 956961f7cf3..cd0669ae8d6 100644
--- a/gcc/config/alpha/osf.h
+++ b/gcc/config/alpha/osf.h
@@ -30,9 +30,14 @@ Boston, MA 02111-1307, USA.  */
 -Dunix -D__osf__ -D_LONGLONG -DSYSTYPE_BSD \
 -D_SYSTYPE_BSD -Asystem(unix) -Asystem(xpg4)"
 
+#define CPP_SUBTARGET_SPEC \
+"%{pthread:-D_REENTRANT}"
+
 /* Under OSF4, -p and -pg require -lprof1, and -lprof1 requires -lpdf.  */
 
-#define LIB_SPEC "%{p:-lprof1 -lpdf} %{pg:-lprof1 -lpdf} %{a:-lprof2} -lc"
+#define LIB_SPEC \
+"%{p:-lprof1 -lpdf} %{pg:-lprof1 -lpdf} %{a:-lprof2} \
+ %{pthread: -lpthread -lmach -lexc} -lc"
 
 /* Pass "-G 8" to ld because Alpha's CC does.  Pass -O3 if we are
    optimizing, -O1 if we are not.  Pass -shared, -non_shared or