Mercurial > hg > truffle

comparison src/share/vm/utilities/decoder.cpp @ 14521:29ccc4cbabca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 12 Mar 2014 13:30:08 +0100
parents abec000618bf
children 4ca6dc0799b6
comparison
equal deleted inserted replaced
14520:f84115370178 14521:29ccc4cbabca
1 /* 1 /*
2 * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 * 4 *
5 * This code is free software; you can redistribute it and/or modify it 5 * This code is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License version 2 only, as 6 * under the terms of the GNU General Public License version 2 only, as
7 * published by the Free Software Foundation. 7 * published by the Free Software Foundation.
30 30
31 #if defined(_WINDOWS) 31 #if defined(_WINDOWS)
32 #include "decoder_windows.hpp" 32 #include "decoder_windows.hpp"
33 #elif defined(__APPLE__) 33 #elif defined(__APPLE__)
34 #include "decoder_machO.hpp" 34 #include "decoder_machO.hpp"
35 #elif defined(AIX)
36 #include "decoder_aix.hpp"
35 #else 37 #else
36 #include "decoder_elf.hpp" 38 #include "decoder_elf.hpp"
37 #endif 39 #endif
38 40
39 AbstractDecoder* Decoder::_shared_decoder = NULL; 41 AbstractDecoder* Decoder::_shared_decoder = NULL;
64 AbstractDecoder* decoder; 66 AbstractDecoder* decoder;
65 #if defined(_WINDOWS) 67 #if defined(_WINDOWS)
66 decoder = new (std::nothrow) WindowsDecoder(); 68 decoder = new (std::nothrow) WindowsDecoder();
67 #elif defined (__APPLE__) 69 #elif defined (__APPLE__)
68 decoder = new (std::nothrow)MachODecoder(); 70 decoder = new (std::nothrow)MachODecoder();
71 #elif defined(AIX)
72 decoder = new (std::nothrow)AIXDecoder();
69 #else 73 #else
70 decoder = new (std::nothrow)ElfDecoder(); 74 decoder = new (std::nothrow)ElfDecoder();
71 #endif 75 #endif
72 76
73 if (decoder == NULL || decoder->has_error()) { 77 if (decoder == NULL || decoder->has_error()) {