Attachment 232749 Details for Bug 262845 – Add -Wno-bitwise-instead-of-logical for clang >= 14

[patch] Add -Wno-bitwise-instead-of-logical for clang >= 14

java__openjdk13_14_15_16_17-fix-clang14-build-1.diff (text/plain), 3.50 KB, created by Dimitry Andric on 2022-03-26 19:54:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dimitry Andric

Created: 2022-03-26 19:54:27 UTC

Size: 3.50 KB

patch

obsolete

>commit 5637958ed11e8090a7d18d6368b57e3550b0194a
>Author: Dimitry Andric <dim@FreeBSD.org>
>Date:   Sat Mar 26 20:47:44 2022 +0100
>
>    java/openjdk13 java/openjdk14 java/openjdk15 java/openjdk16 java/openjdk17: fix build with clang 14
>
>diff --git a/java/openjdk13/Makefile b/java/openjdk13/Makefile
>index c78fdded6489..a187baee5ad6 100644
>--- a/java/openjdk13/Makefile
>+++ b/java/openjdk13/Makefile
>@@ -130,7 +130,12 @@ CONFIGURE_ARGS+=	--with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFA
> .else
> MAKE_ENV+=	USE_CLANG=true
> .if ${COMPILER_VERSION} >= 130
>-CONFIGURE_ARGS+=	--with-extra-cflags="-Wno-unused-but-set-parameter"
>+EXTRA_CFLAGS+=		-Wno-unused-but-set-parameter
>+.if ${COMPILER_VERSION} >= 140
>+EXTRA_CFLAGS+=		-Wno-bitwise-instead-of-logical
>+.endif
>+CONFIGURE_ARGS+=	--with-extra-cflags="${EXTRA_CFLAGS}"
>+CONFIGURE_ARGS+=	--with-extra-cxxflags="${EXTRA_CFLAGS}"
> .endif
> .endif
> 
>diff --git a/java/openjdk14/Makefile b/java/openjdk14/Makefile
>index eaf7ae811e30..5c01e6bb95e2 100644
>--- a/java/openjdk14/Makefile
>+++ b/java/openjdk14/Makefile
>@@ -132,7 +132,12 @@ CONFIGURE_ARGS+=	--with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFA
> .else
> MAKE_ENV+=	USE_CLANG=true
> .if ${COMPILER_VERSION} >= 130
>-CONFIGURE_ARGS+=	--with-extra-cflags="-Wno-unused-but-set-parameter"
>+EXTRA_CFLAGS+=		-Wno-unused-but-set-parameter
>+.if ${COMPILER_VERSION} >= 140
>+EXTRA_CFLAGS+=		-Wno-bitwise-instead-of-logical
>+.endif
>+CONFIGURE_ARGS+=	--with-extra-cflags="${EXTRA_CFLAGS}"
>+CONFIGURE_ARGS+=	--with-extra-cxxflags="${EXTRA_CFLAGS}"
> .endif
> .endif
> 
>diff --git a/java/openjdk15/Makefile b/java/openjdk15/Makefile
>index 28e44f2ea369..acd497b76ea2 100644
>--- a/java/openjdk15/Makefile
>+++ b/java/openjdk15/Makefile
>@@ -131,7 +131,12 @@ CONFIGURE_ARGS+=	--with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFA
> .else
> MAKE_ENV+=	USE_CLANG=true
> .if ${COMPILER_VERSION} >= 130
>-CONFIGURE_ARGS+=	--with-extra-cflags="-Wno-unused-but-set-parameter"
>+EXTRA_CFLAGS+=		-Wno-unused-but-set-parameter
>+.if ${COMPILER_VERSION} >= 140
>+EXTRA_CFLAGS+=		-Wno-bitwise-instead-of-logical
>+.endif
>+CONFIGURE_ARGS+=	--with-extra-cflags="${EXTRA_CFLAGS}"
>+CONFIGURE_ARGS+=	--with-extra-cxxflags="${EXTRA_CFLAGS}"
> .endif
> .endif
> 
>diff --git a/java/openjdk16/Makefile b/java/openjdk16/Makefile
>index 4d7f95959c51..bba4b4283847 100644
>--- a/java/openjdk16/Makefile
>+++ b/java/openjdk16/Makefile
>@@ -134,7 +134,12 @@ CONFIGURE_ARGS+=	--with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFA
> .else
> MAKE_ENV+=	USE_CLANG=true
> .if ${COMPILER_VERSION} >= 130
>-CONFIGURE_ARGS+=	--with-extra-cflags="-Wno-unused-but-set-parameter"
>+EXTRA_CFLAGS+=		-Wno-unused-but-set-parameter
>+.if ${COMPILER_VERSION} >= 140
>+EXTRA_CFLAGS+=		-Wno-bitwise-instead-of-logical
>+.endif
>+CONFIGURE_ARGS+=	--with-extra-cflags="${EXTRA_CFLAGS}"
>+CONFIGURE_ARGS+=	--with-extra-cxxflags="${EXTRA_CFLAGS}"
> .endif
> .endif
> 
>diff --git a/java/openjdk17/Makefile b/java/openjdk17/Makefile
>index 04dd691cf65f..056911944d74 100644
>--- a/java/openjdk17/Makefile
>+++ b/java/openjdk17/Makefile
>@@ -149,7 +149,12 @@ CONFIGURE_ARGS+=	--with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFA
> .else
> MAKE_ENV+=	USE_CLANG=true
> .if ${COMPILER_VERSION} >= 130
>-CONFIGURE_ARGS+=	--with-extra-cflags="-Wno-unused-but-set-parameter"
>+EXTRA_CFLAGS+=		-Wno-unused-but-set-parameter
>+.if ${COMPILER_VERSION} >= 140
>+EXTRA_CFLAGS+=		-Wno-bitwise-instead-of-logical
>+.endif
>+CONFIGURE_ARGS+=	--with-extra-cflags="${EXTRA_CFLAGS}"
>+CONFIGURE_ARGS+=	--with-extra-cxxflags="${EXTRA_CFLAGS}"
> .endif
> .endif
>

Actions: View | Diff

Attachments on bug 262845: 232749