diff options
| author | Eric Andersen <andersen@codepoet.org> | 2001-04-25 23:29:12 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2001-04-25 23:29:12 +0000 |
| commit | beef72b5c0c3bdf705ade933ac48c0d9fa184083 (patch) | |
| tree | 393b74f3c33ca76ed512a7405de643dc81b1bb8e /ldso/ldso | |
| parent | bb6334f6f024ca7f2d66d282e4cd34180f102a3e (diff) | |
Move libdl and udate build method a bit
-Erik
Diffstat (limited to 'ldso/ldso')
| -rw-r--r-- | ldso/ldso/.cvsignore | 2 | ||||
| -rw-r--r-- | ldso/ldso/Makefile | 16 | ||||
| -rw-r--r-- | ldso/ldso/dl-hash.c | 2 | ||||
| -rw-r--r-- | ldso/ldso/hash.c | 2 |
4 files changed, 7 insertions, 15 deletions
diff --git a/ldso/ldso/.cvsignore b/ldso/ldso/.cvsignore index 2b84b754f..32b7f101f 100644 --- a/ldso/ldso/.cvsignore +++ b/ldso/ldso/.cvsignore @@ -1,2 +1,2 @@ -ld-linux-uclibc.so.1 +ld-linux-uclibc.so.0 diff --git a/ldso/ldso/Makefile b/ldso/ldso/Makefile index 38e93e941..86b3bd904 100644 --- a/ldso/ldso/Makefile +++ b/ldso/ldso/Makefile @@ -2,7 +2,7 @@ TOPDIR=../../ include $(TOPDIR)Rules.mak include $(TOPDIR)/ld.so-1/Config.mk -DIRS = $(TARGET_ARCH) libdl +DIRS = $(TARGET_ARCH) CFLAGS += -DNO_UNDERSCORE -DVERBOSE_DLINKER CFLAGS += -DUSE_CACHE -fPIC -D__PIC__ #-funroll-loops @@ -11,29 +11,21 @@ CSRC= boot1.c hash.c readelflib1.c vsprintf.c COBJS=$(patsubst %.c,%.o, $(CSRC)) OBJS=$(COBJS) -DLINKER = ld-linux-uclibc.so - ELF_LDFLAGS=--shared # using GNU ld -ifneq ($(DIRS),) -lib realclean clean:: - @set -e; for i in $(DIRS); do \ - echo making $@ in $$i; \ - $(MAKE) -C $$i $@; \ - done; -endif +all: lib lib:: $(OBJS) $(LD) -e _dl_boot $(ELF_LDFLAGS) -o $(DLINKER).$(LDSO_VMAJOR) \ -soname $(DLINKER).$(LDSO_VMAJOR) *.o $(COBJS): %.o : %.c - $(CC) -I. -I./$(TARGET_ARCH) $(CFLAGS) -c $< -o $@ + $(CC) -I. -I./$(TARGET_ARCH) -I../libdl $(CFLAGS) -c $< -o $@ $(STRIPTOOL) -x -R .note -R .comment $*.o realclean:: $(RM) -f .depend $(DLINKER) core *.o *.a *.s *.i tmp_make foo *~ clean:: - $(RM) -f $(DLINKER) core *.o *.a *.s *.i tmp_make foo *~ + $(RM) -f $(DLINKER)* core *.o *.a *.s *.i tmp_make foo *~ diff --git a/ldso/ldso/dl-hash.c b/ldso/ldso/dl-hash.c index 4eab974a8..048c27738 100644 --- a/ldso/ldso/dl-hash.c +++ b/ldso/ldso/dl-hash.c @@ -25,7 +25,7 @@ #include <linux/unistd.h> #include <linux/elf.h> -#include "libdl/dlfcn.h" +#include "dlfcn.h" #include "hash.h" #include "linuxelf.h" #include "syscall.h" diff --git a/ldso/ldso/hash.c b/ldso/ldso/hash.c index 4eab974a8..048c27738 100644 --- a/ldso/ldso/hash.c +++ b/ldso/ldso/hash.c @@ -25,7 +25,7 @@ #include <linux/unistd.h> #include <linux/elf.h> -#include "libdl/dlfcn.h" +#include "dlfcn.h" #include "hash.h" #include "linuxelf.h" #include "syscall.h" |