Re: WIP: LLVM 3.4

2013-12-17 Thread Brad Smith
On Mon, Dec 16, 2013 at 06:26:30PM -0500, Brad Smith wrote:
 On Sun, Dec 15, 2013 at 12:26:21AM -0500, Brad Smith wrote:
  On Fri, Dec 13, 2013 at 11:34:44PM -0500, Brad Smith wrote:
   On Sat, Dec 07, 2013 at 05:40:32AM -0500, Brad Smith wrote:
On Thu, Dec 05, 2013 at 03:35:56AM -0500, Brad Smith wrote:
 Here is a work in progress update to LLVM 3.4. This has only been 
 lightly
 tested on amd64. I need this build tested on i386, powerpc, sparc64 
 and
 mips64 to start off. If you have such an arch please try building it 
 as
 soon as possible as I'd like to report any issues upstream if there 
 are
 any. Any runtime testing feedback would also be appreciated.

An updated diff merging with the up to date port. No functional change
with the 3.4 update itself.
   
   Added a diff from matthew@ to allow Clang to deal with the driver command
   line paramter -R /some/dir which 3.3 was previously just ignoring but
   warning about the unused command line paramater and 3.4 will now exit with
   an error.
   
  An updated diff adding a patch to fix some unit test code building on 32-bit
  archs, .e.g. i386, powerpc, to allow the regrssion test suite to build as 
  well
  as run on 32-bit archs.
 
 An updated diff after adding the bash dependency for the test framework.
 
And rc3...


Index: Makefile
===
RCS file: /home/cvs/ports/devel/llvm/Makefile,v
retrieving revision 1.70
diff -u -p -r1.70 Makefile
--- Makefile16 Dec 2013 20:34:46 -  1.70
+++ Makefile17 Dec 2013 12:13:54 -
@@ -8,14 +8,13 @@ DPB_PROPERTIES = parallel
 
 COMMENT =  modular, fast C/C++/ObjC compiler, static analyzer and tools
 
-LLVM_V =   3.3
-REVISION = 3
-DISTNAME = llvm-${LLVM_V}.src
-PKGNAME =  llvm-${LLVM_V}
+LLVM_V =   3.4
+DISTNAME = llvm-${LLVM_V}rc3.source
+PKGNAME =  llvm-${LLVM_V}rc3
 CATEGORIES =   devel
-MASTER_SITES = http://llvm.org/releases/${LLVM_V}/
+MASTER_SITES = http://llvm.org/pre-releases/${LLVM_V}/rc3/
 
-DISTFILES =${DISTNAME}${EXTRACT_SUFX} cfe-${LLVM_V}.src${EXTRACT_SUFX}
+DISTFILES =${DISTNAME}${EXTRACT_SUFX} 
cfe-${LLVM_V}rc3.source${EXTRACT_SUFX}
 
 SHARED_LIBS =  clang   0.0 # 3.2
 
@@ -25,9 +24,9 @@ HOMEPAGE =http://www.llvm.org/
 # BSD
 PERMIT_PACKAGE_CDROM = Yes
 
-WANTLIB =  c m pthread stdc++ z
+WANTLIB =  c curses m pthread stdc++ z
 
-WRKDIST =  ${WRKDIR}/llvm-${LLVM_V}.src
+WRKDIST =  ${WRKDIR}/llvm.src
 
 MODULES =  devel/cmake \
lang/python
@@ -40,8 +39,7 @@ SEPARATE_BUILD =  Yes
 CONFIGURE_ARGS =   -DLLVM_ENABLE_FFI:Bool=False \
-DLLVM_REQUIRES_RTTI:Bool=True \
-DCMAKE_BUILD_TYPE:String=Release \
-   -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2:Bool=True \
-   -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD:String=R600
+   -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2:Bool=True
 
 # Workaround relocation overflow
 .if ${MACHINE_ARCH} == powerpc
@@ -54,7 +52,8 @@ CLANG_INCLUDE_PATH =  lib/clang/${LLVM_V}
 SUBST_VARS +=  CLANG_INCLUDE_PATH LLVM_V
 
 post-extract:
-   @mv ${WRKDIR}/cfe-${LLVM_V}.src ${WRKDIST}/tools/clang
+   @rm ${WRKDIST}/tools/clang
+   @mv ${WRKDIR}/cfe.src ${WRKDIST}/tools/clang
 
 pre-configure:
@${SUBST_CMD} ${WRKSRC}/tools/clang/tools/scan-build/scan-build
Index: distinfo
===
RCS file: /home/cvs/ports/devel/llvm/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo21 Jun 2013 22:09:12 -  1.12
+++ distinfo17 Dec 2013 12:12:36 -
@@ -1,4 +1,4 @@
-SHA256 (cfe-3.3.src.tar.gz) = sbVd5Ks6V9PgMxqD4ChGEBkcd9kk40RkmNkRPQjfuZY=
-SHA256 (llvm-3.3.src.tar.gz) = aHZrHnDQWiXi9QLpl6PLOTcYejKWWVz24Jd9XNZydXg=
-SIZE (cfe-3.3.src.tar.gz) = 9425539
-SIZE (llvm-3.3.src.tar.gz) = 13602421
+SHA256 (cfe-3.4rc3.source.tar.gz) = 
YjAKwyVR7jM+8h6HX43R0vcnXK/BOtNbfi34XShPpsA=
+SHA256 (llvm-3.4rc3.source.tar.gz) = 
YGtjLgG9V3GPKkYHy95koRMhnmSbVUOTVUBChb6D+cs=
+SIZE (cfe-3.4rc3.source.tar.gz) = 10440545
+SIZE (llvm-3.4rc3.source.tar.gz) = 15561407
Index: patches/patch-CMakeLists_txt
===
RCS file: /home/cvs/ports/devel/llvm/patches/patch-CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -r1.3 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt21 Jun 2013 22:09:12 -  1.3
+++ patches/patch-CMakeLists_txt14 Dec 2013 04:25:54 -
@@ -2,14 +2,14 @@ $OpenBSD: patch-CMakeLists_txt,v 1.3 201
 
 Don't confuse scripts who want the version with appended 'svn' goo.
 
 CMakeLists.txt.origMon May  6 12:23:07 2013
