Darwin: Revise handling of some driver opts.

Darwin has a user convenience feature where some linker options are exposed
at the driver level (so one can type '-all_load' instead of '-Wl,-all_load'
or '-Xlinker -all_load').  We retain this feature, but now these options are
all marked as 'Driver' and we process them as early as possible so that they
get allocated to the right toolchain command.  There are a couple of special
cases where these driver opts are used multiple times, or to control
operations on more than one command (e.g. dynamiclib).  These are handled
specially and we then add %<xxxx specs for the commands that _do not_ need
them.  NOTE: the ordering of 'shared' and 'dynamiclib' is significant, hence
they are placed out of alphabetical order at the start.  Likewise, we keep
a couple of cases where a negative option originally appeared after the
positive alternate, potentially overriding it.

When we report an error with %e, it seems necessary to strip the option
before doing so, otherwise it survives to the cc1 command line (%e does not
appear to abort the program before this).

Right now there is no mechanism to split up the 'variable portion' (%*) of
the matched spec string, so where we have some driver specs that take 2 or
3 arguments, these cannot be processed here, but are deferred until the
LINK_SPEC, where they are copied verbatim.

We have a 'safe' version of the macOS version string, that has been sanity-
checked and truncated to minor version.  If the 'tiny' (3rd) portion of the
value is not significant, it is better to use the safe one in version-compare().

Signed-off-by: Iain Sandoe <iain@sandoe.co.uk>

gcc/ChangeLog:

	* config/darwin-driver.c (darwin_driver_init): Revise comments, handle
	filelist and framework options in specs instead of code.
	* config/darwin.h (SUBTARGET_DRIVER_SELF_SPECS): Update to handle link
	specs that are really driver ones.
	(DARWIN_CC1_SPEC): Likewise.
	(CPP_SPEC): Likewise.
	(SYSROOT_SPEC): Append space.
	(LINK_SYSROOT_SPEC): Remove most driver link specs.
	(STANDARD_STARTFILE_PREFIX_2): Update link-related specs.
	(STARTFILE_SPEC): Likewise.
	(ASM_MMACOSX_VERSION_MIN_SPEC): Fix line wrap.
	(ASM_SPEC): Update driver-related specs.
	(ASM_FINAL_SPEC): Likewise.
	* config/darwin.opt: Remove now unused option aliases.
	* config/i386/darwin.h (EXTRA_ASM_OPTS): Ensure space after opt.
	(ASM_SPEC): Update driver-related specs.

1 files changed, 187 insertions, 111 deletions

diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h
index 0fa1c57..4aedf46 100644
--- a/gcc/config/darwin.h
+++ b/gcc/config/darwin.h
@@ -118,25 +118,164 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 /* True if pragma ms_struct is in effect.  */
 extern GTY(()) int darwin_ms_struct;
 
-/* The majority of Darwin's special driver opts are direct access to ld flags
-   (to save the user typing -Wl,xxxxx or Xlinker xxxxx) but we can't process
-   them here, since doing so will make it appear that there are linker infiles
-   and the linker will invoked even when it is not necessary.
+/* Darwin has a user convenience feature where some linker options are exposed
+   at the driver level (so one can type "-all_load" instead of "-Wl,-all_load"
+   or "-Xlinker -all_load").  We retain this, but now these options are all
+   marked as 'Driver' and we process them as early as possible so that they
+   get allocated to the right toolchain command.  There are a couple of special
+   cases where these driver opts are used multiple times, or to control
+   operations on more than one command (e.g. dynamiclib).  These are handled
+   specially and we then add %<xxxx specs for the commands that _don't_ need
+   them.  NOTE: the order of 'shared' and 'dynamiclib' is significant, hence
+   they are placed out of alphabetical order at the start.  Likewise, we keep
+   a couple of cases where a negative option originally appeared after the
+   positive alternate, potentially overriding it.
+   When we report an error with %e, it seems necessary to strip the option
+   before doing so, otherwise it survives to the cc1 command line (%e doesn't
+   appear to abort the program before this).
+   Right now there's no mechanism to split up the "variable portion" (%*) of
+   the matched spec string, so where we have some driver specs that take 2
+   or 3 arguments, these cannot be processed here, but are deferred until the
+   LINK_SPEC, where they are copied verbatim.
+   We have a "safe" version of the MacOS version string, that's been sanity-
+   checked and truncated to minor version.  If the 'tiny' (3rd) portion of the
+   value is not significant, it's better to use this in version-compare().  */
 
