Re: UPDATE: lang/flang 5 => 6
On 05/06/18 11:38, Brian Callahan wrote:
On 05/05/18 08:42, Brian Callahan wrote:
On 05/02/18 00:41, Brian Callahan wrote:
Hi ports --
Finally got flang fixed for llvm-6.
It requires a new sub-port, lang/flang/libpgmath, the new Fortran
math library that comes with flang6.
New sub-port + diff for the other 2 sub-ports attached.
Passes the NIST Fortran 77 test suite (get a copy here:
http://www.fortran-2000.com/ArnaudRecipes/fcvs21_f95.html)
OK?
~Brian
Flang has been updated in the meantime, new patch/tarball.
~Brian
If it makes reviewing easier, this update of flang does not depend on
the libaio_compat port I sent out. We'll handle that after this goes
in, not before. I'd like to see flang unbroken so I can move on to
adding arm64 support.
In the meantime meantime, flang has been updated again. Since I'm
already here, now includes patches to allow flang6 to link with lld and
have programs compiled with it also link with lld.
~Brian
Index: Makefile
===
RCS file: /cvs/ports/lang/flang/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile 31 Dec 2017 18:06:38 - 1.1.1.1
+++ Makefile 9 May 2018 16:03:53 -
@@ -3,5 +3,6 @@
SUBDIR =
SUBDIR += driver
SUBDIR += flang
+SUBDIR += libpgmath
.include
Index: Makefile.inc
===
RCS file: /cvs/ports/lang/flang/Makefile.inc,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile.inc
--- Makefile.inc 31 Dec 2017 18:06:38 - 1.1.1.1
+++ Makefile.inc 9 May 2018 16:03:53 -
@@ -12,6 +12,7 @@ GH_ACCOUNT ?= flang-compiler
# driver: BSD
# flang: Apache 2.0 (will become BSD once integrated into LLVM)
+# libpgmath: Apache 2.0 (will become BSD once integrated into LLVM)
PERMIT_PACKAGE_CDROM = Yes
NO_TEST ?= Yes
Index: driver/Makefile
===
RCS file: /cvs/ports/lang/flang/driver/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- driver/Makefile 7 Apr 2018 14:58:18 - 1.4
+++ driver/Makefile 9 May 2018 16:03:53 -
@@ -1,15 +1,13 @@
# $OpenBSD: Makefile,v 1.4 2018/04/07 14:58:18 ajacoutot Exp $
-BROKEN = needs work for LLVM 6.0
-
# If you are updating to a new version
-# (e.g. 5.0->5.1 or 6.0), you need to sync
+# (e.g. 6.0->6.1 or 7.0), you need to sync
# patches with devel/llvm
COMMENT = LLVM Fortran compiler driver
-DISTNAME = flang-driver-5.0.1.20180308
+DISTNAME = flang-driver-6.0.0.20180416
GH_PROJECT = flang-driver
-GH_COMMIT = 095de1354dd583b0cd4c7a91d5c328710a1a9c32
+GH_COMMIT = ccd507ca383f2122b2c5510aac0f7393f440398a
WANTLIB += ${COMPILER_LIBCXX} c m z
Index: driver/distinfo
===
RCS file: /cvs/ports/lang/flang/driver/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- driver/distinfo 13 Mar 2018 02:46:44 - 1.3
+++ driver/distinfo 9 May 2018 16:03:53 -
@@ -1,2 +1,2 @@
-SHA256 (flang-driver-5.0.1.20180308-095de135.tar.gz) = 075nJLft1rXgOM+TEzWUVYodhbg7QbKo5mF5BKuaF84=
-SIZE (flang-driver-5.0.1.20180308-095de135.tar.gz) = 16017829
+SHA256 (flang-driver-6.0.0.20180416-ccd507ca.tar.gz) = a+XxP6BYrHFYQRFKdqyVUHezzqujZMed11JmyctKeg0=
+SIZE (flang-driver-6.0.0.20180416-ccd507ca.tar.gz) = 16780237
Index: driver/patches/patch-include_clang_Basic_DiagnosticSemaKinds_td
===
RCS file: /cvs/ports/lang/flang/driver/patches/patch-include_clang_Basic_DiagnosticSemaKinds_td,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-include_clang_Basic_DiagnosticSemaKinds_td
--- driver/patches/patch-include_clang_Basic_DiagnosticSemaKinds_td 31 Dec 2017 18:06:38 - 1.1.1.1
+++ driver/patches/patch-include_clang_Basic_DiagnosticSemaKinds_td 9 May 2018 16:03:53 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-include_clang_Basic_Diag
Index: include/clang/Basic/DiagnosticSemaKinds.td
--- include/clang/Basic/DiagnosticSemaKinds.td.orig
+++ include/clang/Basic/DiagnosticSemaKinds.td
-@@ -5810,7 +5810,7 @@ def warn_pointer_indirection_from_incompatible_type :
+@@ -5879,7 +5879,7 @@ def warn_pointer_indirection_from_incompatible_type :
InGroup, DefaultIgnore;
def warn_taking_address_of_packed_member : Warning<
"taking address of packed member %0 of class or structure %q1 may result in an unaligned pointer value">,
@@ -12,7 +12,7 @@ Index: include/clang/Basic/DiagnosticSem
def err_objc_object_assignment : Error<
"cannot assign to class object (%0 invalid)">;
-@@ -6747,7 +6747,7 @@ def ext_typecheck_convert_incompatible_pointer_sign :
+@@ -6838,7 +6838,7 @@ def ext_typecheck_convert_incompatible_pointer_sign :
"sending to parameter of different type}0,1"
"|%diff{casting $ to type $|casting between types}0,1}2"
" converts between pointers to integer types with different sign">,
Index:
Re: UPDATE: lang/flang 5 => 6
On 05/05/18 08:42, Brian Callahan wrote: On 05/02/18 00:41, Brian Callahan wrote: Hi ports -- Finally got flang fixed for llvm-6. It requires a new sub-port, lang/flang/libpgmath, the new Fortran math library that comes with flang6. New sub-port + diff for the other 2 sub-ports attached. Passes the NIST Fortran 77 test suite (get a copy here: http://www.fortran-2000.com/ArnaudRecipes/fcvs21_f95.html) OK? ~Brian Flang has been updated in the meantime, new patch/tarball. ~Brian If it makes reviewing easier, this update of flang does not depend on the libaio_compat port I sent out. We'll handle that after this goes in, not before. I'd like to see flang unbroken so I can move on to adding arm64 support.
Re: UPDATE: lang/flang 5 => 6
On 05/02/18 00:41, Brian Callahan wrote:
Hi ports --
Finally got flang fixed for llvm-6.
It requires a new sub-port, lang/flang/libpgmath, the new Fortran math
library that comes with flang6.
New sub-port + diff for the other 2 sub-ports attached.
Passes the NIST Fortran 77 test suite (get a copy here:
http://www.fortran-2000.com/ArnaudRecipes/fcvs21_f95.html)
OK?
~Brian
Flang has been updated in the meantime, new patch/tarball.
~Brian
Index: Makefile
===
RCS file: /cvs/ports/lang/flang/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile 31 Dec 2017 18:06:38 - 1.1.1.1
+++ Makefile 5 May 2018 12:36:59 -
@@ -3,5 +3,6 @@
SUBDIR =
SUBDIR += driver
SUBDIR += flang
+SUBDIR += libpgmath
.include
Index: Makefile.inc
===
RCS file: /cvs/ports/lang/flang/Makefile.inc,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile.inc
--- Makefile.inc 31 Dec 2017 18:06:38 - 1.1.1.1
+++ Makefile.inc 5 May 2018 12:36:59 -
@@ -12,6 +12,7 @@ GH_ACCOUNT ?= flang-compiler
# driver: BSD
# flang: Apache 2.0 (will become BSD once integrated into LLVM)
+# libpgmath: Apache 2.0 (will become BSD once integrated into LLVM)
PERMIT_PACKAGE_CDROM = Yes
NO_TEST ?= Yes
Index: driver/Makefile
===
RCS file: /cvs/ports/lang/flang/driver/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- driver/Makefile 7 Apr 2018 14:58:18 - 1.4
+++ driver/Makefile 5 May 2018 12:36:59 -
@@ -1,15 +1,13 @@
# $OpenBSD: Makefile,v 1.4 2018/04/07 14:58:18 ajacoutot Exp $
-BROKEN = needs work for LLVM 6.0
-
# If you are updating to a new version
-# (e.g. 5.0->5.1 or 6.0), you need to sync
+# (e.g. 6.0->6.1 or 7.0), you need to sync
# patches with devel/llvm
COMMENT = LLVM Fortran compiler driver
-DISTNAME = flang-driver-5.0.1.20180308
+DISTNAME = flang-driver-6.0.0.20180416
GH_PROJECT = flang-driver
-GH_COMMIT = 095de1354dd583b0cd4c7a91d5c328710a1a9c32
+GH_COMMIT = ccd507ca383f2122b2c5510aac0f7393f440398a
WANTLIB += ${COMPILER_LIBCXX} c m z
Index: driver/distinfo
===
RCS file: /cvs/ports/lang/flang/driver/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- driver/distinfo 13 Mar 2018 02:46:44 - 1.3
+++ driver/distinfo 5 May 2018 12:36:59 -
@@ -1,2 +1,2 @@
-SHA256 (flang-driver-5.0.1.20180308-095de135.tar.gz) = 075nJLft1rXgOM+TEzWUVYodhbg7QbKo5mF5BKuaF84=
-SIZE (flang-driver-5.0.1.20180308-095de135.tar.gz) = 16017829
+SHA256 (flang-driver-6.0.0.20180416-ccd507ca.tar.gz) = a+XxP6BYrHFYQRFKdqyVUHezzqujZMed11JmyctKeg0=
+SIZE (flang-driver-6.0.0.20180416-ccd507ca.tar.gz) = 16780237
Index: driver/patches/patch-include_clang_Basic_DiagnosticSemaKinds_td
===
RCS file: /cvs/ports/lang/flang/driver/patches/patch-include_clang_Basic_DiagnosticSemaKinds_td,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-include_clang_Basic_DiagnosticSemaKinds_td
--- driver/patches/patch-include_clang_Basic_DiagnosticSemaKinds_td 31 Dec 2017 18:06:38 - 1.1.1.1
+++ driver/patches/patch-include_clang_Basic_DiagnosticSemaKinds_td 5 May 2018 12:36:59 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-include_clang_Basic_Diag
Index: include/clang/Basic/DiagnosticSemaKinds.td
--- include/clang/Basic/DiagnosticSemaKinds.td.orig
+++ include/clang/Basic/DiagnosticSemaKinds.td
-@@ -5810,7 +5810,7 @@ def warn_pointer_indirection_from_incompatible_type :
+@@ -5879,7 +5879,7 @@ def warn_pointer_indirection_from_incompatible_type :
InGroup, DefaultIgnore;
def warn_taking_address_of_packed_member : Warning<
"taking address of packed member %0 of class or structure %q1 may result in an unaligned pointer value">,
@@ -12,7 +12,7 @@ Index: include/clang/Basic/DiagnosticSem
def err_objc_object_assignment : Error<
"cannot assign to class object (%0 invalid)">;
-@@ -6747,7 +6747,7 @@ def ext_typecheck_convert_incompatible_pointer_sign :
+@@ -6838,7 +6838,7 @@ def ext_typecheck_convert_incompatible_pointer_sign :
"sending to parameter of different type}0,1"
"|%diff{casting $ to type $|casting between types}0,1}2"
" converts between pointers to integer types with different sign">,
Index: driver/patches/patch-include_clang_Driver_Options_td
===
RCS file: /cvs/ports/lang/flang/driver/patches/patch-include_clang_Driver_Options_td,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-include_clang_Driver_Options_td
--- driver/patches/patch-include_clang_Driver_Options_td 31 Dec 2017 18:06:38 - 1.1.1.1
+++ driver/patches/patch-include_clang_Driver_Options_td 5 May 2018 12:36:59 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-include_clang_Driver_Opt
Index:
UPDATE: lang/flang 5 => 6
Hi ports --
Finally got flang fixed for llvm-6.
It requires a new sub-port, lang/flang/libpgmath, the new Fortran math
library that comes with flang6.
New sub-port + diff for the other 2 sub-ports attached.
Passes the NIST Fortran 77 test suite (get a copy here:
http://www.fortran-2000.com/ArnaudRecipes/fcvs21_f95.html)
OK?
~Brian
Index: Makefile
===
RCS file: /cvs/ports/lang/flang/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile 31 Dec 2017 18:06:38 - 1.1.1.1
+++ Makefile 2 May 2018 04:35:39 -
@@ -3,5 +3,6 @@
SUBDIR =
SUBDIR += driver
SUBDIR += flang
+SUBDIR += libpgmath
.include
Index: Makefile.inc
===
RCS file: /cvs/ports/lang/flang/Makefile.inc,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile.inc
--- Makefile.inc 31 Dec 2017 18:06:38 - 1.1.1.1
+++ Makefile.inc 2 May 2018 04:35:39 -
@@ -12,6 +12,7 @@ GH_ACCOUNT ?= flang-compiler
# driver: BSD
# flang: Apache 2.0 (will become BSD once integrated into LLVM)
+# libpgmath: Apache 2.0 (will become BSD once integrated into LLVM)
PERMIT_PACKAGE_CDROM = Yes
NO_TEST ?= Yes
Index: driver/Makefile
===
RCS file: /cvs/ports/lang/flang/driver/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- driver/Makefile 7 Apr 2018 14:58:18 - 1.4
+++ driver/Makefile 2 May 2018 04:35:39 -
@@ -1,15 +1,13 @@
# $OpenBSD: Makefile,v 1.4 2018/04/07 14:58:18 ajacoutot Exp $
-BROKEN = needs work for LLVM 6.0
-
# If you are updating to a new version
-# (e.g. 5.0->5.1 or 6.0), you need to sync
+# (e.g. 6.0->6.1 or 7.0), you need to sync
# patches with devel/llvm
COMMENT = LLVM Fortran compiler driver
-DISTNAME = flang-driver-5.0.1.20180308
+DISTNAME = flang-driver-6.0.0.20180416
GH_PROJECT = flang-driver
-GH_COMMIT = 095de1354dd583b0cd4c7a91d5c328710a1a9c32
+GH_COMMIT = ccd507ca383f2122b2c5510aac0f7393f440398a
WANTLIB += ${COMPILER_LIBCXX} c m z
Index: driver/distinfo
===
RCS file: /cvs/ports/lang/flang/driver/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- driver/distinfo 13 Mar 2018 02:46:44 - 1.3
+++ driver/distinfo 2 May 2018 04:35:39 -
@@ -1,2 +1,2 @@
-SHA256 (flang-driver-5.0.1.20180308-095de135.tar.gz) = 075nJLft1rXgOM+TEzWUVYodhbg7QbKo5mF5BKuaF84=
-SIZE (flang-driver-5.0.1.20180308-095de135.tar.gz) = 16017829
+SHA256 (flang-driver-6.0.0.20180416-ccd507ca.tar.gz) = a+XxP6BYrHFYQRFKdqyVUHezzqujZMed11JmyctKeg0=
+SIZE (flang-driver-6.0.0.20180416-ccd507ca.tar.gz) = 16780237
Index: driver/patches/patch-include_clang_Basic_DiagnosticSemaKinds_td
===
RCS file: /cvs/ports/lang/flang/driver/patches/patch-include_clang_Basic_DiagnosticSemaKinds_td,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-include_clang_Basic_DiagnosticSemaKinds_td
--- driver/patches/patch-include_clang_Basic_DiagnosticSemaKinds_td 31 Dec 2017 18:06:38 - 1.1.1.1
+++ driver/patches/patch-include_clang_Basic_DiagnosticSemaKinds_td 2 May 2018 04:35:39 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-include_clang_Basic_Diag
Index: include/clang/Basic/DiagnosticSemaKinds.td
--- include/clang/Basic/DiagnosticSemaKinds.td.orig
+++ include/clang/Basic/DiagnosticSemaKinds.td
-@@ -5810,7 +5810,7 @@ def warn_pointer_indirection_from_incompatible_type :
+@@ -5879,7 +5879,7 @@ def warn_pointer_indirection_from_incompatible_type :
InGroup, DefaultIgnore;
def warn_taking_address_of_packed_member : Warning<
"taking address of packed member %0 of class or structure %q1 may result in an unaligned pointer value">,
@@ -12,7 +12,7 @@ Index: include/clang/Basic/DiagnosticSem
def err_objc_object_assignment : Error<
"cannot assign to class object (%0 invalid)">;
-@@ -6747,7 +6747,7 @@ def ext_typecheck_convert_incompatible_pointer_sign :
+@@ -6838,7 +6838,7 @@ def ext_typecheck_convert_incompatible_pointer_sign :
"sending to parameter of different type}0,1"
"|%diff{casting $ to type $|casting between types}0,1}2"
" converts between pointers to integer types with different sign">,
Index: driver/patches/patch-include_clang_Driver_Options_td
===
RCS file: /cvs/ports/lang/flang/driver/patches/patch-include_clang_Driver_Options_td,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-include_clang_Driver_Options_td
--- driver/patches/patch-include_clang_Driver_Options_td 31 Dec 2017 18:06:38 - 1.1.1.1
+++ driver/patches/patch-include_clang_Driver_Options_td 2 May 2018 04:35:39 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-include_clang_Driver_Opt
Index: include/clang/Driver/Options.td
--- include/clang/Driver/Options.td.orig
+++ include/clang/Driver/Options.td
-@@ -2166,7 +2166,7 @@
