summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@eecs.umich.edu>2007-05-26 20:15:35 -0700
committerSteve Reinhardt <stever@eecs.umich.edu>2007-05-26 20:15:35 -0700
commit6a48f6b67d41b03e04aaba8e5fbe4e20059a9b9f (patch)
tree9166eea0eea8ead9cf73c2addfb816a80c018f85 /src
parent87bb4c3792d080e0be0b16b0b39957215c7dfbfa (diff)
parent4f0f217c1b6a8c888ff8a1c60d1eb36cbdf14490 (diff)
downloadgem5-6a48f6b67d41b03e04aaba8e5fbe4e20059a9b9f.tar.xz
Merge vm1.(none):/home/stever/bk/newmem-head
into vm1.(none):/home/stever/bk/newmem-cache2 --HG-- extra : convert_revision : f940480672861185a494f3fae1bfca13d31fed9f
Diffstat (limited to 'src')
-rw-r--r--src/base/loader/elf_object.cc11
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 *