OpenJDK / amber / amber
changeset 37469:ac811846846c
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:14 +0200 |
| parents | 8173cbc15e07 |
| children | d668bb1f3633 |
| files | hotspot/makefiles/gensrc/GensrcAdlc.gmk hotspot/src/os/aix/vm/perfMemory_aix.cpp |
| diffstat | 2 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/hotspot/makefiles/gensrc/GensrcAdlc.gmk Tue Apr 12 09:08:48 2016 +0000 +++ b/hotspot/makefiles/gensrc/GensrcAdlc.gmk Wed Apr 13 11:13:14 2016 +0200 @@ -41,9 +41,8 @@ ADLC_CFLAGS := -m64 ADLC_CFLAGS_WARNINGS := +w else ifeq ($(OPENJDK_BUILD_OS), aix) - # FIXME: Not implemented. These flags are likely, however - # ADLC_LDFLAGS := -q64 - # ADLC_CFLAGS := -qnortti -qnoeh -q64 + ADLC_LDFLAGS := -q64 + ADLC_CFLAGS := -qnortti -qeh -q64 -DAIX else ifeq ($(OPENJDK_BUILD_OS), windows) ADLC_LDFLAGS := -nologo ADLC_CFLAGS := -nologo -EHsc @@ -89,7 +88,7 @@ else ifeq ($(OPENJDK_TARGET_OS), solaris) ADLCFLAGS += -DSOLARIS=1 -DSPARC_WORKS=1 else ifeq ($(OPENJDK_TARGET_OS), aix) - # FIXME: Not implemented + ADLCFLAGS += -DAIX=1 else ifeq ($(OPENJDK_TARGET_OS), macosx) ADLCFLAGS += -D_ALLBSD_SOURCE=1 -D_GNU_SOURCE=1 endif
--- a/hotspot/src/os/aix/vm/perfMemory_aix.cpp Tue Apr 12 09:08:48 2016 +0000 +++ b/hotspot/src/os/aix/vm/perfMemory_aix.cpp Wed Apr 13 11:13:14 2016 +0200 @@ -956,7 +956,7 @@ #ifdef O_NOFOLLOW RESTARTABLE(::open(filename, oflags), result); #else - open_o_nofollow(filename, oflags); + result = open_o_nofollow(filename, oflags); #endif if (result == OS_ERR) {