diff options
author | Ali Saidi <saidi@eecs.umich.edu> | 2006-05-26 17:03:47 -0400 |
---|---|---|
committer | Ali Saidi <saidi@eecs.umich.edu> | 2006-05-26 17:03:47 -0400 |
commit | f456360bbcd6e4e4fd1550e96658934affac3eb9 (patch) | |
tree | 8d0062cf6097b02e46dc98b05c3f230cd15670b7 /src/base/loader/elf_object.cc | |
parent | 28ea9729427d2c994d54f0548f80afaeb221b88f (diff) | |
parent | 53510f184452c46868a9e6ece9ccb7f30ab70843 (diff) | |
download | gem5-f456360bbcd6e4e4fd1550e96658934affac3eb9.tar.xz |
Merge zeep.pool:/z/saidi/work/m5.newmem
into zeep.pool:/z/saidi/work/m5.newmem.head
--HG--
extra : convert_revision : 1344e6a30073a1091a904593e6d4733baf19d7e2
Diffstat (limited to 'src/base/loader/elf_object.cc')
-rw-r--r-- | src/base/loader/elf_object.cc | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/base/loader/elf_object.cc b/src/base/loader/elf_object.cc index 165501e1c..79601e9d1 100644 --- a/src/base/loader/elf_object.cc +++ b/src/base/loader/elf_object.cc @@ -30,16 +30,10 @@ // Because of the -Wundef flag we have to do this #define __LIBELF_INTERNAL__ 0 -// counterintuitive, but the flag below causes libelf to define -// 64-bit elf types that apparently didn't exist in some older -// versions of Linux. They seem to be there in 2.4.x, so don't -// set this now (it causes things to break on 64-bit platforms). -#define __LIBELF64_LINUX 0 #define __LIBELF_NEED_LINK_H 0 #define __LIBELF_SYMBOL_VERSIONS 0 -#include "libelf/libelf.h" -#include "libelf/gelf.h" +#include "gelf.h" #include "base/loader/elf_object.hh" #include "base/misc.hh" |