comparison src/share/vm/precompiled/precompiled.hpp @ 10408:836a62f43af9

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 19 Jun 2013 10:45:56 +0200
parents 5fc51c1ecdeb f2110083203d
children d8041d695d19
comparison
equal deleted inserted replaced
10086:e0fb8a213650 10408:836a62f43af9
24 24
25 // Precompiled headers are turned off for Sun Studion, 25 // Precompiled headers are turned off for Sun Studion,
26 // or if the user passes USE_PRECOMPILED_HEADER=0 to the makefiles. 26 // or if the user passes USE_PRECOMPILED_HEADER=0 to the makefiles.
27 27
28 #ifndef DONT_USE_PRECOMPILED_HEADER 28 #ifndef DONT_USE_PRECOMPILED_HEADER
29
30 # include "asm/assembler.hpp" 29 # include "asm/assembler.hpp"
31 # include "asm/assembler.inline.hpp" 30 # include "asm/assembler.inline.hpp"
32 # include "asm/codeBuffer.hpp" 31 # include "asm/codeBuffer.hpp"
33 # include "asm/register.hpp" 32 # include "asm/register.hpp"
34 # include "ci/ciArray.hpp" 33 # include "ci/ciArray.hpp"