Mercurial > hg > truffle
diff src/share/vm/utilities/copy.hpp @ 2044:06f017f7daa7
Merge.
author | Thomas Wuerthinger <wuerthinger@ssw.jku.at> |
---|---|
date | Fri, 07 Jan 2011 18:18:08 +0100 |
parents | f95d63e2154a |
children | b92c45f2bc75 |
line wrap: on
line diff
--- a/src/share/vm/utilities/copy.hpp Wed Dec 29 20:06:41 2010 +0100 +++ b/src/share/vm/utilities/copy.hpp Fri Jan 07 18:18:08 2011 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -22,6 +22,11 @@ * */ +#ifndef SHARE_VM_UTILITIES_COPY_HPP +#define SHARE_VM_UTILITIES_COPY_HPP + +#include "runtime/stubRoutines.hpp" + // Assembly code for platforms that need it. extern "C" { void _Copy_conjoint_words(HeapWord* from, HeapWord* to, size_t count); @@ -317,5 +322,16 @@ } // Platform dependent implementations of the above methods. - #include "incls/_copy_pd.hpp.incl" +#ifdef TARGET_ARCH_x86 +# include "copy_x86.hpp" +#endif +#ifdef TARGET_ARCH_sparc +# include "copy_sparc.hpp" +#endif +#ifdef TARGET_ARCH_zero +# include "copy_zero.hpp" +#endif + }; + +#endif // SHARE_VM_UTILITIES_COPY_HPP