Mercurial > hg > truffle
diff src/cpu/x86/vm/stubRoutines_x86_32.cpp @ 6948:e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 12 Nov 2012 23:14:12 +0100 |
parents | a3ecd773a7b9 |
children | f34d701e952e |
line wrap: on
line diff
--- a/src/cpu/x86/vm/stubRoutines_x86_32.cpp Mon Nov 12 18:11:17 2012 +0100 +++ b/src/cpu/x86/vm/stubRoutines_x86_32.cpp Mon Nov 12 23:14:12 2012 +0100 @@ -44,3 +44,4 @@ address StubRoutines::x86::_verify_mxcsr_entry = NULL; address StubRoutines::x86::_verify_fpu_cntrl_wrd_entry = NULL; +address StubRoutines::x86::_key_shuffle_mask_addr = NULL;