-+++ CMakeLists.txt Tue Jun 18 23:00:44 2013
-@@ -13,7 +13,7 @@ set(CMAKE_MODULE_PATH
- set(LLVM_VERSION_MAJOR 3)
- set(LLVM_VERSION_MINOR 3)
+--- CMakeLists.txt.orig

Re: WIP: LLVM 3.4

2013-12-17 Thread Brad Smith
On Tue, Dec 17, 2013 at 07:10:43PM -0500, Brad Smith wrote:
 On Mon, Dec 16, 2013 at 06:26:30PM -0500, Brad Smith wrote:
  On Sun, Dec 15, 2013 at 12:26:21AM -0500, Brad Smith wrote:
   On Fri, Dec 13, 2013 at 11:34:44PM -0500, Brad Smith wrote:
On Sat, Dec 07, 2013 at 05:40:32AM -0500, Brad Smith wrote:
 On Thu, Dec 05, 2013 at 03:35:56AM -0500, Brad Smith wrote:
  Here is a work in progress update to LLVM 3.4. This has only been 
  lightly
  tested on amd64. I need this build tested on i386, powerpc, sparc64 
  and
  mips64 to start off. If you have such an arch please try building 
  it as
  soon as possible as I'd like to report any issues upstream if there 
  are
  any. Any runtime testing feedback would also be appreciated.
 
 An updated diff merging with the up to date port. No functional change
 with the 3.4 update itself.

Added a diff from matthew@ to allow Clang to deal with the driver 
command
line paramter -R /some/dir which 3.3 was previously just ignoring but
warning about the unused command line paramater and 3.4 will now exit 
with
an error.

   An updated diff adding a patch to fix some unit test code building on 
   32-bit
   archs, .e.g. i386, powerpc, to allow the regrssion test suite to build as 
   well
   as run on 32-bit archs.
  
  An updated diff after adding the bash dependency for the test framework.
  
 And rc3...

And enable the integrated assembler on PowerPC..


Index: Makefile
===
RCS file: /home/cvs/ports/devel/llvm/Makefile,v
retrieving revision 1.70
diff -u -p -r1.70 Makefile
--- Makefile16 Dec 2013 20:34:46 -  1.70
+++ Makefile17 Dec 2013 12:13:54 -
@@ -8,14 +8,13 @@ DPB_PROPERTIES = parallel
 
 COMMENT =  modular, fast C/C++/ObjC compiler, static analyzer and tools
 
-LLVM_V =   3.3
-REVISION = 3
-DISTNAME = llvm-${LLVM_V}.src
-PKGNAME =  llvm-${LLVM_V}
+LLVM_V =   3.4
+DISTNAME = llvm-${LLVM_V}rc3.source
+PKGNAME =  llvm-${LLVM_V}rc3
 CATEGORIES =   devel
-MASTER_SITES = http://llvm.org/releases/${LLVM_V}/
+MASTER_SITES = http://llvm.org/pre-releases/${LLVM_V}/rc3/
 
-DISTFILES =${DISTNAME}${EXTRACT_SUFX} cfe-${LLVM_V}.src${EXTRACT_SUFX}
+DISTFILES =${DISTNAME}${EXTRACT_SUFX} 
cfe-${LLVM_V}rc3.source${EXTRACT_SUFX}
 
 SHARED_LIBS =  clang   0.0 # 3.2
 
@@ -25,9 +24,9 @@ HOMEPAGE =http://www.llvm.org/
 # BSD
 PERMIT_PACKAGE_CDROM = Yes
 
-WANTLIB =  c m pthread stdc++ z
+WANTLIB =  c curses m pthread stdc++ z
 
-WRKDIST =  ${WRKDIR}/llvm-${LLVM_V}.src
+WRKDIST =  ${WRKDIR}/llvm.src
 
 MODULES =  devel/cmake \
lang/python
@@ -40,8 +39,7 @@ SEPARATE_BUILD =  Yes
 CONFIGURE_ARGS =   -DLLVM_ENABLE_FFI:Bool=False \
-DLLVM_REQUIRES_RTTI:Bool=True \
-DCMAKE_BUILD_TYPE:String=Release \
-   -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2:Bool=True \
-   -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD:String=R600
+   -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2:Bool=True
 
 # Workaround relocation overflow
 .if ${MACHINE_ARCH} == powerpc
@@ -54,7 +52,8 @@ CLANG_INCLUDE_PATH =  lib/clang/${LLVM_V}
 SUBST_VARS +=  CLANG_INCLUDE_PATH LLVM_V
 
 post-extract:
-   @mv ${WRKDIR}/cfe-${LLVM_V}.src ${WRKDIST}/tools/clang
+   @rm ${WRKDIST}/tools/clang
+   @mv ${WRKDIR}/cfe.src ${WRKDIST}/tools/clang
 
 pre-configure:
@${SUBST_CMD} ${WRKSRC}/tools/clang/tools/scan-build/scan-build
Index: distinfo
===
RCS file: /home/cvs/ports/devel/llvm/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo21 Jun 2013 22:09:12 -  1.12
+++ distinfo17 Dec 2013 12:12:36 -
@@ -1,4 +1,4 @@
-SHA256 (cfe-3.3.src.tar.gz) = sbVd5Ks6V9PgMxqD4ChGEBkcd9kk40RkmNkRPQjfuZY=
-SHA256 (llvm-3.3.src.tar.gz) = aHZrHnDQWiXi9QLpl6PLOTcYejKWWVz24Jd9XNZydXg=
-SIZE (cfe-3.3.src.tar.gz) = 9425539
-SIZE (llvm-3.3.src.tar.gz) = 13602421
+SHA256 (cfe-3.4rc3.source.tar.gz) = 
YjAKwyVR7jM+8h6HX43R0vcnXK/BOtNbfi34XShPpsA=
+SHA256 (llvm-3.4rc3.source.tar.gz) = 
YGtjLgG9V3GPKkYHy95koRMhnmSbVUOTVUBChb6D+cs=
+SIZE (cfe-3.4rc3.source.tar.gz) = 10440545
+SIZE (llvm-3.4rc3.source.tar.gz) = 15561407
Index: patches/patch-CMakeLists_txt
===
RCS file: /home/cvs/ports/devel/llvm/patches/patch-CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -r1.3 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt21 Jun 2013 22:09:12 -  1.3
+++ patches/patch-CMakeLists_txt18 Dec 2013 02:04:40 -
@@ -2,14 +2,14 @@ $OpenBSD: patch-CMakeLists_txt,v 1.3 201
 
 Don't confuse scripts who want the version with appended 'svn' goo.
 
 CMakeLists.txt.origMon May  6 12:23:07 2013
-+++ 

Re: WIP: LLVM 3.4

2013-12-17 Thread Landry Breuil
On Tue, Dec 17, 2013 at 09:45:32PM -0500, Brad Smith wrote:
 On Tue, Dec 17, 2013 at 07:10:43PM -0500, Brad Smith wrote:
  On Mon, Dec 16, 2013 at 06:26:30PM -0500, Brad Smith wrote:
   On Sun, Dec 15, 2013 at 12:26:21AM -0500, Brad Smith wrote:
On Fri, Dec 13, 2013 at 11:34:44PM -0500, Brad Smith wrote:
 On Sat, Dec 07, 2013 at 05:40:32AM -0500, Brad Smith wrote:
  On Thu, Dec 05, 2013 at 03:35:56AM -0500, Brad Smith wrote:
   Here is a work in progress update to LLVM 3.4. This has only been 
   lightly
   tested on amd64. I need this build tested on i386, powerpc, 
   sparc64 and
   mips64 to start off. If you have such an arch please try building 
   it as
   soon as possible as I'd like to report any issues upstream if 
   there are
   any. Any runtime testing feedback would also be appreciated.
  
  An updated diff merging with the up to date port. No functional 
  change
  with the 3.4 update itself.
 
 Added a diff from matthew@ to allow Clang to deal with the driver 
 command
 line paramter -R /some/dir which 3.3 was previously just ignoring but
 warning about the unused command line paramater and 3.4 will now exit 
 with
 an error.
 
An updated diff adding a patch to fix some unit test code building on 
32-bit
archs, .e.g. i386, powerpc, to allow the regrssion test suite to build 
as well
as run on 32-bit archs.
   
   An updated diff after adding the bash dependency for the test framework.
   
  And rc3...
 
 And enable the integrated assembler on PowerPC..

What's the point, is it backporting an upstream change, and how has this
been tested ?

Landry



Re: WIP: LLVM 3.4

2013-12-16 Thread Brad Smith
On Sun, Dec 15, 2013 at 12:26:21AM -0500, Brad Smith wrote:
 On Fri, Dec 13, 2013 at 11:34:44PM -0500, Brad Smith wrote:
  On Sat, Dec 07, 2013 at 05:40:32AM -0500, Brad Smith wrote:
   On Thu, Dec 05, 2013 at 03:35:56AM -0500, Brad Smith wrote:
Here is a work in progress update to LLVM 3.4. This has only been 
lightly
tested on amd64. I need this build tested on i386, powerpc, sparc64 and
mips64 to start off. If you have such an arch please try building it as
soon as possible as I'd like to report any issues upstream if there are
any. Any runtime testing feedback would also be appreciated.
   
   An updated diff merging with the up to date port. No functional change
   with the 3.4 update itself.
  
  Added a diff from matthew@ to allow Clang to deal with the driver command
  line paramter -R /some/dir which 3.3 was previously just ignoring but
  warning about the unused command line paramater and 3.4 will now exit with
  an error.
  
 An updated diff adding a patch to fix some unit test code building on 32-bit
 archs, .e.g. i386, powerpc, to allow the regrssion test suite to build as well
 as run on 32-bit archs.

An updated diff after adding the bash dependency for the test framework.


Index: Makefile
===
RCS file: /cvs/ports/devel/llvm/Makefile,v
retrieving revision 1.70
diff -u -p -r1.70 Makefile
--- Makefile16 Dec 2013 20:34:46 -  1.70
+++ Makefile16 Dec 2013 20:35:59 -
@@ -8,14 +8,14 @@ DPB_PROPERTIES = parallel
 
 COMMENT =  modular, fast C/C++/ObjC compiler, static analyzer and tools
 
-LLVM_V =   3.3
-REVISION = 3
-DISTNAME = llvm-${LLVM_V}.src
-PKGNAME =  llvm-${LLVM_V}
+LLVM_V =   3.4
+DISTNAME = llvm.src-${LLVM_V}rc2-source
+PKGNAME =  llvm-${LLVM_V}rc2
 CATEGORIES =   devel
-MASTER_SITES = http://llvm.org/releases/${LLVM_V}/
+MASTER_SITES = http://llvm.org/pre-releases/${LLVM_V}/rc2/
+EXTRACT_SUFX = .tar.xz
 
-DISTFILES =${DISTNAME}${EXTRACT_SUFX} cfe-${LLVM_V}.src${EXTRACT_SUFX}
+DISTFILES =${DISTNAME}${EXTRACT_SUFX} 
cfe.src-${LLVM_V}rc2-source${EXTRACT_SUFX}
 
 SHARED_LIBS =  clang   0.0 # 3.2
 
@@ -25,9 +25,9 @@ HOMEPAGE =http://www.llvm.org/
 # BSD
 PERMIT_PACKAGE_CDROM = Yes
 
-WANTLIB =  c m pthread stdc++ z
+WANTLIB =  c curses m pthread stdc++ z
 
-WRKDIST =  ${WRKDIR}/llvm-${LLVM_V}.src
+WRKDIST =  ${WRKDIR}/llvm.src
 
 MODULES =  devel/cmake \
lang/python
@@ -40,8 +40,7 @@ SEPARATE_BUILD =  Yes
 CONFIGURE_ARGS =   -DLLVM_ENABLE_FFI:Bool=False \
-DLLVM_REQUIRES_RTTI:Bool=True \
-DCMAKE_BUILD_TYPE:String=Release \
-   -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2:Bool=True \
-   -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD:String=R600
+   -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2:Bool=True
 
 # Workaround relocation overflow
 .if ${MACHINE_ARCH} == powerpc
@@ -54,7 +53,8 @@ CLANG_INCLUDE_PATH =  lib/clang/${LLVM_V}
 SUBST_VARS +=  CLANG_INCLUDE_PATH LLVM_V
 
 post-extract:
-   @mv ${WRKDIR}/cfe-${LLVM_V}.src ${WRKDIST}/tools/clang
+   @rm ${WRKDIST}/tools/clang
+   @mv ${WRKDIR}/cfe.src ${WRKDIST}/tools/clang
 
 pre-configure:
@${SUBST_CMD} ${WRKSRC}/tools/clang/tools/scan-build/scan-build
Index: distinfo
===
RCS file: /cvs/ports/devel/llvm/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo21 Jun 2013 22:09:12 -  1.12
+++ distinfo16 Dec 2013 20:35:59 -
@@ -1,4 +1,4 @@
-SHA256 (cfe-3.3.src.tar.gz) = sbVd5Ks6V9PgMxqD4ChGEBkcd9kk40RkmNkRPQjfuZY=
-SHA256 (llvm-3.3.src.tar.gz) = aHZrHnDQWiXi9QLpl6PLOTcYejKWWVz24Jd9XNZydXg=
-SIZE (cfe-3.3.src.tar.gz) = 9425539
-SIZE (llvm-3.3.src.tar.gz) = 13602421
+SHA256 (cfe.src-3.4rc2-source.tar.xz) = 
QG6V1W6QeN5R5aKQq1wjMMy5AKDGNzzQ8NyGvxAX8Ls=
+SHA256 (llvm.src-3.4rc2-source.tar.xz) = 
2TRf5o8bxg16pNa+VZt/ptHBbr/Puag0Dm2L6sDwc8w=
+SIZE (cfe.src-3.4rc2-source.tar.xz) = 7618328
+SIZE (llvm.src-3.4rc2-source.tar.xz) = 10490924
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/devel/llvm/patches/patch-CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -r1.3 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt21 Jun 2013 22:09:12 -  1.3
+++ patches/patch-CMakeLists_txt16 Dec 2013 20:35:59 -
@@ -2,14 +2,14 @@ $OpenBSD: patch-CMakeLists_txt,v 1.3 201
 
 Don't confuse scripts who want the version with appended 'svn' goo.
 
 CMakeLists.txt.origMon May  6 12:23:07 2013
-+++ CMakeLists.txt Tue Jun 18 23:00:44 2013
-@@ -13,7 +13,7 @@ set(CMAKE_MODULE_PATH
- set(LLVM_VERSION_MAJOR 3)
- set(LLVM_VERSION_MINOR 3)
+--- CMakeLists.txt.origMon Nov 25 13:34:26 2013
 CMakeLists.txt Wed Dec  4 03:41:41 2013
+@@ 

Re: WIP: LLVM 3.4

2013-12-14 Thread Brad Smith
On Fri, Dec 13, 2013 at 11:34:44PM -0500, Brad Smith wrote:
 On Sat, Dec 07, 2013 at 05:40:32AM -0500, Brad Smith wrote:
  On Thu, Dec 05, 2013 at 03:35:56AM -0500, Brad Smith wrote:
   Here is a work in progress update to LLVM 3.4. This has only been lightly
   tested on amd64. I need this build tested on i386, powerpc, sparc64 and
   mips64 to start off. If you have such an arch please try building it as
   soon as possible as I'd like to report any issues upstream if there are
   any. Any runtime testing feedback would also be appreciated.
  
  An updated diff merging with the up to date port. No functional change
  with the 3.4 update itself.
 
 Added a diff from matthew@ to allow Clang to deal with the driver command
 line paramter -R /some/dir which 3.3 was previously just ignoring but
 warning about the unused command line paramater and 3.4 will now exit with
 an error.
 
An updated diff adding a patch to fix some unit test code building on 32-bit
archs, .e.g. i386, powerpc, to allow the regrssion test suite to build as well
as run on 32-bit archs.


Index: Makefile
===
RCS file: /home/cvs/ports/devel/llvm/Makefile,v
retrieving revision 1.69
diff -u -p -r1.69 Makefile
--- Makefile7 Dec 2013 10:30:39 -   1.69
+++ Makefile7 Dec 2013 10:35:09 -
@@ -8,14 +8,14 @@ DPB_PROPERTIES = parallel
 
 COMMENT =  modular, fast C/C++/ObjC compiler, static analyzer and tools
 
-LLVM_V =   3.3
-REVISION = 3
-DISTNAME = llvm-${LLVM_V}.src
-PKGNAME =  llvm-${LLVM_V}
+LLVM_V =   3.4
+DISTNAME = llvm.src-${LLVM_V}rc2-source
+PKGNAME =  llvm-${LLVM_V}rc2
 CATEGORIES =   devel
-MASTER_SITES = http://llvm.org/releases/${LLVM_V}/
+MASTER_SITES = http://llvm.org/pre-releases/${LLVM_V}/rc2/
+EXTRACT_SUFX = .tar.xz
 
-DISTFILES =${DISTNAME}${EXTRACT_SUFX} cfe-${LLVM_V}.src${EXTRACT_SUFX}
+DISTFILES =${DISTNAME}${EXTRACT_SUFX} 
cfe.src-${LLVM_V}rc2-source${EXTRACT_SUFX}
 
 SHARED_LIBS =  clang   0.0 # 3.2
 
@@ -25,9 +25,9 @@ HOMEPAGE =http://www.llvm.org/
 # BSD
 PERMIT_PACKAGE_CDROM = Yes
 
-WANTLIB =  c m pthread stdc++ z
+WANTLIB =  c curses m pthread stdc++ z
 
-WRKDIST =  ${WRKDIR}/llvm-${LLVM_V}.src
+WRKDIST =  ${WRKDIR}/llvm.src
 
 MODULES =  devel/cmake \
lang/python
@@ -39,8 +39,7 @@ SEPARATE_BUILD =  Yes
 CONFIGURE_ARGS =   -DLLVM_ENABLE_FFI:Bool=False \
-DLLVM_REQUIRES_RTTI:Bool=True \
-DCMAKE_BUILD_TYPE:String=Release \
-   -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2:Bool=True \
-   -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD:String=R600
+   -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2:Bool=True
 
 # Workaround relocation overflow
 .if ${MACHINE_ARCH} == powerpc
@@ -53,7 +52,8 @@ CLANG_INCLUDE_PATH =  lib/clang/${LLVM_V}
 SUBST_VARS +=  CLANG_INCLUDE_PATH LLVM_V
 
 post-extract:
-   @mv ${WRKDIR}/cfe-${LLVM_V}.src ${WRKDIST}/tools/clang
+   @rm ${WRKDIST}/tools/clang
+   @mv ${WRKDIR}/cfe.src ${WRKDIST}/tools/clang
 
 pre-configure:
@${SUBST_CMD} ${WRKSRC}/tools/clang/tools/scan-build/scan-build
Index: distinfo
===
RCS file: /home/cvs/ports/devel/llvm/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo21 Jun 2013 22:09:12 -  1.12
+++ distinfo4 Dec 2013 08:31:53 -
@@ -1,4 +1,4 @@
-SHA256 (cfe-3.3.src.tar.gz) = sbVd5Ks6V9PgMxqD4ChGEBkcd9kk40RkmNkRPQjfuZY=
-SHA256 (llvm-3.3.src.tar.gz) = aHZrHnDQWiXi9QLpl6PLOTcYejKWWVz24Jd9XNZydXg=
-SIZE (cfe-3.3.src.tar.gz) = 9425539
-SIZE (llvm-3.3.src.tar.gz) = 13602421
+SHA256 (cfe.src-3.4rc2-source.tar.xz) = 
QG6V1W6QeN5R5aKQq1wjMMy5AKDGNzzQ8NyGvxAX8Ls=
+SHA256 (llvm.src-3.4rc2-source.tar.xz) = 
2TRf5o8bxg16pNa+VZt/ptHBbr/Puag0Dm2L6sDwc8w=
+SIZE (cfe.src-3.4rc2-source.tar.xz) = 7618328
+SIZE (llvm.src-3.4rc2-source.tar.xz) = 10490924
Index: patches/patch-CMakeLists_txt
===
RCS file: /home/cvs/ports/devel/llvm/patches/patch-CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -r1.3 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt21 Jun 2013 22:09:12 -  1.3
+++ patches/patch-CMakeLists_txt14 Dec 2013 04:25:54 -
@@ -2,14 +2,14 @@ $OpenBSD: patch-CMakeLists_txt,v 1.3 201
 
 Don't confuse scripts who want the version with appended 'svn' goo.
 
 CMakeLists.txt.origMon May  6 12:23:07 2013
-+++ CMakeLists.txt Tue Jun 18 23:00:44 2013
-@@ -13,7 +13,7 @@ set(CMAKE_MODULE_PATH
- set(LLVM_VERSION_MAJOR 3)
- set(LLVM_VERSION_MINOR 3)
+--- CMakeLists.txt.origMon Nov 25 13:34:26 2013
 CMakeLists.txt Wed Dec  4 03:41:41 2013
+@@ -14,7 +14,7 @@ set(LLVM_VERSION_MAJOR 3)
+ set(LLVM_VERSION_MINOR 4)
  
--set(PACKAGE_VERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}svn)

Re: WIP: LLVM 3.4

2013-12-13 Thread Donovan Watteau
 On 06/12/13 3:26 PM, Brad Smith wrote:
 On 05/12/13 3:35 AM, Brad Smith wrote:
 Here is a work in progress update to LLVM 3.4. This has only been lightly
 tested on amd64. I need this build tested on i386, powerpc, sparc64 and
 mips64 to start off. If you have such an arch please try building it as
 soon as possible as I'd like to report any issues upstream if there are
 any. Any runtime testing feedback would also be appreciated.

 Still looking for build tests for sparc64 and mips64.
 
 and mips64?

I built it as well on my loongson (it took about 18 hours).

A simple C hello world compiles, links and runs fine.  However, trying
to compile base vi(1) with clang gives this:

=== build
clang -O2 -pipe  -I/usr/src/usr.bin/vi/build 
-I/usr/src/usr.bin/vi/build/../include   -c 
/usr/src/usr.bin/vi/build/../cl/cl_bsd.c
clang -O2 -pipe  -I/usr/src/usr.bin/vi/build 
-I/usr/src/usr.bin/vi/build/../include   -c 
/usr/src/usr.bin/vi/build/../cl/cl_funcs.c
/tmp/cl_funcs-556884.s: Assembler messages:
/tmp/cl_funcs-556884.s:43: Error: opcode not supported on this processor: mips3 
(mips3) `movn $1,$7,$8'
/tmp/cl_funcs-556884.s:620: Error: opcode not supported on this processor: 
mips3 (mips3) `movn $3,$5,$1'
clang-3.4: error: assembler command failed with exit code 1 (use -v to see 
invocation)
*** Error 1 in build (sys.mk:87 'cl_funcs.o')
*** Error 1 in /usr/src/usr.bin/vi (bsd.subdir.mk:48 'all')

Still, it looks like things are improving for mips64.

make test needs a few more hours...



Re: WIP: LLVM 3.4

2013-12-13 Thread Brad Smith
On Sat, Dec 07, 2013 at 05:40:32AM -0500, Brad Smith wrote:
 On Thu, Dec 05, 2013 at 03:35:56AM -0500, Brad Smith wrote:
  Here is a work in progress update to LLVM 3.4. This has only been lightly
  tested on amd64. I need this build tested on i386, powerpc, sparc64 and
  mips64 to start off. If you have such an arch please try building it as
  soon as possible as I'd like to report any issues upstream if there are
  any. Any runtime testing feedback would also be appreciated.
 
 An updated diff merging with the up to date port. No functional change
 with the 3.4 update itself.

Added a diff from matthew@ to allow Clang to deal with the driver command
line paramter -R /some/dir which 3.3 was previously just ignoring but
warning about the unused command line paramater and 3.4 will now exit with
an error.

Could someone with an i386 system try building Firefox/Firefox-ESR with
LLVM and see how it goes?

 
Index: Makefile
===
RCS file: /home/cvs/ports/devel/llvm/Makefile,v
retrieving revision 1.69
diff -u -p -r1.69 Makefile
--- Makefile7 Dec 2013 10:30:39 -   1.69
+++ Makefile7 Dec 2013 10:35:09 -
@@ -8,14 +8,14 @@ DPB_PROPERTIES = parallel
 
 COMMENT =  modular, fast C/C++/ObjC compiler, static analyzer and tools
 
-LLVM_V =   3.3
-REVISION = 3
-DISTNAME = llvm-${LLVM_V}.src
-PKGNAME =  llvm-${LLVM_V}
+LLVM_V =   3.4
+DISTNAME = llvm.src-${LLVM_V}rc2-source
+PKGNAME =  llvm-${LLVM_V}rc2
 CATEGORIES =   devel
-MASTER_SITES = http://llvm.org/releases/${LLVM_V}/
+MASTER_SITES = http://llvm.org/pre-releases/${LLVM_V}/rc2/
+EXTRACT_SUFX = .tar.xz
 
-DISTFILES =${DISTNAME}${EXTRACT_SUFX} cfe-${LLVM_V}.src${EXTRACT_SUFX}
+DISTFILES =${DISTNAME}${EXTRACT_SUFX} 
cfe.src-${LLVM_V}rc2-source${EXTRACT_SUFX}
 
 SHARED_LIBS =  clang   0.0 # 3.2
 
@@ -25,9 +25,9 @@ HOMEPAGE =http://www.llvm.org/
 # BSD
 PERMIT_PACKAGE_CDROM = Yes
 
-WANTLIB =  c m pthread stdc++ z
+WANTLIB =  c curses m pthread stdc++ z
 
-WRKDIST =  ${WRKDIR}/llvm-${LLVM_V}.src
+WRKDIST =  ${WRKDIR}/llvm.src
 
 MODULES =  devel/cmake \
lang/python
@@ -39,8 +39,7 @@ SEPARATE_BUILD =  Yes
 CONFIGURE_ARGS =   -DLLVM_ENABLE_FFI:Bool=False \
-DLLVM_REQUIRES_RTTI:Bool=True \
-DCMAKE_BUILD_TYPE:String=Release \
-   -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2:Bool=True \
-   -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD:String=R600
+   -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2:Bool=True
 
 # Workaround relocation overflow
 .if ${MACHINE_ARCH} == powerpc
@@ -53,7 +52,8 @@ CLANG_INCLUDE_PATH =  lib/clang/${LLVM_V}
 SUBST_VARS +=  CLANG_INCLUDE_PATH LLVM_V
 
 post-extract:
-   @mv ${WRKDIR}/cfe-${LLVM_V}.src ${WRKDIST}/tools/clang
+   @rm ${WRKDIST}/tools/clang
+   @mv ${WRKDIR}/cfe.src ${WRKDIST}/tools/clang
 
 pre-configure:
@${SUBST_CMD} ${WRKSRC}/tools/clang/tools/scan-build/scan-build
Index: distinfo
===
RCS file: /home/cvs/ports/devel/llvm/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo21 Jun 2013 22:09:12 -  1.12
+++ distinfo4 Dec 2013 08:31:53 -
@@ -1,4 +1,4 @@
-SHA256 (cfe-3.3.src.tar.gz) = sbVd5Ks6V9PgMxqD4ChGEBkcd9kk40RkmNkRPQjfuZY=
-SHA256 (llvm-3.3.src.tar.gz) = aHZrHnDQWiXi9QLpl6PLOTcYejKWWVz24Jd9XNZydXg=
-SIZE (cfe-3.3.src.tar.gz) = 9425539
-SIZE (llvm-3.3.src.tar.gz) = 13602421
+SHA256 (cfe.src-3.4rc2-source.tar.xz) = 
QG6V1W6QeN5R5aKQq1wjMMy5AKDGNzzQ8NyGvxAX8Ls=
+SHA256 (llvm.src-3.4rc2-source.tar.xz) = 
2TRf5o8bxg16pNa+VZt/ptHBbr/Puag0Dm2L6sDwc8w=
+SIZE (cfe.src-3.4rc2-source.tar.xz) = 7618328
+SIZE (llvm.src-3.4rc2-source.tar.xz) = 10490924
Index: patches/patch-CMakeLists_txt
===
RCS file: /home/cvs/ports/devel/llvm/patches/patch-CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -r1.3 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt21 Jun 2013 22:09:12 -  1.3
+++ patches/patch-CMakeLists_txt14 Dec 2013 04:25:54 -
@@ -2,14 +2,14 @@ $OpenBSD: patch-CMakeLists_txt,v 1.3 201
 
 Don't confuse scripts who want the version with appended 'svn' goo.
 
 CMakeLists.txt.origMon May  6 12:23:07 2013
-+++ CMakeLists.txt Tue Jun 18 23:00:44 2013
-@@ -13,7 +13,7 @@ set(CMAKE_MODULE_PATH
- set(LLVM_VERSION_MAJOR 3)
- set(LLVM_VERSION_MINOR 3)
+--- CMakeLists.txt.origMon Nov 25 13:34:26 2013
 CMakeLists.txt Wed Dec  4 03:41:41 2013
+@@ -14,7 +14,7 @@ set(LLVM_VERSION_MAJOR 3)
+ set(LLVM_VERSION_MINOR 4)
  
--set(PACKAGE_VERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}svn)
-+set(PACKAGE_VERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR})
+ if (NOT PACKAGE_VERSION)
+-  set(PACKAGE_VERSION 

Re: WIP: LLVM 3.4

2013-12-11 Thread Tobias Ulmer
On Sat, Dec 07, 2013 at 06:29:56PM -0500, Brad Smith wrote:
 On 06/12/13 3:26 PM, Brad Smith wrote:
 On 05/12/13 3:35 AM, Brad Smith wrote:
 Here is a work in progress update to LLVM 3.4. This has only been lightly
 tested on amd64. I need this build tested on i386, powerpc, sparc64 and
 mips64 to start off. If you have such an arch please try building it as
 soon as possible as I'd like to report any issues upstream if there are
 any. Any runtime testing feedback would also be appreciated.
 
 Still looking for build tests for sparc64 and mips64.
 
 and mips64?

mips64 is looking good so far, it's currently generating man pages...

 
 
 -- 
 This message has been scanned for viruses and
 dangerous content by MailScanner, and is
 believed to be clean.
 



Re: WIP: LLVM 3.4

2013-12-11 Thread Brad Smith

On 11/12/13 4:59 AM, Tobias Ulmer wrote:

On Sat, Dec 07, 2013 at 06:29:56PM -0500, Brad Smith wrote:

On 06/12/13 3:26 PM, Brad Smith wrote:

On 05/12/13 3:35 AM, Brad Smith wrote:

Here is a work in progress update to LLVM 3.4. This has only been lightly
tested on amd64. I need this build tested on i386, powerpc, sparc64 and
mips64 to start off. If you have such an arch please try building it as
soon as possible as I'd like to report any issues upstream if there are
any. Any runtime testing feedback would also be appreciated.


Still looking for build tests for sparc64 and mips64.


and mips64?


mips64 is looking good so far, it's currently generating man pages...


Ya, that is at the very end. Ok. good. Thanks.


--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.



Re: WIP: LLVM 3.4

2013-12-07 Thread Landry Breuil
On Fri, Dec 06, 2013 at 03:26:55PM -0500, Brad Smith wrote:
 On 05/12/13 3:35 AM, Brad Smith wrote:
 Here is a work in progress update to LLVM 3.4. This has only been lightly
 tested on amd64. I need this build tested on i386, powerpc, sparc64 and
 mips64 to start off. If you have such an arch please try building it as
 soon as possible as I'd like to report any issues upstream if there are
 any. Any runtime testing feedback would also be appreciated.
 
 Still looking for build tests for sparc64 and mips64.

It builds and packages on sparc64:

$make test
===  Regression tests for llvm-3.4rc2
ninja: error: unknown target 'RUNTESTFLAGS='

And it still fails to pass firefox's configure script:

checking for gcc pr39608... yes
This compiler would fail to build firefox, please upgrade.
-- config.log --
int main(void) {
  jsop_setelem(0, 47);
}

configure:11044: checking for gcc pr39608
configure:11074: c++ -c -O2 -pipe -fno-exceptions -fno-strict-aliasing
-fno-rtti -ffunction-sections -fdata-sections -fno-exceptions
-fno-math-errno -std=gnu++0x -fno-tree-vrp -Qunused-arguments
conftest.C 15
clang-3.4: error: unknown argument: '-fno-tree-vrp'
configure: failed program was:
#line 11056 configure
#include confdefs.h

typedef void (*FuncType)();
templateFuncType Impl
void f();
templatetypename T class C {
  typedef CT ThisC;
  templateint g()
  static void h() {
fThisC::hg ();
  }
};

int main() {
true
; return 0; }


Landry



Re: WIP: LLVM 3.4

2013-12-07 Thread Brad Smith

On 07/12/13 4:41 AM, Landry Breuil wrote:

On Fri, Dec 06, 2013 at 03:26:55PM -0500, Brad Smith wrote:

On 05/12/13 3:35 AM, Brad Smith wrote:

Here is a work in progress update to LLVM 3.4. This has only been lightly
tested on amd64. I need this build tested on i386, powerpc, sparc64 and
mips64 to start off. If you have such an arch please try building it as
soon as possible as I'd like to report any issues upstream if there are
any. Any runtime testing feedback would also be appreciated.


Still looking for build tests for sparc64 and mips64.


It builds and packages on sparc64:

$make test
===  Regression tests for llvm-3.4rc2
ninja: error: unknown target 'RUNTESTFLAGS='


I have a diff pending with Stuart to fix the regression tests. That
was broken after the switch to CMake.


And it still fails to pass firefox's configure script:


Mozilla's autoconf infrastructure for whatever reason is not detecting 
that that is Clang and running autoconf checks for GCC on Clang which it 
should not be. I would need to see the full autoconf run up to that

point to see if we can spot where things go wrong. The autoconf script
from the bits I looked at seems to be able to determine GCC vs Clang
but I didn't come across the actual tests to see how it does so.


checking for gcc pr39608... yes
This compiler would fail to build firefox, please upgrade.
-- config.log --
int main(void) {
   jsop_setelem(0, 47);
}

configure:11044: checking for gcc pr39608
configure:11074: c++ -c -O2 -pipe -fno-exceptions -fno-strict-aliasing
-fno-rtti -ffunction-sections -fdata-sections -fno-exceptions
-fno-math-errno -std=gnu++0x -fno-tree-vrp -Qunused-arguments
conftest.C 15
clang-3.4: error: unknown argument: '-fno-tree-vrp'
configure: failed program was:
#line 11056 configure
#include confdefs.h

typedef void (*FuncType)();
templateFuncType Impl
void f();
templatetypename T class C {
   typedef CT ThisC;
   templateint g()
   static void h() {
 fThisC::hg ();
   }
};

int main() {
true
; return 0; }


Landry





--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.



Re: WIP: LLVM 3.4

2013-12-07 Thread Brad Smith
On Thu, Dec 05, 2013 at 03:35:56AM -0500, Brad Smith wrote:
 Here is a work in progress update to LLVM 3.4. This has only been lightly
 tested on amd64. I need this build tested on i386, powerpc, sparc64 and
 mips64 to start off. If you have such an arch please try building it as
 soon as possible as I'd like to report any issues upstream if there are
 any. Any runtime testing feedback would also be appreciated.

An updated diff merging with the up to date port. No functional change
with the 3.4 update itself.


Index: Makefile
===
RCS file: /cvs/ports/devel/llvm/Makefile,v
retrieving revision 1.69
diff -u -p -r1.69 Makefile
--- Makefile7 Dec 2013 10:30:39 -   1.69
+++ Makefile7 Dec 2013 10:35:20 -
@@ -8,14 +8,14 @@ DPB_PROPERTIES = parallel
 
 COMMENT =  modular, fast C/C++/ObjC compiler, static analyzer and tools
 
-LLVM_V =   3.3
-REVISION = 3
-DISTNAME = llvm-${LLVM_V}.src
-PKGNAME =  llvm-${LLVM_V}
+LLVM_V =   3.4
+DISTNAME = llvm.src-${LLVM_V}rc2-source
+PKGNAME =  llvm-${LLVM_V}rc2
 CATEGORIES =   devel
-MASTER_SITES = http://llvm.org/releases/${LLVM_V}/
+MASTER_SITES = http://llvm.org/pre-releases/${LLVM_V}/rc2/
+EXTRACT_SUFX = .tar.xz
 
-DISTFILES =${DISTNAME}${EXTRACT_SUFX} cfe-${LLVM_V}.src${EXTRACT_SUFX}
+DISTFILES =${DISTNAME}${EXTRACT_SUFX} 
cfe.src-${LLVM_V}rc2-source${EXTRACT_SUFX}
 
 SHARED_LIBS =  clang   0.0 # 3.2
 
@@ -25,9 +25,9 @@ HOMEPAGE =http://www.llvm.org/
 # BSD
 PERMIT_PACKAGE_CDROM = Yes
 
-WANTLIB =  c m pthread stdc++ z
+WANTLIB =  c curses m pthread stdc++ z
 
-WRKDIST =  ${WRKDIR}/llvm-${LLVM_V}.src
+WRKDIST =  ${WRKDIR}/llvm.src
 
 MODULES =  devel/cmake \
lang/python
@@ -39,8 +39,7 @@ SEPARATE_BUILD =  Yes
 CONFIGURE_ARGS =   -DLLVM_ENABLE_FFI:Bool=False \
-DLLVM_REQUIRES_RTTI:Bool=True \
-DCMAKE_BUILD_TYPE:String=Release \
-   -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2:Bool=True \
-   -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD:String=R600
+   -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2:Bool=True
 
 # Workaround relocation overflow
 .if ${MACHINE_ARCH} == powerpc
@@ -53,7 +52,8 @@ CLANG_INCLUDE_PATH =  lib/clang/${LLVM_V}
 SUBST_VARS +=  CLANG_INCLUDE_PATH LLVM_V
 
 post-extract:
-   @mv ${WRKDIR}/cfe-${LLVM_V}.src ${WRKDIST}/tools/clang
+   @rm ${WRKDIST}/tools/clang
+   @mv ${WRKDIR}/cfe.src ${WRKDIST}/tools/clang
 
 pre-configure:
@${SUBST_CMD} ${WRKSRC}/tools/clang/tools/scan-build/scan-build
Index: distinfo
===
RCS file: /cvs/ports/devel/llvm/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo21 Jun 2013 22:09:12 -  1.12
+++ distinfo7 Dec 2013 10:35:20 -
@@ -1,4 +1,4 @@
-SHA256 (cfe-3.3.src.tar.gz) = sbVd5Ks6V9PgMxqD4ChGEBkcd9kk40RkmNkRPQjfuZY=
-SHA256 (llvm-3.3.src.tar.gz) = aHZrHnDQWiXi9QLpl6PLOTcYejKWWVz24Jd9XNZydXg=
-SIZE (cfe-3.3.src.tar.gz) = 9425539
-SIZE (llvm-3.3.src.tar.gz) = 13602421
+SHA256 (cfe.src-3.4rc2-source.tar.xz) = 
QG6V1W6QeN5R5aKQq1wjMMy5AKDGNzzQ8NyGvxAX8Ls=
+SHA256 (llvm.src-3.4rc2-source.tar.xz) = 
2TRf5o8bxg16pNa+VZt/ptHBbr/Puag0Dm2L6sDwc8w=
+SIZE (cfe.src-3.4rc2-source.tar.xz) = 7618328
+SIZE (llvm.src-3.4rc2-source.tar.xz) = 10490924
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/devel/llvm/patches/patch-CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -r1.3 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt21 Jun 2013 22:09:12 -  1.3
+++ patches/patch-CMakeLists_txt7 Dec 2013 10:35:20 -
@@ -2,14 +2,14 @@ $OpenBSD: patch-CMakeLists_txt,v 1.3 201
 
 Don't confuse scripts who want the version with appended 'svn' goo.
 
 CMakeLists.txt.origMon May  6 12:23:07 2013
-+++ CMakeLists.txt Tue Jun 18 23:00:44 2013
-@@ -13,7 +13,7 @@ set(CMAKE_MODULE_PATH
- set(LLVM_VERSION_MAJOR 3)
- set(LLVM_VERSION_MINOR 3)
+--- CMakeLists.txt.origMon Nov 25 13:34:26 2013
 CMakeLists.txt Wed Dec  4 03:41:41 2013
+@@ -14,7 +14,7 @@ set(LLVM_VERSION_MAJOR 3)
+ set(LLVM_VERSION_MINOR 4)
  
--set(PACKAGE_VERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}svn)
-+set(PACKAGE_VERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR})
+ if (NOT PACKAGE_VERSION)
+-  set(PACKAGE_VERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}svn)
++  set(PACKAGE_VERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR})
+ endif()
  
