infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-07-10 02:59:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Erik Joelsson 2016-04-13 12:11:06 +02:00
commit 9166e5a215
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hotspot/makefiles/gensrc/GensrcAdlc.gmk
View File

@ -41,9 +41,8 @@ ifeq ($(call check-jvm-feature, compiler2), true)
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 @@ ifeq ($(call check-jvm-feature, compiler2), true)
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

2
hotspot/src/os/aix/vm/perfMemory_aix.cpp
View File

@ -956,7 +956,7 @@ static int open_sharedmem_file(const char* filename, int oflags, TRAPS) {
#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) {