Commit Graph

58 Commits

Author SHA1 Message Date
Evan Wilde
07bb587ead Move availability args to response file
The availability flags keep increasing the number of characters on the
command line overflowing the maximum character length on Windows and
making the commands harder to read. This patch moves the generated
arguments into a separate response file so that they can continue to
grow without running into argument length limitations.
2025-07-08 16:04:53 +01:00
Alastair Houghton
8eb879831c Merge pull request #81940 from al45tair/eng/PR-152498657
Rename SwiftStdlibCurrentOS to StdlibDeploymentTarget.
2025-07-07 12:04:38 +01:00
Alastair Houghton
0813e95569 Merge pull request #81440 from al45tair/currentos-availability
[Concurrency][Stdlib] Add SwiftStdlibCurrentOS availability, use it.
2025-07-07 12:04:00 +01:00
Guillaume Lessard
63bc461aef [cmake] InoutLifetimeDependence should be enabled
Addresses rdar://152467655
2025-06-02 20:19:44 -07:00
Guillaume Lessard
30cd7e4fab [cmake] LifetimeDependenceMutableAccessors should be enabled 2025-05-13 11:11:11 -07:00
Slava Pestov
c905c5c335 cmake: Establish dependency on utils/availability-macros.def 2025-04-21 15:01:29 -04:00
Doug Gregor
06c0efbce6 [stdlib] Reinstate AllowUnsafeAttribute experimental feature on libraries
We need this so that older compilers can handle the .swiftinterface
files we generate. It's unnecessary for newer compilers and can be
removed later.

Fixes rdar://148529962.

(cherry picked from commit 0100104ff7)
2025-04-04 15:18:25 -07:00
Guillaume Lessard
c21de062bb Merge pull request #78561 from glessard/rdar137710901-span-properties-prototype
[SE-0456] Span properties (part 1)
2025-03-24 08:47:47 -07:00
Saleem Abdulrasool
3106f15165 Runtimes: adjust the default settings for Windows
This adjusts the default settings for the Windows build of the Swift
runtime to include reflection and to re-order them to match the Darwin
configuration to make it easier to identify differences.
2025-03-21 12:11:41 -07:00
Guillaume Lessard
96e9945d10 [stdlib] only enable “AddressableTypes” for the core stdlib 2025-03-10 14:24:59 -07:00
Saleem Abdulrasool
c3604743de Runtimes: tweak incorrect case (NFC)
This adjusts the spelling for the architecture specifier for the Windows
compilers. Take the opportunity to further restrict the compiler check
to micro-optimize the CMake configure phase.
2025-03-08 08:22:15 -08:00
Saleem Abdulrasool
0d8e005185 Merge pull request #79754 from compnerd/cx16
build: only apply `-mcx16` on X86 CPUs
2025-03-04 09:18:14 -08:00
Saleem Abdulrasool
40bf17c00d build: only apply -mcx16 on X86 CPUs
This is required to support compilation for non-X86 architectures.
2025-03-03 15:51:43 -08:00
Evan Wilde
0c5455ebad Fix missing PROPERTIES keyword in Finddispatch
Was missing the `PROPERTIES` keyword on the `Finddispatch` cmake
module resulting in failures to load it correctly.
2025-03-03 10:45:23 -08:00
Evan Wilde
3102bc0334 Extract experimental feature flags
Extracting experimental feature flags into a separate file so that we
can add Allan as a code owner of just that file. He has to deal with
breakage when folks remove these flags improperly.
2025-02-27 14:16:44 -08:00
Evan Wilde
71f9aac6e3 Merge pull request #79548 from etcwilde/ewilde/stdlib-rebuild-install-story
CMake: SwiftCore Install Story
2025-02-26 09:53:02 -08:00
Evan Wilde
6afa780fdd Add Finddispatch module
Implementing an initial `Finddispatch.cmake` module to find Dispatch
from the system SDK on Apple platforms. Still should implement a basic
mechanism for finding it on Windows and Linux. Note that those platforms
will likely use the dispatch config mechanism most frequently, but this
should still work as a fallback.

This mechanism is the only one that works for Apple platforms though as
those use libdispatch from the SDK rather than building it with
corelibs-libdispatch.

When building for Linux and Windows, it is possible to build a custom
corelibs-libdispatch runtime with `dispatch_DIR` and avoid this module.
This module makes it possible to use a pre-built corelibs-libdispatch
when one is available without needing to build it. The module uses
the `Swift_SDKROOT` filepath as a hint on where to look for the runtime
libraries and the `dispatch_STATIC` boolean to specify whether it should
find the dynamic library or the static archive.
2025-02-24 16:31:39 -08:00
Evan Wilde
7870db67f8 CMake: Runtime Installation Story
Starting to work on a full installation story for the Swift runtimes.
This involves generating the SwiftCoreConfig cmake files to allow
importing the just-built runtimes into the overlays and supplemental
libraries, setting up the flags appropriately for the given SwiftCore
build configuration.

This also separates out the development and runtime components to allow
installing just the runtimes without the headers.

