Index: gcc/config.gcc
===================================================================
--- gcc/config.gcc	(revision 169769)
+++ gcc/config.gcc	(working copy)
@@ -1044,7 +1044,7 @@ hppa[12]*-*-hpux10*)
 	esac
 	tm_file="${tm_file} pa/pa32-regs.h dbxelf.h pa/som.h \
 		 pa/pa-hpux.h pa/pa-hpux10.h"
-	extra_options="${extra_options} pa/pa-hpux.opt"
+	extra_options="${extra_options} pa/pa-hpux.opt pa/pa-hpux10.opt"
 	case ${target} in
 	*-*-hpux10.[1-9]*)
 		tm_file="${tm_file} pa/pa-hpux1010.h"
Index: gcc/config/hpux11.opt
===================================================================
--- gcc/config/hpux11.opt	(revision 169769)
+++ gcc/config/hpux11.opt	(working copy)
@@ -27,4 +27,7 @@
 mt
 Driver RejectNegative
 
+pthread
+Driver
+
 ; This comment is to ensure we retain the blank line above.
Index: gcc/config/pa/pa-hpux.opt
===================================================================
--- gcc/config/pa/pa-hpux.opt	(revision 169769)
+++ gcc/config/pa/pa-hpux.opt	(working copy)
@@ -1,6 +1,6 @@
 ; Options for the HP PA-RISC port of the compiler.
 
-; Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+; Copyright (C) 2005, 2007, 2011 Free Software Foundation, Inc.
 ;
 ; This file is part of GCC.
 ;
@@ -29,3 +29,9 @@ Specify UNIX standard for predefines and
 mwsio
 Target RejectNegative InverseMask(SIO)
 Generate cpp defines for workstation IO
+
+nolibdld
+Driver
+
+rdynamic
+Driver
Index: gcc/config/pa/pa-hpux10.opt
===================================================================
--- gcc/config/pa/pa-hpux10.opt	(revision 0)
+++ gcc/config/pa/pa-hpux10.opt	(revision 0)
@@ -0,0 +1,22 @@
+; Options specific to HP-UX 10.
+
+; Copyright (C) 2011 Free Software Foundation, Inc.
+;
+; This file is part of GCC.
+;
+; GCC is free software; you can redistribute it and/or modify it under
+; the terms of the GNU General Public License as published by the Free
+; Software Foundation; either version 3, or (at your option) any later
+; version.
+;
+; GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+; WARRANTY; without even the implied warranty of MERCHANTABILITY or
+; FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+; for more details.
+;
+; You should have received a copy of the GNU General Public License
+; along with GCC; see the file COPYING3.  If not see
+; <http://www.gnu.org/licenses/>.
+
+threads
+Driver