remove #ifndef __puma from code using LLVM
Contemporary AspectC++ versions can deal with the LLVM headers very well, and #ifdef __puma stuff in Fail* headers results in unmaintainable #ifdef __puma blocks in other parts of Fail* (e.g., the trace importer). Make sure you're using a 64-bit ac++ when living in a 64-bit userland (the 32-bit version doesn't know about __int128), and be aware that AspectC++ r325 introduced a regression that has not been fixed yet. Change-Id: I5bb759b08995a74b020d44a2b40e9d7a6e18111c
This commit is contained in:
@ -5,13 +5,10 @@
|
||||
#include "util/CommandLine.hpp"
|
||||
#include "Importer.hpp"
|
||||
|
||||
#ifndef __puma
|
||||
#include "util/llvmdisassembler/LLVMDisassembler.hpp"
|
||||
#endif
|
||||
|
||||
|
||||
class RegisterImporter : public Importer {
|
||||
#ifndef __puma
|
||||
llvm::OwningPtr<llvm::object::Binary> binary;
|
||||
llvm::OwningPtr<fail::LLVMDisassembler> disas;
|
||||
|
||||
@ -19,8 +16,6 @@ class RegisterImporter : public Importer {
|
||||
const Trace_Event &ev,
|
||||
const fail::LLVMtoFailTranslator::reginfo_t &info,
|
||||
char access_type);
|
||||
#endif
|
||||
|
||||
|
||||
fail::CommandLine::option_handle NO_GP, FLAGS, IP;
|
||||
bool do_gp, do_flags, do_ip;
|
||||
|
||||
Reference in New Issue
Block a user