rip out all the duplicated debug code and move into a shared file

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

diff --git a/ldso/ldso/Makefile b/ldso/ldso/Makefile
index 1f6476d..3aaafb7 100644 (file)
--- a/ldso/ldso/Makefile
+++ b/ldso/ldso/Makefile
@@ -21,14 +21,22 @@ TOPDIR=../../
 include $(TOPDIR)Rules.mak
 LDSO_FULLNAME=ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
 
-SSPFLAGS=$(call check_gcc,-fno-stack-protector,)
+# reset to initial (disabling predefined CFLAGS)
+ASFLAGS=
+ifeq ($(UCLIBC_BUILD_NOEXECSTACK),y)
+ASFLAGS+=$(call check_as,--noexecstack)
+endif
+
+XXFLAGS=$(XWARNINGS) $(SSP_DISABLE_FLAGS)
+ifeq ($(DL_FINI_CRT_COMPAT),y)
+XXFLAGS+=-D_DL_FINI_CRT_COMPAT
+endif
 
-XXFLAGS=$(XWARNINGS) $(SSPFLAGS)
 ifeq ($(DODEBUG),y)
 # Not really much point in including debugging info, since gdb
 # can't really debug ldso, since gdb requires help from ldso to
 # debug things....
-XXFLAGS+=-Os #-g3
+XXFLAGS+=-Os -g3
 else
 XXFLAGS+=$(OPTIMIZATION)
 endif
@@ -37,11 +45,13 @@ XXFLAGS+= $(XARCH_CFLAGS) $(CPU_CFLAGS) $(PICFLAG) \
        -fno-builtin -nostdinc -D_LIBC -I$(TOPDIR)ldso/include -I. -I$(TOPDIR)include
 
 # BEWARE!!! At least mips* will die if -O0 is used!!!
-XXFLAGS :=$(XXFLAGS:-O0=-O1)
-
-XXFLAGS+=$(shell $(CC) -print-search-dirs | sed -ne "s/install: *\(.*\)/-I\1include/gp")
-LDFLAGS=$(CPU_LDFLAGS-y) -Bsymbolic -shared --warn-common --export-dynamic --sort-common \
+XXFLAGS:=$(XXFLAGS:-O0=-O1)
+XXFLAGS+=-isystem $(shell $(CC) -print-file-name=include)
+LDFLAGS=$(CPU_LDFLAGS-y) -e _start -z now -Bsymbolic -shared --warn-common --export-dynamic --sort-common \
        -z combreloc --discard-locals --discard-all --no-undefined
+ifeq ($(UCLIBC_BUILD_RELRO),y)
+       LDFLAGS+=-z relro
+endif
 
 CSRC= ldso.c
 COBJS=$(patsubst %.c,%.o, $(CSRC))
@@ -64,11 +74,11 @@ endif
 #This stuff will not work with -fomit-frame-pointer
 XXFLAGS := $(XXFLAGS:-fomit-frame-pointer=)
 
-all: lib
+all: $(LDSO_FULLNAME)
 
-lib:: $(OBJS) $(DLINK_OBJS)
-       $(LD) $(LDFLAGS) -e _dl_boot -soname=$(UCLIBC_LDSO) \
-               -o $(LDSO_FULLNAME) $(OBJS) $(LIBGCC);
+$(LDSO_FULLNAME): $(OBJS) $(DLINK_OBJS)
+       $(LD) $(LDFLAGS) -soname=$(UCLIBC_LDSO) \
+               -o $(LDSO_FULLNAME) $(OBJS) $(LIBGCC)
        $(INSTALL) -d $(TOPDIR)lib
        $(INSTALL) -m 755 $(LDSO_FULLNAME) $(TOPDIR)lib
        $(LN) -sf $(LDSO_FULLNAME) $(TOPDIR)lib/$(UCLIBC_LDSO)
@@ -78,10 +88,11 @@ $(COBJS): %.o : %.c
        $(STRIPTOOL) -x -R .note -R .comment $*.o
 
 $(AOBJS): %.o : %.S
-       $(CC) $(XXFLAGS) -I../libdl -c $< -o $@
+       $(CC) $(XXFLAGS) $(ASFLAGS) -I../libdl -c $< -o $@
        $(STRIPTOOL) -x -R .note -R .comment $*.o
 
-ldso.o: $(CSRC)
+ldso.o: $(CSRC) dl-elf.c dl-hash.c dl-startup.c dl-debug.c \
+       $(TARGET_ARCH)/*.h $(TARGET_ARCH)/*.c $(TOPDIR)ldso/include/*.h
 
 clean:
        $(RM) $(UCLIBC_LDSO)* $(OBJS) $(LDSO_FULLNAME)* core *.o *.a *.s *.i ldso.h *~