-   However, a few can be handled and we can elide options that are silently-
-   ignored defaults, plus warn on obsolete ones that no longer function.  */
 #undef SUBTARGET_DRIVER_SELF_SPECS
 #define SUBTARGET_DRIVER_SELF_SPECS					\
-"%{fapple-kext|mkernel:-static}",					\
-"%{gfull:-g -fno-eliminate-unused-debug-symbols} %<gfull",		\
-"%{gsplit-dwarf:%ngsplit-dwarf is not supported on this platform} \
-   %<gsplit-dwarf",							\
-"%{gused:-g -feliminate-unused-debug-symbols} %<gused",			\
-"%{rpath*: -Xlinker -rpath -Xlinker %*}",					\
-"%{shared:-Zdynamiclib} %<shared",					\
-"%{static:%{Zdynamic:%e conflicting code gen style switches are used}}",\
-"%{y*:%nthe y option is obsolete and ignored} %<y*",			\
-"%<Mach "
+  "%{shared:%{!dynamiclib:-dynamiclib}} %<shared",			\
+  "%{static:%{dynamic|dynamiclib:%econflicting code generation switches}}",\
+  "%{dynamiclib:-Xlinker -dylib \
+     %{allowable_client*:-Xlinker -allowable_client -Xlinker %*} \
+       %<allowable_client* \
+     %{bundle_loader*: %<bundle_loader* \
+       %e-bundle_loader not allowed with -dynamiclib} \
+     %{client_name*: %<client_name* \
+       %e-client_name not allowed with -dynamiclib} \
+     %{compatibility_version*:\
+       -Xlinker -dylib_compatibility_version -Xlinker %*} \
+       %<compatibility_version* \
+     %{current_version*:-Xlinker -dylib_current_version -Xlinker %*} \
+       %<current_version* \
+     %{install_name*:-Xlinker -dylib_install_name -Xlinker %* } \
+       %<install_name* \
+     %{keep_private_externs: %<keep_private_externs \
+       %e-keep_private_externs not allowed with -dynamiclib} \
+     %{private_bundle: %<private_bundle \
+       %e-private_bundle not allowed with -dynamiclib} \
+    }",									\
+  "%{!dynamiclib: \
+     %{bundle_loader*:-Xlinker -bundle_loader -Xlinker %*} \
+       %<bundle_loader* \
+     %{client_name*:-Xlinker -client_name -Xlinker %*} \
+       %<client_name* \
+     %{compatibility_version*: %<compatibility_version* \
+       %e-compatibility_version only allowed with -dynamiclib} \
+     %{current_version*: %<current_version* \
+       %e-current_version only allowed with -dynamiclib} \
+     %{install_name*: %<install_name* \
+       %e-install_name only allowed with -dynamiclib} \
+     %{keep_private_externs:-Xlinker -keep_private_externs} \
+       %<keep_private_externs \
+     %{private_bundle:-Xlinker -private_bundle} \
+       %<private_bundle \
+    }",									\
+  "%{all_load:-Xlinker -all_load} %<all_load",				\
+  "%{arch_errors_fatal:-Xlinker -arch_errors_fatal} \
+    %<arch_errors_fatal",						\
+  "%{bind_at_load:-Xlinker -bind_at_load} %<bind_at_load",		\
+  "%{bundle:%{!dynamiclib:-Xlinker -bundle; \
+              :%e-bundle not allowed with -dynamiclib}}",	\
+  "%{dead_strip:-Xlinker -dead_strip} %<dead_strip",			\
+  "%{dylib_file*:-Xlinker -dylib_file -Xlinker %*} %<dylib_file*",	\
+  "%{dylinker:-Xlinker -dylinker} %<dylinker",				\
+  "%{dylinker_install_name*:-Xlinker -dylinker_install_name -Xlinker %*}\
+    %<dylinker_install_name*",						\
+  "%{exported_symbols_list*:-Xlinker -exported_symbols_list -Xlinker %*}\
+    %<exported_symbols_list",						\
+  "%{findirect-virtual-calls: -fapple-kext} %<findirect-virtual-calls", \
+  "%{fterminated-vtables: -fapple-kext} %<fterminated-vtables",		\
+  "%{fapple-kext|mkernel:-static}",					\
+  "%{filelist*:-Xlinker -filelist -Xlinker %*} %<filelist*",		\
+  "%{flat_namespace:-Xlinker -flat_namespace} %<flat_namespace",	\
+  "%{force_cpusubtype_ALL:-Xassembler -force_cpusubtype_ALL} ",		\
+  "%{force_flat_namespace: \
+     %{!dynamiclib:-Xlinker -force_flat_namespace; \
+       :%e-force_flat_namespace not allowed with -dynamiclib}} \
+    %<force_flat_namespace",						\
+  "%{framework*:-Xlinker -framework -Xlinker %*} %<framework*",		\
+  "%{gfull:-g -fno-eliminate-unused-debug-symbols} %<gfull",		\
+  "%{gused:-g -feliminate-unused-debug-symbols} %<gused",		\
+  "%{gsplit-dwarf:%ngsplit-dwarf is not supported on this platform} \
+    %<gsplit-dwarf",							\
+  "%{headerpad_max_install_names:-Xlinker -headerpad_max_install_names}\
+    %<headerpad_max_install_names",					\
+  "%{image_base*:-Xlinker -image_base -Xlinker %*} %<image_base*",	\
+  "%{init*:-Xlinker -init -Xlinker %*} %<init*",			\
+  "%{multi_module:-Xlinker -multi_module} %<multi_module",		\
+  "%{multiply_defined*:-Xlinker -multiply_defined -Xlinker %*; \
+     :%{shared-libgcc: \
+       %:version-compare(< 10.5 asm_macosx_version_min= -Xlinker) \
+       %:version-compare(< 10.5 asm_macosx_version_min= -multiply_defined) \
+       %:version-compare(< 10.5 asm_macosx_version_min= -Xlinker) \
+       %:version-compare(< 10.5 asm_macosx_version_min= suppress)}} \
+     %<multiply_defined*",						\
+  "%{multiplydefinedunused*:\
+     -Xlinker -multiply_defined_unused -Xlinker %*} \
+     %<multiplydefinedunused* ",					\
+  "%{no_dead_strip_inits_and_terms:\
+     -Xlinker -no_dead_strip_inits_and_terms} \
+     %<no_dead_strip_inits_and_terms",					\
+  "%{nofixprebinding:-Xlinker -nofixprebinding} %<nofixprebinding",	\
+  "%{nomultidefs:-Xlinker -nomultidefs} %<nomultidefs",			\
+  "%{pagezero_size*:-Xlinker -pagezero_size -Xlinker %*} \
+    %<pagezero_size",							\
+  "%{prebind:-Xlinker -prebind} %<prebind",				\
+  "%{noprebind:-Xlinker -noprebind} %<noprebind",			\
+  "%{prebind_all_twolevel_modules:\
+     -Xlinker -prebind_all_twolevel_modules} \
+     %<prebind_all_twolevel_modules",					\
+  "%{preload:-Xlinker -preload} %<preload",				\
+  "%{read_only_relocs*:-Xlinker -read_only_relocs -Xlinker %*} \
+     %<read_only_relocs*",						\
+  "%{rpath*: -Xlinker -rpath -Xlinker %*}",				\
+  "%{seg_addr_table_filename*: \
+     -Xlinker -seg_addr_table_filename -Xlinker %*} \
+     %<seg_addr_table_filename*",					\
+  "%{seg_addr_table*:-Xlinker -seg_addr_table -Xlinker %*} \
+     %<seg_addr_table*",						\
+  "%{seg1addr*:-Xlinker -image_base -Xlinker %*} %<seg1addr*",		\
+  "%{seglinkedit:-Xlinker -seglinkedit} %<seglinkedit",			\
+  "%{noseglinkedit:-Xlinker -noseglinkedit} %<noseglinkedit",		\
+  "%{segs_read_only_addr*:-Xlinker -segs_read_only_addr -Xlinker %*} \
+    %<segs_read_only_addr*",						\
+  "%{segs_read_write_addr*:-Xlinker -segs_read_write_addr -Xlinker %*} \
+    %<segs_read_write_addr*",						\
+  "%{single_module:-Xlinker -single_module} %<single_module",		\
+  "%{sub_library*:-Xlinker -sub_library -Xlinker %*} %<sub_library*",	\
+  "%{sub_umbrella*:-Xlinker -sub_umbrella -Xlinker %*} %<sub_umbrella*",\
+  "%{twolevel_namespace:-Xlinker -twolevel_namespace} \
+     %<twolevel_namespace",						\
+  "%{twolevel_namespace_hints:-Xlinker -twolevel_namespace_hints} \
+     %<twolevel_namespace_hints",					\
+  "%{umbrella*:-Xlinker -umbrella -Xlinker %*} %<umbrella*",		\
+  "%{undefined*:-Xlinker -undefined -Xlinker %*} %<undefined*",		\
+  "%{unexported_symbols_list*:\
+     -Xlinker -unexported_symbols_list -Xlinker %*} \
+     %<unexported_symbols_list*",					\
+  "%{!weak_reference_mismatches*:\
+     %:version-compare(< 10.5 asm_macosx_version_min= -Xlinker) \
+ %:version-compare(< 10.5 asm_macosx_version_min= -weak_reference_mismatches) \
+     %:version-compare(< 10.5 asm_macosx_version_min= -Xlinker) \
+     %:version-compare(< 10.5 asm_macosx_version_min= non-weak)}",	\
+  "%{weak_reference_mismatches*:\
+    -Xlinker -weak_reference_mismatches -Xlinker %*} \
+    %<weak_reference_mismatches*",					\
+  "%{whyload:-Xlinker -whyload} %<whyload",				\
+  "%{whatsloaded:-Xlinker -whatsloaded} %<whatsloaded",			\
+  "%{w:-Xlinker -w}",							\
+  "%<y*",								\
+  "%<Mach "
 
 #if LD64_HAS_EXPORT_DYNAMIC
 #define DARWIN_RDYNAMIC "%{rdynamic:-export_dynamic}"
