From e9f751ab161ae3663e13108a47fdf722fcb84d67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Jeli=C5=84ski?= <djelinski@openjdk.org> Date: Wed, 9 Aug 2023 12:26:32 +0000 Subject: [PATCH] 8311247: Some cpp files are compiled with -std:c11 flag Reviewed-by: aivanov, jwaters, prr, erikj --- make/modules/java.desktop/lib/Awt2dLibraries.gmk | 7 ++++++- make/modules/java.security.jgss/Lib.gmk | 5 +++-- make/modules/jdk.accessibility/Launcher.gmk | 7 ++++++- make/modules/jdk.accessibility/Lib.gmk | 6 +++++- make/modules/jdk.crypto.mscapi/Lib.gmk | 3 ++- 5 files changed, 22 insertions(+), 6 deletions(-) diff --git a/make/modules/java.desktop/lib/Awt2dLibraries.gmk b/make/modules/java.desktop/lib/Awt2dLibraries.gmk index 2956076599f..3208e1db31a 100644 --- a/make/modules/java.desktop/lib/Awt2dLibraries.gmk +++ b/make/modules/java.desktop/lib/Awt2dLibraries.gmk @@ -132,6 +132,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \ EXCLUDE_FILES := $(LIBAWT_EXFILES), \ OPTIMIZATION := HIGHEST, \ CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \ + CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \ EXTRA_HEADER_DIRS := $(LIBAWT_EXTRA_HEADER_DIRS), \ DISABLED_WARNINGS_gcc_awt_LoadLibrary.c := unused-result, \ DISABLED_WARNINGS_gcc_debug_mem.c := format-nonliteral, \ @@ -613,7 +614,9 @@ ifeq ($(call isTargetOs, windows), true) $(eval $(call SetupJdkLibrary, BUILD_LIBJAWT, \ NAME := jawt, \ OPTIMIZATION := LOW, \ - CFLAGS := $(CXXFLAGS_JDKLIB) \ + CFLAGS := $(CFLAGS_JDKLIB) \ + $(LIBJAWT_CFLAGS), \ + CXXFLAGS := $(CXXFLAGS_JDKLIB) \ $(LIBJAWT_CFLAGS), \ EXTRA_HEADER_DIRS := $(LIBJAWT_EXTRA_HEADER_DIRS), \ LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \ @@ -796,6 +799,8 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false) OPTIMIZATION := LOW, \ CFLAGS := $(CFLAGS_JDKLIB) $(LIBSPLASHSCREEN_CFLAGS) \ $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS) $(LIBZ_CFLAGS), \ + CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBSPLASHSCREEN_CFLAGS) \ + $(GIFLIB_CFLAGS) $(LIBJPEG_CFLAGS) $(PNG_CFLAGS) $(LIBZ_CFLAGS), \ EXTRA_HEADER_DIRS := $(LIBSPLASHSCREEN_HEADER_DIRS), \ DISABLED_WARNINGS_gcc_dgif_lib.c := sign-compare, \ DISABLED_WARNINGS_gcc_jcmaster.c := implicit-fallthrough, \ diff --git a/make/modules/java.security.jgss/Lib.gmk b/make/modules/java.security.jgss/Lib.gmk index fcd46b44044..20d9d5e281c 100644 --- a/make/modules/java.security.jgss/Lib.gmk +++ b/make/modules/java.security.jgss/Lib.gmk @@ -45,8 +45,9 @@ ifeq ($(call isTargetOs, windows), true) $(eval $(call SetupJdkLibrary, BUILD_LIBSSPI_BRIDGE, \ NAME := sspi_bridge, \ OPTIMIZATION := LOW, \ - CFLAGS := $(CFLAGS_JDKLIB) \ - -I$(TOPDIR)/src/java.security.jgss/share/native/libj2gss, \ + EXTRA_HEADER_DIRS := libj2gss, \ + CFLAGS := $(CFLAGS_JDKLIB), \ + CXXFLAGS := $(CXXFLAGS_JDKLIB), \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ LIBS := Secur32.lib, \ diff --git a/make/modules/jdk.accessibility/Launcher.gmk b/make/modules/jdk.accessibility/Launcher.gmk index 7ff2a46910e..d41ec4bc2f9 100644 --- a/make/modules/jdk.accessibility/Launcher.gmk +++ b/make/modules/jdk.accessibility/Launcher.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -43,6 +43,9 @@ ifeq ($(call isTargetOs, windows), true) CFLAGS := $(filter-out -Zc:wchar_t-, $(CFLAGS_JDKEXE)) -Zc:wchar_t \ -analyze- -Od -Gd -D_WINDOWS \ -D_UNICODE -DUNICODE -RTC1 -EHsc, \ + CXXFLAGS := $(filter-out -Zc:wchar_t-, $(CXXFLAGS_JDKEXE)) -Zc:wchar_t \ + -analyze- -Od -Gd -D_WINDOWS \ + -D_UNICODE -DUNICODE -RTC1 -EHsc, \ DISABLED_WARNINGS_microsoft_jabswitch.cpp := 4267 4996, \ LDFLAGS := $(LDFLAGS_JDKEXE), \ LIBS := advapi32.lib version.lib user32.lib, \ @@ -65,6 +68,7 @@ ifeq ($(call isTargetOs, windows), true) SRC := $(ACCESSIBILITY_SRCDIR)/jaccessinspector $(ACCESSIBILITY_SRCDIR)/common \ $(ACCESSIBILITY_SRCDIR)/toolscommon $(ACCESSIBILITY_SRCDIR)/bridge, \ CFLAGS := $$(CFLAGS_JDKEXE) $(TOOLS_CFLAGS) -DACCESSBRIDGE_ARCH_$2 -EHsc, \ + CXXFLAGS := $$(CXXFLAGS_JDKEXE) $(TOOLS_CFLAGS) -DACCESSBRIDGE_ARCH_$2 -EHsc, \ LDFLAGS := $$(LDFLAGS_JDKEXE) -stack:655360, \ LIBS := advapi32.lib user32.lib, \ VERSIONINFO_RESOURCE := $(ACCESSIBILITY_SRCDIR)/jaccessinspector/jaccessinspectorWindow.rc, \ @@ -86,6 +90,7 @@ ifeq ($(call isTargetOs, windows), true) SRC := $(ACCESSIBILITY_SRCDIR)/jaccesswalker $(ACCESSIBILITY_SRCDIR)/common \ $(ACCESSIBILITY_SRCDIR)/toolscommon $(ACCESSIBILITY_SRCDIR)/bridge, \ CFLAGS := $$(CFLAGS_JDKEXE) $(TOOLS_CFLAGS) -DACCESSBRIDGE_ARCH_$2 -EHsc, \ + CXXFLAGS := $$(CXXFLAGS_JDKEXE) $(TOOLS_CFLAGS) -DACCESSBRIDGE_ARCH_$2 -EHsc, \ LDFLAGS := $$(LDFLAGS_JDKEXE) -stack:655360, \ LIBS := advapi32.lib comctl32.lib gdi32.lib user32.lib, \ VERSIONINFO_RESOURCE := $(ACCESSIBILITY_SRCDIR)/jaccesswalker/jaccesswalkerWindow.rc, \ diff --git a/make/modules/jdk.accessibility/Lib.gmk b/make/modules/jdk.accessibility/Lib.gmk index 28666b97325..0cdfb64d2aa 100644 --- a/make/modules/jdk.accessibility/Lib.gmk +++ b/make/modules/jdk.accessibility/Lib.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -43,6 +43,8 @@ ifeq ($(call isTargetOs, windows), true) DISABLED_WARNINGS_microsoft := 4311 4302 4312, \ CFLAGS := $(filter-out -MD, $(CFLAGS_JDKLIB)) -MT \ -DACCESSBRIDGE_ARCH_$2, \ + CXXFLAGS := $(filter-out -MD, $(CXXFLAGS_JDKLIB)) -MT \ + -DACCESSBRIDGE_ARCH_$2, \ EXTRA_HEADER_DIRS := \ include/bridge \ java.desktop:include, \ @@ -70,6 +72,8 @@ ifeq ($(call isTargetOs, windows), true) DISABLED_WARNINGS_microsoft_WinAccessBridge.cpp := 4302 4311, \ CFLAGS := $(CFLAGS_JDKLIB) \ -DACCESSBRIDGE_ARCH_$2, \ + CXXFLAGS := $(CXXFLAGS_JDKLIB) \ + -DACCESSBRIDGE_ARCH_$2, \ EXTRA_HEADER_DIRS := \ include/bridge, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ diff --git a/make/modules/jdk.crypto.mscapi/Lib.gmk b/make/modules/jdk.crypto.mscapi/Lib.gmk index 096ce9b3e46..4d81e2c6e6b 100644 --- a/make/modules/jdk.crypto.mscapi/Lib.gmk +++ b/make/modules/jdk.crypto.mscapi/Lib.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -33,6 +33,7 @@ ifeq ($(call isTargetOs, windows), true) NAME := sunmscapi, \ OPTIMIZATION := LOW, \ CFLAGS := $(CFLAGS_JDKLIB), \ + CXXFLAGS := $(CXXFLAGS_JDKLIB), \ LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ LIBS := crypt32.lib advapi32.lib ncrypt.lib, \