Commit Graph

826 Commits

Author SHA1 Message Date
Vedant Kumar
bafb963d7b Enable linker dead stripping on Darwin (#22839)
* Enable linker dead stripping on Darwin

See r://48283130. This shaves 6MB+ off of swift and SourceKitService,
26.8MB off of swift-llvm-opt, 29.4MB off sil-passpipeline-dumper, etc.

* Disable dead stripping in Debug builds

It can hide linker errors caused by dependency cycles.
2019-02-25 10:52:48 -08:00
Saleem Abdulrasool
22fde69e6c cmake: make swiftRemoteMirror export interfaces on Windows
Unfortunately, `swift-reflection-test` links against the *TARGET*
library `swiftRemoteMirror`.  The linked library is built as a target
library, which means that we use the custom library target construction
which suffixes the target with a variant spelling.  Because the number
of variants is really high, we pass along the explicit EXPORTS macro
manually.  However, we also build the library as a static library for
the *HOST*.  This means that we need the sources to be aware of whether
they are built statically or dyanmically.  This is accomplished by means
of the `_WINDLL` macro.  The target library is shared and is built using
the custom wrapper for the library construction, which will create all
the variants and then use `_compute_variant_c_flags` which does not get
told what type of library is being built, so it assumes static and does
not append `_WINDLL`.  This results in the shared library not exposing
any interfaces on Windows.  When this happens, link will helpfully elide
the import library.  The result of that is that the
swift-reflection-test binary will fail to link due to no import library
for the RemoteMirror.  Explicitly add the -D_WINDLL if appropriate
manually after we have computed the C flags.  *siiiiiiigh*
2019-02-23 20:03:47 -08:00
Saleem Abdulrasool
8062230cff CMake: use _WINDLL rather than _USRDLL
`_USRDLL` is used to indicate that you are building a MFC DLL while
`_WINDLL` is specified for **ALL** DLL builds.  Use the correct macro.
2019-02-22 10:49:25 -08:00
Jordan Rose
43feb9cbe1 On Apple platforms, use swiftmodule directories for the stdlib (#21797)
This changes the Swift resource directory from looking like

    lib/
      swift/
        macosx/
          libswiftCore.dylib
          libswiftDarwin.dylib
          x86_64/
            Swift.swiftmodule
            Swift.swiftdoc
            Darwin.swiftmodule
            Darwin.swiftdoc

to

    lib/
      swift/
        macosx/
          libswiftCore.dylib
          libswiftDarwin.dylib
          Swift.swiftmodule/
            x86_64.swiftmodule
            x86_64.swiftdoc
          Darwin.swiftmodule/
            x86_64.swiftmodule
            x86_64.swiftdoc

matching the layout we use for multi-architecture swiftmodules
everywhere else (particularly frameworks).

There's no change in this commit to how Linux swiftmodules are
packaged. There's been past interest in going the /opposite/ direction
for Linux, since there's not standard support for fat
(multi-architecture) .so libraries. Moving the .so search path /down/
to an architecture-specific directory on Linux would allow the same
resource directory to be used for both host-compiling and
cross-compiling.

rdar://problem/43545560
2019-02-19 14:47:21 -08:00
Ross Bayer
083350af77 Revert "[CMake] Remove LINK_LIBRARIES option from _add_swift_executable_single" 2019-02-12 14:42:22 -08:00
Ross Bayer
fc58ad4207 Merge pull request #22128 from xiaobai/remove_link_libs_option
[CMake] Remove LINK_LIBRARIES option from _add_swift_executable_single
2019-02-11 12:22:26 -08:00
Saleem Abdulrasool
f441f089cc build: fix mismatch of MSVCRT in release mode
When building RelWithDebInfo, we would accidentally link against the debug
MSVCRT library rather than the release mode one resulting in memory corruptions.
2019-02-08 15:08:56 -08:00
Saleem Abdulrasool
85f45dfe30 SwiftRemoteMirror: add a host build for the tools
This adds an explicit version of the SwiftRemoteMirror library for use
in the tools that comprise the toolchain.  This is a separate build from
the target specific builds of the library even though we may be building
the runtime for the (same) host.
2019-01-28 18:00:58 -08:00
Michael Gottesman
cc68e6a0d5 Remove some remaining dead code from the +0 argument convention bring up.
I already removed the option from SILOptions, so all of this stuff is dead.
2019-01-27 13:18:06 -08:00
Alex Langford
6c63f4d3f5 [CMake] Remove LINK_LIBRARIES option from _add_swift_executable_single
This option has been unused since commit
dd85d79105. We now use
target_link_libraries instead of this option.
2019-01-25 14:25:58 -08:00
Ben Langmuir
753eb53f1c Merge pull request #21721 from benlangmuir/optionalize
[cmake] Make install of stdlib target libraries OPTIONAL
2019-01-22 16:19:06 -08:00
Ben Langmuir
cba2670479 [cmake] Update OPTIONAL install products to be Darwin-only
Per review feedback.
2019-01-22 12:05:55 -08:00
Ben Langmuir
d08a2a058a [cmake] Make install of stdlib target libraries OPTIONAL
This fixes using --install-swift on macOS when not building all of the
variant stdlibs (e.g. iphonesimulator, etc.).

When we build swift on macOS, by default we build only the macOS stdlib.
The other stdlib variants are still configured and there are targets to
build them if you e.g. run `ninja swift-stdlib-iphonesimulator-x86_64`
manually.  However, we do not separate the _install_ actions.  This
meant that you couldn't install without building all the configured
stdlib variants.
2019-01-22 11:13:29 -08:00
Saleem Abdulrasool
d4598ec15a Merge pull request #22002 from compnerd/nx
build: inline single use `add_swift_executable`
2019-01-19 13:22:40 -08:00
Saleem Abdulrasool
7402221425 build: cleanup unneeded flags for Windows
This flag is now handled by the driver, so remove it from the special
handling in the build system.
2019-01-19 10:06:06 -08:00
Saleem Abdulrasool
a0ec0c0dfb build: inline single use add_swift_executable
Inline the single use of this function and remove the extra parameter
handling around it, letting `_add_swift_executable_single` do the heavy
lifting.
2019-01-19 09:38:40 -08:00
Doug Gregor
00485afc68 Always set the compatibility_version of linked dylibs on Darwin.
Use 1.0.0 when there is no more-specific SWIFT_COMPILER_VERSION.
2019-01-15 14:35:21 -08:00
Michael Gottesman
cb41b77dca Fix --force-optimized-typechecker
I believe this was broken due to recent refactoring of cmake.
2019-01-14 14:27:51 -08:00
Jordan Rose
aea1ef8175 Move API notes out of the arch-specific subdirectories in lib/swift/ (#21690)
They're all the same anyway, and no longer even need to be compiled,
just copied in as text.

And drastically simplify how we "generate" them. Instead of attaching
their build jobs to the appropriate overlays, if present, "just" have
one job to copy them all and attach it to the Darwin overlay. That's
what we do for the overlay shim headers, and it's good enough.
(Eventually we want to get out of the business of shipping them
altogether.)

This does have the same flaw as the shim headers: if you /just/ change
API notes, the corresponding overlay does not get rebuilt. You have to
touch that too. But in practice that'll happen most of the time
anyway.

Part of rdar://problem/43545560
2019-01-09 14:06:21 -08:00
Saleem Abdulrasool
6dac8dd092 build: cleanup swiftCore link definition
Colocate the target specific library specification.  Inline the single
site use of the place holder ICU_UC and ICU_I18N libraries rather than
trying to create special library processing code for that.
2019-01-08 08:31:35 -08:00
Saleem Abdulrasool
46ec2cf0fb add_swift_host_tool: normalize arguments, rename prefix 2019-01-04 15:30:09 -08:00
Saleem Abdulrasool
783e8eceaa Merge pull request #21635 from compnerd/toolchain-only
build: honour LLVM_INSTALL_TOOLCHAIN_ONLY
2019-01-04 10:11:01 -08:00
Saleem Abdulrasool
29e8127d26 build: use the architecture directory for Windows resources
Windows does not support fat binaries, so the target specific components should
be placed into the architecture subdirectory.  Due to the cross-compilation
model that swift has, this needs to be added explicitly for now.
2019-01-04 09:08:35 -08:00
Saleem Abdulrasool
c9c12feacc build: honour LLVM_INSTALL_TOOLCHAIN_ONLY
This improves the integration with LLVM and the unified build.  The
LLVM_INSTALL_TOOLCHAIN_ONLY flag ensures that the the development libraries are
not installed.  Because this option is not defined by default, the beahavioural
changes here are not triggered by default.
2019-01-04 08:56:04 -08:00
Saleem Abdulrasool
1d2a4d65b5 build: attempt to install the import libraries 2019-01-03 12:24:20 -08:00
Saleem Abdulrasool
9624932391 build: add Windows includes to build 2018-12-16 22:23:41 -08:00
swift-ci
8629cd5c2a Merge pull request #21314 from drodriguez/android-link-with-cpp-abi 2018-12-15 14:31:08 -08:00
Saleem Abdulrasool
7020740dcf Merge pull request #21326 from xiaobai/swift_component_required
[CMake] Require SWIFT_COMPONENT for add_swift_host_tool
2018-12-14 17:30:47 -08:00
Saleem Abdulrasool
3225e36d63 stdlib: reorder add_subdirectory to repair the Windows build
Due to the horrible attrocities against software of the attempt to perform
cross-compilation in the swift build system, we need to emulate the linking
behaviour for Windows with the link against the import library.  The emulation
requires the custom creation of import library targets.  In order to actually
get the linking semantics correct, the dependendency targets must be created
prior to use (unlike standard CMake).  The reordering ensures that we get
correct linkage when building for Windows.

Perform a simple optimization to avoid a number of string comparisions for the
host system.
2018-12-14 13:56:16 -08:00
Daniel Rodríguez Troitiño
bcf800a15d [android] Link with static C++ ABI for Android.
Normally, the C++ shared library would have link against the C++ ABI
shared library, but the Android NDK does not distribute the later, so
one need to link manually against the static C++ ABI from the NDK.
2018-12-14 13:23:31 -08:00
Alex Langford
5d5d01a2fe [CMake] Require SWIFT_COMPONENT for add_swift_host_tool 2018-12-14 12:27:53 -08:00
Saleem Abdulrasool
883966edda build: only add -Fsystem path if configured
The system framework paths are only configured for the Apple targets.  Add a
condition to avoid a search path to be added for other SDKs.
2018-12-13 09:42:04 -08:00
Michael Gottesman
b2ae3a8b2c [cmake] Move add_swift_target_executable into the new stdlib cmake directory.
This will ensure that additional target executables can not be added to the rest
of the swift project without anyone noticing since the non-stdlib parts of
Swift's cmake will not have visibility of the declaration unless they change the
cmake lookup paths.
2018-12-11 16:43:49 -08:00
Saleem Abdulrasool
0a601defd5 build: use the right extension for Windows for swiftrt
The swift image registrar uses the extension `.obj` as is traditional on
Windows.  Ensure that we get the extension correct when cross-compiling with the
Swift specific cross-compilation system.
2018-12-06 15:51:35 -08:00
Daniel Rodríguez Troitiño
b3b0d87055 [android] Avoid linking twice with C++
The Android targetted libraries already link (manually) with the Android
NDK C++ libraries. When using Clang and lld, an extra link to libc++ is
requested, which will fail because Android names it libc++_shared.so
instead. To avoid looking for the wrong name, and since the library is
referenced manually either way, request no linking with the standard C++
libraries (but add the math library in, which is implicitly linked when
C++ is linked, and it is needed for Glibc at least).
2018-12-06 11:10:22 -08:00
Saleem Abdulrasool
e3b699bb59 build: overwrite the fat libraries with the targets
Ensure that the use the target specific names for the fat libraries for
non-MachO targets which do not support fat libraries.  This fixes the
windows build.
2018-12-03 19:39:50 -08:00
Saleem Abdulrasool
3d1839a016 build: support SWIFT_MODULE_DEPENDS_WINDOWS
Add support for depending on swift modules for the windows target.  This
is needed as the private swift modules start to build on Windows.
2018-11-29 19:26:59 -08:00
Daniel Rodríguez Troitiño
def11722a9 Split link flags and link libraries lists to make gold happy.
gold is more strict than lld about the order of the arguments, that's
why CMake offers two different properties for the linker: LINK_FLAGS and
LINK_LIBRARIES. The former _add_variant_link_flags was adding the
libraries to LINK_FLAGS, when the correct thing is to add them to
LINK_LIBRARIES.

The change adds a new output variable for _add_variant_link_flags which
will containt the linked libraries, and CMake will be able to generate
the correct command line invocation for when gold is used.

This should fix the Android CI build.
2018-11-27 15:24:52 -08:00
Saleem Abdulrasool
d1eb3a54b4 Merge pull request #20766 from compnerd/importing-fat
build; correct swift fat library linking on Windows
2018-11-26 21:36:31 -08:00
Saleem Abdulrasool
d8bce85076 build; correct swift fat library linking on Windows
Windows does not link against the library but the import library.  When
building the target specific bits, we unfortunately do not use the cmake
build infrastructure properly.  This results in us trying to link
against libraries which do not exist.  Redirect the link to the right
files.  This allows us to build swift-reflection-test.
2018-11-26 16:38:38 -08:00
Saleem Abdulrasool
6a0989b7a2 build: pass /GR- when using cl-like drivers
When building with clang-cl, we should pass /GR- rather than the
gcc-style driver options.  This repairs the build of swift on Windows.
2018-11-26 12:50:18 -08:00
Saleem Abdulrasool
66fa742732 Merge pull request #20718 from compnerd/host-tools-dce
host tools DCE
2018-11-26 09:55:17 -08:00
Saleem Abdulrasool
adfb508317 build: specify architecture when building for Windows
The Windows SDK requires that the architecture is specified.
2018-11-25 19:09:29 -08:00
Saleem Abdulrasool
1f9feb550f add_swift_host_tool: DCE DEPENDS (NFC) 2018-11-23 11:03:34 -08:00
Saleem Abdulrasool
9110ae733e add_swift_host_tool: DCE COMPILE_FLAGS (NFC) 2018-11-23 11:03:34 -08:00
Saleem Abdulrasool
47e060878d add_swift_host_tool: DCE SWIFT_MODULE_DEPENDS (NFC) 2018-11-23 11:03:34 -08:00
Saleem Abdulrasool
f3e4982179 build: remove DONT_STRIP_MAIN_SYMBOL, DISABLE_ASLR flags
These flags are unused by the single add_swift_executable call.  Remove
support for these flags.
2018-11-05 22:46:09 -08:00
Xi Ge
103f9a8246 Revert "[Build System: CMake] make add_swift_library a wrapper to add_llvm_library" 2018-11-02 12:49:07 -07:00
Saleem Abdulrasool
c3555cf0c4 add_swift_host_library: special handling for GYB sources 2018-10-31 12:46:31 -07:00
Saleem Abdulrasool
e92c2a251e add_swift_host_library: make a trivial wrapper around add_llvm_library 2018-10-31 12:46:31 -07:00