- option(LLVM_USE_FOLDERS Enable solution folders in Visual Studio. Disable 
for Express versions. ON)
- if ( LLVM_USE_FOLDERS )
+ option(LLVM_INSTALL_TOOLCHAIN_ONLY Only include toolchain files in the 
'install' target. OFF)
Index: patches/patch-lib_CodeGen_StackProtector_cpp

Re: WIP: LLVM 3.4

2013-12-07 Thread Landry Breuil
On Sat, Dec 07, 2013 at 05:27:40AM -0500, Brad Smith wrote:
 On 07/12/13 4:41 AM, Landry Breuil wrote:
 On Fri, Dec 06, 2013 at 03:26:55PM -0500, Brad Smith wrote:
 On 05/12/13 3:35 AM, Brad Smith wrote:
 Here is a work in progress update to LLVM 3.4. This has only been lightly
 tested on amd64. I need this build tested on i386, powerpc, sparc64 and
 mips64 to start off. If you have such an arch please try building it as
 soon as possible as I'd like to report any issues upstream if there are
 any. Any runtime testing feedback would also be appreciated.
 
 Still looking for build tests for sparc64 and mips64.
 
 It builds and packages on sparc64:
 
 $make test
 ===  Regression tests for llvm-3.4rc2
 ninja: error: unknown target 'RUNTESTFLAGS='
 
 I have a diff pending with Stuart to fix the regression tests. That
 was broken after the switch to CMake.
 
 And it still fails to pass firefox's configure script:
 
 Mozilla's autoconf infrastructure for whatever reason is not detecting that
 that is Clang and running autoconf checks for GCC on Clang which it should
 not be. I would need to see the full autoconf run up to that
 point to see if we can spot where things go wrong. The autoconf script
 from the bits I looked at seems to be able to determine GCC vs Clang
 but I didn't come across the actual tests to see how it does so.

