Mercurial > hg > truffle
comparison src/share/vm/utilities/decoder.cpp @ 17812:a7d4d4655766
Merge
author | kvn |
---|---|
date | Wed, 26 Mar 2014 18:21:05 -0700 |
parents | a9becfeecd1b |
children | 4ca6dc0799b6 |
comparison
equal
deleted
inserted
replaced
17789:6b207d038106 | 17812:a7d4d4655766 |
---|---|
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()) { |