Patchwork Add Darwin options from specs to darwin.opt

login
register
mail settings
Submitter Joseph S. Myers
Date Dec. 16, 2010, 11:01 p.m.
Message ID <Pine.LNX.4.64.1012162259490.16840@digraph.polyomino.org.uk>
Download mbox | patch
Permalink /patch/75823/
State New
Headers show

Comments

Joseph S. Myers - Dec. 16, 2010, 11:01 p.m.
In preparation for the driver only accepting options listed in .opt
files, and not other options that simply happen to match some spec,
this patch adds Darwin options matched by specs to darwin.opt.  In the
case of -headerpad_max_install_names, the spec had a trailing '*' but
the Darwin ld manpage did not indicate the option took any operands,
so I removed the '*' from the spec.

Tested building cc1 and xgcc for cross to i686-darwin.  OK to commit?

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.
Mike Stump - Dec. 16, 2010, 11:34 p.m.
On Dec 16, 2010, at 3:01 PM, Joseph S. Myers wrote:
> In preparation for the driver only accepting options listed in .opt
> files, and not other options that simply happen to match some spec,
> this patch adds Darwin options matched by specs to darwin.opt.

> OK to commit?

Ok.


I'm half expecting that the entire reason for using -Z prefixes will eventually go away and we can just remove all the -Z stuff.

Patch

Index: gcc/config/darwin.opt
===================================================================
--- gcc/config/darwin.opt	(revision 167956)
+++ gcc/config/darwin.opt	(working copy)
@@ -52,6 +52,9 @@  C ObjC C++ ObjC++ Separate Alias(MF) Mis
 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(Zmu
 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
 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_a
 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_symbol
 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
 
Index: gcc/config/darwin.h
===================================================================
--- gcc/config/darwin.h	(revision 167956)
+++ gcc/config/darwin.h	(working copy)
@@ -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)} \