Merge the templateTable_x86_32/64.hpp files also.

Edit share/vm/interpreter/templateTable.hpp to only include templateTable_x86.hpp

Also

philli% diff templateTable_x86_*.hpp
2c2
< * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
---
> * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
25,26c25,26
< #ifndef CPU_X86_VM_TEMPLATETABLE_X86_32_HPP
< #define CPU_X86_VM_TEMPLATETABLE_X86_32_HPP
---
> #ifndef CPU_X86_VM_TEMPLATETABLE_X86_64_HPP
> #define CPU_X86_VM_TEMPLATETABLE_X86_64_HPP
42c42
< #endif // CPU_X86_VM_TEMPLATETABLE_X86_32_HPP
---
> #endif // CPU_X86_VM_TEMPLATETABLE_X86_64_HPP

Should be

#ifndef CPU_X86_VM_TEMPLATETABLE_X86_HPP
#define ^above
...
#endif // ^above