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 <[EMAIL PROTECTED]>

---

Changes from v1: Also skip elflink on sparc64

 Makefile |    2 ++
 init.c   |    2 ++
 2 files changed, 4 insertions(+)

diff -upNr libhugetlbfs-1.3-pre1.orig/Makefile libhugetlbfs-1.3-pre1/Makefile
--- libhugetlbfs-1.3-pre1.orig/Makefile 2008-04-11 16:11:52.000000000 -0700
+++ libhugetlbfs-1.3-pre1/Makefile      2008-04-11 16:12:47.000000000 -0700
@@ -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 -upNr libhugetlbfs-1.3-pre1.orig/init.c libhugetlbfs-1.3-pre1/init.c
--- libhugetlbfs-1.3-pre1.orig/init.c   2008-04-11 16:11:52.000000000 -0700
+++ libhugetlbfs-1.3-pre1/init.c        2008-04-11 16:12:00.000000000 -0700
@@ -22,6 +22,8 @@
 static void __attribute__ ((constructor)) setup_libhugetlbfs(void)
 {
        __hugetlbfs_setup_debug();
+#ifndef NO_ELFLINK
        __hugetlbfs_setup_elflink();
+#endif
        __hugetlbfs_setup_morecore();
 }

Attachment: signature.asc
Description: This is a digitally signed message part

-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Don't miss this year's exciting event. There's still time to save $100. 
Use priority code J8TL2D2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Libhugetlbfs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/libhugetlbfs-devel

Reply via email to