1.1 --- a/src/cpu/x86/vm/copy_x86.hpp Tue Nov 23 15:01:43 2010 -0500 1.2 +++ b/src/cpu/x86/vm/copy_x86.hpp Tue Nov 23 13:22:55 2010 -0800 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved. 1.6 + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. 1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.8 * 1.9 * This code is free software; you can redistribute it and/or modify it 1.10 @@ -22,10 +22,22 @@ 1.11 * 1.12 */ 1.13 1.14 +#ifndef CPU_X86_VM_COPY_X86_HPP 1.15 +#define CPU_X86_VM_COPY_X86_HPP 1.16 + 1.17 // Inline functions for memory copy and fill. 1.18 1.19 // Contains inline asm implementations 1.20 -#include "incls/_copy_pd.inline.hpp.incl" 1.21 +#ifdef TARGET_OS_ARCH_linux_x86 1.22 +# include "copy_linux_x86.inline.hpp" 1.23 +#endif 1.24 +#ifdef TARGET_OS_ARCH_solaris_x86 1.25 +# include "copy_solaris_x86.inline.hpp" 1.26 +#endif 1.27 +#ifdef TARGET_OS_ARCH_windows_x86 1.28 +# include "copy_windows_x86.inline.hpp" 1.29 +#endif 1.30 + 1.31 1.32 static void pd_fill_to_words(HeapWord* tohw, size_t count, juint value) { 1.33 #ifdef AMD64 1.34 @@ -58,3 +70,5 @@ 1.35 static void pd_zero_to_bytes(void* to, size_t count) { 1.36 (void)memset(to, 0, count); 1.37 } 1.38 + 1.39 +#endif // CPU_X86_VM_COPY_X86_HPP