Merge pull request #70058 from apple/revert-69973-embedded-linux

Revert "[embedded] Start building embedded support on Linux/ELF, expand archs of the embedded stdlib to cover common embedded targets"

Author: angela-laar

cmake/modules/SwiftSetIfArchBitness.cmake

@@ -11,14 +11,12 @@ function(set_if_arch_bitness var_name)
      "${SIA_ARCH}" STREQUAL "x86" OR
      "${SIA_ARCH}" STREQUAL "armv5" OR
      "${SIA_ARCH}" STREQUAL "armv6" OR
-     "${SIA_ARCH}" STREQUAL "armv6m" OR
      "${SIA_ARCH}" STREQUAL "armv7" OR
      "${SIA_ARCH}" STREQUAL "armv7k" OR
      "${SIA_ARCH}" STREQUAL "arm64_32" OR
      "${SIA_ARCH}" STREQUAL "armv7m" OR
      "${SIA_ARCH}" STREQUAL "armv7em" OR
      "${SIA_ARCH}" STREQUAL "armv7s" OR
-     "${SIA_ARCH}" STREQUAL "riscv32" OR
      "${SIA_ARCH}" STREQUAL "wasm32" OR
      "${SIA_ARCH}" STREQUAL "powerpc")
     set("${var_name}" "${SIA_CASE_32_BIT}" PARENT_SCOPE)

stdlib/public/CMakeLists.txt

@@ -138,7 +138,7 @@ option(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB
       "Enable build of the embedded Swift standard library and runtime"
       TRUE)
 
-if((NOT SWIFT_HOST_VARIANT STREQUAL "macosx") AND (NOT SWIFT_HOST_VARIANT STREQUAL "linux"))
+if(NOT SWIFT_HOST_VARIANT STREQUAL "macosx")
   set(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB FALSE)
 elseif(NOT SWIFT_INCLUDE_TOOLS)
   # Temporarily, only build embedded stdlib when building the compiler, to
@@ -151,36 +151,12 @@ endif()
 if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB)
   set(EMBEDDED_STDLIB_TARGET_TRIPLES
     # arch    module_name               target triple
-    "armv6    armv6-apple-none-macho    armv6-apple-none-macho"
-    "armv6m   armv6m-apple-none-macho   armv6m-apple-none-macho"
     "armv7    armv7-apple-none-macho    armv7-apple-none-macho"
-    "armv7em  armv7em-apple-none-macho  armv7em-apple-none-macho"
     "arm64    arm64-apple-none-macho    arm64-apple-none-macho"
-
-    # the following are all ELF targets
-    "armv6    armv6-none-none-eabi      armv6-none-none-eabi"
-    "armv6m   armv6m-none-none-eabi     armv6-none-none-eabi"
-    "armv7    armv7-none-none-eabi      armv7-none-none-eabi"
-    "armv7em  armv7em-none-none-eabi    armv7em-none-none-eabi"
-    "aarch64  aarch64-none-none-elf     aarch64-none-none-elf"
-    "riscv32  riscv32-none-none-eabi    riscv32-none-none-eabi"
-    "riscv64  riscv64-none-none-eabi    riscv64-none-none-eabi"
+    "x86_64   x86_64-apple-macos        x86_64-apple-macos10.13"
+    "arm64    arm64-apple-macos         arm64-apple-macos10.13"
+    "arm64e   arm64e-apple-macos        arm64e-apple-macos10.13"
     )
-
-  if (SWIFT_HOST_VARIANT STREQUAL "linux")
-    set(EMBEDDED_STDLIB_TARGET_TRIPLES ${EMBEDDED_STDLIB_TARGET_TRIPLES}
-      "${SWIFT_HOST_VARIANT_ARCH} ${SWIFT_HOST_VARIANT_ARCH}-unknown-linux-gnu ${SWIFT_HOST_VARIANT_ARCH}-unknown-linux-gnu"
-      # In practice this expands to either:
-      # "x86_64   x86_64-unknown-linux-gnu  x86_64-unknown-linux-gnu"
-      # "aarch64  aarch64-unknown-linux-gnu aarch64-unknown-linux-gnu"
-      )
-  elseif (SWIFT_HOST_VARIANT STREQUAL "macosx")
-    set(EMBEDDED_STDLIB_TARGET_TRIPLES ${EMBEDDED_STDLIB_TARGET_TRIPLES}
-      "x86_64   x86_64-apple-macos        x86_64-apple-macos10.13"
-      "arm64    arm64-apple-macos         arm64-apple-macos10.13"
-      "arm64e   arm64e-apple-macos        arm64e-apple-macos10.13"
-      )
-  endif()
 endif()
 
 if(SWIFT_BUILD_STDLIB)

stdlib/public/Concurrency/CMakeLists.txt

