Mercurial > hg > truffle

comparison src/share/vm/runtime/os.hpp @ 17812:a7d4d4655766

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author kvn
date Wed, 26 Mar 2014 18:21:05 -0700
parents 62c54fcc0a35
children 917873d2983d 364b73402247
comparison
equal deleted inserted replaced
17789:6b207d038106 17812:a7d4d4655766
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
770 # include "os_posix.hpp" 774 # include "os_posix.hpp"
771 #endif 775 #endif
772 #ifdef TARGET_OS_FAMILY_windows 776 #ifdef TARGET_OS_FAMILY_windows
773 # include "os_windows.hpp" 777 # include "os_windows.hpp"
774 #endif 778 #endif
779 #ifdef TARGET_OS_FAMILY_aix
780 # include "os_aix.hpp"
781 # include "os_posix.hpp"
782 #endif
775 #ifdef TARGET_OS_FAMILY_bsd 783 #ifdef TARGET_OS_FAMILY_bsd
776 # include "os_posix.hpp" 784 # include "os_posix.hpp"
777 # include "os_bsd.hpp" 785 # include "os_bsd.hpp"
778 #endif 786 #endif
779 #ifdef TARGET_OS_ARCH_linux_x86 787 #ifdef TARGET_OS_ARCH_linux_x86
797 #ifdef TARGET_OS_ARCH_linux_arm 805 #ifdef TARGET_OS_ARCH_linux_arm
798 # include "os_linux_arm.hpp" 806 # include "os_linux_arm.hpp"
799 #endif 807 #endif
800 #ifdef TARGET_OS_ARCH_linux_ppc 808 #ifdef TARGET_OS_ARCH_linux_ppc
801 # include "os_linux_ppc.hpp" 809 # include "os_linux_ppc.hpp"
810 #endif
811 #ifdef TARGET_OS_ARCH_aix_ppc
812 # include "os_aix_ppc.hpp"
802 #endif 813 #endif
803 #ifdef TARGET_OS_ARCH_bsd_x86 814 #ifdef TARGET_OS_ARCH_bsd_x86
804 # include "os_bsd_x86.hpp" 815 # include "os_bsd_x86.hpp"
805 #endif 816 #endif
806 #ifdef TARGET_OS_ARCH_bsd_zero 817 #ifdef TARGET_OS_ARCH_bsd_zero