< prev index next >
make/lib/Awt2dLibraries.gmk
Print this page
@@ -206,15 +206,11 @@
ifeq ($(OPENJDK_TARGET_OS), linux)
# FIXME: This is probably not what we want to do, but keep it now for compatibility.
LIBAWT_CFLAGS += $(EXPORT_ALL_SYMBOLS)
endif
-# Turn off all warnings for debug_mem.c This is needed because the specific warning
-# about initializing a declared 'extern' cannot be turned off individually. Only
-# applies to debug builds.
ifeq ($(TOOLCHAIN_TYPE), gcc)
- BUILD_LIBAWT_debug_mem.c_CFLAGS := -w
# This option improves performance of MaskFill in Java2D by 20% for some gcc
LIBAWT_CFLAGS += -fgcse-after-reload
endif
$(eval $(call SetupJdkLibrary, BUILD_LIBAWT, \
@@ -223,12 +219,11 @@
EXCLUDES := $(LIBAWT_EXCLUDES), \
EXCLUDE_FILES := $(LIBAWT_EXFILES), \
OPTIMIZATION := LOW, \
CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_CFLAGS), \
EXTRA_HEADER_DIRS := $(LIBAWT_EXTRA_HEADER_DIRS), \
- DISABLED_WARNINGS_gcc := sign-compare unused-result maybe-uninitialized \
- format-nonliteral parentheses unused-value unused-function, \
+ DISABLED_WARNINGS_gcc := unused-value unused-function, \
DISABLED_WARNINGS_clang := logical-op-parentheses extern-initializer \
sign-compare format-nonliteral, \
DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE, \
DISABLED_WARNINGS_microsoft := 4244 4267 4996, \
ASFLAGS := $(LIBAWT_ASFLAGS), \
@@ -311,34 +306,20 @@
ifeq ($(OPENJDK_TARGET_OS), linux)
LIBAWT_XAWT_LIBS += -lpthread
endif
- ifeq ($(TOOLCHAIN_TYPE), gcc)
- # Turn off all warnings for the following files since they contain warnings
- # that cannot be turned of individually.
- # redefining a macro
- BUILD_LIBAWT_XAWT_gtk2_interface.c_CFLAGS := -w
- # comparison between pointer and integer
- BUILD_LIBAWT_XAWT_awt_Font.c_CFLAGS := -w
- # initializing a declared 'extern'
- BUILD_LIBAWT_XAWT_debug_mem.c_CFLAGS := -w
- endif
-
$(eval $(call SetupJdkLibrary, BUILD_LIBAWT_XAWT, \
NAME := awt_xawt, \
EXTRA_SRC := $(LIBAWT_XAWT_EXTRA_SRC), \
EXTRA_HEADER_DIRS := $(LIBAWT_XAWT_EXTRA_HEADER_DIRS), \
EXCLUDES := $(LIBAWT_XAWT_EXCLUDES), \
OPTIMIZATION := LOW, \
CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_XAWT_CFLAGS) \
$(X_CFLAGS), \
WARNINGS_AS_ERRORS_xlc := false, \
- DISABLED_WARNINGS_gcc := type-limits pointer-to-int-cast \
- unused-result maybe-uninitialized format \
- format-security int-to-pointer-cast parentheses \
- implicit-fallthrough undef unused-function, \
+ DISABLED_WARNINGS_gcc := format unused-function, \
DISABLED_WARNINGS_clang := parentheses format undef \
logical-op-parentheses format-nonliteral int-conversion, \
DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE \
E_ASSIGNMENT_TYPE_MISMATCH E_NON_CONST_INIT, \
LDFLAGS := $(LDFLAGS_JDKLIB) \
< prev index next >