@@ -157,9 +296,7 @@ extern GTY(()) int darwin_ms_struct;
    %:version-compare(>= 10.7 mmacosx-version-min= -no_pie) }"
 
 #define DARWIN_CC1_SPEC							\
-  "%{findirect-virtual-calls: -fapple-kext} %<findirect-virtual-calls " \
-  "%{fterminated-vtables: -fapple-kext} %<fterminated-vtables "		\
-  "%<filelist* %<framework*"
+  "%<dynamic %<dynamiclib %<force_cpusubtype_ALL "
 
 #define SUBSUBTARGET_OVERRIDE_OPTIONS					\
   do {									\
@@ -184,7 +321,7 @@ extern GTY(()) int darwin_ms_struct;
 
 #undef	CPP_SPEC
 #define CPP_SPEC "%{static:%{!dynamic:-D__STATIC__}}%{!static:-D__DYNAMIC__}" \
-	" %{pthread:-D_REENTRANT}"
+	" %{pthread:-D_REENTRANT} "
 
 /* This is a fix for PR41260 by passing -no_compact_unwind on darwin10 and
    later until the assembler, linker and libunwind are able to deal with the
@@ -274,101 +411,38 @@ extern GTY(()) int darwin_ms_struct;
 #define HAVE_LD_SYSROOT 1
 /* It seems the only (working) way to get a space after %R is to append a
    dangling '/'.  */
-#define SYSROOT_SPEC "%{!isysroot*:-syslibroot %R/ }"
+#define SYSROOT_SPEC "%{!isysroot*:-syslibroot %R/ } "
 
 /* Do the same as clang, for now, and insert the sysroot for ld when an
    isysroot is specified.  */
-#define LINK_SYSROOT_SPEC "%{isysroot*:-syslibroot %*}"
+#define LINK_SYSROOT_SPEC "%{isysroot*:-syslibroot %*} "
 
 /* Suppress the addition of extra prefix paths when a sysroot is in use.  */
 #define STANDARD_STARTFILE_PREFIX_1 ""
 #define STANDARD_STARTFILE_PREFIX_2 ""
 
-/* Please keep the random linker options in alphabetical order (modulo
-   'Z' and 'no' prefixes). Note that options taking arguments may appear
-   multiple times on a command line with different arguments each time,
-   so put a * after their names so all of them get passed.  */
+
+/* Please keep the random linker options in alphabetical order.
+   Note that options taking arguments may appear multiple times on a command
+   line with different arguments each time, so put a * after their names so
+   all of them get passed.  */
 #define LINK_SPEC  \
-  "%{static}%{!static:-dynamic} \
+  "%{static}%{!static:%{!dynamic:-dynamic}} \
    %:remove-outfile(-ldl) \
    %:remove-outfile(-lm) \
    %:remove-outfile(-lpthread) \
    %{fgnu-runtime: %{static|static-libgcc: \
                      %:replace-outfile(-lobjc libobjc-gnu.a%s); \
-                    :%:replace-outfile(-lobjc -lobjc-gnu ) } }\
+                    :%:replace-outfile(-lobjc -lobjc-gnu )}}\
    %{static|static-libgcc|static-libgfortran:%:replace-outfile(-lgfortran libgfortran.a%s)}\
    %{static|static-libgcc|static-libstdc++|static-libgfortran:%:replace-outfile(-lgomp libgomp.a%s)}\
    %{static|static-libgcc|static-libstdc++:%:replace-outfile(-lstdc++ libstdc++.a%s)}\
