Peter Kjellerstedt writes:

[uclinux-h8/uClibc.git] / ldso / ldso / Makefile

diff --git a/ldso/ldso/Makefile b/ldso/ldso/Makefile
index 37e114b..e026fca 100644 (file)
--- a/ldso/ldso/Makefile
+++ b/ldso/ldso/Makefile
@@ -1,7 +1,7 @@
 # Makefile for uClibc
 #
 # Copyright (C) 2000 by Lineo, inc.
-# Copyright (C) 2000,2001 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2002 Erik Andersen <andersen@uclibc.org>
 #
 # This program is free software; you can redistribute it and/or modify it under
 # the terms of the GNU Library General Public License as published by the Free
@@ -23,50 +23,73 @@
 
 
 TOPDIR=../../
-DOPIC=true
 include $(TOPDIR)Rules.mak
+LDSO_FULLNAME=ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
 
 
-LDSO_FULLNAME=ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).so
+XXFLAGS=$(XWARNINGS) $(OPTIMIZATION) $(XARCH_CFLAGS) $(CPU_CFLAGS) $(PICFLAG) \
+       -DUCLIBC_TARGET_PREFIX=\"$(TARGET_PREFIX)\" \
+       -DUCLIBC_DEVEL_PREFIX=\"$(DEVEL_PREFIX)\" \
+       -DUCLIBC_BUILD_DIR=\"$(shell cd $(TOPDIR) && pwd)\" \
+       -fno-builtin -nostdinc -I$(TOPDIR)ldso/include -I. -I$(TOPDIR)include
 
-#XXFLAGS += #-DDL_DEBUG #-funroll-loops
-XXFLAGS+=-DUCLIBC_TARGET_PREFIX=\"$(TARGET_PREFIX)\" \
+ifeq ($(DODEBUG),y)
+XXFLAGS=$(XWARNINGS) -O0 -g3 $(XARCH_CFLAGS) $(CPU_CFLAGS) $(PICFLAG) \
+       -DUCLIBC_TARGET_PREFIX=\"$(TARGET_PREFIX)\" \
        -DUCLIBC_DEVEL_PREFIX=\"$(DEVEL_PREFIX)\" \
-       -DUCLIBC_BUILD_DIR=\"$(shell cd $(TOPDIR) && pwd)\"
-LDFLAGS=-nostdlib -shared --warn-common --export-dynamic --warn-once \
-       -z combreloc --sort-common --discard-locals --discard-all
+       -DUCLIBC_BUILD_DIR=\"$(shell cd $(TOPDIR) && pwd)\" \
+       -fno-builtin -nostdinc -I$(TOPDIR)ldso/include -I. -I$(TOPDIR)include
+endif
+
+XXFLAGS+=$(shell $(CC) -print-search-dirs | sed -ne "s/install: *\(.*\)/-I\1include/gp")
+LDFLAGS=$(CPU_LDFLAGS-y) -shared --warn-common --export-dynamic --sort-common \
+       -z combreloc --discard-locals --discard-all
 CSRC= ldso.c #hash.c readelflib1.c $(TARGET_ARCH)/elfinterp.c
 COBJS=$(patsubst %.c,%.o, $(CSRC))
 ASRC=$(shell ls $(TARGET_ARCH)/*.S)
 AOBJS=$(patsubst %.S,%.o, $(ASRC))
 OBJS=$(AOBJS) $(COBJS)
 
-ifneq ($(strip $(DODEBUG)),true)
+ifneq ($(strip $(DODEBUG)),y)
 LDFLAGS+=-s
 endif
 
+ifeq ($(strip $(SUPPORT_LD_DEBUG)),y)
+XXFLAGS+=-D__SUPPORT_LD_DEBUG__
+endif
+
+ifeq ($(strip $(SUPPORT_LD_DEBUG_EARLY)),y)
+XXFLAGS+=-D__SUPPORT_LD_DEBUG_EARLY__
+endif
+
+ifeq ($(strip $(FORCE_SHAREABLE_TEXT_SEGMENTS)),y)
+XXFLAGS+=-DFORCE_SHAREABLE_TEXT_SEGMENTS
+endif
+
 all: lib
 
-lib:: ldso.h $(OBJS) $(DLINK_OBJS)
-       $(CC) -e _dl_boot $(LDFLAGS) -o $(LDSO_FULLNAME) \
-           -Wl,-soname=$(UCLIBC_LDSO) $(OBJS)
-       install -d $(TOPDIR)lib 
-       install -m 755 $(LDSO_FULLNAME) $(TOPDIR)lib
+lib:: _dl_progname.h $(OBJS) $(DLINK_OBJS)
+       $(LD) $(LDFLAGS) -e _dl_boot -soname=$(UCLIBC_LDSO) \
+               -o $(LDSO_FULLNAME) $(OBJS) $(LIBGCC);
+       $(INSTALL) -d $(TOPDIR)lib
+       $(INSTALL) -m 755 $(LDSO_FULLNAME) $(TOPDIR)lib
        (cd $(TOPDIR)lib && ln -sf $(LDSO_FULLNAME) $(UCLIBC_LDSO))
 
-ldso.h: Makefile
-       echo "const char *_dl_progname=\""$(UCLIBC_LDSO)"\";" > ldso.h
-       echo "#include \"$(TARGET_ARCH)/elfinterp.c\"" >> ldso.h
+_dl_progname.h: Makefile
+       echo "const char *_dl_progname=\""$(UCLIBC_LDSO)"\";" > _dl_progname.h
+       echo "#include \"$(TARGET_ARCH)/elfinterp.c\"" >> _dl_progname.h
 
 
 $(COBJS): %.o : %.c
-       $(CC) $(CFLAGS) $(XXFLAGS) -I. -I./$(TARGET_ARCH) -I../libdl -c $< -o $@
+       $(CC) $(XXFLAGS) -I../libdl -c $< -o $@
        $(STRIPTOOL) -x -R .note -R .comment $*.o
 
 $(AOBJS): %.o : %.S
-       $(CC) $(CFLAGS) -I. -I./$(TARGET_ARCH) -I../libdl -c $< -o $@
+       $(CC) $(XXFLAGS) -I../libdl -c $< -o $@
        $(STRIPTOOL) -x -R .note -R .comment $*.o
 
+ldso.o: ldso.c hash.c readelflib1.c $(TARGET_ARCH)/elfinterp.c _dl_progname.h
+
 clean::
-       $(RM) -f $(UCLIBC_LDSO)* $(OBJS) $(LDSO_FULLNAME)* core *.o *.a *.s *.i ldso.h *~
+       $(RM) -f $(UCLIBC_LDSO)* $(OBJS) $(LDSO_FULLNAME)* core *.o *.a *.s *.i _dl_progname.h ldso.h *~