Mercurial > hg > graal-jvmci-8
comparison src/share/vm/runtime/os.hpp @ 14411:bdd155477289
8023033: PPC64 (part 13): basic changes for AIX
Summary: Added AIX includes alpha-sorted before BSD. Fix compilation issues with xlC in shared code. Basic shared platform dependend adaption (vm_version etc.).
Reviewed-by: kvn, dholmes, stefank
author | goetz |
---|---|
date | Thu, 22 Aug 2013 09:39:54 -0700 |
parents | af21010d1062 |
children | e2722a66aba7 |
comparison
equal
deleted
inserted
replaced
14410:f42f2e2a1518 | 14411:bdd155477289 |
---|---|
39 # include <setjmp.h> | 39 # include <setjmp.h> |
40 #endif | 40 #endif |
41 #ifdef TARGET_OS_FAMILY_windows | 41 #ifdef TARGET_OS_FAMILY_windows |
42 # include "jvm_windows.h" | 42 # include "jvm_windows.h" |
43 #endif | 43 #endif |
44 #ifdef TARGET_OS_FAMILY_aix | |
45 # include "jvm_aix.h" | |
46 # include <setjmp.h> | |
47 #endif | |
44 #ifdef TARGET_OS_FAMILY_bsd | 48 #ifdef TARGET_OS_FAMILY_bsd |
45 # include "jvm_bsd.h" | 49 # include "jvm_bsd.h" |
46 # include <setjmp.h> | 50 # include <setjmp.h> |
47 #endif | 51 #endif |
48 | 52 |
748 # include "os_posix.hpp" | 752 # include "os_posix.hpp" |
749 #endif | 753 #endif |
750 #ifdef TARGET_OS_FAMILY_windows | 754 #ifdef TARGET_OS_FAMILY_windows |
751 # include "os_windows.hpp" | 755 # include "os_windows.hpp" |
752 #endif | 756 #endif |
757 #ifdef TARGET_OS_FAMILY_aix | |
758 # include "os_aix.hpp" | |
759 # include "os_posix.hpp" | |
760 #endif | |
753 #ifdef TARGET_OS_FAMILY_bsd | 761 #ifdef TARGET_OS_FAMILY_bsd |
754 # include "os_posix.hpp" | 762 # include "os_posix.hpp" |
755 # include "os_bsd.hpp" | 763 # include "os_bsd.hpp" |
756 #endif | 764 #endif |
757 #ifdef TARGET_OS_ARCH_linux_x86 | 765 #ifdef TARGET_OS_ARCH_linux_x86 |
775 #ifdef TARGET_OS_ARCH_linux_arm | 783 #ifdef TARGET_OS_ARCH_linux_arm |
776 # include "os_linux_arm.hpp" | 784 # include "os_linux_arm.hpp" |
777 #endif | 785 #endif |
778 #ifdef TARGET_OS_ARCH_linux_ppc | 786 #ifdef TARGET_OS_ARCH_linux_ppc |
779 # include "os_linux_ppc.hpp" | 787 # include "os_linux_ppc.hpp" |
788 #endif | |
789 #ifdef TARGET_OS_ARCH_aix_ppc | |
790 # include "os_aix_ppc.hpp" | |
780 #endif | 791 #endif |
781 #ifdef TARGET_OS_ARCH_bsd_x86 | 792 #ifdef TARGET_OS_ARCH_bsd_x86 |
782 # include "os_bsd_x86.hpp" | 793 # include "os_bsd_x86.hpp" |
783 #endif | 794 #endif |
784 #ifdef TARGET_OS_ARCH_bsd_zero | 795 #ifdef TARGET_OS_ARCH_bsd_zero |