-   %{!Zdynamiclib: \
-     %{Zforce_cpusubtype_ALL:-arch %(darwin_arch) -force_cpusubtype_ALL} \
-     %{!Zforce_cpusubtype_ALL:-arch %(darwin_subarch)} \
-     %{Zbundle:-bundle} \
-     %{Zbundle_loader*:-bundle_loader %*} \
-     %{client_name*} \
-     %{compatibility_version*:%e-compatibility_version only allowed with -dynamiclib\
-} \
-     %{current_version*:%e-current_version only allowed with -dynamiclib} \
-     %{Zforce_flat_namespace:-force_flat_namespace} \
-     %{Zinstall_name*:%e-install_name only allowed with -dynamiclib} \
-     %{keep_private_externs} \
-     %{private_bundle} \
-    } \
-   %{Zdynamiclib: -dylib \
-     %{Zbundle:%e-bundle not allowed with -dynamiclib} \
-     %{Zbundle_loader*:%e-bundle_loader not allowed with -dynamiclib} \
-     %{client_name*:%e-client_name not allowed with -dynamiclib} \
-     %{compatibility_version*:-dylib_compatibility_version %*} \
-     %{current_version*:-dylib_current_version %*} \
-     %{Zforce_cpusubtype_ALL:-arch %(darwin_arch)} \
-     %{!Zforce_cpusubtype_ALL: -arch %(darwin_subarch)} \
-     %{Zforce_flat_namespace:%e-force_flat_namespace not allowed with -dynamiclib} \
-     %{Zinstall_name*:-dylib_install_name %*} \
-     %{keep_private_externs:%e-keep_private_externs not allowed with -dynamiclib} \
-     %{private_bundle:%e-private_bundle not allowed with -dynamiclib} \
-    } \
-   %{Zall_load:-all_load} \
-   %{Zallowable_client*:-allowable_client %*} \
-   %{Zbind_at_load:-bind_at_load} \
-   %{Zarch_errors_fatal:-arch_errors_fatal} \
-   %{Zdead_strip:-dead_strip} \
-   %{Zno_dead_strip_inits_and_terms:-no_dead_strip_inits_and_terms} \
-   %{Zdylib_file*:-dylib_file %*} \
-   %{Zdynamic:-dynamic}\
-   %{Zexported_symbols_list*:-exported_symbols_list %*} \
-   %{Zflat_namespace:-flat_namespace} \
-   %{headerpad_max_install_names} \
-   %{Zimage_base*:-image_base %*} \
-   %{Zinit*:-init %*} \
-   %{mmacosx-version-min=*:-macosx_version_min %*} \
-   %{nomultidefs} \
-   %{Zmulti_module:-multi_module} %{Zsingle_module:-single_module} \
-   %{Zmultiply_defined*:-multiply_defined %*} \
-   %{!Zmultiply_defined*:%{shared-libgcc: \
-     %:version-compare(< 10.5 mmacosx-version-min= -multiply_defined) \
-     %:version-compare(< 10.5 mmacosx-version-min= suppress)}} \
-   %{Zmultiplydefinedunused*:-multiply_defined_unused %*} \
-   %{prebind} %{noprebind} %{nofixprebinding} %{prebind_all_twolevel_modules} \
-   %{read_only_relocs} \
-   %{sectcreate*} %{sectorder*} %{seg1addr*} %{segprot*} \
-   %{Zsegaddr*:-segaddr %*} \
-   %{Zsegs_read_only_addr*:-segs_read_only_addr %*} \
-   %{Zsegs_read_write_addr*:-segs_read_write_addr %*} \
-   %{Zseg_addr_table*: -seg_addr_table %*} \
-   %{Zfn_seg_addr_table_filename*:-seg_addr_table_filename %*} \
-   %{sub_library*} %{sub_umbrella*} \
-   " LINK_SYSROOT_SPEC " \
-   %{twolevel_namespace} %{twolevel_namespace_hints} \
-   %{Zumbrella*: -umbrella %*} \
-   %{undefined*} \
-   %{Zunexported_symbols_list*:-unexported_symbols_list %*} \
-   %{Zweak_reference_mismatches*:-weak_reference_mismatches %*} \
-   %{!Zweak_reference_mismatches*:-weak_reference_mismatches non-weak} \
-   %{w} \
-   %{pagezero_size*} %{segs_read_*} %{seglinkedit} %{noseglinkedit}  \
-   %{sectalign*} %{sectobjectsymbols*} %{segcreate*} %{whyload} \
-   %{whatsloaded} %{dylinker_install_name*} \
-   %{dylinker} "
-
+   %{force_cpusubtype_ALL:-arch %(darwin_arch)} \
+   %{!force_cpusubtype_ALL:-arch %(darwin_subarch)} "\
+   LINK_SYSROOT_SPEC \
+  "%{mmacosx-version-min=*:-macosx_version_min %*} \
+   %{sectalign*} %{sectcreate*} %{sectobjectsymbols*}  %{sectorder*} \
+   %{segaddr*} %{segcreate*} %{segprot*} "
 
 /* Machine dependent libraries.  */
 
