Remove changes not related to this (probably a previous bad merge)

Author: elsteveogrande

libcxx/test/libcxx/transitive_includes/cxx03.csv

@@ -122,19 +122,15 @@ atomic ratio
 atomic type_traits
 atomic version
 barrier atomic
-barrier cctype
 barrier climits
 barrier cmath
 barrier compare
 barrier concepts
 barrier cstddef
 barrier cstdint
-barrier cstdio
 barrier cstdlib
 barrier cstring
 barrier ctime
-barrier cwchar
-barrier cwctype
 barrier exception
 barrier initializer_list
 barrier iosfwd
@@ -2036,7 +2032,6 @@ stdexcept new
 stdexcept type_traits
 stdexcept typeinfo
 stdexcept version
-stop_token cstddef
 stop_token iosfwd
 stop_token version
 streambuf algorithm

libcxx/test/libcxx/transitive_includes/cxx11.csv

@@ -122,19 +122,15 @@ atomic ratio
 atomic type_traits
 atomic version
 barrier atomic
-barrier cctype
 barrier climits
 barrier cmath
 barrier compare
 barrier concepts
 barrier cstddef
 barrier cstdint
-barrier cstdio
 barrier cstdlib
 barrier cstring
 barrier ctime
-barrier cwchar
-barrier cwctype
 barrier exception
 barrier initializer_list
 barrier iosfwd
@@ -2036,7 +2032,6 @@ stdexcept new
 stdexcept type_traits
 stdexcept typeinfo
 stdexcept version
-stop_token cstddef
 stop_token iosfwd
 stop_token version
 streambuf algorithm

libcxx/test/libcxx/transitive_includes/cxx14.csv

@@ -125,19 +125,15 @@ atomic ratio
 atomic type_traits
 atomic version
 barrier atomic
-barrier cctype
 barrier climits
 barrier cmath
 barrier compare
 barrier concepts
 barrier cstddef
 barrier cstdint
-barrier cstdio
 barrier cstdlib
 barrier cstring
 barrier ctime
-barrier cwchar
-barrier cwctype
 barrier exception
 barrier initializer_list
 barrier iosfwd
@@ -2076,7 +2072,6 @@ stdexcept new
 stdexcept type_traits
 stdexcept typeinfo
 stdexcept version
-stop_token cstddef
 stop_token iosfwd
 stop_token version
 streambuf algorithm

libcxx/test/libcxx/transitive_includes/cxx17.csv

@@ -122,19 +122,15 @@ atomic ratio
 atomic type_traits
 atomic version
 barrier atomic
-barrier cctype
 barrier climits
 barrier cmath
 barrier compare
 barrier concepts
 barrier cstddef
 barrier cstdint
-barrier cstdio
 barrier cstdlib
 barrier cstring
 barrier ctime
-barrier cwchar
-barrier cwctype
 barrier exception
 barrier initializer_list
 barrier iosfwd
@@ -2089,7 +2085,6 @@ stdexcept new
 stdexcept type_traits
 stdexcept typeinfo
 stdexcept version
-stop_token cstddef
 stop_token iosfwd
 stop_token version
 streambuf algorithm

llvm/utils/gn/build/sync_source_lists_from_cmake.py

@@ -61,13 +61,13 @@ def git_out(args):
     gn_files = git_out(["ls-files", "*BUILD.gn"]).splitlines()
 
     # Matches e.g. |   "foo.cpp",|, captures |foo| in group 1.
-    gn_cpp_re = re.compile(r'^\s*"([^$"]+\.(?:cpp|c|h|S))",$', re.MULTILINE)
+    gn_cpp_re = re.compile(r'^\s*"([^$"]+\.(?:cpp|c|h|mm|S))",$', re.MULTILINE)
     # Matches e.g. |   bar_sources = [ "foo.cpp" ]|, captures |foo| in group 1.
     gn_cpp_re2 = re.compile(
-        r'^\s*(?:.*_)?sources \+?= \[ "([^$"]+\.(?:cpp|c|h|S))" ]$', re.MULTILINE
+        r'^\s*(?:.*_)?sources \+?= \[ "([^$"]+\.(?:cpp|c|h|mm|S))" ]$', re.MULTILINE
     )
     # Matches e.g. |   foo.cpp|, captures |foo| in group 1.
-    cmake_cpp_re = re.compile(r"^\s*([A-Za-z_0-9./-]+\.(?:cpp|c|h|S))$", re.MULTILINE)
+    cmake_cpp_re = re.compile(r"^\s*([A-Za-z_0-9./-]+\.(?:cpp|c|h|mm|S))$", re.MULTILINE)
 
     changes_by_rev = defaultdict(lambda: defaultdict(lambda: defaultdict(list)))
 
@@ -108,6 +108,12 @@ def get_sources(source_re, text):
 
         gn_cpp = get_sources(gn_cpp_re, open(gn_file).read())
         gn_cpp |= get_sources(gn_cpp_re2, open(gn_file).read())
+
+        sources_file = os.path.join(os.path.dirname(gn_file), "sources.gni")
+        if os.path.exists(sources_file):
+            gn_cpp |= get_sources(gn_cpp_re, open(sources_file).read())
+            gn_cpp |= get_sources(gn_cpp_re2, open(sources_file).read())
+
         cmake_cpp = get_sources(cmake_cpp_re, open(cmake_file).read())
 
         if gn_cpp == cmake_cpp:

llvm/utils/gn/build/toolchain/BUILD.gn

@@ -71,23 +71,6 @@ template("unix_toolchain") {
       default_output_dir = "{{root_out_dir}}/lib"
     }
 
-    if (current_os == "ios" || current_os == "mac") {
-      # gn < 1693 (e214b5d35898) doesn't support |frameworks|, requiring
-      # frameworks to be listed in |libs|, but gn >= 1808 (3028c6a426a4) forbids
-      # frameworks from appearing in |libs|. This assertion provides a helpful
-      # cue to upgrade, and is much more user-friendly than the failure that
-      # occurs when an older gn encounters |frameworks|.
-      #
-      # gn_version doesn’t actually exist in gn < 1709 (52cb644a3fb4), and
-      # defined(gn_version) doesn't actually work as expected
-      # (https://crbug.com/gn/183), so 1709 is the true minimum enforced by
-      # this construct, and if gn_version is not available, this line will still
-      # be blamed, making the resolution somewhat discoverable.
-      assert(gn_version >= 1693,
-             "Your GN is too old! " +
-                 "Update it, perhaps by running llvm/utils/gn/get.py")
-    }
-
     # Make these apply to all tools below.
     lib_switch = "-l"
     lib_dir_switch = "-L"