Mercurial > hg > graal-jvmci-8

diff src/share/vm/runtime/atomic.cpp @ 14465:28f281e8de1d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author kvn
date Thu, 20 Feb 2014 12:20:56 -0800
parents abec000618bf
children 4ca6dc0799b6
line wrap: on
line diff
--- a/src/share/vm/runtime/atomic.cpp	Tue Feb 18 09:54:24 2014 -0500
+++ b/src/share/vm/runtime/atomic.cpp	Thu Feb 20 12:20:56 2014 -0800
@@ -33,6 +33,9 @@
 #ifdef TARGET_OS_FAMILY_windows
 # include "os_windows.inline.hpp"
 #endif
+#ifdef TARGET_OS_FAMILY_aix
+# include "os_aix.inline.hpp"
+#endif
 #ifdef TARGET_OS_FAMILY_bsd
 # include "os_bsd.inline.hpp"
 #endif