@@ -410,9 +484,9 @@ extern GTY(()) int darwin_ms_struct;
 
 #undef  STARTFILE_SPEC
 #define STARTFILE_SPEC							    \
-"%{Zdynamiclib: %(darwin_dylib1) %{fgnu-tm: -lcrttms.o}}		    \
- %{!Zdynamiclib:%{Zbundle:%(darwin_bundle1)}				    \
-     %{!Zbundle:%{pg:%{static:-lgcrt0.o}				    \
+"%{dynamiclib: %(darwin_dylib1) %{fgnu-tm: -lcrttms.o}}			   \
+ %{!dynamiclib:%{bundle:%(darwin_bundle1)}				    \
+     %{!bundle:%{pg:%{static:-lgcrt0.o}					    \
                      %{!static:%{object:-lgcrt0.o}			    \
                                %{!object:%{preload:-lgcrt0.o}		    \
                                  %{!preload:-lgcrt1.o                       \
@@ -423,7 +497,7 @@ extern GTY(()) int darwin_ms_struct;
                                 %{!object:%{preload:-lcrt0.o}		    \
                                   %{!preload: %(darwin_crt1)		    \
 					      %(darwin_crt2)}}}}}}	    \
- %(darwin_crt3)"
+ %(darwin_crt3) %<dynamiclib "
 
 /* We want a destructor last in the list.  */
 #define TM_DESTRUCTOR "%{fgnu-tm: -lcrttme.o}"
@@ -463,24 +537,25 @@ extern GTY(()) int darwin_ms_struct;
 #ifdef HAVE_AS_MMACOSX_VERSION_MIN_OPTION
 /* Emit macosx version (but only major).  */
 #define ASM_MMACOSX_VERSION_MIN_SPEC \
-  " %{asm_macosx_version_min=*: -mmacosx-version-min=%*} %<asm_macosx_version_min=*"
+"%{asm_macosx_version_min=*: -mmacosx-version-min=%* } \
+   %<asm_macosx_version_min=* "
 #else
-#define ASM_MMACOSX_VERSION_MIN_SPEC " %<asm_macosx_version_min=*"
+#define ASM_MMACOSX_VERSION_MIN_SPEC " %<asm_macosx_version_min=* "
 #endif
 
-/* When we detect that we're cctools or llvm as, we need to insert the right
-   additional options.  */
 #if HAVE_GNU_AS
+/* The options are added in gcc.c for this case.  */
 #define ASM_OPTIONS ""
 #else
+/* When we detect that we're cctools or llvm as, we need to insert the right
+   additional options.  Actually, currently these are the same as GAS.  */
 #define ASM_OPTIONS "%{v} %{w:-W} %{I*}"
 #endif
 
 /* Default Darwin ASM_SPEC, very simple. */
-#define ASM_SPEC "-arch %(darwin_arch) \
-  " ASM_OPTIONS " \
-  %{Zforce_cpusubtype_ALL:-force_cpusubtype_ALL} \
-  %{static}" ASM_MMACOSX_VERSION_MIN_SPEC
+#define ASM_SPEC \
+"%{static} -arch %(darwin_arch) " \
+ASM_OPTIONS ASM_MMACOSX_VERSION_MIN_SPEC
 
 #ifdef HAVE_AS_STABS_DIRECTIVE
 /* We only pass a debug option to the assembler if that supports stabs, since
@@ -494,7 +569,8 @@ extern GTY(()) int darwin_ms_struct;
 #define ASM_DEBUG_OPTION_SPEC	""
 
 #define ASM_FINAL_SPEC \
-  "%{gsplit-dwarf:%ngsplit-dwarf is not supported on this platform} %<gsplit-dwarf"
+  "%{gsplit-dwarf:%ngsplit-dwarf is not supported on this platform} \
+     %<gsplit-dwarf"
 
 /* We now require C++11 to bootstrap and newer tools than those based on
    stabs, so require DWARF-2, even if stabs is supported by the assembler.  */