On 01/07 01:53, Jeremy Evans wrote:
> On 01/07 09:46, Stuart Henderson wrote:
> > > llvm's only current dependency is lang/llvm-gcc4, which I haven't tested
> > > yet as it is i386 only. If someone else could test that and see if it
> > > works with LLVM 2.8, I'd appreciate it.
> >
> > llvm-gcc4 will need to be updated to a matching version.
> >
> > it might be that the problem affecting amd64 has since been fixed,
> > you could try adding to ONLY_FOR_ARCHS and see what happens...
> > (fast machine recommended ;-)
>
> I'll see if I can give it a shot this weekend.
Success! llvm-gcc4 builds correctly now on amd64 and is at least able
to compile simple programs such as nc(1). I didn't try anything more
advanced yet (requests?).
Three diffs included. First is llvm-gcc. Second is an updated llvm
diff that should reduce future PLIST churn, requested by Mikolaj
Kucharski. Third is a diff to enable llvm support in rubinius.
I haven't yet checked to see if any of the llvm-gcc shared libs should
be bumped. Any advice in this area?
Jeremy
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/llvm-gcc4/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile 26 Nov 2010 17:27:38 -0000 1.13
+++ Makefile 8 Jan 2011 00:57:05 -0000
@@ -3,17 +3,15 @@
# XXX WORK IN PROGRESS.
#ONLY_FOR_ARCHS = ${GCC4_ARCHS}
-ONLY_FOR_ARCHS = i386
-# amd64 has an -fPIC problem
+ONLY_FOR_ARCHS = i386 amd64
# others unknown at this time
COMMENT = gcc4 front-end for LLVM
GCC_V = 4.2.1
-LLVM_V = 2.7
+LLVM_V = 2.8
DISTNAME = llvm-gcc-4.2-${LLVM_V}.source
PKGNAME = ${DISTNAME:S/.source//:S/gcc-/gcc/}
-REVISION = 2
EXTRACT_SUFX= .tgz
SHARED_LIBS = ssp 0.0 \
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/llvm-gcc4/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 29 Apr 2010 16:45:53 -0000 1.4
+++ distinfo 8 Jan 2011 00:18:14 -0000
@@ -1,5 +1,5 @@
-MD5 (llvm-gcc-4.2-2.7.source.tgz) = xQMwBc6sGYi3zckIRFCQ8A==
-RMD160 (llvm-gcc-4.2-2.7.source.tgz) = Uj7dlOzgDKqqP/I5nzwLBEtQ9DI=
-SHA1 (llvm-gcc-4.2-2.7.source.tgz) = qvRm76QelQFNUaL4pgrTt3ccGCk=
-SHA256 (llvm-gcc-4.2-2.7.source.tgz) =
HMvO9f5mEzkuJPIf0jqe0mkoJ8E/jYXCazvc0bO1BHo=
-SIZE (llvm-gcc-4.2-2.7.source.tgz) = 55699337
+MD5 (llvm-gcc-4.2-2.8.source.tgz) = 5bBWn18BgIbGIgHYfhYRVA==
+RMD160 (llvm-gcc-4.2-2.8.source.tgz) = MF9BV7FpEoMbK4l7CaVfwkBbzAw=
+SHA1 (llvm-gcc-4.2-2.8.source.tgz) = WPuj3d25xps0XIr6bGmdnZ0T9VE=
+SHA256 (llvm-gcc-4.2-2.8.source.tgz) =
BHhaADHBqh46iZJqxqBpyWJ2B06nEZWDBri/ltnUnk0=
+SIZE (llvm-gcc-4.2-2.8.source.tgz) = 55748118
Index: pkg/PFRAG.shared
===================================================================
RCS file: /cvs/ports/lang/llvm-gcc4/pkg/PFRAG.shared,v
retrieving revision 1.2
diff -u -p -r1.2 PFRAG.shared
--- pkg/PFRAG.shared 24 Jun 2009 20:10:10 -0000 1.2
+++ pkg/PFRAG.shared 8 Jan 2011 00:43:16 -0000
@@ -1,4 +1,7 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2009/06/24 20:10:10 sthen Exp $
+...@lib lib/llvm-gcc-${LLVM_V}/fpic/libobjc.so.${LIBobjc_VERSION}
+...@lib lib/llvm-gcc-${LLVM_V}/fpic/libssp.so.${LIBssp_VERSION}
+...@lib lib/llvm-gcc-${LLVM_V}/fpic/libstdc++.so.${LIBstdc++_VERSION}
@lib lib/llvm-gcc-${LLVM_V}/libobjc.so.${LIBobjc_VERSION}
@lib lib/llvm-gcc-${LLVM_V}/libssp.so.${LIBssp_VERSION}
@lib lib/llvm-gcc-${LLVM_V}/libstdc++.so.${LIBstdc++_VERSION}
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/llvm-gcc4/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 24 Jun 2009 20:10:10 -0000 1.2
+++ pkg/PLIST 8 Jan 2011 00:43:16 -0000
@@ -18,6 +18,18 @@ bin/llvm-gccbug
@comment @info info/gccinstall.info
@comment @info info/gccint.info
lib/llvm-gcc-${LLVM_V}/
+lib/llvm-gcc-${LLVM_V}/fpic/
+lib/llvm-gcc-${LLVM_V}/fpic/libesupc++.a
+lib/llvm-gcc-${LLVM_V}/fpic/libesupc++.la
+lib/llvm-gcc-${LLVM_V}/fpic/libiberty.a
+lib/llvm-gcc-${LLVM_V}/fpic/libobjc.a
+lib/llvm-gcc-${LLVM_V}/fpic/libobjc.la
+lib/llvm-gcc-${LLVM_V}/fpic/libssp.a
+lib/llvm-gcc-${LLVM_V}/fpic/libssp.la
+lib/llvm-gcc-${LLVM_V}/fpic/libssp_nonshared.a
+lib/llvm-gcc-${LLVM_V}/fpic/libssp_nonshared.la
+lib/llvm-gcc-${LLVM_V}/fpic/libstdc++.a
+lib/llvm-gcc-${LLVM_V}/fpic/libstdc++.la
lib/llvm-gcc-${LLVM_V}/gcc/
lib/llvm-gcc-${LLVM_V}/gcc/${CONFIG}/
lib/llvm-gcc-${LLVM_V}/gcc/${CONFIG}/${GCC_V}/
@@ -25,6 +37,9 @@ lib/llvm-gcc-${LLVM_V}/gcc/${CONFIG}/${G
@bin lib/llvm-gcc-${LLVM_V}/gcc/${CONFIG}/${GCC_V}/cc1obj
@bin lib/llvm-gcc-${LLVM_V}/gcc/${CONFIG}/${GCC_V}/cc1plus
@bin lib/llvm-gcc-${LLVM_V}/gcc/${CONFIG}/${GCC_V}/collect2
+lib/llvm-gcc-${LLVM_V}/gcc/${CONFIG}/${GCC_V}/fpic/
+lib/llvm-gcc-${LLVM_V}/gcc/${CONFIG}/${GCC_V}/fpic/libgcc.a
+lib/llvm-gcc-${LLVM_V}/gcc/${CONFIG}/${GCC_V}/fpic/libgcov.a
lib/llvm-gcc-${LLVM_V}/gcc/${CONFIG}/${GCC_V}/include/
lib/llvm-gcc-${LLVM_V}/gcc/${CONFIG}/${GCC_V}/include/README
lib/llvm-gcc-${LLVM_V}/gcc/${CONFIG}/${GCC_V}/include/ammintrin.h
@@ -93,6 +108,48 @@ lib/llvm-gcc-${LLVM_V}/gcc/${CONFIG}/${G
lib/llvm-gcc-${LLVM_V}/include/
lib/llvm-gcc-${LLVM_V}/include/c++/
lib/llvm-gcc-${LLVM_V}/include/c++/algorithm
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/bits/
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/bits/atomic_word.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/bits/basic_file.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/bits/c++allocator.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/bits/c++config.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/bits/c++io.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/bits/c++locale.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/bits/cpu_defines.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/bits/ctype_base.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/bits/ctype_inline.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/bits/ctype_noninline.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/bits/cxxabi_tweaks.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/bits/gthr-default.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/bits/gthr-posix.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/bits/gthr-single.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/bits/gthr-tpf.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/bits/gthr.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/bits/messages_members.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/bits/os_defines.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/bits/time_members.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/bits/
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/bits/atomic_word.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/bits/basic_file.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/bits/c++allocator.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/bits/c++config.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/bits/c++io.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/bits/c++locale.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/bits/cpu_defines.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/bits/ctype_base.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/bits/ctype_inline.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/bits/ctype_noninline.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/bits/cxxabi_tweaks.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/bits/gthr-default.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/bits/gthr-posix.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/bits/gthr-single.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/bits/gthr-tpf.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/bits/gthr.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/bits/messages_members.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/bits/os_defines.h
+lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/fpic/bits/time_members.h
lib/llvm-gcc-${LLVM_V}/include/c++/backward/
lib/llvm-gcc-${LLVM_V}/include/c++/backward/algo.h
lib/llvm-gcc-${LLVM_V}/include/c++/backward/algobase.h
@@ -574,27 +631,6 @@ lib/llvm-gcc-${LLVM_V}/include/c++/ext/v
lib/llvm-gcc-${LLVM_V}/include/c++/ext/vstring_util.h
lib/llvm-gcc-${LLVM_V}/include/c++/fstream
lib/llvm-gcc-${LLVM_V}/include/c++/functional
-lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/
-lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/bits/
-lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/bits/atomic_word.h
-lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/bits/basic_file.h
-lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/bits/c++allocator.h
-lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/bits/c++config.h
-lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/bits/c++io.h
-lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/bits/c++locale.h
-lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/bits/cpu_defines.h
-lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/bits/ctype_base.h
-lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/bits/ctype_inline.h
-lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/bits/ctype_noninline.h
-lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/bits/cxxabi_tweaks.h
-lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/bits/gthr-default.h
-lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/bits/gthr-posix.h
-lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/bits/gthr-single.h
-lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/bits/gthr-tpf.h
-lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/bits/gthr.h
-lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/bits/messages_members.h
-lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/bits/os_defines.h
-lib/llvm-gcc-${LLVM_V}/include/c++/${CONFIG}/bits/time_members.h
lib/llvm-gcc-${LLVM_V}/include/c++/iomanip
lib/llvm-gcc-${LLVM_V}/include/c++/ios
lib/llvm-gcc-${LLVM_V}/include/c++/iosfwd
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/llvm/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile 15 Nov 2010 19:46:00 -0000 1.28
+++ Makefile 8 Jan 2011 00:21:04 -0000
@@ -2,9 +2,8 @@
COMMENT = Low Level Virtual Machine (LLVM) compiler infrastructure
-LLVM_V = 2.7
+LLVM_V = 2.8
DISTNAME = llvm-${LLVM_V}
-REVISION = 4
CATEGORIES = devel
@@ -63,6 +62,9 @@ CONFIGURE_ARGS = --enable-bindings=no \
--enable-optimized
MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC}/autoconf
+
+CLANG_INCLUDE_PATH = lib/clang/${LLVM_V}/include
+SUBST_VARS += CLANG_INCLUDE_PATH
pre-configure:
@perl -pi -e s,-lpthread,-pthread,g ${WRKSRC}/configure
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/llvm/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 29 Apr 2010 16:37:09 -0000 1.6
+++ distinfo 6 Jan 2011 19:25:47 -0000
@@ -1,10 +1,10 @@
-MD5 (clang-2.7.tgz) = uDJgqowTSUrfiXi18ji/Gw==
-MD5 (llvm-2.7.tgz) = rDImYfIOfWyBCxhp+Iatmw==
-RMD160 (clang-2.7.tgz) = F3/c9Zvkpgw3zw37BYU1yc27rU4=
-RMD160 (llvm-2.7.tgz) = D6LzYt1qRe/sNc6PoPjTbZjzLI8=
-SHA1 (clang-2.7.tgz) = TYMmv+IwinNVpeTKLrFyv/12Hh4=
-SHA1 (llvm-2.7.tgz) = BZ/CGw7BtknEo97IF1bl+SqhMaI=
-SHA256 (clang-2.7.tgz) = +zSUcZR/FVwc2hyKSju8f6Q3uG9oddmXj4bJFd/tYjo=
-SHA256 (llvm-2.7.tgz) = mWZL3IUDowYDgWavM/KOtCbZnil1daWddKGg3L3bvKU=
-SIZE (clang-2.7.tgz) = 4953739
-SIZE (llvm-2.7.tgz) = 8374297
+MD5 (clang-2.8.tgz) = EOFMkB/Dco7svVuCngEbWQ==
+MD5 (llvm-2.8.tgz) = Ig02G00XBR/0uyHGSr4Fug==
+RMD160 (clang-2.8.tgz) = 8AlWtt4pzAnzmSrqvRQPIYnGzzk=
+RMD160 (llvm-2.8.tgz) = P1px0H4QWnz0bq/HqQBqknA1ASw=
+SHA1 (clang-2.8.tgz) = lJd8hM4TYwfbvq3pXme/48JRYf8=
+SHA1 (llvm-2.8.tgz) = bUn+A50o6GZN4lSRx3XLLFmeMME=
+SHA256 (clang-2.8.tgz) = 7YNIFVPmo5qKKVPoljDYgdh4M1BvCWqQ8Y2T7Cve4ME=
+SHA256 (llvm-2.8.tgz) = Ja3bdC8cbMEod+0O6STdqWLYSDaO4JW+jkg0KuYT1Ds=
+SIZE (clang-2.8.tgz) = 5666777
+SIZE (llvm-2.8.tgz) = 9112527
Index: patches/patch-Makefile_config_in
===================================================================
RCS file: /cvs/ports/devel/llvm/patches/patch-Makefile_config_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Makefile_config_in
--- patches/patch-Makefile_config_in 29 Apr 2010 16:37:09 -0000 1.3
+++ patches/patch-Makefile_config_in 6 Jan 2011 19:32:48 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_config_in,v 1.3 2010/04/29 16:37:09 jsg Exp $
---- Makefile.config.in.orig Thu Mar 4 21:56:19 2010
-+++ Makefile.config.in Tue Apr 27 21:04:40 2010
-@@ -79,11 +79,11 @@ LLVMMAKE := $(LLVM_SRC_ROOT)/make
+--- Makefile.config.in.orig Tue Aug 3 15:53:22 2010
++++ Makefile.config.in Thu Jan 6 11:26:07 2011
+@@ -83,11 +83,11 @@ LLVMMAKE := $(LLVM_SRC_ROOT)/make
PROJ_bindir := $(PROJ_prefix)/bin
PROJ_libdir := $(PROJ_prefix)/lib
PROJ_datadir := $(PROJ_prefix)/share
Index: patches/patch-Makefile_rules
===================================================================
RCS file: patches/patch-Makefile_rules
diff -N patches/patch-Makefile_rules
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile_rules 6 Jan 2011 23:38:15 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+--- Makefile.rules.orig Thu Jan 6 15:35:39 2011
++++ Makefile.rules Thu Jan 6 15:37:39 2011
+@@ -959,9 +959,10 @@ ifeq ($(HAVE_LINK_VERSION_SCRIPT),1)
+ NativeExportsFile := $(ObjDir)/$(notdir $(EXPORTED_SYMBOL_FILE)).map
+ $(NativeExportsFile): $(EXPORTED_SYMBOL_FILE) $(ObjDir)/.dir
+ $(Verb) echo "{" > $@
+- $(Verb) grep -q "\<" $< && echo " global:" >> $@ || :
++ $(Verb) echo " global:" >> $@
+ $(Verb) sed -e 's/$$/;/' -e 's/^/ /' < $< >> $@
+- $(Verb) echo " local: *;" >> $@
++ $(Verb) echo " local:" >> $@
++ $(Verb) echo " *;" >> $@
+ $(Verb) echo "};" >> $@
+ clean-local::
+ -$(Verb) $(RM) -f $(NativeExportsFile)
Index: patches/patch-lib_System_Unix_Path_inc
===================================================================
RCS file: patches/patch-lib_System_Unix_Path_inc
diff -N patches/patch-lib_System_Unix_Path_inc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-lib_System_Unix_Path_inc 7 Jan 2011 19:27:42 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- lib/System/Unix/Path.inc.orig Thu Sep 2 11:24:46 2010
++++ lib/System/Unix/Path.inc Fri Jan 7 11:27:10 2011
+@@ -282,7 +282,7 @@ Path::GetCurrentDirectory() {
+ return Path(pathname);
+ }
+
+-#if defined(__FreeBSD__) || defined (__NetBSD__) || defined(__minix)
++#if defined(__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) ||
defined(__minix)
+ static int
+ test_dir(char buf[PATH_MAX], char ret[PATH_MAX],
+ const char *dir, const char *bin)
+@@ -350,7 +350,7 @@ Path Path::GetMainExecutable(const char *argv0, void *
+ if (realpath(exe_path, link_path))
+ return Path(std::string(link_path));
+ }
+-#elif defined(__FreeBSD__) || defined (__NetBSD__) || defined(__minix)
++#elif defined(__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__)
|| defined(__minix)
+ char exe_path[PATH_MAX];
+
+ if (getprogpath(exe_path, argv0) != NULL)
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.5
diff -u -p -r1.5 patch-tools_clang_lib_Driver_Tools_cpp
--- patches/patch-tools_clang_lib_Driver_Tools_cpp 12 Jun 2010 12:15:08
-0000 1.5
+++ patches/patch-tools_clang_lib_Driver_Tools_cpp 6 Jan 2011 19:32:47
-0000
@@ -1,24 +1,12 @@
$OpenBSD: patch-tools_clang_lib_Driver_Tools_cpp,v 1.5 2010/06/12 12:15:08
sthen Exp $
---- tools/clang/lib/Driver/Tools.cpp.orig Sun Mar 7 04:46:18 2010
-+++ tools/clang/lib/Driver/Tools.cpp Thu Jun 10 16:12:25 2010
-@@ -576,6 +576,11 @@ void Clang::AddX86TargetArgs(const ArgList &Args,
- CPUName = "core2";
- else if (getToolChain().getArchName() == "i386")
- CPUName = "yonah";
-+ } else if (getToolChain().getOS().startswith("openbsd")) {
-+ if (getToolChain().getArchName() == "x86_64")
-+ CPUName = "x86-64";
-+ else if (getToolChain().getArchName() == "i386")
-+ CPUName = "i486";
- } else {
- if (getToolChain().getArchName() == "x86_64")
- CPUName = "x86-64";
-@@ -2551,7 +2556,7 @@ void openbsd::Link::ConstructJob(Compilation &C, const
- if (Triple.substr(0, 6) == "x86_64")
- Triple.replace(0, 6, "amd64");
- CmdArgs.push_back(Args.MakeArgString("-L/usr/lib/gcc-lib/" + Triple +
-- "/3.3.5"));
-+ "/4.2.1"));
+--- tools/clang/lib/Driver/Tools.cpp.orig Thu Sep 2 16:59:25 2010
++++ tools/clang/lib/Driver/Tools.cpp Thu Jan 6 11:29:39 2011
+@@ -2631,7 +2631,7 @@ void auroraux::Link::ConstructJob(Compilation &C, cons
+
+ CmdArgs.push_back(Args.MakeArgString("-L/opt/gcc4/lib/gcc/"
+ + getToolChain().getTripleString()
+- + "/4.2.4"));
++ + "/4.2.1"));
Args.AddAllArgs(CmdArgs, options::OPT_L);
Args.AddAllArgs(CmdArgs, options::OPT_T_Group);
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 12 Jun 2010
12:15:08 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,19 +0,0 @@
-$OpenBSD: patch-tools_clang_lib_Frontend_InitHeaderSearch_cpp,v 1.2 2010/06/12
12:15:08 sthen Exp $
---- tools/clang/lib/Frontend/InitHeaderSearch.cpp.orig Sat Mar 6 20:38:10 2010
-+++ tools/clang/lib/Frontend/InitHeaderSearch.cpp Wed Apr 28 21:11:32 2010
-@@ -581,6 +581,15 @@ void InitHeaderSearch::AddDefaultCPlusPlusIncludePaths
- case llvm::Triple::FreeBSD:
- AddGnuCPlusPlusIncludePaths("/usr/include/c++/4.2", "", "", "", triple);
- break;
-+ case llvm::Triple::OpenBSD:
-+ {
-+ std::string t = triple.getTriple();
-+ if (t.substr(0, 6) == "x86_64")
-+ t.replace(0, 6, "amd64");
-+ AddGnuCPlusPlusIncludePaths("/usr/include/g++",
-+ t, "", "", triple);
-+ }
-+ break;
- case llvm::Triple::Solaris:
- // Solaris - Fall though..
- case llvm::Triple::AuroraUX:
Index: patches/patch-tools_clang_lib_Lex_Lexer_cpp
===================================================================
RCS file: /cvs/ports/devel/llvm/patches/patch-tools_clang_lib_Lex_Lexer_cpp,v
retrieving revision 1.5
diff -u -p -r1.5 patch-tools_clang_lib_Lex_Lexer_cpp
--- patches/patch-tools_clang_lib_Lex_Lexer_cpp 29 Apr 2010 16:37:09 -0000
1.5
+++ patches/patch-tools_clang_lib_Lex_Lexer_cpp 6 Jan 2011 19:32:47 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-tools_clang_lib_Lex_Lexer_cpp,v 1.5 2010/04/29 16:37:09 jsg
Exp $
---- tools/clang/lib/Lex/Lexer.cpp.orig Wed Feb 3 22:06:21 2010
-+++ tools/clang/lib/Lex/Lexer.cpp Tue Apr 27 20:57:36 2010
-@@ -1104,6 +1104,7 @@ static bool isEndOfBlockCommentWithEscapedNewLine(cons
+--- tools/clang/lib/Lex/Lexer.cpp.orig Tue Aug 31 09:42:00 2010
++++ tools/clang/lib/Lex/Lexer.cpp Thu Jan 6 11:26:07 2011
+@@ -1334,6 +1334,7 @@ static bool isEndOfBlockCommentWithEscapedNewLine(cons
return true;
}
Index: patches/patch-tools_clang_lib_Parse_AttributeList_cpp
===================================================================
RCS file: patches/patch-tools_clang_lib_Parse_AttributeList_cpp
diff -N patches/patch-tools_clang_lib_Parse_AttributeList_cpp
--- patches/patch-tools_clang_lib_Parse_AttributeList_cpp 29 Apr 2010
16:37:09 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-$OpenBSD: patch-tools_clang_lib_Parse_AttributeList_cpp,v 1.2 2010/04/29
16:37:09 jsg Exp $
---- tools/clang/lib/Parse/AttributeList.cpp.orig Tue Feb 23 23:00:30 2010
-+++ tools/clang/lib/Parse/AttributeList.cpp Tue Apr 27 21:03:13 2010
-@@ -119,5 +119,6 @@ AttributeList::Kind AttributeList::getKind(const Ident
- .Case("cf_returns_retained", AT_cf_returns_retained)
- .Case("reqd_work_group_size", AT_reqd_wg_size)
- .Case("no_instrument_function", AT_no_instrument_function)
-+ .Case("bounded", IgnoredAttribute) // XXX
- .Default(UnknownAttribute);
- }
Index: patches/patch-tools_clang_lib_Sema_AttributeList_cpp
===================================================================
RCS file: patches/patch-tools_clang_lib_Sema_AttributeList_cpp
diff -N patches/patch-tools_clang_lib_Sema_AttributeList_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-tools_clang_lib_Sema_AttributeList_cpp 6 Jan 2011
19:32:47 -0000
@@ -0,0 +1,10 @@
+$OpenBSD$
+--- tools/clang/lib/Sema/AttributeList.cpp.orig Thu Jan 6 11:31:26 2011
++++ tools/clang/lib/Sema/AttributeList.cpp Thu Jan 6 11:32:32 2011
+@@ -132,5 +132,6 @@ AttributeList::Kind AttributeList::getKind(const Ident
+ .Case("__fastcall", AT_fastcall)
+ .Case("__thiscall", AT_thiscall)
+ .Case("__pascal", AT_pascal)
++ .Case("bounded", IgnoredAttribute) // XXX
+ .Default(UnknownAttribute);
+ }
Index: patches/patch-tools_clang_lib_Sema_SemaDeclAttr_cpp
===================================================================
RCS file:
/cvs/ports/devel/llvm/patches/patch-tools_clang_lib_Sema_SemaDeclAttr_cpp,v
retrieving revision 1.3
diff -u -p -r1.3 patch-tools_clang_lib_Sema_SemaDeclAttr_cpp
--- patches/patch-tools_clang_lib_Sema_SemaDeclAttr_cpp 29 Apr 2010 16:37:09
-0000 1.3
+++ patches/patch-tools_clang_lib_Sema_SemaDeclAttr_cpp 6 Jan 2011 19:32:47
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-tools_clang_lib_Sema_SemaDeclAttr_cpp,v 1.3 2010/04/29
16:37:09 jsg Exp $
---- tools/clang/lib/Sema/SemaDeclAttr.cpp.orig Thu Feb 25 04:26:51 2010
-+++ tools/clang/lib/Sema/SemaDeclAttr.cpp Wed Apr 28 21:11:32 2010
-@@ -1133,7 +1133,7 @@ static FormatAttrKind getFormatAttrKind(llvm::StringRe
+--- tools/clang/lib/Sema/SemaDeclAttr.cpp.orig Thu Sep 2 18:29:35 2010
++++ tools/clang/lib/Sema/SemaDeclAttr.cpp Thu Jan 6 11:26:15 2011
+@@ -1387,7 +1387,7 @@ static FormatAttrKind getFormatAttrKind(llvm::StringRe
if (Format == "scanf" || Format == "printf" || Format == "printf0" ||
Format == "strfmon" || Format == "cmn_err" || Format == "strftime" ||
Format == "NSString" || Format == "CFString" || Format == "vcmn_err" ||
@@ -9,4 +9,4 @@ $OpenBSD: patch-tools_clang_lib_Sema_Sem
+ Format == "zcmn_err" || Format == "kprintf")
return SupportedFormat;
- return InvalidFormat;
+ if (Format == "gcc_diag" || Format == "gcc_cdiag" ||
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.1
diff -u -p -r1.1 patch-tools_clang_tools_scan-build_scan-build
--- patches/patch-tools_clang_tools_scan-build_scan-build 29 Apr 2010
16:37:09 -0000 1.1
+++ patches/patch-tools_clang_tools_scan-build_scan-build 7 Jan 2011
20:29:20 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-tools_clang_tools_scan-build_scan-build,v 1.1 2010/04/29
16:37:09 jsg Exp $
---- tools/clang/tools/scan-build/scan-build.orig Thu Feb 25 20:01:53 2010
-+++ tools/clang/tools/scan-build/scan-build Wed Apr 28 19:55:39 2010
+--- tools/clang/tools/scan-build/scan-build.orig Fri Mar 26 17:20:01 2010
++++ tools/clang/tools/scan-build/scan-build Thu Jan 6 13:36:35 2011
@@ -382,7 +382,7 @@ sub CopyFiles {
my $Dir = shift;
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/llvm/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST
--- pkg/PLIST 28 Sep 2010 07:38:24 -0000 1.12
+++ pkg/PLIST 8 Jan 2011 00:21:18 -0000
@@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST,v 1.12 2010/09/28 07:38:24 sthen Exp $
@bin bin/bugpoint
bin/c++-analyzer
+...@bin bin/c-index-test
bin/ccc-analyzer
@bin bin/clang
bin/clang++
@@ -10,10 +11,12 @@ bin/clang++
@bin bin/llvm-as
@bin bin/llvm-bcanalyzer
bin/llvm-config
+...@bin bin/llvm-diff
@bin bin/llvm-dis
@bin bin/llvm-extract
@bin bin/llvm-ld
@bin bin/llvm-link
+...@bin bin/llvm-mc
@bin bin/llvm-nm
@bin bin/llvm-prof
@bin bin/llvm-ranlib
@@ -32,35 +35,43 @@ include/clang/AST/ASTConsumer.h
include/clang/AST/ASTContext.h
include/clang/AST/ASTDiagnostic.h
include/clang/AST/ASTImporter.h
+include/clang/AST/ASTVector.h
include/clang/AST/Attr.h
+include/clang/AST/AttrImpl.inc
+include/clang/AST/Attrs.inc
include/clang/AST/CXXInheritance.h
include/clang/AST/CanonicalType.h
include/clang/AST/CharUnits.h
include/clang/AST/Decl.h
+include/clang/AST/DeclAccessPair.h
include/clang/AST/DeclBase.h
include/clang/AST/DeclCXX.h
include/clang/AST/DeclContextInternals.h
+include/clang/AST/DeclFriend.h
include/clang/AST/DeclGroup.h
-include/clang/AST/DeclNodes.def
+include/clang/AST/DeclNodes.inc
include/clang/AST/DeclObjC.h
include/clang/AST/DeclTemplate.h
include/clang/AST/DeclVisitor.h
include/clang/AST/DeclarationName.h
+include/clang/AST/DependentDiagnostic.h
include/clang/AST/Expr.h
include/clang/AST/ExprCXX.h
include/clang/AST/ExprObjC.h
include/clang/AST/ExternalASTSource.h
include/clang/AST/FullExpr.h
include/clang/AST/NestedNameSpecifier.h
+include/clang/AST/OperationKinds.h
include/clang/AST/ParentMap.h
include/clang/AST/PrettyPrinter.h
include/clang/AST/RecordLayout.h
+include/clang/AST/RecursiveASTVisitor.h
include/clang/AST/Redeclarable.h
include/clang/AST/Stmt.h
include/clang/AST/StmtCXX.h
include/clang/AST/StmtGraphTraits.h
include/clang/AST/StmtIterator.h
-include/clang/AST/StmtNodes.def
+include/clang/AST/StmtNodes.inc
include/clang/AST/StmtObjC.h
include/clang/AST/StmtVisitor.h
include/clang/AST/TemplateBase.h
@@ -74,15 +85,18 @@ include/clang/AST/TypeNodes.def
include/clang/AST/TypeOrdering.h
include/clang/AST/TypeVisitor.h
include/clang/AST/UnresolvedSet.h
+include/clang/AST/UsuallyTinyPtrVector.h
include/clang/Analysis/
include/clang/Analysis/Analyses/
+include/clang/Analysis/Analyses/FormatString.h
include/clang/Analysis/Analyses/LiveVariables.h
-include/clang/Analysis/Analyses/PrintfFormatString.h
+include/clang/Analysis/Analyses/PseudoConstantAnalysis.h
include/clang/Analysis/Analyses/ReachableCode.h
include/clang/Analysis/Analyses/UninitializedValues.h
include/clang/Analysis/AnalysisContext.h
include/clang/Analysis/AnalysisDiagnostic.h
include/clang/Analysis/CFG.h
+include/clang/Analysis/CFGStmtMap.h
include/clang/Analysis/FlowSensitive/
include/clang/Analysis/FlowSensitive/DataflowSolver.h
include/clang/Analysis/FlowSensitive/DataflowValues.h
@@ -90,13 +104,14 @@ include/clang/Analysis/ProgramPoint.h
include/clang/Analysis/Support/
include/clang/Analysis/Support/BlkExprDeclBitVector.h
include/clang/Analysis/Support/BumpVector.h
-include/clang/Analysis/Support/Optional.h
include/clang/Analysis/Support/SaveAndRestore.h
include/clang/Analysis/Visitors/
include/clang/Analysis/Visitors/CFGRecStmtDeclVisitor.h
include/clang/Analysis/Visitors/CFGRecStmtVisitor.h
include/clang/Analysis/Visitors/CFGStmtVisitor.h
include/clang/Basic/
+include/clang/Basic/AttrKinds.h
+include/clang/Basic/AttrList.inc
include/clang/Basic/Builtins.def
include/clang/Basic/Builtins.h
include/clang/Basic/BuiltinsARM.def
@@ -135,7 +150,10 @@ include/clang/Basic/TokenKinds.def
include/clang/Basic/TokenKinds.h
include/clang/Basic/TypeTraits.h
include/clang/Basic/Version.h
+include/clang/Basic/Version.inc
+include/clang/Basic/arm_neon.inc
include/clang/Checker/
+include/clang/Checker/AnalysisConsumer.h
include/clang/Checker/BugReporter/
include/clang/Checker/BugReporter/BugReporter.h
include/clang/Checker/BugReporter/BugType.h
@@ -145,11 +163,14 @@ include/clang/Checker/Checkers/Dereferen
include/clang/Checker/Checkers/LocalCheckers.h
include/clang/Checker/DomainSpecific/
include/clang/Checker/DomainSpecific/CocoaConventions.h
+include/clang/Checker/FrontendActions.h
include/clang/Checker/ManagerRegistry.h
+include/clang/Checker/PathDiagnosticClients.h
include/clang/Checker/PathSensitive/
include/clang/Checker/PathSensitive/AnalysisManager.h
include/clang/Checker/PathSensitive/BasicValueFactory.h
include/clang/Checker/PathSensitive/Checker.h
+include/clang/Checker/PathSensitive/CheckerHelpers.h
include/clang/Checker/PathSensitive/CheckerVisitor.def
include/clang/Checker/PathSensitive/CheckerVisitor.h
include/clang/Checker/PathSensitive/ConstraintManager.h
@@ -174,12 +195,15 @@ include/clang/Checker/PathSensitive/Summ
include/clang/Checker/PathSensitive/SymbolManager.h
include/clang/Checker/PathSensitive/ValueManager.h
include/clang/CodeGen/
-include/clang/CodeGen/CodeGenOptions.h
+include/clang/CodeGen/BackendUtil.h
+include/clang/CodeGen/CodeGenAction.h
include/clang/CodeGen/ModuleBuilder.h
include/clang/Driver/
include/clang/Driver/Action.h
include/clang/Driver/Arg.h
include/clang/Driver/ArgList.h
+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
@@ -202,9 +226,9 @@ include/clang/Frontend/
include/clang/Frontend/ASTConsumers.h
include/clang/Frontend/ASTUnit.h
include/clang/Frontend/Analyses.def
-include/clang/Frontend/AnalysisConsumer.h
+include/clang/Frontend/AnalyzerOptions.h
include/clang/Frontend/ChainedDiagnosticClient.h
-include/clang/Frontend/CodeGenAction.h
+include/clang/Frontend/CodeGenOptions.h
include/clang/Frontend/CommandLineSourceLoc.h
include/clang/Frontend/CompilerInstance.h
include/clang/Frontend/CompilerInvocation.h
@@ -214,7 +238,6 @@ include/clang/Frontend/DependencyOutputO
include/clang/Frontend/DiagnosticOptions.h
include/clang/Frontend/DocumentXML.def
include/clang/Frontend/DocumentXML.h
-include/clang/Frontend/FixItRewriter.h
include/clang/Frontend/FrontendAction.h
include/clang/Frontend/FrontendActions.h
include/clang/Frontend/FrontendDiagnostic.h
@@ -223,10 +246,6 @@ include/clang/Frontend/FrontendPluginReg
include/clang/Frontend/HeaderSearchOptions.h
include/clang/Frontend/LangStandard.h
include/clang/Frontend/LangStandards.def
-include/clang/Frontend/PCHBitCodes.h
-include/clang/Frontend/PCHReader.h
-include/clang/Frontend/PCHWriter.h
-include/clang/Frontend/PathDiagnosticClients.h
include/clang/Frontend/PreprocessorOptions.h
include/clang/Frontend/PreprocessorOutputOptions.h
include/clang/Frontend/StmtXML.def
@@ -235,6 +254,8 @@ include/clang/Frontend/TextDiagnosticPri
include/clang/Frontend/TypeXML.def
include/clang/Frontend/Utils.h
include/clang/Frontend/VerifyDiagnosticsClient.h
+include/clang/FrontendTool/
+include/clang/FrontendTool/Utils.h
include/clang/Index/
include/clang/Index/ASTLocation.h
include/clang/Index/Analyzer.h
@@ -249,8 +270,8 @@ include/clang/Index/Program.h
include/clang/Index/STLExtras.h
include/clang/Index/SelectorMap.h
include/clang/Index/TranslationUnit.h
-include/clang/Index/Utils.h
include/clang/Lex/
+include/clang/Lex/CodeCompletionHandler.h
include/clang/Lex/DirectoryLookup.h
include/clang/Lex/ExternalPreprocessorSource.h
include/clang/Lex/HeaderMap.h
@@ -264,6 +285,7 @@ include/clang/Lex/PPCallbacks.h
include/clang/Lex/PTHLexer.h
include/clang/Lex/PTHManager.h
include/clang/Lex/Pragma.h
+include/clang/Lex/PreprocessingRecord.h
include/clang/Lex/Preprocessor.h
include/clang/Lex/PreprocessorLexer.h
include/clang/Lex/ScratchBuffer.h
@@ -271,27 +293,51 @@ include/clang/Lex/Token.h
include/clang/Lex/TokenConcatenation.h
include/clang/Lex/TokenLexer.h
include/clang/Parse/
-include/clang/Parse/Action.h
-include/clang/Parse/AttributeList.h
-include/clang/Parse/DeclSpec.h
-include/clang/Parse/Designator.h
-include/clang/Parse/Ownership.h
+include/clang/Parse/ParseAST.h
include/clang/Parse/ParseDiagnostic.h
include/clang/Parse/Parser.h
-include/clang/Parse/Scope.h
-include/clang/Parse/Template.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/Sema/
+include/clang/Sema/AnalysisBasedWarnings.h
+include/clang/Sema/AttributeList.h
+include/clang/Sema/CXXFieldCollector.h
include/clang/Sema/CodeCompleteConsumer.h
+include/clang/Sema/DeclSpec.h
+include/clang/Sema/DelayedDiagnostic.h
+include/clang/Sema/Designator.h
include/clang/Sema/ExternalSemaSource.h
-include/clang/Sema/ParseAST.h
+include/clang/Sema/IdentifierResolver.h
+include/clang/Sema/Initialization.h
+include/clang/Sema/Lookup.h
+include/clang/Sema/ObjCMethodList.h
+include/clang/Sema/Overload.h
+include/clang/Sema/Ownership.h
+include/clang/Sema/ParsedTemplate.h
+include/clang/Sema/PrettyDeclStackTrace.h
+include/clang/Sema/Scope.h
+include/clang/Sema/ScopeInfo.h
+include/clang/Sema/Sema.h
include/clang/Sema/SemaConsumer.h
include/clang/Sema/SemaDiagnostic.h
+include/clang/Sema/SemaInternal.h
+include/clang/Sema/Template.h
+include/clang/Sema/TemplateDeduction.h
+include/clang/Serialization/
+include/clang/Serialization/ASTBitCodes.h
+include/clang/Serialization/ASTDeserializationListener.h
+include/clang/Serialization/ASTReader.h
+include/clang/Serialization/ASTWriter.h
+include/clang/Serialization/AttrPCHRead.inc
+include/clang/Serialization/AttrPCHWrite.inc
include/llvm/
include/llvm-c/
include/llvm-c/Analysis.h
@@ -311,6 +357,7 @@ include/llvm/ADT/APFloat.h
include/llvm/ADT/APInt.h
include/llvm/ADT/APSInt.h
include/llvm/ADT/BitVector.h
+include/llvm/ADT/DAGDeltaAlgorithm.h
include/llvm/ADT/DeltaAlgorithm.h
include/llvm/ADT/DenseMap.h
include/llvm/ADT/DenseMapInfo.h
@@ -325,6 +372,8 @@ include/llvm/ADT/ImmutableMap.h
include/llvm/ADT/ImmutableSet.h
include/llvm/ADT/IndexedMap.h
include/llvm/ADT/IntrusiveRefCntPtr.h
+include/llvm/ADT/NullablePtr.h
+include/llvm/ADT/Optional.h
include/llvm/ADT/OwningPtr.h
include/llvm/ADT/PointerIntPair.h
include/llvm/ADT/PointerUnion.h
@@ -362,6 +411,7 @@ include/llvm/Analysis/AliasSetTracker.h
include/llvm/Analysis/CFGPrinter.h
include/llvm/Analysis/CallGraph.h
include/llvm/Analysis/CaptureTracking.h
+include/llvm/Analysis/CodeMetrics.h
include/llvm/Analysis/ConstantFolding.h
include/llvm/Analysis/ConstantsScanner.h
include/llvm/Analysis/DOTGraphTraitsPass.h
@@ -379,7 +429,9 @@ include/llvm/Analysis/IntervalPartition.
include/llvm/Analysis/LazyValueInfo.h
include/llvm/Analysis/LibCallAliasAnalysis.h
include/llvm/Analysis/LibCallSemantics.h
+include/llvm/Analysis/Lint.h
include/llvm/Analysis/LiveValues.h
+include/llvm/Analysis/Loads.h
include/llvm/Analysis/LoopDependenceAnalysis.h
include/llvm/Analysis/LoopInfo.h
include/llvm/Analysis/LoopPass.h
@@ -392,16 +444,20 @@ include/llvm/Analysis/PostDominators.h
include/llvm/Analysis/ProfileInfo.h
include/llvm/Analysis/ProfileInfoLoader.h
include/llvm/Analysis/ProfileInfoTypes.h
+include/llvm/Analysis/RegionInfo.h
+include/llvm/Analysis/RegionIterator.h
+include/llvm/Analysis/RegionPrinter.h
include/llvm/Analysis/ScalarEvolution.h
include/llvm/Analysis/ScalarEvolutionExpander.h
include/llvm/Analysis/ScalarEvolutionExpressions.h
+include/llvm/Analysis/ScalarEvolutionNormalization.h
include/llvm/Analysis/SparsePropagation.h
include/llvm/Analysis/Trace.h
include/llvm/Analysis/ValueTracking.h
include/llvm/Analysis/Verifier.h
include/llvm/Argument.h
include/llvm/Assembly/
-include/llvm/Assembly/AsmAnnotationWriter.h
+include/llvm/Assembly/AssemblyAnnotationWriter.h
include/llvm/Assembly/Parser.h
include/llvm/Assembly/PrintModulePass.h
include/llvm/Assembly/Writer.h
@@ -419,17 +475,18 @@ include/llvm/CMakeLists.txt
include/llvm/CallGraphSCCPass.h
include/llvm/CallingConv.h
include/llvm/CodeGen/
+include/llvm/CodeGen/Analysis.h
include/llvm/CodeGen/AsmPrinter.h
include/llvm/CodeGen/BinaryObject.h
include/llvm/CodeGen/CalcSpillWeights.h
include/llvm/CodeGen/CallingConvLower.h
-include/llvm/CodeGen/DwarfWriter.h
-include/llvm/CodeGen/ELFRelocation.h
include/llvm/CodeGen/FastISel.h
+include/llvm/CodeGen/FunctionLoweringInfo.h
include/llvm/CodeGen/GCMetadata.h
include/llvm/CodeGen/GCMetadataPrinter.h
include/llvm/CodeGen/GCStrategy.h
include/llvm/CodeGen/GCs.h
+include/llvm/CodeGen/ISDOpcodes.h
include/llvm/CodeGen/IntrinsicLowering.h
include/llvm/CodeGen/JITCodeEmitter.h
include/llvm/CodeGen/LatencyPriorityQueue.h
@@ -464,6 +521,7 @@ include/llvm/CodeGen/MachineRelocation.h
include/llvm/CodeGen/MachineSSAUpdater.h
include/llvm/CodeGen/ObjectCodeEmitter.h
include/llvm/CodeGen/Passes.h
+include/llvm/CodeGen/PostRAHazardRecognizer.h
include/llvm/CodeGen/ProcessImplicitDefs.h
include/llvm/CodeGen/PseudoSourceValue.h
include/llvm/CodeGen/RegAllocRegistry.h
@@ -482,14 +540,13 @@ include/llvm/CodeGen/ValueTypes.h
include/llvm/CodeGen/ValueTypes.td
include/llvm/CompilerDriver/
include/llvm/CompilerDriver/Action.h
+include/llvm/CompilerDriver/AutoGenerated.h
include/llvm/CompilerDriver/BuiltinOptions.h
include/llvm/CompilerDriver/Common.td
include/llvm/CompilerDriver/CompilationGraph.h
include/llvm/CompilerDriver/Error.h
-include/llvm/CompilerDriver/ForceLinkage.h
-include/llvm/CompilerDriver/ForceLinkageMacros.h
+include/llvm/CompilerDriver/Main.h
include/llvm/CompilerDriver/Main.inc
-include/llvm/CompilerDriver/Plugin.h
include/llvm/CompilerDriver/Tool.h
include/llvm/Config/
include/llvm/Config/AsmParsers.def
@@ -498,6 +555,8 @@ include/llvm/Config/Disassemblers.def
include/llvm/Config/Targets.def
include/llvm/Config/config.h
include/llvm/Config/config.h.cmake
+include/llvm/Config/llvm-config.h
+include/llvm/Config/llvm-config.h.cmake
include/llvm/Constant.h
include/llvm/Constants.h
include/llvm/DerivedTypes.h
@@ -533,31 +592,42 @@ include/llvm/LinkAllPasses.h
include/llvm/LinkAllVMCore.h
include/llvm/Linker.h
include/llvm/MC/
+include/llvm/MC/EDInstInfo.h
+include/llvm/MC/ELFObjectWriter.h
include/llvm/MC/MCAsmInfo.h
include/llvm/MC/MCAsmInfoCOFF.h
include/llvm/MC/MCAsmInfoDarwin.h
+include/llvm/MC/MCAsmLayout.h
include/llvm/MC/MCAssembler.h
include/llvm/MC/MCCodeEmitter.h
include/llvm/MC/MCContext.h
include/llvm/MC/MCDirectives.h
include/llvm/MC/MCDisassembler.h
+include/llvm/MC/MCDwarf.h
+include/llvm/MC/MCELFSymbolFlags.h
include/llvm/MC/MCExpr.h
include/llvm/MC/MCFixup.h
include/llvm/MC/MCInst.h
include/llvm/MC/MCInstPrinter.h
+include/llvm/MC/MCLabel.h
+include/llvm/MC/MCMachOSymbolFlags.h
+include/llvm/MC/MCObjectStreamer.h
+include/llvm/MC/MCObjectWriter.h
include/llvm/MC/MCParser/
include/llvm/MC/MCParser/AsmCond.h
include/llvm/MC/MCParser/AsmLexer.h
-include/llvm/MC/MCParser/AsmParser.h
include/llvm/MC/MCParser/MCAsmLexer.h
include/llvm/MC/MCParser/MCAsmParser.h
+include/llvm/MC/MCParser/MCAsmParserExtension.h
include/llvm/MC/MCParser/MCParsedAsmOperand.h
include/llvm/MC/MCSection.h
+include/llvm/MC/MCSectionCOFF.h
include/llvm/MC/MCSectionELF.h
include/llvm/MC/MCSectionMachO.h
include/llvm/MC/MCStreamer.h
include/llvm/MC/MCSymbol.h
include/llvm/MC/MCValue.h
+include/llvm/MC/MachObjectWriter.h
include/llvm/MC/SectionKind.h
include/llvm/Metadata.h
include/llvm/Module.h
@@ -567,17 +637,20 @@ include/llvm/Pass.h
include/llvm/PassAnalysisSupport.h
include/llvm/PassManager.h
include/llvm/PassManagers.h
+include/llvm/PassRegistry.h
include/llvm/PassSupport.h
include/llvm/Support/
include/llvm/Support/AlignOf.h
include/llvm/Support/Allocator.h
include/llvm/Support/CFG.h
+include/llvm/Support/COFF.h
include/llvm/Support/CallSite.h
include/llvm/Support/Casting.h
include/llvm/Support/CommandLine.h
include/llvm/Support/Compiler.h
include/llvm/Support/ConstantFolder.h
include/llvm/Support/ConstantRange.h
+include/llvm/Support/CrashRecoveryContext.h
include/llvm/Support/DOTGraphTraits.h
include/llvm/Support/DataFlow.h
include/llvm/Support/Debug.h
@@ -616,7 +689,6 @@ include/llvm/Support/Regex.h
include/llvm/Support/Registry.h
include/llvm/Support/RegistryParser.h
include/llvm/Support/SMLoc.h
-include/llvm/Support/SlowOperationInformer.h
include/llvm/Support/SourceMgr.h
include/llvm/Support/StableBasicBlockNumbering.h
include/llvm/Support/StandardPasses.h
@@ -654,6 +726,7 @@ include/llvm/System/Solaris.h
include/llvm/System/ThreadLocal.h
include/llvm/System/Threading.h
include/llvm/System/TimeValue.h
+include/llvm/System/Valgrind.h
include/llvm/Target/
include/llvm/Target/Mangler.h
include/llvm/Target/SubtargetFeature.h
@@ -661,6 +734,7 @@ include/llvm/Target/Target.td
include/llvm/Target/TargetAsmBackend.h
include/llvm/Target/TargetAsmLexer.h
include/llvm/Target/TargetAsmParser.h
+include/llvm/Target/TargetCallingConv.h
include/llvm/Target/TargetCallingConv.td
include/llvm/Target/TargetData.h
include/llvm/Target/TargetELFWriterInfo.h
@@ -680,6 +754,7 @@ include/llvm/Target/TargetRegistry.h
include/llvm/Target/TargetSchedule.td
include/llvm/Target/TargetSelect.h
include/llvm/Target/TargetSelectionDAG.td
+include/llvm/Target/TargetSelectionDAGInfo.h
include/llvm/Target/TargetSubtarget.h
include/llvm/Transforms/
include/llvm/Transforms/IPO/
@@ -698,7 +773,7 @@ include/llvm/Transforms/Utils/FunctionUt
include/llvm/Transforms/Utils/Local.h
include/llvm/Transforms/Utils/PromoteMemToReg.h
include/llvm/Transforms/Utils/SSAUpdater.h
-include/llvm/Transforms/Utils/SSI.h
+include/llvm/Transforms/Utils/SSAUpdaterImpl.h
include/llvm/Transforms/Utils/UnifyFunctionExitNodes.h
include/llvm/Transforms/Utils/UnrollLoop.h
include/llvm/Transforms/Utils/ValueMapper.h
@@ -709,31 +784,39 @@ include/llvm/User.h
include/llvm/Value.h
include/llvm/ValueSymbolTable.h
lib/clang/
-lib/clang/1.1/
-lib/clang/1.1/include/
-lib/clang/1.1/include/emmintrin.h
-lib/clang/1.1/include/float.h
-lib/clang/1.1/include/iso646.h
-lib/clang/1.1/include/limits.h
-lib/clang/1.1/include/mm_malloc.h
-lib/clang/1.1/include/mmintrin.h
-lib/clang/1.1/include/pmmintrin.h
-lib/clang/1.1/include/smmintrin.h
-lib/clang/1.1/include/stdarg.h
-lib/clang/1.1/include/stdbool.h
-lib/clang/1.1/include/stddef.h
-lib/clang/1.1/include/stdint.h
-lib/clang/1.1/include/tgmath.h
-lib/clang/1.1/include/tmmintrin.h
-lib/clang/1.1/include/xmmintrin.h
-lib/libCIndex.a
-lib/libCIndex.so
+lib/clang/2.8/
+${CLANG_INCLUDE_PATH}/
+${CLANG_INCLUDE_PATH}/altivec.h
+${CLANG_INCLUDE_PATH}/arm_neon.h
+${CLANG_INCLUDE_PATH}/avxintrin.h
+${CLANG_INCLUDE_PATH}/emmintrin.h
+${CLANG_INCLUDE_PATH}/float.h
+${CLANG_INCLUDE_PATH}/immintrin.h
+${CLANG_INCLUDE_PATH}/iso646.h
+${CLANG_INCLUDE_PATH}/limits.h
+${CLANG_INCLUDE_PATH}/mm_malloc.h
+${CLANG_INCLUDE_PATH}/mmintrin.h
+${CLANG_INCLUDE_PATH}/nmmintrin.h
+${CLANG_INCLUDE_PATH}/pmmintrin.h
+${CLANG_INCLUDE_PATH}/smmintrin.h
+${CLANG_INCLUDE_PATH}/stdarg.h
+${CLANG_INCLUDE_PATH}/stdbool.h
+${CLANG_INCLUDE_PATH}/stddef.h
+${CLANG_INCLUDE_PATH}/stdint.h
+${CLANG_INCLUDE_PATH}/tgmath.h
+${CLANG_INCLUDE_PATH}/tmmintrin.h
+${CLANG_INCLUDE_PATH}/varargs.h
+${CLANG_INCLUDE_PATH}/wmmintrin.h
+${CLANG_INCLUDE_PATH}/x86intrin.h
+${CLANG_INCLUDE_PATH}/xmmintrin.h
+lib/libBugpointPasses.so
lib/libCompilerDriver.a
lib/libEnhancedDisassembly.a
lib/libEnhancedDisassembly.so
lib/libLLVMARMAsmParser.a
lib/libLLVMARMAsmPrinter.a
lib/libLLVMARMCodeGen.a
+lib/libLLVMARMDisassembler.a
lib/libLLVMARMInfo.a
lib/libLLVMAlphaAsmPrinter.a
lib/libLLVMAlphaCodeGen.a
@@ -766,9 +849,8 @@ lib/libLLVMMBlazeAsmPrinter.a
lib/libLLVMMBlazeCodeGen.a
lib/libLLVMMBlazeInfo.a
lib/libLLVMMC.a
+lib/libLLVMMCDisassembler.a
lib/libLLVMMCParser.a
-lib/libLLVMMSIL.a
-lib/libLLVMMSILInfo.a
lib/libLLVMMSP430AsmPrinter.a
lib/libLLVMMSP430CodeGen.a
lib/libLLVMMSP430Info.a
@@ -807,6 +889,8 @@ lib/libLLVMpic16passes.a
lib/libLTO.a
lib/libLTO.so
lib/libUnitTestMain.a
+lib/libclang.a
+lib/libclang.so
lib/libclangAST.a
lib/libclangAnalysis.a
lib/libclangBasic.a
@@ -814,14 +898,36 @@ lib/libclangChecker.a
lib/libclangCodeGen.a
lib/libclangDriver.a
lib/libclangFrontend.a
+lib/libclangFrontendTool.a
lib/libclangIndex.a
lib/libclangLex.a
lib/libclangParse.a
lib/libclangRewrite.a
lib/libclangSema.a
-lib/libplugin_llvmc_Base.a
-lib/libplugin_llvmc_Clang.a
+lib/libclangSerialization.a
lib/libprofile_rt.so
+...@man man/cat1/bugpoint.0
+...@man man/cat1/clang.0
+...@man man/cat1/lit.0
+...@man man/cat1/llc.0
+...@man man/cat1/lli.0
+...@man man/cat1/llvm-ar.0
+...@man man/cat1/llvm-as.0
+...@man man/cat1/llvm-bcanalyzer.0
+...@man man/cat1/llvm-config.0
+...@man man/cat1/llvm-diff.0
+...@man man/cat1/llvm-dis.0
+...@man man/cat1/llvm-extract.0
+...@man man/cat1/llvm-ld.0
+...@man man/cat1/llvm-link.0
+...@man man/cat1/llvm-nm.0
+...@man man/cat1/llvm-prof.0
+...@man man/cat1/llvm-ranlib.0
+...@man man/cat1/llvmc.0
+...@man man/cat1/llvmgcc.0
+...@man man/cat1/llvmgxx.0
+...@man man/cat1/opt.0
+...@man man/cat1/tblgen.0
@man man/man1/bugpoint.1
@man man/man1/clang.1
@man man/man1/lit.1
@@ -831,6 +937,7 @@ lib/libprofile_rt.so
@man man/man1/llvm-as.1
@man man/man1/llvm-bcanalyzer.1
@man man/man1/llvm-config.1
+...@man man/man1/llvm-diff.1
@man man/man1/llvm-dis.1
@man man/man1/llvm-extract.1
@man man/man1/llvm-ld.1
@@ -865,6 +972,7 @@ share/doc/llvm/html/CommandGuide/llvm-ar
share/doc/llvm/html/CommandGuide/llvm-as.html
share/doc/llvm/html/CommandGuide/llvm-bcanalyzer.html
share/doc/llvm/html/CommandGuide/llvm-config.html
+share/doc/llvm/html/CommandGuide/llvm-diff.html
share/doc/llvm/html/CommandGuide/llvm-dis.html
share/doc/llvm/html/CommandGuide/llvm-extract.html
share/doc/llvm/html/CommandGuide/llvm-ld.html
@@ -958,6 +1066,7 @@ share/doc/llvm/ps/llvm-ar.ps
share/doc/llvm/ps/llvm-as.ps
share/doc/llvm/ps/llvm-bcanalyzer.ps
share/doc/llvm/ps/llvm-config.ps
+share/doc/llvm/ps/llvm-diff.ps
share/doc/llvm/ps/llvm-dis.ps
share/doc/llvm/ps/llvm-extract.ps
share/doc/llvm/ps/llvm-ld.ps
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/rubinius/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile 7 Jan 2011 19:18:43 -0000 1.6
+++ Makefile 8 Jan 2011 01:02:30 -0000
@@ -7,7 +7,7 @@ COMMENT = Ruby virtual machine and core
V= 1.2.0
DISTNAME = rubinius-${V}-20101221
PKGNAME = rubinius-$V
-REVISION = 1
+REVISION = 2
CATEGORIES = lang lang/ruby
@@ -28,7 +28,8 @@ MASTER_SITES = http://asset.rubini.us/
BUILD_DEPENDS = devel/bison \
devel/ruby-rake \
- devel/libffi
+ devel/libffi \
+ devel/llvm
LIB_DEPENDS = databases/gdbm \
databases/db/v4 \
${MODRUBY_LIB_DEPENDS}
@@ -53,8 +54,7 @@ MAKE_ENV += CC="${CC}"
do-configure:
${SUBST_CMD} ${WRKSRC}/rakelib/vm.rake
cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${MAKE_ENV} ${RUBY}
configure \
- --prefix=${PREFIX}/lib/rubinius --skip-prebuilt --disable-llvm \
- --rake=${RAKE}
+ --prefix=${PREFIX}/lib/rubinius --skip-prebuilt --rake=${RAKE}
do-build:
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${RAKE} build
