Merge

7aef98a1 · asaha · 9df6cbf6 · b225fd75 · 7aef98a1 · 7aef98a1
展开全部显示空白变更内容
内联并排

Showing with 399 addition and 74 deletion

.hgtags .hgtags +1 -0

make/aix/makefiles/xlc.make make/aix/makefiles/xlc.make +6 -0

src/os/aix/vm/perfMemory_aix.cpp src/os/aix/vm/perfMemory_aix.cpp +392 -74

未找到文件。
--- a/.hgtags
+++ b/.hgtags
@@ -590,6 +590,7 @@ d2e9a6bec4f2eec8506eed16f7324992a85d8480 hs25.40-b24
 0f0cb4eeab2d871274f4ffdcd6017d2fdfa89238 hs25.40-b25
 0ee548a1cda08c884eccd563e2d5fdb6ee769b5a jdk8u40-b22
 0e67683b700174eab71ea205d1cfa4f1cf4523ba jdk8u40-b23
+fa4e797f61e6dda1a60e06944018213bff2a1b76 jdk8u40-b24
 b95f13f05f553309cd74d6ccf8fcedb259c6716c jdk8u45-b00
 41c3c456e326185053f0654be838f4b0bfb38078 jdk8u45-b01
 626fd8c2eec63e2a2dff3839bfe12c0431bf00a4 jdk8u45-b02

--- a/make/aix/makefiles/xlc.make
+++ b/make/aix/makefiles/xlc.make
@@ -74,6 +74,12 @@ CFLAGS += -D_REENTRANT
 # no xlc counterpart for -fcheck-new
 # CFLAGS += -fcheck-new

+# We need to define this on the command line if we want to use the the
+# predefined format specifiers from "inttypes.h". Otherwise system headrs
+# can indirectly include inttypes.h before we define __STDC_FORMAT_MACROS
+# in globalDefinitions.hpp
+CFLAGS += -D__STDC_FORMAT_MACROS
+
 ARCHFLAG = -q64

 CFLAGS     += $(ARCHFLAG)

--- a/src/os/aix/vm/perfMemory_aix.cpp
+++ b/src/os/aix/vm/perfMemory_aix.cpp