Mercurial > hg > graal-jvmci-8
comparison src/share/vm/runtime/atomic.cpp @ 14518:d8041d695d19
Merged with jdk9/dev/hotspot changeset 3812c088b945
author | twisti |
---|---|
date | Tue, 11 Mar 2014 18:45:59 -0700 |
parents | abec000618bf |
children | 4ca6dc0799b6 |
comparison
equal
deleted
inserted
replaced
14141:f97c5ec83832 | 14518:d8041d695d19 |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * | 4 * |
5 * This code is free software; you can redistribute it and/or modify it | 5 * This code is free software; you can redistribute it and/or modify it |
6 * under the terms of the GNU General Public License version 2 only, as | 6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
30 #ifdef TARGET_OS_FAMILY_solaris | 30 #ifdef TARGET_OS_FAMILY_solaris |
31 # include "os_solaris.inline.hpp" | 31 # include "os_solaris.inline.hpp" |
32 #endif | 32 #endif |
33 #ifdef TARGET_OS_FAMILY_windows | 33 #ifdef TARGET_OS_FAMILY_windows |
34 # include "os_windows.inline.hpp" | 34 # include "os_windows.inline.hpp" |
35 #endif | |
36 #ifdef TARGET_OS_FAMILY_aix | |
37 # include "os_aix.inline.hpp" | |
35 #endif | 38 #endif |
36 #ifdef TARGET_OS_FAMILY_bsd | 39 #ifdef TARGET_OS_FAMILY_bsd |
37 # include "os_bsd.inline.hpp" | 40 # include "os_bsd.inline.hpp" |
38 #endif | 41 #endif |
39 | 42 |