Yet it has no issue on amd64 with clang 3.3.

Landry



Re: WIP: LLVM 3.4

2013-12-07 Thread Brad Smith

On 06/12/13 3:26 PM, Brad Smith wrote:

On 05/12/13 3:35 AM, Brad Smith wrote:

Here is a work in progress update to LLVM 3.4. This has only been lightly
tested on amd64. I need this build tested on i386, powerpc, sparc64 and
mips64 to start off. If you have such an arch please try building it as
soon as possible as I'd like to report any issues upstream if there are
any. Any runtime testing feedback would also be appreciated.


Still looking for build tests for sparc64 and mips64.


and mips64?


--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.



Re: WIP: LLVM 3.4

2013-12-07 Thread Brian Callahan

On 12/7/2013 6:29 PM, Brad Smith wrote:

On 06/12/13 3:26 PM, Brad Smith wrote:

On 05/12/13 3:35 AM, Brad Smith wrote:

Here is a work in progress update to LLVM 3.4. This has only been
lightly
tested on amd64. I need this build tested on i386, powerpc, sparc64 and
mips64 to start off. If you have such an arch please try building it as
soon as possible as I'd like to report any issues upstream if there are
any. Any runtime testing feedback would also be appreciated.


Still looking for build tests for sparc64 and mips64.


