averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #439 from hpux735/master

Browse Source 
Beginning support for ARMv7 hosts (RasPi, etc.)
This commit is contained in:
Dmitri Gribenko
2015-12-13 00:10:20 -08:00
parent 2882816e59 4bf81e09da
commit f28d34845c
7 changed files with 133 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Driver/ToolChains.cpp
View File

@@ -1115,8 +1115,10 @@ toolchains::GenericUnix::constructInvocation(const LinkJobAction &job,
// Add the linker script that coalesces protocol conformance sections.
Arguments.push_back("-Xlinker");
Arguments.push_back("-T");
Arguments.push_back(
context.Args.MakeArgString(Twine(RuntimeLibPath) + "/x86_64/swift.ld"));
// FIXME: This should also query the abi type (i.e. gnueabihf)
Arguments.push_back(context.Args.MakeArgString(
Twine(RuntimeLibPath) + "/" + getTriple().getArchName() + "/swift.ld"));
// This should be the last option, for convenience in checking output.
Arguments.push_back("-o");