OpenJDK / jdk / hs
changeset 37529:868c7195632c
8154087: Fix AIX and Linux/ppc64le after the integration of the new hotspot build
Reviewed-by: erikj, goetz
| author | simonis |
|---|---|
| date | Wed, 13 Apr 2016 11:13:15 +0200 |
| parents | caaadf14458c |
| children | e83b85f957c9 |
| files | jdk/make/lib/Awt2dLibraries.gmk jdk/make/lib/CoreLibraries.gmk jdk/make/lib/NioLibraries.gmk |
| diffstat | 3 files changed, 9 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/make/lib/Awt2dLibraries.gmk Tue Apr 12 00:43:57 2016 -0700 +++ b/jdk/make/lib/Awt2dLibraries.gmk Wed Apr 13 11:13:15 2016 +0200 @@ -370,6 +370,7 @@ OPTIMIZATION := LOW, \ CFLAGS := $(CFLAGS_JDKLIB) $(LIBAWT_XAWT_CFLAGS) \ $(X_CFLAGS), \ + WARNINGS_AS_ERRORS_xlc := false, \ DISABLED_WARNINGS_gcc := type-limits pointer-to-int-cast \ deprecated-declarations unused-result maybe-uninitialized format \ format-security int-to-pointer-cast parentheses, \ @@ -582,6 +583,7 @@ $(CUPS_CFLAGS) \ $(X_CFLAGS) \ $(LIBAWT_HEADLESS_CFLAGS), \ + DISABLED_WARNINGS_xlc := 1506-356, \ DISABLED_WARNINGS_gcc := maybe-uninitialized int-to-pointer-cast, \ DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE \ E_EMPTY_TRANSLATION_UNIT, \ @@ -598,6 +600,10 @@ OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt_headless, \ )) + # AIX warning explanation: + # 1506-356 : (W) Compilation unit is empty. + # This happens during the headless build + $(BUILD_LIBAWT_HEADLESS): $(BUILD_LIBAWT) TARGETS += $(BUILD_LIBAWT_HEADLESS) @@ -695,6 +701,7 @@ CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBFONTMANAGER_CFLAGS), \ OPTIMIZATION := $(LIBFONTMANAGER_OPTIMIZATION), \ CFLAGS_windows = -DCC_NOEX, \ + WARNINGS_AS_ERRORS_xlc := false, \ DISABLED_WARNINGS_gcc := sign-compare int-to-pointer-cast \ type-limits missing-field-initializers, \ DISABLED_WARNINGS_CXX_gcc := reorder delete-non-virtual-dtor strict-overflow \
--- a/jdk/make/lib/CoreLibraries.gmk Tue Apr 12 00:43:57 2016 -0700 +++ b/jdk/make/lib/CoreLibraries.gmk Wed Apr 13 11:13:15 2016 +0200 @@ -146,6 +146,7 @@ $(LIBJAVA_CFLAGS), \ System.c_CFLAGS := $(VERSION_CFLAGS), \ jdk_util.c_CFLAGS := $(VERSION_CFLAGS), \ + WARNINGS_AS_ERRORS_xlc := false, \ DISABLED_WARNINGS_gcc := unused-result, \ DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \ MAPFILE := $(LIBJAVA_MAPFILE), \
--- a/jdk/make/lib/NioLibraries.gmk Tue Apr 12 00:43:57 2016 -0700 +++ b/jdk/make/lib/NioLibraries.gmk Wed Apr 13 11:13:15 2016 +0200 @@ -70,6 +70,7 @@ SRC := $(BUILD_LIBNIO_SRC), \ EXCLUDE_FILES := $(BUILD_LIBNIO_EXFILES), \ OPTIMIZATION := HIGH, \ + WARNINGS_AS_ERRORS_xlc := false, \ CFLAGS := $(CFLAGS_JDKLIB) \ $(BUILD_LIBNIO_CFLAGS), \ MAPFILE := $(BUILD_LIBNIO_MAPFILE), \