and mips64?




I could fire off a mips64el build, but it won't be until the latter half 
of the coming week. If no one's done it by then, I'll do it.




Re: WIP: LLVM 3.4

2013-12-06 Thread Brad Smith

On 05/12/13 3:35 AM, Brad Smith wrote:

Here is a work in progress update to LLVM 3.4. This has only been lightly
tested on amd64. I need this build tested on i386, powerpc, sparc64 and
mips64 to start off. If you have such an arch please try building it as
soon as possible as I'd like to report any issues upstream if there are
any. Any runtime testing feedback would also be appreciated.


Still looking for build tests for sparc64 and mips64.


Index: Makefile
===
RCS file: /home/cvs/ports/devel/llvm/Makefile,v
retrieving revision 1.68
diff -u -p -r1.68 Makefile
--- Makefile2 Dec 2013 22:14:29 -   1.68
+++ Makefile4 Dec 2013 08:35:47 -
@@ -8,14 +8,14 @@ DPB_PROPERTIES = parallel

  COMMENT = modular, fast C/C++/ObjC compiler, static analyzer and tools

-LLVM_V =   3.3
-REVISION = 2
-DISTNAME = llvm-${LLVM_V}.src
-PKGNAME =  llvm-${LLVM_V}
+LLVM_V =   3.4
+DISTNAME = llvm.src-${LLVM_V}rc2-source
+PKGNAME =  llvm-${LLVM_V}rc2
  CATEGORIES =  devel
