Adjustments for the 5.5 branch

Author: DougGregor

include/swift/Option/FrontendOptions.td

@@ -765,6 +765,10 @@ def type_info_dump_filter_EQ : Joined<["-"], "type-info-dump-filter=">,
   Flags<[FrontendOption]>,
   HelpText<"One of 'all', 'resilient' or 'fragile'">;
 
+def emit_ldadd_cfile_path
+  : Separate<["-"], "emit-ldadd-cfile-path">, MetaVarName<"<path>">,
+    HelpText<"Generate .c file defining symbols to add back">;
+
 def swift_async_frame_pointer_EQ : Joined<["-"], "swift-async-frame-pointer=">,
   Flags<[FrontendOption]>,
   HelpText<"One of 'auto', 'always' or 'never'">;

utils/build-script

@@ -1,4 +1,4 @@
-<<<#!/usr/bin/env python
+#!/usr/bin/env python
 
 # This source file is part of the Swift.org open source project
 #

utils/swift_build_support/swift_build_support/build_script_invocation.py

@@ -439,12 +439,6 @@ def convert_to_impl_arguments(self):
                 ' '.join(args.llvm_ninja_targets_for_cross_compile_hosts)
             ]
 
-        if args.darwin_symroot_path_filters:
-            impl_args += [
-                "--darwin_symroot_path_filters=%s" %
-                ' '.join(args.darwin_symroot_path_filters)
-            ]
-
         # Compute the set of host-specific variables, which we pass through to
         # the build script via environment variables.
         host_specific_variables = self.compute_host_specific_variables()
@@ -511,9 +505,6 @@ def compute_product_classes(self):
         # in the host toolchain. If the host toolchain is not equpipped with
         # a Swift compiler, a warning is emitted. In the future, it may become
         # mandatory that the host toolchain come with its own `swiftc`.
-        if self.args.build_early_swift_driver:
-            before_impl_product_classes.append(products.EarlySwiftDriver)
-
         if self.args.build_cmark:
             before_impl_product_classes.append(products.CMark)
 

utils/swift_build_support/swift_build_support/products/product.py

@@ -58,6 +58,18 @@ def is_build_script_impl_product(cls):
         """
         raise NotImplementedError
 
+    @classmethod
+    def is_ignore_install_all_product(cls):
+        """is_ignore_install_all_product -> bool
+
+        Whether this product is to ignore the install-all directive
+        and insted always respect its own should_install.
+        This is useful when we run -install-all but have products
+        which should never be installed into the toolchain
+        (e.g. earlyswiftdriver)
+        """
+        return False
+
     @classmethod
     def is_swiftpm_unified_build_product(cls):
         """is_swiftpm_unified_build_product -> bool