summaryrefslogtreecommitdiff
path: root/base/loader
diff options
context:
space:
mode:
authorNathan Binkert <binkertn@umich.edu>2004-01-30 16:01:26 -0500
committerNathan Binkert <binkertn@umich.edu>2004-01-30 16:01:26 -0500
commit4ae64216c3c27e9f1e35ce93114f932f3d2c3361 (patch)
treefe3ca24667628af7c2e5a94a3bcae585fb492855 /base/loader
parenta0c3e61d320e72bbdddf4cea1413f6638e0faf45 (diff)
parent2f4f7aacf77dea16795a4052613da6092f6efc31 (diff)
downloadgem5-4ae64216c3c27e9f1e35ce93114f932f3d2c3361.tar.xz
Merge
--HG-- extra : convert_revision : 8690e31b64235874d74ea4a1123a408610fb115b
Diffstat (limited to 'base/loader')
-rw-r--r--base/loader/elf_object.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/base/loader/elf_object.cc b/base/loader/elf_object.cc
index 929d455a5..9889b9d4c 100644
--- a/base/loader/elf_object.cc
+++ b/base/loader/elf_object.cc
@@ -30,7 +30,11 @@
// Because of the -Wundef flag we have to do this
#define __LIBELF_INTERNAL__ 0
-#define __LIBELF64_LINUX 1
+// 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
#include <libelf/libelf.h>