svn commit: r452497 - in head/devel: flang flang-clang flang/files
Johannes M Dieterich
jmd at FreeBSD.org
Fri Oct 20 01:34:46 UTC 2017
Author: jmd
Date: Fri Oct 20 01:34:43 2017
New Revision: 452497
URL: https://svnweb.freebsd.org/changeset/ports/452497
Log:
devel/flang-clang and devel/flang: Upgrade to later snapshots. They bring a lot of fixed bugs inside of flang and support for ejecting AVX512 operations. Removes dependency on lang/openmp since devel/llvm40 brings its own (correct) libomp.so.
Reviewed by: swills (mentor)
Approved by: swills (mentor)
Differential Revision: https://reviews.freebsd.org/D12734
Deleted:
head/devel/flang/files/patch-runtime_flang_cdexp.c
head/devel/flang/files/patch-runtime_flang_cexp.c
head/devel/flang/files/patch-runtime_flangrti_erfc__scaled.c
head/devel/flang/files/patch-runtime_flangrti_erfc__scaledf.c
Modified:
head/devel/flang-clang/Makefile
head/devel/flang-clang/distinfo
head/devel/flang/Makefile
head/devel/flang/distinfo
head/devel/flang/files/patch-CMakeLists.txt
head/devel/flang/files/patch-runtime_flang_async.c
head/devel/flang/files/patch-runtime_flang_stime3f.c
head/devel/flang/files/patch-runtime_flangrti_dumpregs.h
head/devel/flang/files/patch-runtime_flangrti_iostdinit.c
head/devel/flang/files/patch-runtime_flangrti_trace__lin.c
head/devel/flang/files/patch-runtime_flangrti_x86__64-Linux_dumpregs.c
Modified: head/devel/flang-clang/Makefile
==============================================================================
--- head/devel/flang-clang/Makefile Fri Oct 20 01:09:12 2017 (r452496)
+++ head/devel/flang-clang/Makefile Fri Oct 20 01:34:43 2017 (r452497)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= flang-clang
-DISTVERSION= 4.0-20170812
+DISTVERSION= 4.0-20171019
PORTREVISION= 1
CATEGORIES= devel lang
@@ -14,10 +14,8 @@ LICENSE_NAME= LLVM Release License
LICENSE_FILE= ${WRKSRC}/LICENSE.TXT
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-BUILD_DEPENDS= llvm40>=0:devel/llvm40 \
- openmp>=0:devel/openmp
-RUN_DEPENDS= llvm40>=0:devel/llvm40 \
- openmp>=0:devel/openmp
+BUILD_DEPENDS= llvm40>=0:devel/llvm40
+RUN_DEPENDS= llvm40>=0:devel/llvm40
ONLY_FOR_ARCHS= amd64
ONLY_FOR_ARCHS_REASON_amd64= for now only builds and is supported on amd64
@@ -35,7 +33,7 @@ SHEBANG_FILES= tools/scan-view/bin/scan-view \
USE_GITHUB= yes
GH_ACCOUNT= flang-compiler
GH_PROJECT= clang
-GH_TAGNAME= 79d1970
+GH_TAGNAME= 70938ea
CMAKE_ARGS+= -DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config40
Modified: head/devel/flang-clang/distinfo
==============================================================================
--- head/devel/flang-clang/distinfo Fri Oct 20 01:09:12 2017 (r452496)
+++ head/devel/flang-clang/distinfo Fri Oct 20 01:34:43 2017 (r452497)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502586432
-SHA256 (flang-compiler-clang-4.0-20170812-79d1970_GH0.tar.gz) = e1b3442b6ccfc9574e0e4479e55b66baf57d957ac1b4652a38e29ae221e51d4f
-SIZE (flang-compiler-clang-4.0-20170812-79d1970_GH0.tar.gz) = 15210102
+TIMESTAMP = 1508451770
+SHA256 (flang-compiler-clang-4.0-20171019-70938ea_GH0.tar.gz) = 6b462819323e3dcd0a34a844582adbfd47936d108be66850bb2e75853c66e354
+SIZE (flang-compiler-clang-4.0-20171019-70938ea_GH0.tar.gz) = 15209610
Modified: head/devel/flang/Makefile
==============================================================================
--- head/devel/flang/Makefile Fri Oct 20 01:09:12 2017 (r452496)
+++ head/devel/flang/Makefile Fri Oct 20 01:34:43 2017 (r452497)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= flang
-DISTVERSION= 4.0-20170812
+DISTVERSION= 4.0-20171019
PORTREVISION= 1
CATEGORIES= devel
@@ -13,10 +13,8 @@ LICENSE= APACHE20
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
BUILD_DEPENDS= llvm40>=0:devel/llvm40 \
- openmp>=0:devel/openmp \
flang-clang>=0:devel/flang-clang
RUN_DEPENDS= llvm40>=0:devel/llvm40 \
- openmp>=0:devel/openmp \
flang-clang>=0:devel/flang-clang
ONLY_FOR_ARCHS= amd64
@@ -33,12 +31,13 @@ USES+= ${_USES_PYTHON}
USE_GITHUB= yes
GH_ACCOUNT= flang-compiler
-GH_TAGNAME= f7af78c
+GH_TAGNAME= e68c31f
CMAKE_ARGS+= -DLLVM_CONFIG=${LOCALBASE}/bin/llvm-config40 \
-DCMAKE_CXX_COMPILER=${LOCALBASE}flang/bin/clang++ \
-DCMAKE_C_COMPILER=${LOCALBASE}/flang/bin/clang \
- -DCMAKE_Fortran_COMPILER=${LOCALBASE}/flang/bin/flang
+ -DCMAKE_Fortran_COMPILER=${LOCALBASE}/flang/bin/flang \
+ -DFLANG_LIBOMP=${LOCALBASE}/llvm40/lib/libomp.so
CMAKE_INSTALL_PREFIX= ${PREFIX}/flang
Modified: head/devel/flang/distinfo
==============================================================================
--- head/devel/flang/distinfo Fri Oct 20 01:09:12 2017 (r452496)
+++ head/devel/flang/distinfo Fri Oct 20 01:34:43 2017 (r452497)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502586565
-SHA256 (flang-compiler-flang-4.0-20170812-f7af78c_GH0.tar.gz) = 96c38c73f1ed5b3ba45e04232ec4b6ad4fb25a3cc0b1fa48a0036d51ecee1329
-SIZE (flang-compiler-flang-4.0-20170812-f7af78c_GH0.tar.gz) = 3587549
+TIMESTAMP = 1508451863
+SHA256 (flang-compiler-flang-4.0-20171019-e68c31f_GH0.tar.gz) = 5797b5ea4f97f80428c3e918ed4579044a42a94550af5d3ab6603020ed3b9499
+SIZE (flang-compiler-flang-4.0-20171019-e68c31f_GH0.tar.gz) = 3926694
Modified: head/devel/flang/files/patch-CMakeLists.txt
==============================================================================
--- head/devel/flang/files/patch-CMakeLists.txt Fri Oct 20 01:09:12 2017 (r452496)
+++ head/devel/flang/files/patch-CMakeLists.txt Fri Oct 20 01:34:43 2017 (r452497)
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig 2017-07-17 19:12:06 UTC
+--- CMakeLists.txt.orig 2017-10-19 11:03:03 UTC
+++ CMakeLists.txt
-@@ -48,6 +48,19 @@ if( ${TARGET_OS} STREQUAL "Linux" )
+@@ -51,6 +51,19 @@ if( ${TARGET_OS} STREQUAL "Linux" )
message("Unsupported architecture: ${TARGET_ARCHITECTURE}" )
return()
endif()
@@ -20,7 +20,7 @@
else()
message("Unsupported OS: ${TARGET_OS}" )
return()
-@@ -56,7 +69,8 @@ endif()
+@@ -59,7 +72,8 @@ endif()
# The cmake documentation states that these are set. They are not so we
# set them here
set(CMAKE_HOST_SYSTEM_NAME ${TARGET_OS})
@@ -30,12 +30,12 @@
# If we are not building as a part of LLVM, build Flang as an
# standalone project, using LLVM as an external library:
-@@ -292,7 +306,7 @@ endif()
+@@ -296,7 +310,7 @@ endif()
# Add appropriate flags for GCC
if (LLVM_COMPILER_IS_GCC_COMPATIBLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-common -Woverloaded-virtual -Wcast-qual -fno-strict-aliasing -pedantic -Wno-long-long -Wall -W -Wno-unused-parameter -Wwrite-strings")
-- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
-+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-macro-redefined -Wno-logical-not-parentheses -Wno-unknown-warning-option")
- endif ()
-
- if (APPLE)
+- option(WITH_WERROR "Compile with '-Werror' C compiler flag" ON)
++ option(WITH_WERROR "Compile with '-Werror' C compiler flag" OFF)
+ if (WITH_WERROR)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
+ endif ()
Modified: head/devel/flang/files/patch-runtime_flang_async.c
==============================================================================
--- head/devel/flang/files/patch-runtime_flang_async.c Fri Oct 20 01:09:12 2017 (r452496)
+++ head/devel/flang/files/patch-runtime_flang_async.c Fri Oct 20 01:34:43 2017 (r452497)
@@ -1,37 +1,14 @@
---- runtime/flang/async.c.orig 2017-05-17 00:40:01 UTC
+--- runtime/flang/async.c.orig 2017-10-19 11:03:03 UTC
+++ runtime/flang/async.c
-@@ -27,6 +27,8 @@
- * Fio_asy_close - called from close
- */
+@@ -39,9 +39,10 @@
+ #include <errno.h>
+ #endif
+#include <sys/signal.h>
+
- #if !defined(INTERIX86) && !defined(TARGET_INTERIX) && !defined(TARGET_OSX) && !defined(CRAY) && !defined(TARGET_WIN_X8632)
-
- #if !defined(TARGET_WIN_X8664)
-@@ -44,7 +46,6 @@
#include "stdioInterf.h"
#include "async.h"
-
-
+
#define FIO_MAX_ASYNC_TRANSACTIONS 16
- /* one struct per file */
-@@ -320,7 +321,7 @@ Fio_asy_read(struct asy *asy, void *adr,
- asy->aiocb[tn].aio_reqprio = 0;
- asy->aiocb[tn].aio_buf = adr;
- asy->aiocb[tn].aio_nbytes = len;
-- memset(&(asy->aiocb[tn].aio_sigevent), 0, sizeof(sigevent_t));
-+ memset(&(asy->aiocb[tn].aio_sigevent), 0, sizeof(struct sigevent));
- asy->aiocb[tn].aio_offset = asy->atd[tn].off;
- n = aio_read(&(asy->aiocb[tn]));
- #endif
-@@ -374,7 +375,7 @@ Fio_asy_write(struct asy *asy, void *adr
- asy->aiocb[tn].aio_reqprio = 0;
- asy->aiocb[tn].aio_buf = adr;
- asy->aiocb[tn].aio_nbytes = len;
-- memset(&(asy->aiocb[tn].aio_sigevent), 0, sizeof(sigevent_t));
-+ memset(&(asy->aiocb[tn].aio_sigevent), 0, sizeof(struct sigevent));
- asy->aiocb[tn].aio_offset = asy->atd[tn].off;
- n = aio_write(&(asy->aiocb[tn]));
- #endif
Modified: head/devel/flang/files/patch-runtime_flang_stime3f.c
==============================================================================
--- head/devel/flang/files/patch-runtime_flang_stime3f.c Fri Oct 20 01:09:12 2017 (r452496)
+++ head/devel/flang/files/patch-runtime_flang_stime3f.c Fri Oct 20 01:34:43 2017 (r452497)
@@ -1,4 +1,4 @@
---- runtime/flang/stime3f.c.orig 2017-05-17 00:40:01 UTC
+--- runtime/flang/stime3f.c.orig 2017-10-19 11:03:03 UTC
+++ runtime/flang/stime3f.c
@@ -27,13 +27,7 @@
Modified: head/devel/flang/files/patch-runtime_flangrti_dumpregs.h
==============================================================================
--- head/devel/flang/files/patch-runtime_flangrti_dumpregs.h Fri Oct 20 01:09:12 2017 (r452496)
+++ head/devel/flang/files/patch-runtime_flangrti_dumpregs.h Fri Oct 20 01:34:43 2017 (r452497)
@@ -1,4 +1,4 @@
---- runtime/flangrti/dumpregs.h.orig 2017-05-17 00:40:01 UTC
+--- runtime/flangrti/dumpregs.h.orig 2017-10-19 11:03:03 UTC
+++ runtime/flangrti/dumpregs.h
@@ -21,6 +21,6 @@
* Declare routines that access the machine registers
Modified: head/devel/flang/files/patch-runtime_flangrti_iostdinit.c
==============================================================================
--- head/devel/flang/files/patch-runtime_flangrti_iostdinit.c Fri Oct 20 01:09:12 2017 (r452496)
+++ head/devel/flang/files/patch-runtime_flangrti_iostdinit.c Fri Oct 20 01:34:43 2017 (r452497)
@@ -1,4 +1,4 @@
---- runtime/flangrti/iostdinit.c.orig 2017-05-17 00:40:01 UTC
+--- runtime/flangrti/iostdinit.c.orig 2017-10-19 11:03:03 UTC
+++ runtime/flangrti/iostdinit.c
@@ -160,7 +160,7 @@ __io_ferror(void *p)
int
@@ -9,7 +9,7 @@
}
/* is a tty? */
-@@ -270,14 +270,14 @@ extern long *_imp___timezone_dll; /* for
+@@ -270,14 +270,14 @@ extern long *_imp___timezone_dll; /* for crtdll.dll */
#define timezone _timezone /* cygnus, timezone is usually a function */
#endif
Modified: head/devel/flang/files/patch-runtime_flangrti_trace__lin.c
==============================================================================
--- head/devel/flang/files/patch-runtime_flangrti_trace__lin.c Fri Oct 20 01:09:12 2017 (r452496)
+++ head/devel/flang/files/patch-runtime_flangrti_trace__lin.c Fri Oct 20 01:34:43 2017 (r452497)
@@ -1,4 +1,4 @@
---- runtime/flangrti/trace_lin.c.orig 2017-05-17 00:40:01 UTC
+--- runtime/flangrti/trace_lin.c.orig 2017-10-19 11:03:03 UTC
+++ runtime/flangrti/trace_lin.c
@@ -85,7 +85,7 @@ static struct sigs sigs[] = {
{0, CODNULL, NULL} /* end of list */
@@ -11,7 +11,7 @@
@@ -99,7 +99,7 @@ __abort_trace(int skip)
char **strings;
- size_t i, n;
+ size_t i;
- if (regs != (gregset_t *)0) {
+ if (regs != (void *)0) {
Modified: head/devel/flang/files/patch-runtime_flangrti_x86__64-Linux_dumpregs.c
==============================================================================
--- head/devel/flang/files/patch-runtime_flangrti_x86__64-Linux_dumpregs.c Fri Oct 20 01:09:12 2017 (r452496)
+++ head/devel/flang/files/patch-runtime_flangrti_x86__64-Linux_dumpregs.c Fri Oct 20 01:34:43 2017 (r452497)
@@ -1,4 +1,4 @@
---- runtime/flangrti/x86_64-Linux/dumpregs.c.orig 2017-05-17 00:40:01 UTC
+--- runtime/flangrti/x86_64-Linux/dumpregs.c.orig 2017-10-19 11:03:03 UTC
+++ runtime/flangrti/x86_64-Linux/dumpregs.c
@@ -40,7 +40,7 @@
#define RSP 15
More information about the svn-ports-all
mailing list