-MASTER_SITES = http://llvm.org/releases/${LLVM_V}/
+MASTER_SITES = http://llvm.org/pre-releases/${LLVM_V}/rc2/
+EXTRACT_SUFX = .tar.xz

-DISTFILES =${DISTNAME}${EXTRACT_SUFX} cfe-${LLVM_V}.src${EXTRACT_SUFX}
+DISTFILES =${DISTNAME}${EXTRACT_SUFX} 
cfe.src-${LLVM_V}rc2-source${EXTRACT_SUFX}

  SHARED_LIBS = clang   0.0 # 3.2

@@ -25,9 +25,9 @@ HOMEPAGE =http://www.llvm.org/
  # BSD
  PERMIT_PACKAGE_CDROM =Yes

-WANTLIB =  c m pthread stdc++ z
+WANTLIB =  c curses m pthread stdc++ z

-WRKDIST =  ${WRKDIR}/llvm-${LLVM_V}.src
+WRKDIST =  ${WRKDIR}/llvm.src

  MODULES = devel/cmake \
lang/python
@@ -41,8 +41,7 @@ SEPARATE_BUILD =  Yes
  CONFIGURE_ARGS =  -DLLVM_ENABLE_FFI:Bool=False \
-DLLVM_REQUIRES_RTTI:Bool=True \
-DCMAKE_BUILD_TYPE:String=Release \
-   -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2:Bool=True \
-   -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD:String=R600
+   -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2:Bool=True

  # Workaround relocation overflow
  .if ${MACHINE_ARCH} == powerpc
