On Fri, Oct 20, 2006 at 09:25:26AM -0500, Steve Fox wrote:
> On Fri, 2006-10-20 at 11:06 +1000, David Gibson wrote:
>
> > Please don't, having two versions of the ld wrapper is horrid - it
> > already parses the -m option to work out which sort of thing it's
> > building. Instead we should either change ld.hugetlbfs so it looks in
> > multiple places for the linker scripts, or (IMO simpler and better)
> > just put the linker scripts in "both" split and common locations,
> > using symlinks.
>
> Ok, that makes sense.
>
> I like the idea of just searching multiple places. I'm not sure I
> understand your second, simpler, suggestion though. Could you explain a
> bit more please?
Well, in response to the further discussion, including info from Red
Hat, how about the following patch:
libhugetlbfs: Always install linker scripts for all targets
This patch changes the install target to always install the linker
scripts for all supported platforms, instead of just the ones think
will be used for the current architecture. This avoids some
complications in corner cases as to which scripts will be needed, and
could also make life more convenient for cross-compiles. The linker
scripts are small, so there's no strong reason to avoid installing
them.
Signed-off-by: David Gibson <[EMAIL PROTECTED]>
Index: libhugetlbfs/Makefile
===================================================================
--- libhugetlbfs.orig/Makefile 2006-10-24 13:27:57.000000000 +1000
+++ libhugetlbfs/Makefile 2006-10-24 13:31:07.000000000 +1000
@@ -5,6 +5,7 @@ LIBOBJS = $(BASEOBJS) elflink.o morecore
SBINOBJS = hugetlbd
INSTALL_OBJ_LIBS = libhugetlbfs.so libhugetlbfs.a
LDSCRIPT_TYPES = B BDT
+LDSCRIPT_DIST_ELF = elf32ppclinux elf64ppc elf_i386 elf_x86_64
INSTALL_OBJSCRIPT = ld.hugetlbfs
VERSION=version.h
SOURCE = $(shell find . -maxdepth 1 ! -name version.h -a -name '*.[h]')
@@ -72,13 +73,7 @@ EXTRA_DIST = \
HOWTO \
LGPL-2.1
-ifdef CC32
-INSTALL_LDSCRIPTS = $(foreach type,$(LDSCRIPT_TYPES),$(ELF32).x$(type))
-endif
-ifdef CC64
-INSTALL_LDSCRIPTS += $(foreach type,$(LDSCRIPT_TYPES),$(ELF64).x$(type))
-endif
-
+INSTALL_LDSCRIPTS = $(foreach
type,$(LDSCRIPT_TYPES),$(LDSCRIPT_DIST_ELF:%=%.x$(type)))
ifdef V
VECHO = :
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Libhugetlbfs-devel mailing list
Libhugetlbfs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/libhugetlbfs-devel
