aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric B Munson <ebmunson@us.ibm.com>2008-04-15 10:19:51 -0700
committerNishanth Aravamudan <nacc@us.ibm.com>2008-04-15 17:05:31 -0700
commit4ee04fc4e0bd67fca758637778056d85c339b538 (patch)
tree4a6c3f02d358f3eb122ad2ac77a4da4680e27bcb
parenta6249347146c8f4b783fd742f2ead0ce13cb33f3 (diff)
downloadlibhugetlbfs-4ee04fc4e0bd67fca758637778056d85c339b538.tar.gz
Skip elflink calls in setup_libhugetlbfs on IA64/sparc64
Building on IA64 and sparc64 currently fails because elflink is not supported. This patch sets up a NO_ELFLINK define in the appropriate sections of the Makefile and a check in setup_libhugetlbfs that will skip the elflink calls on IA64 and sparc64. Signed-off-by: Eric Munson <ebmunson@us.ibm.com> Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
-rw-r--r--Makefile2
-rw-r--r--init.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index e18dba7..6d5b328 100644
--- a/Makefile
+++ b/Makefile
@@ -52,10 +52,12 @@ else
ifeq ($(ARCH),ia64)
CC64 = gcc
LIB64 = lib64
+CFLAGS += -DNO_ELFLINK
else
ifeq ($(ARCH),sparc64)
CC64 = gcc -m64
LIB64 = lib64
+CFLAGS += -DNO_ELFLINK
else
$(error "Unrecognized architecture ($(ARCH))")
endif
diff --git a/init.c b/init.c
index 2aca5a6..e1415f5 100644
--- a/init.c
+++ b/init.c
@@ -22,6 +22,8 @@
static void __attribute__ ((constructor)) setup_libhugetlbfs(void)
{
__hugetlbfs_setup_debug();
+#ifndef NO_ELFLINK
__hugetlbfs_setup_elflink();
+#endif
__hugetlbfs_setup_morecore();
}