Mercurial > hg > graal-compiler
diff src/cpu/ppc/vm/assembler_ppc.hpp @ 14726:92aa6797d639
Backed out merge changeset: b51e29501f30
Backed out merge revision to its first parent (8f483e200405)
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Mon, 24 Mar 2014 21:30:43 +0100 |
| parents | e5e8aa897002 |
| children |
line wrap: on
line diff
--- a/src/cpu/ppc/vm/assembler_ppc.hpp Fri Mar 21 16:36:59 2014 -0700 +++ b/src/cpu/ppc/vm/assembler_ppc.hpp Mon Mar 24 21:30:43 2014 +0100 @@ -124,7 +124,6 @@ } }; -#if !defined(ABI_ELFv2) // A ppc64 function descriptor. struct FunctionDescriptor VALUE_OBJ_CLASS_SPEC { private: @@ -162,7 +161,6 @@ _env = (address) 0xbad; } }; -#endif class Assembler : public AbstractAssembler { protected: @@ -1069,7 +1067,6 @@ // Emit an address. inline address emit_addr(const address addr = NULL); -#if !defined(ABI_ELFv2) // Emit a function descriptor with the specified entry point, TOC, // and ENV. If the entry point is NULL, the descriptor will point // just past the descriptor. @@ -1077,7 +1074,6 @@ inline address emit_fd(address entry = NULL, address toc = (address) FunctionDescriptor::friend_toc, address env = (address) FunctionDescriptor::friend_env); -#endif ///////////////////////////////////////////////////////////////////////////////////// // PPC instructions