diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cde0107e17c6839eef46452df1e8f584278deae3..0bf3695441332ce956468598295cc214bf1e3828 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-16  Joseph Myers  <joseph@codesourcery.com>
+
+	* config/darwin.opt (dylinker, headerpad_max_install_names,
+	keep_private_externs, nofixprebinding, nomultidefs, noprebind,
+	noseglinkedit, object, prebind, prebind_all_twolevel_modules,
+	preload, private_bundle, pthread, seglinkedit, twolevel_namespace,
+	twolevel_namespace_hints, whatsloaded, whyload, y, Mach, X): New
+	Driver options.
+	* config/darwin.h (LINK_SPEC): Remove '*' after
+	headerpad_max_install_names.
+
 2010-12-16  Sebastian Pop  <sebastian.pop@amd.com>
 
 	PR tree-optimization/46924
diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h
index b6cb1f2b1b905aa4e741b4c4f355b975928f897c..ba617401ff37c515eaab0344806c95620a436df0 100644
--- a/gcc/config/darwin.h
+++ b/gcc/config/darwin.h
@@ -262,7 +262,7 @@ extern GTY(()) int darwin_ms_struct;
    %{Zdynamic:-dynamic}\
    %{Zexported_symbols_list*:-exported_symbols_list %*} \
    %{Zflat_namespace:-flat_namespace} \
-   %{headerpad_max_install_names*} \
+   %{headerpad_max_install_names} \
    %{Zimage_base*:-image_base %*} \
    %{Zinit*:-init %*} \
    %{!mmacosx-version-min=*:-macosx_version_min %(darwin_minversion)} \
diff --git a/gcc/config/darwin.opt b/gcc/config/darwin.opt
index 0e234d9c62a45ae1cffa733988e8cb3454b374ec..0d8c4b542c2c1ab3da2d9bdfc2a0b26eace35dcf 100644
--- a/gcc/config/darwin.opt
+++ b/gcc/config/darwin.opt
@@ -52,6 +52,9 @@ C ObjC C++ ObjC++ Separate Alias(MF) MissingArgError(missing filename after %qs)
 dylib_file
 Driver Separate Alias(Zdylib_file)
 
+dylinker
+Driver
+
 dynamic
 Driver Alias(Zdynamic)
 
@@ -88,6 +91,9 @@ Driver
 gused
 Driver
 
+headerpad_max_install_names
+Driver
+
 image_base
 Driver Separate Alias(Zimage_base)
 
@@ -97,6 +103,9 @@ Driver Separate Alias(Zinit)
 install_name
 Driver Separate Alias(Zinstall_name)
 
+keep_private_externs
+Driver
+
 mconstant-cfstrings
 Target Report Var(darwin_constant_cfstrings) Init(1)
 Generate compile-time CFString objects
@@ -113,6 +122,36 @@ Driver RejectNegative Separate Alias(Zmultiplydefinedunused)
 no_dead_strip_inits_and_terms
 Driver Alias(Zno_dead_strip_inits_and_terms)
 
+nofixprebinding
+Driver
+
+nomultidefs
+Driver
+
+noprebind
+Driver
+
+noseglinkedit
+Driver
+
+object
+Driver
+
+prebind
+Driver
+
+prebind_all_twolevel_modules
+Driver
+
+preload
+Driver
+
+private_bundle
+Driver
+
+pthread
+Driver
+
 seg_addr_table
 Driver Separate Alias(Zseg_addr_table)
 
@@ -122,6 +161,9 @@ Driver Separate Alias(Zfn_seg_addr_table_filename)
 segaddr
 Driver Separate Args(2) Alias(Zsegaddr)
 
+seglinkedit
+Driver
+
 segs_read_only_addr
 Driver Separate Alias(Zsegs_read_only_addr)
 
@@ -131,6 +173,12 @@ Driver Separate Alias(Zsegs_read_write_addr)
 single_module
 Driver Alias(Zsingle_module)
 
+twolevel_namespace
+Driver
+
+twolevel_namespace_hints
+Driver
+
 umbrella
 Driver Separate Alias(Zumbrella)
 
@@ -140,6 +188,18 @@ Driver Separate Alias(Zunexported_symbols_list)
 weak_reference_mismatches
 Driver Separate Alias(Zweak_reference_mismatches)
 
+whatsloaded
+Driver
+
+whyload
+Driver
+
+y
+Driver Joined
+
+Mach
+Driver
+
 Wnonportable-cfstrings
 Target Report Var(darwin_warn_nonportable_cfstrings) Init(1) Warning
 Warn if constant CFString objects contain non-portable characters
@@ -181,6 +241,9 @@ iframework
 Target RejectNegative C ObjC C++ ObjC++ Joined Separate 
 -iframework <dir>	Add <dir> to the end of the system framework include path
 
+X
+Driver
+
 Zall_load
 Driver