Mercurial > hg > truffle
comparison src/share/vm/runtime/threadLocalStorage.hpp @ 17812:a7d4d4655766
Merge
author | kvn |
---|---|
date | Wed, 26 Mar 2014 18:21:05 -0700 |
parents | bdd155477289 |
children | 4ca6dc0799b6 |
comparison
equal
deleted
inserted
replaced
17789:6b207d038106 | 17812:a7d4d4655766 |
---|---|
66 # include "threadLS_linux_arm.hpp" | 66 # include "threadLS_linux_arm.hpp" |
67 #endif | 67 #endif |
68 #ifdef TARGET_OS_ARCH_linux_ppc | 68 #ifdef TARGET_OS_ARCH_linux_ppc |
69 # include "threadLS_linux_ppc.hpp" | 69 # include "threadLS_linux_ppc.hpp" |
70 #endif | 70 #endif |
71 #ifdef TARGET_OS_ARCH_aix_ppc | |
72 # include "threadLS_aix_ppc.hpp" | |
73 #endif | |
71 #ifdef TARGET_OS_ARCH_bsd_x86 | 74 #ifdef TARGET_OS_ARCH_bsd_x86 |
72 # include "threadLS_bsd_x86.hpp" | 75 # include "threadLS_bsd_x86.hpp" |
73 #endif | 76 #endif |
74 #ifdef TARGET_OS_ARCH_bsd_zero | 77 #ifdef TARGET_OS_ARCH_bsd_zero |
75 # include "threadLS_bsd_zero.hpp" | 78 # include "threadLS_bsd_zero.hpp" |