@@ -198,18 +198,9 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB AND SWIFT_SHOULD_BUILD_EMBEDDED_CONCURRENC
     list(GET list 1 mod)
     list(GET list 2 triple)
 
-    if (SWIFT_HOST_VARIANT STREQUAL "linux")
-      if(NOT "${mod}" MATCHES "-linux-gnu$")
-        continue()
-      endif()
-      set(extra_c_compile_flags)
-      set(extra_swift_compile_flags)
-    elseif (SWIFT_HOST_VARIANT STREQUAL "macosx")
-      if(NOT "${mod}" MATCHES "-macos$")
-        continue()
-      endif()
-      set(extra_c_compile_flags -D__MACH__ -D__APPLE__ -ffreestanding)
-      set(extra_swift_compile_flags -Xcc -D__MACH__ -Xcc -D__APPLE__ -Xcc -ffreestanding)
+    # TODO: Only build embedded Swift Concurrency for macOS, for now.
+    if(NOT "${mod}" MATCHES "-macos$")
+      continue()
     endif()
 
     set(SWIFT_SDK_embedded_ARCH_${mod}_MODULE "${mod}")
@@ -251,11 +242,12 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB AND SWIFT_SHOULD_BUILD_EMBEDDED_CONCURRENC
       TaskCancellation.swift
 
       SWIFT_COMPILE_FLAGS
-        ${extra_swift_compile_flags} -enable-experimental-feature Embedded
+        -Xcc -D__MACH__ -Xcc -D__APPLE__ -Xcc -ffreestanding -enable-experimental-feature Embedded
         -parse-stdlib -DSWIFT_CONCURRENCY_EMBEDDED
         ${SWIFT_RUNTIME_CONCURRENCY_SWIFT_FLAGS}
       C_COMPILE_FLAGS
-        ${extra_c_compile_flags} ${SWIFT_RUNTIME_CONCURRENCY_C_FLAGS} -DSWIFT_CONCURRENCY_EMBEDDED=1
+        -D__MACH__ -D__APPLE__ -ffreestanding
+        ${SWIFT_RUNTIME_CONCURRENCY_C_FLAGS} -DSWIFT_CONCURRENCY_EMBEDDED=1
       MODULE_DIR "${CMAKE_BINARY_DIR}/lib/swift/embedded"
       SDK "embedded"
       ARCHITECTURE "${mod}"

test/embedded/array-builtins-exec.swift

@@ -6,7 +6,8 @@
 // REQUIRES: swift_in_compiler
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
-// REQUIRES: OS=macosx || OS=linux-gnu
+// REQUIRES: VENDOR=apple
+// REQUIRES: OS=macosx
 
 import Builtin
 

test/embedded/array-to-pointer.swift

@@ -7,7 +7,8 @@
 // REQUIRES: swift_in_compiler
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
-// REQUIRES: OS=macosx || OS=linux-gnu
+// REQUIRES: VENDOR=apple
+// REQUIRES: OS=macosx
 
 @_silgen_name("putchar")
 func putchar(_: UInt8)

test/embedded/array-zero-size-struct.swift

@@ -2,7 +2,8 @@
 
 // REQUIRES: swift_in_compiler
 // REQUIRES: optimized_stdlib
-// REQUIRES: OS=macosx || OS=linux-gnu
+// REQUIRES: VENDOR=apple
+// REQUIRES: OS=macosx
 
 public struct MyStruct {
 }

test/embedded/arrays.swift

@@ -7,7 +7,8 @@
 // REQUIRES: swift_in_compiler
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
-// REQUIRES: OS=macosx || OS=linux-gnu
+// REQUIRES: VENDOR=apple
+// REQUIRES: OS=macosx
 
 @_silgen_name("putchar")
 func putchar(_: UInt8)

test/embedded/class-func.swift

@@ -3,7 +3,8 @@
 // REQUIRES: swift_in_compiler
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
-// REQUIRES: OS=macosx || OS=linux-gnu
+// REQUIRES: VENDOR=apple
+// REQUIRES: OS=macosx
 
 @main
 struct Main {

test/embedded/classes-arrays.swift

@@ -6,7 +6,8 @@
 // REQUIRES: swift_in_compiler
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
-// REQUIRES: OS=macosx || OS=linux-gnu
+// REQUIRES: VENDOR=apple
+// REQUIRES: OS=macosx
 
 class MyClass {
   init() { print("MyClass.init") }

test/embedded/classes-stack-promotion.swift

@@ -7,7 +7,8 @@
 // REQUIRES: swift_in_compiler
 // REQUIRES: executable_test
 // REQUIRES: optimized_stdlib
-// REQUIRES: OS=macosx || OS=linux-gnu
+// REQUIRES: VENDOR=apple
+// REQUIRES: OS=macosx
 
 public class MyClass {
   public init() { print("MyClass.init") }