diff options
| author | Gabe Black <gblack@eecs.umich.edu> | 2007-05-31 20:45:04 +0000 |
|---|---|---|
| committer | Gabe Black <gblack@eecs.umich.edu> | 2007-05-31 20:45:04 +0000 |
| commit | c432588981c2903fda4b00bf03ada3c2c04063f7 (patch) | |
| tree | 6230df1fe2f4032ef76973f8debcccfed6830285 /src/base | |
| parent | 62fde97bb2e40002e59d0185db419f6f72643a6f (diff) | |
| parent | 6b6de8aaae86ea8b0f416a175c547fc67bea804a (diff) | |
| download | gem5-c432588981c2903fda4b00bf03ada3c2c04063f7.tar.xz | |
Merge zizzer.eecs.umich.edu:/bk/newmem
into ahchoo.blinky.homelinux.org:/home/gblack/m5/newmem-x86
src/cpu/simple/base.cc:
Hand merge
--HG--
extra : convert_revision : a2902ef9d917d22ffb9c7dfa2fd444694a65240d
Diffstat (limited to 'src/base')
| -rw-r--r-- | src/base/loader/elf_object.cc | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/base/loader/elf_object.cc b/src/base/loader/elf_object.cc index 8f157da28..f76ea593b 100644 --- a/src/base/loader/elf_object.cc +++ b/src/base/loader/elf_object.cc @@ -31,23 +31,14 @@ #include <string> -// Because of the -Wundef flag we have to do this -#define __LIBELF_INTERNAL__ 0 -#define __LIBELF_NEED_LINK_H 0 -#define __LIBELF_SYMBOL_VERSIONS 0 - #include "gelf.h" #include "base/loader/elf_object.hh" -#include "base/misc.hh" - #include "base/loader/symtab.hh" - +#include "base/misc.hh" #include "base/trace.hh" // for DPRINTF - #include "sim/byteswap.hh" - using namespace std; ObjectFile * |