cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use libc++ (not libestdc++) on powerpc

Browse Source 
sparc64 will follow once base has done the switch
This commit is contained in:
jca 2020-04-04 21:48:39 +00:00
parent fe8f33d7c4
commit 6ace77049c
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/llvm/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.247 2020/03/22 00:58:36 jca Exp $
# $OpenBSD: Makefile,v 1.248 2020/04/04 21:48:39 jca Exp $
# XXX If broken on an architecture, remove the arch from LLVM_ARCHS.
ONLY_FOR_ARCHS = ${LLVM_ARCHS}
@ -18,7 +18,7 @@ PKGSPEC-main = llvm-=${LLVM_V}
PKGNAME-main = llvm-${LLVM_V}
PKGNAME-python = py3-llvm-${LLVM_V}
PKGNAME-lldb = lldb-${LLVM_V}
REVISION-main = 9
REVISION-main = 10
REVISION-python = 1
REVISION-lldb = 2

9
devel/llvm/patches/patch-tools_clang_lib_Driver_ToolChains_OpenBSD_cpp
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-tools_clang_lib_Driver_ToolChains_OpenBSD_cpp,v 1.12 2019/12/27 00:15:46 jca Exp $
$OpenBSD: patch-tools_clang_lib_Driver_ToolChains_OpenBSD_cpp,v 1.13 2020/04/04 21:48:39 jca Exp $
- Add support for building against libestdc++ from ports-gcc.
- Use more *_p.a libraries from base when profiling is requested.
@ -47,7 +47,7 @@ Index: tools/clang/lib/Driver/ToolChains/OpenBSD.cpp
}
if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles)) {
@@ -255,16 +267,79 @@ OpenBSD::OpenBSD(const Driver &D, const llvm::Triple &
@@ -255,16 +267,80 @@ OpenBSD::OpenBSD(const Driver &D, const llvm::Triple &
getFilePaths().push_back(getDriver().SysRoot + "/usr/lib");
}
@ -69,11 +69,12 @@ Index: tools/clang/lib/Driver/ToolChains/OpenBSD.cpp
+ << A->getAsString(Args);
+ }
+ switch (getTriple().getArch()) {
+ case llvm::Triple::arm:
+ case llvm::Triple::aarch64:
+ case llvm::Triple::arm:
+ case llvm::Triple::mips64:
+ case llvm::Triple::ppc:
+ case llvm::Triple::x86:
+ case llvm::Triple::x86_64:
+ case llvm::Triple::mips64:
+ return ToolChain::CST_Libcxx;
+ break;
+ default: