comparison src/share/vm/code/stubs.hpp @ 18041:52b4284cb496

Merge with jdk8u20-b26
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 16:02:50 +0200
parents 89152779163c
children
comparison
equal deleted inserted replaced
17606:45d7b2c7029d 18041:52b4284cb496
33 #ifdef TARGET_OS_FAMILY_solaris 33 #ifdef TARGET_OS_FAMILY_solaris
34 # include "os_solaris.inline.hpp" 34 # include "os_solaris.inline.hpp"
35 #endif 35 #endif
36 #ifdef TARGET_OS_FAMILY_windows 36 #ifdef TARGET_OS_FAMILY_windows
37 # include "os_windows.inline.hpp" 37 # include "os_windows.inline.hpp"
38 #endif
39 #ifdef TARGET_OS_FAMILY_aix
40 # include "os_aix.inline.hpp"
38 #endif 41 #endif
39 #ifdef TARGET_OS_FAMILY_bsd 42 #ifdef TARGET_OS_FAMILY_bsd
40 # include "os_bsd.inline.hpp" 43 # include "os_bsd.inline.hpp"
41 #endif 44 #endif
42 45