diff options
author | Travis Tilley <ttilley@gmail.com> | 2015-05-21 12:41:30 -0400 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-05-22 13:09:01 +0000 |
commit | 81d1b43c5af39e14cb91232c4afcb7839b96f5a1 (patch) | |
tree | 01d279a6a2c6859074d4b3045f851c2e36de13db /main/llvm/clang-3.6-musl-fix-dynamic-linker-paths.patch | |
parent | 386a214b3a1b7586e4d37b94ae84d6830e159f52 (diff) | |
download | aports-81d1b43c5af39e14cb91232c4afcb7839b96f5a1.tar.bz2 aports-81d1b43c5af39e14cb91232c4afcb7839b96f5a1.tar.xz |
main/llvm: update patchset, switch to cmake, perform two-stage build with a minimal bootstrap compile of clang, add clang extras, update package list to split out clang documentation
Diffstat (limited to 'main/llvm/clang-3.6-musl-fix-dynamic-linker-paths.patch')
-rw-r--r-- | main/llvm/clang-3.6-musl-fix-dynamic-linker-paths.patch | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/main/llvm/clang-3.6-musl-fix-dynamic-linker-paths.patch b/main/llvm/clang-3.6-musl-fix-dynamic-linker-paths.patch deleted file mode 100644 index 27c17728ce..0000000000 --- a/main/llvm/clang-3.6-musl-fix-dynamic-linker-paths.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp -index 75eef9e..3e71522 100644 ---- a/lib/Driver/Tools.cpp -+++ b/lib/Driver/Tools.cpp -@@ -7282,8 +7282,14 @@ static std::string getLinuxDynamicLinker(const ArgList &Args, - return "/system/bin/linker64"; - else - return "/system/bin/linker"; -- } else if (ToolChain.getArch() == llvm::Triple::x86 || -- ToolChain.getArch() == llvm::Triple::sparc) -+ } else if (ToolChain.getArch() == llvm::Triple::x86) { -+ switch (ToolChain.getTriple().getEnvironment()) { -+ case llvm::Triple::Musl: -+ return "/lib/ld-musl-i386.so.1"; -+ default: -+ return "/lib/ld-linux.so.2"; -+ } -+ } else if (ToolChain.getArch() == llvm::Triple::sparc) - return "/lib/ld-linux.so.2"; - else if (ToolChain.getArch() == llvm::Triple::aarch64) - return "/lib/ld-linux-aarch64.so.1"; -@@ -7291,10 +7297,17 @@ static std::string getLinuxDynamicLinker(const ArgList &Args, - return "/lib/ld-linux-aarch64_be.so.1"; - else if (ToolChain.getArch() == llvm::Triple::arm || - ToolChain.getArch() == llvm::Triple::thumb) { -- if (ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUEABIHF) -+ switch (ToolChain.getTriple().getEnvironment()) { -+ case llvm::Triple::Musl: -+ case llvm::Triple::MuslEABI: -+ return "/lib/ld-musl-arm.so.3"; -+ case llvm::Triple::MuslEABIHF: -+ return "/lib/ld-musl-armhf.so.3"; -+ case llvm::Triple::GNUEABIHF: - return "/lib/ld-linux-armhf.so.3"; -- else -+ default: - return "/lib/ld-linux.so.3"; -+ } - } else if (ToolChain.getArch() == llvm::Triple::armeb || - ToolChain.getArch() == llvm::Triple::thumbeb) { - if (ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUEABIHF) -@@ -7339,8 +7352,14 @@ static std::string getLinuxDynamicLinker(const ArgList &Args, - else if (ToolChain.getArch() == llvm::Triple::x86_64 && - ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUX32) - return "/libx32/ld-linux-x32.so.2"; -- else -- return "/lib64/ld-linux-x86-64.so.2"; -+ else { -+ switch (ToolChain.getTriple().getEnvironment()) { -+ case llvm::Triple::Musl: -+ return "/lib/ld-musl-x86_64.so.1"; -+ default: -+ return "/lib64/ld-linux-x86-64.so.2"; -+ } -+ } - } - - static void AddRunTimeLibs(const ToolChain &TC, const Driver &D, |