summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Kubaj <pkubaj@FreeBSD.org>2022-05-01 11:36:22 +0200
committerPiotr Kubaj <pkubaj@FreeBSD.org>2022-05-01 11:37:53 +0200
commitf7c20e47c633577989101611a7ba70506c283ab4 (patch)
tree6e6526ed81f91fe8b266d44c80ebff212cd9bb44
parentprint/hplip-plugin: update to 3.22.4 and pet portlint (diff)
lang/gcc12-devel: upgrade to snapshot 20220430
Since this is now the new stable branch, copy patch-clang-vec_step from other GCC ports and switch to using clang on powerpc64*.
-rw-r--r--lang/gcc12-devel/Makefile11
-rw-r--r--lang/gcc12-devel/distinfo6
-rw-r--r--lang/gcc12-devel/files/patch-clang-vec_step21
3 files changed, 26 insertions, 12 deletions
diff --git a/lang/gcc12-devel/Makefile b/lang/gcc12-devel/Makefile
index f814e2948aee..a3a9500e484e 100644
--- a/lang/gcc12-devel/Makefile
+++ b/lang/gcc12-devel/Makefile
@@ -1,8 +1,7 @@
# Created by: Gerald Pfeifer <gerald@FreeBSD.org>
PORTNAME= gcc
-PORTVERSION= 12.0.1.s20220306
-PORTREVISION= 2
+PORTVERSION= 12.0.1.s20220430
CATEGORIES= lang
MASTER_SITES= GCC/snapshots/${DIST_VERSION}
PKGNAMESUFFIX= ${SUFFIX}-devel
@@ -71,15 +70,9 @@ CONFIGURE_ARGS+= --disable-multilib
.if ${ARCH} == amd64
CONFIGURE_TARGET= x86_64-portbld-${OPSYS:tl}${OSREL}
-.elif ${ARCH} == powerpc64
-CONFIGURE_ENV+= UNAME_m="powerpc64"
-. if defined(PPC_ABI) && ${PPC_ABI} == ELFv2
+.elif defined(PPC_ABI) && ${PPC_ABI} == ELFv2
CONFIGURE_ARGS+= --with-abi=elfv2
-. endif
-USE_GCC= yes
-.elif ${ARCH} == powerpc64le
-USE_GCC= yes
.endif
LANGUAGES:= c,c++,objc,fortran,jit
diff --git a/lang/gcc12-devel/distinfo b/lang/gcc12-devel/distinfo
index f0004511149a..f3056bdbd8b5 100644
--- a/lang/gcc12-devel/distinfo
+++ b/lang/gcc12-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1646986300
-SHA256 (gcc-12-20220306.tar.xz) = 3a48aa25eedef45b2edd809b910d288046cbd65a048ea31b9fb85793029b234b
-SIZE (gcc-12-20220306.tar.xz) = 78811636
+TIMESTAMP = 1651388552
+SHA256 (gcc-12-20220430.tar.xz) = 9255efd2b556e229f589f920e08a678d4be537ba088efff5b8809e9715a68911
+SIZE (gcc-12-20220430.tar.xz) = 79067316
diff --git a/lang/gcc12-devel/files/patch-clang-vec_step b/lang/gcc12-devel/files/patch-clang-vec_step
new file mode 100644
index 000000000000..00607540eb2a
--- /dev/null
+++ b/lang/gcc12-devel/files/patch-clang-vec_step
@@ -0,0 +1,21 @@
+https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=239266 reports how
+clang unfortunately poisons user namespace by default (without any
+special options).
+
+Until that changes (or GCC changes) we need to avoid using vec_step
+as a variable.
+
+--- UTC
+Index: gcc/tree-vect-loop.cc
+===================================================================
+--- gcc/tree-vect-loop.cc (revision 273856)
++++ gcc/tree-vect-loop.cc (working copy)
+@@ -55,6 +55,8 @@ along with GCC; see the file COPYING3. If not see
+ #include "vec-perm-indices.h"
+ #include "tree-eh.h"
+
++#define vec_step vec_step_
++
+ /* Loop Vectorization Pass.
+
+ This pass tries to vectorize loops.