From 7c8cba895579c0ae28f91dc1b6e2e8ed9f80d185 Mon Sep 17 00:00:00 2001 From: MBaesken Date: Thu, 20 Jun 2024 13:29:58 +0200 Subject: [PATCH 1/4] JDK-8334618 --- make/autoconf/jdk-options.m4 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4 index b5c679d2a8ef9..4c074f0914b2c 100644 --- a/make/autoconf/jdk-options.m4 +++ b/make/autoconf/jdk-options.m4 @@ -496,9 +496,16 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_LEAK_SANITIZER], # AC_DEFUN_ONCE([JDKOPT_SETUP_UNDEFINED_BEHAVIOR_SANITIZER], [ + AC_ARG_WITH(additional-ubsan-checks, [AS_HELP_STRING([--with-additional-ubsan-checks], + [customizes the ubsan checks])]) + ADDITIONAL_UBSAN_CHECKS= + if test "x$with_additional_ubsan_checks" != "x" ; then + ADDITIONAL_UBSAN_CHECKS="$with_additional_ubsan_checks" + fi + # GCC reports lots of likely false positives for stringop-truncation and format-overflow. # Silence them for now. - UBSAN_CHECKS="-fsanitize=undefined -fsanitize=float-divide-by-zero -fno-sanitize=shift-base -fno-sanitize=alignment" + UBSAN_CHECKS="-fsanitize=undefined -fsanitize=float-divide-by-zero -fno-sanitize=shift-base -fno-sanitize=alignment $ADDITIONAL_UBSAN_CHECKS" UBSAN_CFLAGS="$UBSAN_CHECKS -Wno-stringop-truncation -Wno-format-overflow -fno-omit-frame-pointer -DUNDEFINED_BEHAVIOR_SANITIZER" UBSAN_LDFLAGS="$UBSAN_CHECKS" UTIL_ARG_ENABLE(NAME: ubsan, DEFAULT: false, RESULT: UBSAN_ENABLED, From 6246d85a908df05def773b72ea43da8b3ddce78c Mon Sep 17 00:00:00 2001 From: MBaesken Date: Thu, 20 Jun 2024 14:44:23 +0200 Subject: [PATCH 2/4] use UTIL_ARG_WITH --- make/autoconf/jdk-options.m4 | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4 index 4c074f0914b2c..e7ed818107e00 100644 --- a/make/autoconf/jdk-options.m4 +++ b/make/autoconf/jdk-options.m4 @@ -496,12 +496,7 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_LEAK_SANITIZER], # AC_DEFUN_ONCE([JDKOPT_SETUP_UNDEFINED_BEHAVIOR_SANITIZER], [ - AC_ARG_WITH(additional-ubsan-checks, [AS_HELP_STRING([--with-additional-ubsan-checks], - [customizes the ubsan checks])]) - ADDITIONAL_UBSAN_CHECKS= - if test "x$with_additional_ubsan_checks" != "x" ; then - ADDITIONAL_UBSAN_CHECKS="$with_additional_ubsan_checks" - fi + UTIL_ARG_WITH(NAME: additional-ubsan-checks, TYPE: string, DEFAULT: [], DESC: [Custom ubsan checks], OPTIONAL: true) # GCC reports lots of likely false positives for stringop-truncation and format-overflow. # Silence them for now. From ad51358ae56c6479211a150a74c77f914decab32 Mon Sep 17 00:00:00 2001 From: MBaesken Date: Fri, 21 Jun 2024 10:25:53 +0200 Subject: [PATCH 3/4] more lines --- make/autoconf/jdk-options.m4 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4 index e7ed818107e00..6442befde0ccb 100644 --- a/make/autoconf/jdk-options.m4 +++ b/make/autoconf/jdk-options.m4 @@ -496,11 +496,15 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_LEAK_SANITIZER], # AC_DEFUN_ONCE([JDKOPT_SETUP_UNDEFINED_BEHAVIOR_SANITIZER], [ - UTIL_ARG_WITH(NAME: additional-ubsan-checks, TYPE: string, DEFAULT: [], DESC: [Custom ubsan checks], OPTIONAL: true) + UTIL_ARG_WITH(NAME: additional-ubsan-checks, TYPE: string, + DEFAULT: [], + DESC: [Custom ubsan checks], + OPTIONAL: true) # GCC reports lots of likely false positives for stringop-truncation and format-overflow. # Silence them for now. - UBSAN_CHECKS="-fsanitize=undefined -fsanitize=float-divide-by-zero -fno-sanitize=shift-base -fno-sanitize=alignment $ADDITIONAL_UBSAN_CHECKS" + UBSAN_CHECKS="-fsanitize=undefined -fsanitize=float-divide-by-zero -fno-sanitize=shift-base -fno-sanitize=alignment \ + $ADDITIONAL_UBSAN_CHECKS" UBSAN_CFLAGS="$UBSAN_CHECKS -Wno-stringop-truncation -Wno-format-overflow -fno-omit-frame-pointer -DUNDEFINED_BEHAVIOR_SANITIZER" UBSAN_LDFLAGS="$UBSAN_CHECKS" UTIL_ARG_ENABLE(NAME: ubsan, DEFAULT: false, RESULT: UBSAN_ENABLED, From 0b7402e0b99019a720c17eadbed25f90ba827a67 Mon Sep 17 00:00:00 2001 From: MBaesken Date: Tue, 25 Jun 2024 13:16:12 +0200 Subject: [PATCH 4/4] adjust UTIL_ARG_WITH --- make/autoconf/jdk-options.m4 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4 index 6442befde0ccb..0dca5d133131f 100644 --- a/make/autoconf/jdk-options.m4 +++ b/make/autoconf/jdk-options.m4 @@ -497,9 +497,9 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_LEAK_SANITIZER], AC_DEFUN_ONCE([JDKOPT_SETUP_UNDEFINED_BEHAVIOR_SANITIZER], [ UTIL_ARG_WITH(NAME: additional-ubsan-checks, TYPE: string, - DEFAULT: [], - DESC: [Custom ubsan checks], - OPTIONAL: true) + DEFAULT: [], + DESC: [Customizes the ubsan checks], + OPTIONAL: true) # GCC reports lots of likely false positives for stringop-truncation and format-overflow. # Silence them for now.