Hi,
i've worked on a wip update to our llvm port to a more recent svn
snapshot (selfhosted distfile), the original goal was to test if it was
a bit more useful on ppc (3.1 segfaults quite fast on basic configure
tests) but it seems i can only build a segfault-only clang there..
seems to work a bit on amd64 (building mozilla trunk now):
clang version 3.2 (trunk 163235)
Target: amd64-unknown-openbsd5.2
Anyway, here's the wip update if anyone wants to take it as a start:
- remove libxml2 optional dep, since if it's found it fails the build
(includes iconv.h but nothing provides the include path to it)
- update stack smash handler patch from matthew@
- use -Wl,--relax when linking on ppc, otherwise bombs with relocation
overflow
- update PLIST
- switch to rst2man for the manpage generation, this gives mixed results
(i got more manpages generated on ppc/py-docutils 0.8 than on
amd64/py-docutils 0.9.1.... so PLIST might need manual fixing)
- remove merged patches
Landry
? fail-reloc-oflow
? fail-reloc-oflow-2
? fix-llvm-stack-protector.diff
? llvm-svn-wip.diff
? patch-cmake_config-ix_cmake
? patch-lib_CodeGen_StackProtector_cpp
? patch-tools_clang_lib_Basic_Targets_cpp
? patch-tools_clang_lib_Frontend_InitHeaderSearch_cpp
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/llvm/Makefile,v
retrieving revision 1.53
diff -u -r1.53 Makefile
--- Makefile 5 Sep 2012 23:19:24 -0000 1.53
+++ Makefile 12 Sep 2012 17:27:21 -0000
@@ -3,14 +3,13 @@
# XXX: Remember to bump MODCLANG_VERSION in lang/clang/clang.port.mk when
# updating this port.
-SHARED_LIBS += libclang 0.0 # 3.0
+SHARED_LIBS += clang 0.0 # 3.2
COMMENT = modular, fast C/C++/ObjC compiler, static analyzer and tools
-LLVM_V = 3.1
+LLVM_V = 3.1.163234
DISTNAME = llvm-${LLVM_V}.src
PKGNAME = llvm-${LLVM_V}
-REVISION = 8
CATEGORIES = devel
# packager notes in http://llvm.org/docs/Packaging.html
@@ -32,7 +31,8 @@
WANTLIB = c m pthread stdc++
-MASTER_SITES = http://llvm.org/releases/${LLVM_V}/
+#MASTER_SITES = http://llvm.org/releases/${LLVM_V}/
+MASTER_SITES = http://rhaalovely.net/stuff/
DISTFILES = ${DISTNAME}${EXTRACT_SUFX} clang-${LLVM_V}.src${EXTRACT_SUFX}
WRKDIST = ${WRKDIR}/llvm-${LLVM_V}.src
@@ -44,6 +44,7 @@
lang/python
REGRESS_DEPENDS = devel/dejagnu
+BUILD_DEPENGS += textproc/py-docutils
MAKE_FLAGS = OPTIMIZE_OPTION="${CFLAGS}" \
VERBOSE=Yes \
@@ -59,7 +60,12 @@
-DLLVM_REQUIRES_RTTI:Bool=True \
-DCMAKE_BUILD_TYPE:String=Release
-CLANG_INCLUDE_PATH = lib/clang/${LLVM_V}/include
+# Workaround relocation overflow
+.if ${MACHINE_ARCH} == "powerpc"
+CONFIGURE_ARGS+= -DCMAKE_EXE_LINKER_FLAGS=-Wl,--relax
+.endif
+
+CLANG_INCLUDE_PATH = lib/clang/3.2/include
SUBST_VARS += CLANG_INCLUDE_PATH
pre-configure:
@@ -67,9 +73,10 @@
-@ln -s ${MODPY_BIN} ${WRKDIR}/bin/python
post-build:
- cd ${WRKSRC}/docs/CommandGuide && for i in *.pod; do \
- pod2man --release=CVS --center="LLVM Command Guide" \
- $$i man/man1/$${i%.pod}.1; \
+ ${INSTALL_DATA_DIR} ${WRKSRC}/docs/CommandGuide/man/man1/
+ cd ${WRKSRC}/docs/CommandGuide && for i in *.rst; do \
+ rst2man -q --title="LLVM Command Guide" \
+ $$i man/man1/$${i%.rst}.1; \
done
pod2man --release=CVS --center="LLVM Command Guide" \
${WRKSRC}/tools/clang/docs/tools/clang.pod \
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/llvm/distinfo,v
retrieving revision 1.10
diff -u -r1.10 distinfo
--- distinfo 25 May 2012 09:05:49 -0000 1.10
+++ distinfo 12 Sep 2012 17:27:21 -0000
@@ -1,10 +1,4 @@
-MD5 (clang-3.1.src.tar.gz) = Wb8tMSCjgF8nyv2jgjyq+A==
-MD5 (llvm-3.1.src.tar.gz) = FuqnZ5+EET9lsSdg/f5O4Q==
-RMD160 (clang-3.1.src.tar.gz) = WuCdPWnU8eUOB/a/NHTaluaoT+s=
-RMD160 (llvm-3.1.src.tar.gz) = zrDvNqthCdp6hWiwTedZdS2+5ac=
-SHA1 (clang-3.1.src.tar.gz) = GfM7GHpQ0i/aKm+e2Ylpmpqe/WI=
-SHA1 (llvm-3.1.src.tar.gz) = I0yW5z74GuyaVNqS/CqQJNZTsFk=
-SHA256 (clang-3.1.src.tar.gz) = /2PiFdzT4oOP/eo4UC+NNbqxfkh/PDeZV5lh5FLVp4Y=
-SHA256 (llvm-3.1.src.tar.gz) = HqBRNRl7VADB+I0A/ygNd1znePj56gQuJaHh5zSkuas=
-SIZE (clang-3.1.src.tar.gz) = 8158418
-SIZE (llvm-3.1.src.tar.gz) = 11077429
+SHA256 (clang-3.1.163234.src.tar.gz) =
HKIaAXTUeySCkJRQg3HHc/CwKDxVGHS5LDnraWp7ObI=
+SHA256 (llvm-3.1.163234.src.tar.gz) =
DHSCCDcBdxhrZ7X2oIneeJkTczhUuLIRDsnzXsV4oHw=
+SIZE (clang-3.1.163234.src.tar.gz) = 19751042
+SIZE (llvm-3.1.163234.src.tar.gz) = 26004618
Index: patches/patch-cmake_config-ix_cmake
===================================================================
RCS file: patches/patch-cmake_config-ix_cmake
diff -N patches/patch-cmake_config-ix_cmake
--- patches/patch-cmake_config-ix_cmake 25 May 2012 09:05:49 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-$OpenBSD: patch-cmake_config-ix_cmake,v 1.2 2012/05/25 09:05:49 sthen Exp $
-
-Fix CMake check for pthread_mutex_lock
-
---- cmake/config-ix.cmake.orig Mon Mar 26 22:56:56 2012
-+++ cmake/config-ix.cmake Wed May 23 01:38:47 2012
-@@ -87,6 +87,7 @@ if( NOT PURE_WINDOWS )
- check_library_exists(pthread pthread_create "" HAVE_LIBPTHREAD)
- check_library_exists(pthread pthread_getspecific ""
HAVE_PTHREAD_GETSPECIFIC)
- check_library_exists(pthread pthread_rwlock_init ""
HAVE_PTHREAD_RWLOCK_INIT)
-+ check_library_exists(pthread pthread_mutex_lock "" HAVE_PTHREAD_MUTEX_LOCK)
- check_library_exists(dl dlopen "" HAVE_LIBDL)
- endif()
-
-@@ -133,9 +134,6 @@ check_symbol_exists(strchr string.h HAVE_STRCHR)
- check_symbol_exists(strcmp string.h HAVE_STRCMP)
- check_symbol_exists(strdup string.h HAVE_STRDUP)
- check_symbol_exists(strrchr string.h HAVE_STRRCHR)
--if( NOT PURE_WINDOWS )
-- check_symbol_exists(pthread_mutex_lock pthread.h HAVE_PTHREAD_MUTEX_LOCK)
--endif()
- check_symbol_exists(sbrk unistd.h HAVE_SBRK)
- check_symbol_exists(srand48 stdlib.h HAVE_RAND48_SRAND48)
- if( HAVE_RAND48_SRAND48 )
Index: patches/patch-lib_CodeGen_StackProtector_cpp
===================================================================
RCS file: /cvs/ports/devel/llvm/patches/patch-lib_CodeGen_StackProtector_cpp,v
retrieving revision 1.1
diff -u -r1.1 patch-lib_CodeGen_StackProtector_cpp
--- patches/patch-lib_CodeGen_StackProtector_cpp 4 Aug 2012 14:47:52
-0000 1.1
+++ patches/patch-lib_CodeGen_StackProtector_cpp 12 Sep 2012 17:27:21
-0000
@@ -1,31 +1,48 @@
-$OpenBSD: patch-lib_CodeGen_StackProtector_cpp,v 1.1 2012/08/04 14:47:52
pascal Exp $
---- lib/CodeGen/StackProtector.cpp.orig Wed Nov 23 08:13:56 2011
-+++ lib/CodeGen/StackProtector.cpp Sun Jul 22 19:55:03 2012
-@@ -169,7 +169,7 @@ bool StackProtector::InsertStackProtectors() {
+$OpenBSD$
+--- lib/CodeGen/StackProtector.cpp.orig Wed Sep 5 21:46:45 2012
++++ lib/CodeGen/StackProtector.cpp Thu Sep 6 19:57:55 2012
+@@ -196,6 +196,9 @@ bool StackProtector::InsertStackProtectors() {
+
StackGuardVar = ConstantExpr::getIntToPtr(OffsetVal,
PointerType::get(PtrTy, AddressSpace));
++ } else if (Triple(TLI->getTargetMachine().getTargetTriple()).getOS() ==
++ llvm::Triple::OpenBSD) {
++ StackGuardVar = M->getOrInsertGlobal("__guard", PtrTy);
} else {
-- StackGuardVar = M->getOrInsertGlobal("__stack_chk_guard", PtrTy);
-+ StackGuardVar = M->getOrInsertGlobal("__guard", PtrTy);
+ StackGuardVar = M->getOrInsertGlobal("__stack_chk_guard", PtrTy);
}
-
- BasicBlock &Entry = F->getEntryBlock();
-@@ -247,9 +247,16 @@ BasicBlock *StackProtector::CreateFailBB() {
- BasicBlock *FailBB = BasicBlock::Create(F->getContext(),
+@@ -272,12 +275,28 @@ bool StackProtector::InsertStackProtectors() {
+ /// CreateFailBB - Create a basic block to jump to when the stack protector
+ /// check fails.
+ BasicBlock *StackProtector::CreateFailBB() {
+- BasicBlock *FailBB = BasicBlock::Create(F->getContext(),
++ LLVMContext &Context = F->getContext();
++ BasicBlock *FailBB = BasicBlock::Create(Context,
"CallStackCheckFailBlk", F);
- Constant *StackChkFail =
+- Constant *StackChkFail =
- M->getOrInsertFunction("__stack_chk_fail",
-+ M->getOrInsertFunction("__stack_smash_handler",
- Type::getVoidTy(F->getContext()), NULL);
+- Type::getVoidTy(F->getContext()), NULL);
- CallInst::Create(StackChkFail, "", FailBB);
-+ Constant *G = new GlobalVariable(*M,
-+ ArrayType::get(Type::getInt1Ty(F->getContext()),
-+ F->getName().size() + 1),
-+ true, GlobalVariable::PrivateLinkage,
-+ ConstantDataArray::getString(F->getContext(),
-+ F->getName(), true),
-+ "SSH", false, 0);
-+ CallInst::Create(StackChkFail, G, "", FailBB);
- new UnreachableInst(F->getContext(), FailBB);
+- new UnreachableInst(F->getContext(), FailBB);
++ if (Triple(TLI->getTargetMachine().getTargetTriple()).getOS() ==
++ llvm::Triple::OpenBSD) {
++ Constant *StackChkFail =
++ M->getOrInsertFunction("__stack_smash_handler",
++ Type::getVoidTy(Context),
Type::getInt8PtrTy(Context), NULL);
++ Constant *G = new GlobalVariable(*M,
++ ArrayType::get(Type::getInt8Ty(Context),
++ F->getName().size() + 1),
++ true, GlobalVariable::PrivateLinkage,
++ ConstantDataArray::getString(Context,
++ F->getName(), true),
++ "SSH");
++ CallInst::Create(StackChkFail, G, "", FailBB);
++ } else {
++ Constant *StackChkFail =
++ M->getOrInsertFunction("__stack_chk_fail",
++ Type::getVoidTy(Context), NULL);
++ CallInst::Create(StackChkFail, "", FailBB);
++ }
++ new UnreachableInst(Context, FailBB);
return FailBB;
}
Index: patches/patch-tools_clang_CMakeLists_txt
===================================================================
RCS file: patches/patch-tools_clang_CMakeLists_txt
diff -N patches/patch-tools_clang_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-tools_clang_CMakeLists_txt 12 Sep 2012 17:27:21 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+Build fails if libxml2 is found since it includes iconv.h
+without providing its include path
+--- tools/clang/CMakeLists.txt.orig Mon Sep 10 18:58:24 2012
++++ tools/clang/CMakeLists.txt Mon Sep 10 18:58:49 2012
+@@ -141,7 +141,7 @@ endif ()
+
+ # libxml2 is an optional dependency, required only to run validation
+ # tests on XML output.
+-find_package(LibXml2)
++# find_package(LibXml2)
+
+ configure_file(
+ ${CLANG_SOURCE_DIR}/include/clang/Config/config.h.cmake
Index: patches/patch-tools_clang_lib_Basic_Targets_cpp
===================================================================
RCS file: patches/patch-tools_clang_lib_Basic_Targets_cpp
diff -N patches/patch-tools_clang_lib_Basic_Targets_cpp
--- patches/patch-tools_clang_lib_Basic_Targets_cpp 8 Aug 2012 09:35:24
-0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,70 +0,0 @@
-$OpenBSD: patch-tools_clang_lib_Basic_Targets_cpp,v 1.7 2012/08/08 09:35:24
sthen Exp $
-
-- OpenBSD does not support TLS.
-- Provide target support for powerpc, arm, mips64, mips64el and sparc.
-
---- tools/clang/lib/Basic/Targets.cpp.orig Wed Apr 25 19:26:22 2012
-+++ tools/clang/lib/Basic/Targets.cpp Wed Aug 8 10:32:41 2012
-@@ -371,6 +371,7 @@ class OpenBSDTargetInfo : public OSTargetInfo<Target>
- OpenBSDTargetInfo(const std::string &triple)
- : OSTargetInfo<Target>(triple) {
- this->UserLabelPrefix = "";
-+ this->TLSSupported = false;
-
- llvm::Triple Triple(triple);
- switch (Triple.getArch()) {
-@@ -727,7 +728,8 @@ void PPCTargetInfo::getTargetDefines(const LangOptions
- }
-
- // Target properties.
-- if (getTriple().getOS() != llvm::Triple::NetBSD)
-+ if (getTriple().getOS() != llvm::Triple::NetBSD &&
-+ getTriple().getOS() != llvm::Triple::OpenBSD)
- Builder.defineMacro("_BIG_ENDIAN");
- Builder.defineMacro("__BIG_ENDIAN__");
-
-@@ -3926,6 +3928,8 @@ static TargetInfo *AllocateTarget(const std::string &T
- return new FreeBSDTargetInfo<ARMTargetInfo>(T);
- case llvm::Triple::NetBSD:
- return new NetBSDTargetInfo<ARMTargetInfo>(T);
-+ case llvm::Triple::OpenBSD:
-+ return new OpenBSDTargetInfo<ARMTargetInfo>(T);
- case llvm::Triple::RTEMS:
- return new RTEMSTargetInfo<ARMTargetInfo>(T);
- default:
-@@ -3973,6 +3977,8 @@ static TargetInfo *AllocateTarget(const std::string &T
- return new FreeBSDTargetInfo<Mips64EBTargetInfo>(T);
- case llvm::Triple::NetBSD:
- return new NetBSDTargetInfo<Mips64EBTargetInfo>(T);
-+ case llvm::Triple::OpenBSD:
-+ return new OpenBSDTargetInfo<Mips64EBTargetInfo>(T);
- default:
- return new Mips64EBTargetInfo(T);
- }
-@@ -3987,6 +3993,8 @@ static TargetInfo *AllocateTarget(const std::string &T
- return new FreeBSDTargetInfo<Mips64ELTargetInfo>(T);
- case llvm::Triple::NetBSD:
- return new NetBSDTargetInfo<Mips64ELTargetInfo>(T);
-+ case llvm::Triple::OpenBSD:
-+ return new OpenBSDTargetInfo<Mips64ELTargetInfo>(T);
- default:
- return new Mips64ELTargetInfo(T);
- }
-@@ -4009,6 +4017,8 @@ static TargetInfo *AllocateTarget(const std::string &T
- return new FreeBSDTargetInfo<PPC32TargetInfo>(T);
- case llvm::Triple::NetBSD:
- return new NetBSDTargetInfo<PPC32TargetInfo>(T);
-+ case llvm::Triple::OpenBSD:
-+ return new OpenBSDTargetInfo<PPC32TargetInfo>(T);
- case llvm::Triple::RTEMS:
- return new RTEMSTargetInfo<PPC32TargetInfo>(T);
- default:
-@@ -4049,6 +4059,8 @@ static TargetInfo *AllocateTarget(const std::string &T
- return new SolarisSparcV8TargetInfo(T);
- case llvm::Triple::NetBSD:
- return new NetBSDTargetInfo<SparcV8TargetInfo>(T);
-+ case llvm::Triple::OpenBSD:
-+ return new OpenBSDTargetInfo<SparcV8TargetInfo>(T);
- case llvm::Triple::RTEMS:
- return new RTEMSTargetInfo<SparcV8TargetInfo>(T);
- default:
Index: patches/patch-tools_clang_lib_Driver_ToolChains_h
===================================================================
RCS file:
/cvs/ports/devel/llvm/patches/patch-tools_clang_lib_Driver_ToolChains_h,v
retrieving revision 1.3
diff -u -r1.3 patch-tools_clang_lib_Driver_ToolChains_h
--- patches/patch-tools_clang_lib_Driver_ToolChains_h 4 Aug 2012 14:47:52
-0000 1.3
+++ patches/patch-tools_clang_lib_Driver_ToolChains_h 12 Sep 2012 17:27:21
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-tools_clang_lib_Driver_ToolChains_h,v 1.3 2012/08/04 14:47:52
pascal Exp $
---- tools/clang/lib/Driver/ToolChains.h.orig Sat Jul 28 12:56:00 2012
-+++ tools/clang/lib/Driver/ToolChains.h Sat Jul 28 12:57:23 2012
-@@ -471,6 +471,10 @@ class LLVM_LIBRARY_VISIBILITY OpenBSD : public Generic
+--- tools/clang/lib/Driver/ToolChains.h.orig Wed Sep 5 21:53:53 2012
++++ tools/clang/lib/Driver/ToolChains.h Wed Sep 5 22:05:51 2012
+@@ -474,6 +474,10 @@ class LLVM_LIBRARY_VISIBILITY FreeBSD : public Generic
virtual Tool &SelectTool(const Compilation &C, const JobAction &JA,
const ActionList &Inputs) const;
@@ -11,4 +11,4 @@
+ }
};
- class LLVM_LIBRARY_VISIBILITY FreeBSD : public Generic_ELF {
+ class LLVM_LIBRARY_VISIBILITY NetBSD : public Generic_ELF {
Index: patches/patch-tools_clang_lib_Driver_Tools_cpp
===================================================================
RCS file: /cvs/ports/devel/llvm/patches/patch-tools_clang_lib_Driver_Tools_cpp,v
retrieving revision 1.12
diff -u -r1.12 patch-tools_clang_lib_Driver_Tools_cpp
--- patches/patch-tools_clang_lib_Driver_Tools_cpp 31 Aug 2012 16:21:20
-0000 1.12
+++ patches/patch-tools_clang_lib_Driver_Tools_cpp 12 Sep 2012 17:27:21
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-tools_clang_lib_Driver_Tools_cpp,v 1.12 2012/08/31 16:21:20
pascal Exp $
---- tools/clang/lib/Driver/Tools.cpp.orig Wed Apr 18 23:32:25 2012
-+++ tools/clang/lib/Driver/Tools.cpp Fri Aug 31 13:20:45 2012
-@@ -4601,6 +4601,9 @@ void openbsd::Link::ConstructJob(Compilation &C, const
+--- tools/clang/lib/Driver/Tools.cpp.orig Wed Sep 5 21:53:53 2012
++++ tools/clang/lib/Driver/Tools.cpp Wed Sep 5 22:05:51 2012
+@@ -4889,6 +4889,9 @@ void openbsd::Link::ConstructJob(Compilation &C, const
const Driver &D = getToolChain().getDriver();
ArgStringList CmdArgs;
@@ -11,7 +11,7 @@
if ((!Args.hasArg(options::OPT_nostdlib)) &&
(!Args.hasArg(options::OPT_shared))) {
CmdArgs.push_back("-e");
-@@ -4672,14 +4675,21 @@ void openbsd::Link::ConstructJob(Compilation &C, const
+@@ -4960,14 +4963,21 @@ void openbsd::Link::ConstructJob(Compilation &C, const
// the default system libraries. Just mimic this for now.
CmdArgs.push_back("-lgcc");
Index: patches/patch-tools_clang_lib_Frontend_InitHeaderSearch_cpp
===================================================================
RCS file: patches/patch-tools_clang_lib_Frontend_InitHeaderSearch_cpp
diff -N patches/patch-tools_clang_lib_Frontend_InitHeaderSearch_cpp
--- patches/patch-tools_clang_lib_Frontend_InitHeaderSearch_cpp 6 Aug 2012
22:35:26 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-tools_clang_lib_Frontend_InitHeaderSearch_cpp,v 1.4 2012/08/06
22:35:26 sthen Exp $
-
-Only provide /usr/include in the default C header search path.
-
---- tools/clang/lib/Frontend/InitHeaderSearch.cpp.orig Wed Aug 1 23:49:24 2012
-+++ tools/clang/lib/Frontend/InitHeaderSearch.cpp Wed Aug 1 23:49:57 2012
-@@ -210,6 +210,7 @@ void InitHeaderSearch::AddDefaultCIncludePaths(const l
- switch (os) {
- case llvm::Triple::FreeBSD:
- case llvm::Triple::NetBSD:
-+ case llvm::Triple::OpenBSD:
- break;
- default:
- // FIXME: temporary hack: hard-coded paths.
Index: patches/patch-tools_clang_tools_scan-build_scan-build
===================================================================
RCS file:
/cvs/ports/devel/llvm/patches/patch-tools_clang_tools_scan-build_scan-build,v
retrieving revision 1.3
diff -u -r1.3 patch-tools_clang_tools_scan-build_scan-build
--- patches/patch-tools_clang_tools_scan-build_scan-build 14 Dec 2011
22:58:23 -0000 1.3
+++ patches/patch-tools_clang_tools_scan-build_scan-build 12 Sep 2012
17:27:21 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-tools_clang_tools_scan-build_scan-build,v 1.3 2011/12/14
22:58:23 sthen Exp $
---- tools/clang/tools/scan-build/scan-build.orig Mon Oct 3 13:19:50 2011
-+++ tools/clang/tools/scan-build/scan-build Sun Oct 23 02:24:42 2011
-@@ -401,7 +401,7 @@ sub CopyFiles {
+--- tools/clang/tools/scan-build/scan-build.orig Wed Sep 5 21:53:47 2012
++++ tools/clang/tools/scan-build/scan-build Wed Sep 5 22:05:51 2012
+@@ -403,7 +403,7 @@ sub CopyFiles {
my $Dir = shift;
@@ -10,7 +10,7 @@
DieDiag("Cannot find 'sorttable.js'.\n")
if (! -r $JS);
-@@ -411,7 +411,7 @@ sub CopyFiles {
+@@ -413,7 +413,7 @@ sub CopyFiles {
DieDiag("Could not copy 'sorttable.js' to '$Dir'.\n")
if (! -r "$Dir/sorttable.js");
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/llvm/pkg/PLIST,v
retrieving revision 1.16
diff -u -r1.16 PLIST
--- pkg/PLIST 25 May 2012 09:05:49 -0000 1.16
+++ pkg/PLIST 12 Sep 2012 17:27:22 -0000
@@ -1,13 +1,12 @@
@comment $OpenBSD: PLIST,v 1.16 2012/05/25 09:05:49 sthen Exp $
@bin bin/bugpoint
bin/c++-analyzer
-@bin bin/c-index-test
bin/ccc-analyzer
bin/clang
bin/clang++
-@bin bin/clang-3.1
+@bin bin/clang-3.2
+@bin bin/clang-check
@bin bin/clang-tblgen
-@bin bin/diagtool
@bin bin/llc
@bin bin/lli
@bin bin/llvm-ar
@@ -19,7 +18,6 @@
@bin bin/llvm-dis
@bin bin/llvm-dwarfdump
@bin bin/llvm-extract
-@bin bin/llvm-ld
@bin bin/llvm-link
bin/llvm-lit
@bin bin/llvm-mc
@@ -31,14 +29,16 @@
@bin bin/llvm-rtdyld
@bin bin/llvm-size
@bin bin/llvm-stress
-@bin bin/llvm-stub
@bin bin/llvm-tblgen
@bin bin/macho-dump
@bin bin/opt
bin/scan-build
include/clang/
include/clang-c/
+include/clang-c/CXCompilationDatabase.h
+include/clang-c/CXString.h
include/clang-c/Index.h
+include/clang-c/Platform.h
include/clang/ARCMigrate/
include/clang/ARCMigrate/ARCMT.h
include/clang/ARCMigrate/ARCMTActions.h
@@ -60,6 +60,17 @@
include/clang/AST/CXXInheritance.h
include/clang/AST/CanonicalType.h
include/clang/AST/CharUnits.h
+include/clang/AST/Comment.h
+include/clang/AST/CommentBriefParser.h
+include/clang/AST/CommentCommandTraits.h
+include/clang/AST/CommentDiagnostic.h
+include/clang/AST/CommentHTMLTags.inc
+include/clang/AST/CommentHTMLTagsProperties.inc
+include/clang/AST/CommentLexer.h
+include/clang/AST/CommentNodes.inc
+include/clang/AST/CommentParser.h
+include/clang/AST/CommentSema.h
+include/clang/AST/CommentVisitor.h
include/clang/AST/Decl.h
include/clang/AST/DeclAccessPair.h
include/clang/AST/DeclBase.h
@@ -87,6 +98,7 @@
include/clang/AST/OperationKinds.h
include/clang/AST/ParentMap.h
include/clang/AST/PrettyPrinter.h
+include/clang/AST/RawCommentList.h
include/clang/AST/RecordLayout.h
include/clang/AST/RecursiveASTVisitor.h
include/clang/AST/Redeclarable.h
@@ -110,6 +122,12 @@
include/clang/AST/UnresolvedSet.h
include/clang/AST/VTTBuilder.h
include/clang/AST/VTableBuilder.h
+include/clang/ASTMatchers/
+include/clang/ASTMatchers/ASTMatchFinder.h
+include/clang/ASTMatchers/ASTMatchers.h
+include/clang/ASTMatchers/ASTMatchersInternal.h
+include/clang/ASTMatchers/ASTMatchersMacros.h
+include/clang/ASTMatchers/ASTTypeTraits.h
include/clang/Analysis/
include/clang/Analysis/Analyses/
include/clang/Analysis/Analyses/CFGReachabilityAnalysis.h
@@ -149,14 +167,16 @@
include/clang/Basic/Builtins.h
include/clang/Basic/BuiltinsARM.def
include/clang/Basic/BuiltinsHexagon.def
+include/clang/Basic/BuiltinsMips.def
+include/clang/Basic/BuiltinsNVPTX.def
include/clang/Basic/BuiltinsPPC.def
-include/clang/Basic/BuiltinsPTX.def
include/clang/Basic/BuiltinsX86.def
include/clang/Basic/ConvertUTF.h
include/clang/Basic/Diagnostic.h
include/clang/Basic/DiagnosticASTKinds.inc
include/clang/Basic/DiagnosticAnalysisKinds.inc
include/clang/Basic/DiagnosticCategories.h
+include/clang/Basic/DiagnosticCommentKinds.inc
include/clang/Basic/DiagnosticCommonKinds.inc
include/clang/Basic/DiagnosticDriverKinds.inc
include/clang/Basic/DiagnosticFrontendKinds.inc
@@ -180,6 +200,7 @@
include/clang/Basic/Linkage.h
include/clang/Basic/MacroBuilder.h
include/clang/Basic/Module.h
+include/clang/Basic/ObjCRuntime.h
include/clang/Basic/OnDiskHashTable.h
include/clang/Basic/OpenCL.h
include/clang/Basic/OpenCLExtensions.def
@@ -215,12 +236,10 @@
include/clang/Driver/CC1AsOptions.h
include/clang/Driver/CC1AsOptions.inc
include/clang/Driver/CC1Options.h
-include/clang/Driver/CC1Options.inc
include/clang/Driver/Compilation.h
include/clang/Driver/Driver.h
include/clang/Driver/DriverDiagnostic.h
include/clang/Driver/Job.h
-include/clang/Driver/ObjCRuntime.h
include/clang/Driver/OptSpecifier.h
include/clang/Driver/OptTable.h
include/clang/Driver/Option.h
@@ -241,8 +260,6 @@
include/clang/Frontend/
include/clang/Frontend/ASTConsumers.h
include/clang/Frontend/ASTUnit.h
-include/clang/Frontend/Analyses.def
-include/clang/Frontend/AnalyzerOptions.h
include/clang/Frontend/ChainedDiagnosticConsumer.h
include/clang/Frontend/ChainedIncludesSource.h
include/clang/Frontend/CodeGenOptions.h
@@ -305,15 +322,17 @@
include/clang/Parse/ParseDiagnostic.h
include/clang/Parse/Parser.h
include/clang/Rewrite/
-include/clang/Rewrite/ASTConsumers.h
-include/clang/Rewrite/DeltaTree.h
-include/clang/Rewrite/FixItRewriter.h
-include/clang/Rewrite/FrontendActions.h
-include/clang/Rewrite/HTMLRewrite.h
-include/clang/Rewrite/RewriteRope.h
-include/clang/Rewrite/Rewriter.h
-include/clang/Rewrite/Rewriters.h
-include/clang/Rewrite/TokenRewriter.h
+include/clang/Rewrite/Core/
+include/clang/Rewrite/Core/DeltaTree.h
+include/clang/Rewrite/Core/HTMLRewrite.h
+include/clang/Rewrite/Core/RewriteRope.h
+include/clang/Rewrite/Core/Rewriter.h
+include/clang/Rewrite/Core/TokenRewriter.h
+include/clang/Rewrite/Frontend/
+include/clang/Rewrite/Frontend/ASTConsumers.h
+include/clang/Rewrite/Frontend/FixItRewriter.h
+include/clang/Rewrite/Frontend/FrontendActions.h
+include/clang/Rewrite/Frontend/Rewriters.h
include/clang/Sema/
include/clang/Sema/AnalysisBasedWarnings.h
include/clang/Sema/AttrParsedAttrKinds.inc
@@ -322,6 +341,7 @@
include/clang/Sema/AttributeList.h
include/clang/Sema/CXXFieldCollector.h
include/clang/Sema/CodeCompleteConsumer.h
+include/clang/Sema/CodeCompleteOptions.h
include/clang/Sema/DeclSpec.h
include/clang/Sema/DelayedDiagnostic.h
include/clang/Sema/Designator.h
@@ -361,9 +381,10 @@
include/clang/StaticAnalyzer/Checkers/
include/clang/StaticAnalyzer/Checkers/ClangCheckers.h
include/clang/StaticAnalyzer/Checkers/CommonBugCategories.h
-include/clang/StaticAnalyzer/Checkers/DereferenceChecker.h
include/clang/StaticAnalyzer/Checkers/LocalCheckers.h
include/clang/StaticAnalyzer/Core/
+include/clang/StaticAnalyzer/Core/Analyses.def
+include/clang/StaticAnalyzer/Core/AnalyzerOptions.h
include/clang/StaticAnalyzer/Core/BugReporter/
include/clang/StaticAnalyzer/Core/BugReporter/BugReporter.h
include/clang/StaticAnalyzer/Core/BugReporter/BugReporterVisitor.h
@@ -375,19 +396,21 @@
include/clang/StaticAnalyzer/Core/CheckerRegistry.h
include/clang/StaticAnalyzer/Core/PathDiagnosticConsumers.h
include/clang/StaticAnalyzer/Core/PathSensitive/
+include/clang/StaticAnalyzer/Core/PathSensitive/APSIntType.h
include/clang/StaticAnalyzer/Core/PathSensitive/AnalysisManager.h
include/clang/StaticAnalyzer/Core/PathSensitive/BasicValueFactory.h
include/clang/StaticAnalyzer/Core/PathSensitive/BlockCounter.h
+include/clang/StaticAnalyzer/Core/PathSensitive/CallEvent.h
include/clang/StaticAnalyzer/Core/PathSensitive/CheckerContext.h
include/clang/StaticAnalyzer/Core/PathSensitive/CheckerHelpers.h
include/clang/StaticAnalyzer/Core/PathSensitive/ConstraintManager.h
include/clang/StaticAnalyzer/Core/PathSensitive/CoreEngine.h
+include/clang/StaticAnalyzer/Core/PathSensitive/DynamicTypeInfo.h
include/clang/StaticAnalyzer/Core/PathSensitive/Environment.h
include/clang/StaticAnalyzer/Core/PathSensitive/ExplodedGraph.h
include/clang/StaticAnalyzer/Core/PathSensitive/ExprEngine.h
include/clang/StaticAnalyzer/Core/PathSensitive/FunctionSummary.h
include/clang/StaticAnalyzer/Core/PathSensitive/MemRegion.h
-include/clang/StaticAnalyzer/Core/PathSensitive/ObjCMessage.h
include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState.h
include/clang/StaticAnalyzer/Core/PathSensitive/ProgramStateTrait.h
include/clang/StaticAnalyzer/Core/PathSensitive/ProgramState_Fwd.h
@@ -405,7 +428,13 @@
include/clang/StaticAnalyzer/Frontend/CheckerRegistration.h
include/clang/StaticAnalyzer/Frontend/FrontendActions.h
include/clang/Tooling/
+include/clang/Tooling/ArgumentsAdjusters.h
+include/clang/Tooling/CommonOptionsParser.h
include/clang/Tooling/CompilationDatabase.h
+include/clang/Tooling/CompilationDatabasePluginRegistry.h
+include/clang/Tooling/JSONCompilationDatabase.h
+include/clang/Tooling/Refactoring.h
+include/clang/Tooling/RefactoringCallbacks.h
include/clang/Tooling/Tooling.h
include/llvm/
include/llvm-c/
@@ -418,6 +447,7 @@
include/llvm-c/ExecutionEngine.h
include/llvm-c/Initialization.h
include/llvm-c/LinkTimeOptimizer.h
+include/llvm-c/Linker.h
include/llvm-c/Object.h
include/llvm-c/Target.h
include/llvm-c/TargetMachine.h
@@ -479,7 +509,6 @@
include/llvm/ADT/StringSet.h
include/llvm/ADT/StringSwitch.h
include/llvm/ADT/TinyPtrVector.h
-include/llvm/ADT/Trie.h
include/llvm/ADT/Triple.h
include/llvm/ADT/Twine.h
include/llvm/ADT/UniqueVector.h
@@ -500,9 +529,7 @@
include/llvm/Analysis/CodeMetrics.h
include/llvm/Analysis/ConstantFolding.h
include/llvm/Analysis/ConstantsScanner.h
-include/llvm/Analysis/DIBuilder.h
include/llvm/Analysis/DOTGraphTraitsPass.h
-include/llvm/Analysis/DebugInfo.h
include/llvm/Analysis/DomPrinter.h
include/llvm/Analysis/DominanceFrontier.h
include/llvm/Analysis/DominatorInternals.h
@@ -521,6 +548,7 @@
include/llvm/Analysis/Loads.h
include/llvm/Analysis/LoopDependenceAnalysis.h
include/llvm/Analysis/LoopInfo.h
+include/llvm/Analysis/LoopInfoImpl.h
include/llvm/Analysis/LoopIterator.h
include/llvm/Analysis/LoopPass.h
include/llvm/Analysis/MemoryBuiltins.h
@@ -530,6 +558,8 @@
include/llvm/Analysis/PathNumbering.h
include/llvm/Analysis/PathProfileInfo.h
include/llvm/Analysis/PostDominators.h
+include/llvm/Analysis/ProfileDataLoader.h
+include/llvm/Analysis/ProfileDataTypes.h
include/llvm/Analysis/ProfileInfo.h
include/llvm/Analysis/ProfileInfoLoader.h
include/llvm/Analysis/ProfileInfoTypes.h
@@ -624,10 +654,11 @@
include/llvm/CodeGen/PBQP/Math.h
include/llvm/CodeGen/PBQP/Solution.h
include/llvm/CodeGen/Passes.h
-include/llvm/CodeGen/ProcessImplicitDefs.h
include/llvm/CodeGen/PseudoSourceValue.h
include/llvm/CodeGen/RegAllocPBQP.h
include/llvm/CodeGen/RegAllocRegistry.h
+include/llvm/CodeGen/RegisterClassInfo.h
+include/llvm/CodeGen/RegisterPressure.h
include/llvm/CodeGen/RegisterScavenging.h
include/llvm/CodeGen/ResourcePriorityQueue.h
include/llvm/CodeGen/RuntimeLibcalls.h
@@ -652,7 +683,9 @@
include/llvm/Config/llvm-config.h
include/llvm/Constant.h
include/llvm/Constants.h
+include/llvm/DIBuilder.h
include/llvm/DebugInfo/
+include/llvm/DebugInfo.h
include/llvm/DebugInfo/DIContext.h
include/llvm/DefaultPasses.h
include/llvm/DerivedTypes.h
@@ -672,6 +705,7 @@
include/llvm/GlobalAlias.h
include/llvm/GlobalValue.h
include/llvm/GlobalVariable.h
+include/llvm/IRBuilder.h
include/llvm/InitializePasses.h
include/llvm/InlineAsm.h
include/llvm/InstrTypes.h
@@ -685,7 +719,8 @@
include/llvm/IntrinsicsARM.td
include/llvm/IntrinsicsCellSPU.td
include/llvm/IntrinsicsHexagon.td
-include/llvm/IntrinsicsPTX.td
+include/llvm/IntrinsicsMips.td
+include/llvm/IntrinsicsNVVM.td
include/llvm/IntrinsicsPowerPC.td
include/llvm/IntrinsicsX86.td
include/llvm/IntrinsicsXCore.td
@@ -711,6 +746,7 @@
include/llvm/MC/MCELFObjectWriter.h
include/llvm/MC/MCELFSymbolFlags.h
include/llvm/MC/MCExpr.h
+include/llvm/MC/MCFixedLenDisassembler.h
include/llvm/MC/MCFixup.h
include/llvm/MC/MCFixupKindInfo.h
include/llvm/MC/MCInst.h
@@ -734,6 +770,7 @@
include/llvm/MC/MCParser/MCAsmParserExtension.h
include/llvm/MC/MCParser/MCParsedAsmOperand.h
include/llvm/MC/MCRegisterInfo.h
+include/llvm/MC/MCSchedule.h
include/llvm/MC/MCSection.h
include/llvm/MC/MCSectionCOFF.h
include/llvm/MC/MCSectionELF.h
@@ -749,6 +786,7 @@
include/llvm/MC/MachineLocation.h
include/llvm/MC/SectionKind.h
include/llvm/MC/SubtargetFeature.h
+include/llvm/MDBuilder.h
include/llvm/Metadata.h
include/llvm/Module.h
include/llvm/Object/
@@ -802,6 +840,7 @@
include/llvm/Support/Errno.h
include/llvm/Support/ErrorHandling.h
include/llvm/Support/FEnv.h
+include/llvm/Support/FileOutputBuffer.h
include/llvm/Support/FileSystem.h
include/llvm/Support/FileUtilities.h
include/llvm/Support/Format.h
@@ -810,16 +849,17 @@
include/llvm/Support/GetElementPtrTypeIterator.h
include/llvm/Support/GraphWriter.h
include/llvm/Support/Host.h
-include/llvm/Support/IRBuilder.h
include/llvm/Support/IRReader.h
include/llvm/Support/IncludeFile.h
include/llvm/Support/InstIterator.h
include/llvm/Support/InstVisitor.h
+include/llvm/Support/IntegersSubset.h
+include/llvm/Support/IntegersSubsetMapping.h
+include/llvm/Support/LEB128.h
include/llvm/Support/LICENSE.TXT
include/llvm/Support/LeakDetector.h
include/llvm/Support/Locale.h
include/llvm/Support/LockFileManager.h
-include/llvm/Support/MDBuilder.h
include/llvm/Support/MachO.h
include/llvm/Support/ManagedStatic.h
include/llvm/Support/MathExtras.h
@@ -864,7 +904,6 @@
include/llvm/Support/TimeValue.h
include/llvm/Support/Timer.h
include/llvm/Support/ToolOutputFile.h
-include/llvm/Support/TypeBuilder.h
include/llvm/Support/Valgrind.h
include/llvm/Support/ValueHandle.h
include/llvm/Support/Win64EH.h
@@ -879,6 +918,7 @@
include/llvm/TableGen/Error.h
include/llvm/TableGen/Main.h
include/llvm/TableGen/Record.h
+include/llvm/TableGen/StringMatcher.h
include/llvm/TableGen/TableGenAction.h
include/llvm/TableGen/TableGenBackend.h
include/llvm/Target/
@@ -891,6 +931,7 @@
include/llvm/Target/TargetFrameLowering.h
include/llvm/Target/TargetInstrInfo.h
include/llvm/Target/TargetIntrinsicInfo.h
+include/llvm/Target/TargetItinerary.td
include/llvm/Target/TargetJITInfo.h
include/llvm/Target/TargetLibraryInfo.h
include/llvm/Target/TargetLowering.h
@@ -914,9 +955,10 @@
include/llvm/Transforms/Utils/AddrModeMatcher.h
include/llvm/Transforms/Utils/BasicBlockUtils.h
include/llvm/Transforms/Utils/BuildLibCalls.h
+include/llvm/Transforms/Utils/BypassSlowDivision.h
include/llvm/Transforms/Utils/Cloning.h
include/llvm/Transforms/Utils/CmpInstAnalysis.h
-include/llvm/Transforms/Utils/FunctionUtils.h
+include/llvm/Transforms/Utils/CodeExtractor.h
include/llvm/Transforms/Utils/Local.h
include/llvm/Transforms/Utils/ModuleUtils.h
include/llvm/Transforms/Utils/PromoteMemToReg.h
@@ -928,18 +970,19 @@
include/llvm/Transforms/Utils/ValueMapper.h
include/llvm/Transforms/Vectorize.h
include/llvm/Type.h
+include/llvm/TypeBuilder.h
+include/llvm/TypeFinder.h
include/llvm/Use.h
include/llvm/User.h
include/llvm/Value.h
include/llvm/ValueSymbolTable.h
lib/BugpointPasses.so
lib/LLVMHello.so
-lib/PrintFunctionNames.so
-lib/SampleAnalyzerPlugin.so
lib/clang/
-lib/clang/3.1/
+lib/clang/3.2/
${CLANG_INCLUDE_PATH}/
${CLANG_INCLUDE_PATH}/altivec.h
+${CLANG_INCLUDE_PATH}/ammintrin.h
${CLANG_INCLUDE_PATH}/arm_neon.h
${CLANG_INCLUDE_PATH}/avx2intrin.h
${CLANG_INCLUDE_PATH}/avxintrin.h
@@ -949,6 +992,7 @@
${CLANG_INCLUDE_PATH}/emmintrin.h
${CLANG_INCLUDE_PATH}/float.h
${CLANG_INCLUDE_PATH}/fma4intrin.h
+${CLANG_INCLUDE_PATH}/fmaintrin.h
${CLANG_INCLUDE_PATH}/immintrin.h
${CLANG_INCLUDE_PATH}/iso646.h
${CLANG_INCLUDE_PATH}/limits.h
@@ -973,6 +1017,7 @@
${CLANG_INCLUDE_PATH}/wmmintrin.h
${CLANG_INCLUDE_PATH}/x86intrin.h
${CLANG_INCLUDE_PATH}/xmmintrin.h
+${CLANG_INCLUDE_PATH}/xopintrin.h
lib/libLLVMARMAsmParser.a
lib/libLLVMARMAsmPrinter.a
lib/libLLVMARMCodeGen.a
@@ -1023,11 +1068,11 @@
lib/libLLVMMipsDesc.a
lib/libLLVMMipsDisassembler.a
lib/libLLVMMipsInfo.a
+lib/libLLVMNVPTXAsmPrinter.a
+lib/libLLVMNVPTXCodeGen.a
+lib/libLLVMNVPTXDesc.a
+lib/libLLVMNVPTXInfo.a
lib/libLLVMObject.a
-lib/libLLVMPTXAsmPrinter.a
-lib/libLLVMPTXCodeGen.a
-lib/libLLVMPTXDesc.a
-lib/libLLVMPTXInfo.a
lib/libLLVMPowerPCAsmPrinter.a
lib/libLLVMPowerPCCodeGen.a
lib/libLLVMPowerPCDesc.a
@@ -1057,8 +1102,11 @@
lib/libLLVMipo.a
lib/libLTO.a
lib/libLTO.so
+lib/libclang.a
+@lib lib/libclang.so.${LIBclang_VERSION}
lib/libclangARCMigrate.a
lib/libclangAST.a
+lib/libclangASTMatchers.a
lib/libclangAnalysis.a
lib/libclangBasic.a
lib/libclangCodeGen.a
@@ -1068,7 +1116,8 @@
lib/libclangFrontendTool.a
lib/libclangLex.a
lib/libclangParse.a
-lib/libclangRewrite.a
+lib/libclangRewriteCore.a
+lib/libclangRewriteFrontend.a
lib/libclangSema.a
lib/libclangSerialization.a
lib/libclangStaticAnalyzerCheckers.a
@@ -1077,13 +1126,12 @@
lib/libclangTooling.a
@comment lib/libgtest.a
@comment lib/libgtest_main.a
-lib/liblibclang.a
-@lib lib/liblibclang.so.${LIBlibclang_VERSION}
lib/libprofile_rt.a
-lib/profile_rt.so
-@comment @man man/man1/FileCheck.1
+lib/libprofile_rt.so
+@man man/man1/FileCheck.1
@man man/man1/bugpoint.1
@man man/man1/clang.1
+@man man/man1/index.1
@man man/man1/lit.1
@man man/man1/llc.1
@man man/man1/lli.1
@@ -1096,7 +1144,6 @@
@man man/man1/llvm-diff.1
@man man/man1/llvm-dis.1
@man man/man1/llvm-extract.1
-@man man/man1/llvm-ld.1
@man man/man1/llvm-link.1
@man man/man1/llvm-nm.1
@man man/man1/llvm-prof.1