Component List:
 - SwiftCore_runtime

  The runtime libraries that are required for running code.

 - SwiftCore_development

  The interface with the runtime libraries that are required for
  building code against the runtimes.

 - SwiftCore_cmake

  Files for interfacing CMake projects with the built runtimes.
  This includes the target list and flags needed to use the targets
  built by the specific configuration used to build the runtime
  libraries.

  These files are used for mapping flags, definitions, and locations
  into the overlay libraries and supplemental libraries.

This adds install commands for the object libraries contributing to
libswiftCore so that they are represented in SwiftCoreTargets.cmake.
Object libraries do not contribute anything to the files actually
installed.
2025-02-22 10:33:17 -08:00
Evan Wilde
b1fb62de34 Merge pull request #79499 from etcwilde/ewilde/apple-swift-version-5
Set Swift language version to 5
2025-02-20 13:43:30 -08:00
Evan Wilde
f490e611e1 Merge pull request #79335 from etcwilde/ewilde/catalyst-support
CMake: Catalyst Support
2025-02-19 17:16:09 -08:00
Evan Wilde
ebc0a37760 Set Swift language version to 5
The stdlib needs to build in Swift-5 mode, and ensure that
`-swift-verion 5` be included in the commandline explicitly. While the
compiler defaults to 5 mode, if it's not included explicitly, it won't
be included in the swift interface, which then means that modules that
import it will influence how the textual interface is processed.
The interface for the stdlib must be processed in the Swift 5 language
mode due to sendability. Set it explicitly to ensure that importing
modules do not change the Swift language mode.

Fixes: rdar://145118843
2025-02-19 16:57:43 -08:00
Evan Wilde
e59326cdd5 CMake: Move installation of binary swiftmodule
To keep things consistent with the target and target-variant swiftmodule
files, moving the installation of the binary swift module into
`install_swift_interface`. CMake implicitly generates the target
swiftmodule, but does not know about zippered binaries, so we need to
ensure that the target-variant module is available for installation when
applicable.
2025-02-18 16:29:37 -08:00
Evan Wilde
35537d449a CMake: Emit catalyst modules
If the driver supports it, emit the swiftmodules and interfaces for the
target-variant slice.
2025-02-18 09:34:17 -08:00
Evan Wilde
aa8138a9d1 CMake: Include zippered catalyst slice
Add the flags to include the zippered catalyst slice if a variant target
triple is set.
2025-02-18 09:34:15 -08:00
Evan Wilde
8fe9c094c3 Fix runtime default variable naming
The names of the variables in `DefaultSettings` should end in `_default`
so that the variable that they are defaulting can be overridden.
Otherwise CMake will just set the value and move on overriding the
setting coming from the commandline/cache file.
2025-02-17 10:44:45 -08:00
Saleem Abdulrasool
1458acb451 Merge pull request #78505 from compnerd/concurrent
Runtimes: introduce `swift_Concurrency`
2025-02-15 08:31:19 -08:00
Saleem Abdulrasool
69a3cd8e29 Apply suggestions from code review
Co-authored-by: Evan Wilde <etceterawilde@gmail.com>
2025-02-14 16:19:45 -08:00
Saleem Abdulrasool
34266f630d Runtimes: make resource embedding work on Windows
The `CMAKE_MT` path does not expand as expected. Add a workaround for
the issue so that we are able to build a dynamically linked version of
the standard library with the new runtimes build.
2025-02-14 15:14:55 -08:00
Saleem Abdulrasool
1ac0007883 Runtimes: introduce swift_Concurrency
This adds the `swift_Concurrency` module to the new runtimes build. This
is sufficient to build the code but will require further fine tuning to
ensure that all the flags entirely identical and that the ABI surface is
also fully replicated.
2025-02-13 16:24:36 -08:00
Saleem Abdulrasool
509c385458 Runtimes: attempt to embed a SxS manifest for swiftCore
This will allow us to have multiple parallel installations of swiftCore
with the same DLL name allowing us to side-step the ABI instability
without resorting to SOVERSIONing.
2025-02-12 21:59:47 -08:00
Eric Miotto
2a367234be Runtimes: support generic metadata prespecialization for all of Core
Also provide a flag to enabled/disable it.

Addresses rdar://144255917
2025-02-07 07:39:21 -08:00
Evan Wilde
95f4f6ff80 Merge pull request #78497 from etcwilde/ewilde/stdlib-rebuild-backtrace-reporting
CMake: SwiftCore: Add back SWIFT_STDLIB_SUPPORTS_BACKTRACE_REPORTING
2025-01-24 21:59:55 -08:00
Evan Wilde
5aadacee41 CMake: SwiftCore: Add back SWIFT_STDLIB_SUPPORTS_BACKTRACE_REPORTING
Add an option to enable emitting a stacktrace on calls to `fatalError`.
This is unrelated to the runtime backtracer for diagnosing normal Swift
crashes.

rdar://142440689
2025-01-23 12:42:28 -08:00
Evan Wilde
a9da4a5c1a CMake: Add install platform and architecture subdirs
In some configurations, libraries are installed under
`<install-prefix>/{libdir}/swift/<platform>/<arch>` and module content
is installed under `<install-prefix>/{libdir}/swift/<platform>`.

This also accounts for the fact that Swift currently looks under
`<install-prefix>/{libdir}/swift_static/**` for the static stdlib
builds.
2025-01-23 12:25:21 -08:00
Saleem Abdulrasool
c7ae8c9377 Apply suggestions from code review
Co-authored-by: Evan Wilde <etceterawilde@gmail.com>
2025-01-22 09:25:24 -08:00
Saleem Abdulrasool
530378ae79 Runtimes: extract platform and arch from the driver
With swiftlang/swift#78717 we now can extract the platform and
architecture subdirectories required for deploying the files.
Restructure the code when adding this functionality to invoke the
command once and then extract the various fields that we need.
2025-01-17 15:47:13 -08:00
Justice Adams
4666a418e0 [CMAKE] Add Plist creation to swiftCore (#77960)
* update Resync to copy plist template

* include Plist in linked library for Darwin platforms

* only embedd plist on apple platforms

* formatting fix
2024-12-17 15:49:54 -08:00
Saleem Abdulrasool
cc27fd0c98 Core: check for -mcx16 flag
The Swift runtime requires the CMPXCHG16B ISA extension on x86. This is
controlled by the `-mcx16` flag when targeting the CPU baseline that we
use. Add a check and pass along the flag to repair the build.
2024-12-13 13:59:41 -08:00
Saleem Abdulrasool
59a9ef5bb7 Merge pull request #78134 from etcwilde/ewilde/x-platform-fixes
[CMake] Fix some issues in new runtime build for Linux and Windows builds
2024-12-12 18:11:07 -08:00
Saleem Abdulrasool
fc27a28411 Merge pull request #78144 from compnerd/threading-the-needle
Core: specify the threading package that is in use
2024-12-12 17:30:03 -08:00
Saleem Abdulrasool
6d678ac01d Core: specify the threading package that is in use
This is required for the non-Darwin targets as `SWIFT_THREADING_DARWIN`
does not enable any additional code. However, that macro is used in
other places that are not yet integrated. This was identified by
building for Windows.
2024-12-12 10:48:43 -08:00
Evan Wilde
979697eb13 CMake: Fix expanding the default variable
`defaulted_set` wasn't expanding the default variable, just setting the
value of the variable the name of the variable that should have been
doing the defaulting.
2024-12-11 19:48:36 -08:00
Justice Adams
f1f3604cca remove cmake color diagnostic flags (#78098) 2024-12-11 13:37:59 -08:00
Evan Wilde
e160e23dde [CMake] Connecting more flags and options
Making a more in-depth pass over the definition macros and flags in
SwiftSource.cmake _add_target_variant_swift_compile_flags.
These are only flags that actually matter for swiftCore though. This
does not include concurrency flags.
2024-11-12 11:31:10 -08:00
Evan Wilde
2df8a185b8 [cmake] Add private build extension points
Adding vendor-specific extension points to the build system, giving
vendors a place to put their internal settings and defaults, without
having to modify the build directly. This helps reduce the chances of
merge conflicts and public changes breaking internal settings.

The location of the macros are set with `SwiftCore_PRIVATE_MODULE_DIR`,
so vendors can keep their private extensions in a separate location if
desired. Otherwise, it defaults to `cmake/modules/private`, which
intentionally does not exist at this time.

Currently, we have extensions for the default settings and global
settings.
2024-11-08 17:05:41 -08:00
Evan Wilde
148a910d7b [nfc] Add documentation to default macros
Adding documentation on the behavior of the `defaulted_option` and
`defaulted_set` macros.
2024-11-08 16:41:30 -08:00
Evan Wilde
9185606027 [cmake] Add macro to create defaulted settings
Adding a macro to tie non-boolean variables into the defaulting
mechanism.
2024-11-08 15:58:27 -08:00
Evan Wilde
2a8bb9db93 Adding ELF swiftrt for BSD and Android
BSD and Android also need to build swiftrt.o so adding it to the
default settings.
2024-11-07 15:23:52 -08:00
Evan Wilde
12fb294cce Remove SwiftCore_SWIFTC_CLANGIMPORTER_RESOURCE_DIR
The SwiftCore_SWIFTC_CLANGIMPORTER_RESOURCE_DIR is not being used so I'm
deleting it for now. This means we only grab the target info once.
2024-11-07 00:11:08 -08:00
Evan Wilde
2c07a23a45 Cleanup WMO forcing
This patch cleans up the handling of WMO-forcing in the workaround file.
`-wmo` is passed in each of the link jobs in the non-CMP0157-enabled
configuration to keep it matching the behavior of the CMP0157-enabled
builds.

This also moves the commentary about num-threads and WMO to the top of
the file to make it clearer what is going on. Ideally the file wouldn't
have to exist, but it does.

The file also contains the target install-name fix that landed in CMake
3.29.8 and CMake 3.30.2, so earlier versions of CMake 3.29 will work
with this build as well.
2024-11-07 00:00:33 -08:00