@@ -53,7 +52,8 @@ CLANG_INCLUDE_PATH =  lib/clang/${LLVM_V}
  SUBST_VARS += CLANG_INCLUDE_PATH LLVM_V

  post-extract:
-   @mv ${WRKDIR}/cfe-${LLVM_V}.src ${WRKDIST}/tools/clang
+   @rm ${WRKDIST}/tools/clang
+   @mv ${WRKDIR}/cfe.src ${WRKDIST}/tools/clang

  pre-configure:
@${SUBST_CMD} ${WRKSRC}/tools/clang/tools/scan-build/scan-build
Index: distinfo
===
RCS file: /home/cvs/ports/devel/llvm/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo21 Jun 2013 22:09:12 -  1.12
+++ distinfo4 Dec 2013 08:31:53 -
@@ -1,4 +1,4 @@
-SHA256 (cfe-3.3.src.tar.gz) = sbVd5Ks6V9PgMxqD4ChGEBkcd9kk40RkmNkRPQjfuZY=
-SHA256 (llvm-3.3.src.tar.gz) = aHZrHnDQWiXi9QLpl6PLOTcYejKWWVz24Jd9XNZydXg=
-SIZE (cfe-3.3.src.tar.gz) = 9425539
-SIZE (llvm-3.3.src.tar.gz) = 13602421
+SHA256 (cfe.src-3.4rc2-source.tar.xz) = 
QG6V1W6QeN5R5aKQq1wjMMy5AKDGNzzQ8NyGvxAX8Ls=
+SHA256 (llvm.src-3.4rc2-source.tar.xz) = 
2TRf5o8bxg16pNa+VZt/ptHBbr/Puag0Dm2L6sDwc8w=
+SIZE (cfe.src-3.4rc2-source.tar.xz) = 7618328
+SIZE (llvm.src-3.4rc2-source.tar.xz) = 10490924
Index: patches/patch-CMakeLists_txt
===
RCS file: /home/cvs/ports/devel/llvm/patches/patch-CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -r1.3 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt21 Jun 2013 22:09:12 -  1.3
+++ patches/patch-CMakeLists_txt4 Dec 2013 08:41:49 -
@@ -2,14 +2,14 @@ $OpenBSD: patch-CMakeLists_txt,v 1.3 201

  Don't confuse scripts who want the version with appended 'svn' goo.

 CMakeLists.txt.origMon May  6 12:23:07 2013
-+++ CMakeLists.txt Tue Jun 18 23:00:44 2013
-@@ -13,7 +13,7 @@ set(CMAKE_MODULE_PATH
- set(LLVM_VERSION_MAJOR 3)
- set(LLVM_VERSION_MINOR 3)
+--- CMakeLists.txt.origMon Nov 25 13:34:26 2013
 CMakeLists.txt Wed Dec  4 03:41:41 2013
+@@ -14,7 +14,7 @@ set(LLVM_VERSION_MAJOR 3)
+ set(LLVM_VERSION_MINOR 4)

--set(PACKAGE_VERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}svn)
-+set(PACKAGE_VERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR})
+ if (NOT PACKAGE_VERSION)
+-  set(PACKAGE_VERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}svn)
++  set(PACKAGE_VERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR})
+ endif()

- option(LLVM_USE_FOLDERS Enable solution folders in Visual Studio. Disable for 
Express versions. ON)
- if ( LLVM_USE_FOLDERS )
+ option(LLVM_INSTALL_TOOLCHAIN_ONLY Only include toolchain files in the 'install' 
target. OFF)
Index: patches/patch-lib_CodeGen_StackProtector_cpp
===
RCS file: 

WIP: LLVM 3.4

2013-12-05 Thread Brad Smith
Here is a work in progress update to LLVM 3.4. This has only been lightly
tested on amd64. I need this build tested on i386, powerpc, sparc64 and
mips64 to start off. If you have such an arch please try building it as
soon as possible as I'd like to report any issues upstream if there are
any. Any runtime testing feedback would also be appreciated.


Index: Makefile
===
RCS file: /home/cvs/ports/devel/llvm/Makefile,v
retrieving revision 1.68
diff -u -p -r1.68 Makefile
--- Makefile2 Dec 2013 22:14:29 -   1.68
+++ Makefile4 Dec 2013 08:35:47 -
@@ -8,14 +8,14 @@ DPB_PROPERTIES = parallel
 
 COMMENT =  modular, fast C/C++/ObjC compiler, static analyzer and tools
 
-LLVM_V =   3.3
-REVISION = 2
-DISTNAME = llvm-${LLVM_V}.src
-PKGNAME =  llvm-${LLVM_V}
+LLVM_V =   3.4
+DISTNAME = llvm.src-${LLVM_V}rc2-source
+PKGNAME =  llvm-${LLVM_V}rc2
 CATEGORIES =   devel
-MASTER_SITES = http://llvm.org/releases/${LLVM_V}/
+MASTER_SITES = http://llvm.org/pre-releases/${LLVM_V}/rc2/
+EXTRACT_SUFX = .tar.xz
 
-DISTFILES =${DISTNAME}${EXTRACT_SUFX} cfe-${LLVM_V}.src${EXTRACT_SUFX}
+DISTFILES =${DISTNAME}${EXTRACT_SUFX} 
cfe.src-${LLVM_V}rc2-source${EXTRACT_SUFX}
 
 SHARED_LIBS =  clang   0.0 # 3.2
 
@@ -25,9 +25,9 @@ HOMEPAGE =http://www.llvm.org/
 # BSD
 PERMIT_PACKAGE_CDROM = Yes
 
-WANTLIB =  c m pthread stdc++ z
+WANTLIB =  c curses m pthread stdc++ z
 
-WRKDIST =  ${WRKDIR}/llvm-${LLVM_V}.src
+WRKDIST =  ${WRKDIR}/llvm.src
 
 MODULES =  devel/cmake \
lang/python
@@ -41,8 +41,7 @@ SEPARATE_BUILD =  Yes
 CONFIGURE_ARGS =   -DLLVM_ENABLE_FFI:Bool=False \
-DLLVM_REQUIRES_RTTI:Bool=True \
-DCMAKE_BUILD_TYPE:String=Release \
-   -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2:Bool=True \
-   -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD:String=R600
+   -DCMAKE_DISABLE_FIND_PACKAGE_LibXml2:Bool=True
 
 # Workaround relocation overflow
 .if ${MACHINE_ARCH} == powerpc
@@ -53,7 +52,8 @@ CLANG_INCLUDE_PATH =  lib/clang/${LLVM_V}
 SUBST_VARS +=  CLANG_INCLUDE_PATH LLVM_V
 
 post-extract:
-   @mv ${WRKDIR}/cfe-${LLVM_V}.src ${WRKDIST}/tools/clang
+   @rm ${WRKDIST}/tools/clang
+   @mv ${WRKDIR}/cfe.src ${WRKDIST}/tools/clang
 
 pre-configure:
@${SUBST_CMD} ${WRKSRC}/tools/clang/tools/scan-build/scan-build
Index: distinfo
===
RCS file: /home/cvs/ports/devel/llvm/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo21 Jun 2013 22:09:12 -  1.12
+++ distinfo4 Dec 2013 08:31:53 -
@@ -1,4 +1,4 @@
-SHA256 (cfe-3.3.src.tar.gz) = sbVd5Ks6V9PgMxqD4ChGEBkcd9kk40RkmNkRPQjfuZY=
-SHA256 (llvm-3.3.src.tar.gz) = aHZrHnDQWiXi9QLpl6PLOTcYejKWWVz24Jd9XNZydXg=
-SIZE (cfe-3.3.src.tar.gz) = 9425539
-SIZE (llvm-3.3.src.tar.gz) = 13602421
+SHA256 (cfe.src-3.4rc2-source.tar.xz) = 
QG6V1W6QeN5R5aKQq1wjMMy5AKDGNzzQ8NyGvxAX8Ls=
+SHA256 (llvm.src-3.4rc2-source.tar.xz) = 
2TRf5o8bxg16pNa+VZt/ptHBbr/Puag0Dm2L6sDwc8w=
+SIZE (cfe.src-3.4rc2-source.tar.xz) = 7618328
+SIZE (llvm.src-3.4rc2-source.tar.xz) = 10490924
Index: patches/patch-CMakeLists_txt
===
RCS file: /home/cvs/ports/devel/llvm/patches/patch-CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -r1.3 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt21 Jun 2013 22:09:12 -  1.3
+++ patches/patch-CMakeLists_txt4 Dec 2013 08:41:49 -
@@ -2,14 +2,14 @@ $OpenBSD: patch-CMakeLists_txt,v 1.3 201
 
 Don't confuse scripts who want the version with appended 'svn' goo.
 
 CMakeLists.txt.origMon May  6 12:23:07 2013
-+++ CMakeLists.txt Tue Jun 18 23:00:44 2013
-@@ -13,7 +13,7 @@ set(CMAKE_MODULE_PATH
- set(LLVM_VERSION_MAJOR 3)
- set(LLVM_VERSION_MINOR 3)
+--- CMakeLists.txt.origMon Nov 25 13:34:26 2013
 CMakeLists.txt Wed Dec  4 03:41:41 2013
+@@ -14,7 +14,7 @@ set(LLVM_VERSION_MAJOR 3)
+ set(LLVM_VERSION_MINOR 4)
  
--set(PACKAGE_VERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}svn)
-+set(PACKAGE_VERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR})
+ if (NOT PACKAGE_VERSION)
+-  set(PACKAGE_VERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}svn)
++  set(PACKAGE_VERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR})
+ endif()
  
- option(LLVM_USE_FOLDERS Enable solution folders in Visual Studio. Disable 
for Express versions. ON)
- if ( LLVM_USE_FOLDERS )
+ option(LLVM_INSTALL_TOOLCHAIN_ONLY Only include toolchain files in the 
'install' target. OFF)
Index: patches/patch-lib_CodeGen_StackProtector_cpp
===
RCS file: patches/patch-lib_CodeGen_StackProtector_cpp
diff -N patches/patch-lib_CodeGen_StackProtector_cpp
---