[Linux-vax-usr-commit] uClibc/ldso/ldso Makefile,1.3,1.4 ldso.c,1.6,1.7

[<ai...@us...>]

Update of /cvsroot/linux-vax/uClibc/ldso/ldso
In directory sc8-pr-cvs1:/tmp/cvs-serv11242/ldso/ldso

Modified Files:
	Makefile ldso.c 
Log Message:
DA: merge up 0.9.23


Index: Makefile
===================================================================
RCS file: /cvsroot/linux-vax/uClibc/ldso/ldso/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	27 Sep 2003 14:46:21 -0000	1.3
+++ Makefile	26 Nov 2003 11:36:34 -0000	1.4
@@ -28,13 +28,25 @@
 
 
 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)\" \
+	-DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" \
 	-fno-builtin -nostdinc -I$(TOPDIR)ldso/include -I. -I$(TOPDIR)include
+
+ifeq ($(DODEBUG),y)
+XXFLAGS=$(XWARNINGS) $(XARCH_CFLAGS) $(CPU_CFLAGS) $(PICFLAG) \
+	-DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" \
+	-fno-builtin -nostdinc -I$(TOPDIR)ldso/include -I. -I$(TOPDIR)include
+endif
+
+ifeq ($(TARGET_ARCH),powerpc)
+XXFLAGS+=-Os -g3
+else
+XXFLAGS+=-O0 -g3
+endif
+
 XXFLAGS+=$(shell $(CC) -print-search-dirs | sed -ne "s/install: *\(.*\)/-I\1include/gp")
 LDFLAGS=$(CPU_LDFLAGS-y) -Bsymbolic -Bshareable -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)
@@ -62,9 +74,9 @@
 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))
+	$(INSTALL) -d $(TOPDIR)lib
+	$(INSTALL) -m 755 $(LDSO_FULLNAME) $(TOPDIR)lib
+	$(LN) -sf $(LDSO_FULLNAME) $(TOPDIR)lib/$(UCLIBC_LDSO)
 
 _dl_progname.h: Makefile
 	echo "const char *_dl_progname=\""$(UCLIBC_LDSO)"\";" > _dl_progname.h
@@ -81,6 +93,5 @@
 
 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 _dl_progname.h ldso.h *~
-
+clean:
+	$(RM) $(UCLIBC_LDSO)* $(OBJS) $(LDSO_FULLNAME)* core *.o *.a *.s *.i _dl_progname.h ldso.h *~

Index: ldso.c
===================================================================
RCS file: /cvsroot/linux-vax/uClibc/ldso/ldso/ldso.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ldso.c	27 Sep 2003 14:46:21 -0000	1.6
+++ ldso.c	26 Nov 2003 11:36:34 -0000	1.7
@@ -217,7 +217,7 @@
 	/* First obtain the information on the stack that tells us more about
 	   what binary is loaded, where it is loaded, etc, etc */
 	GET_ARGV(aux_dat, args);
-#if defined (__arm__) || defined (__mips__)
+#if defined (__arm__) || defined (__mips__) || defined (__cris__)
 	aux_dat += 1;
 #endif
 	argc = *(aux_dat - 1);
@@ -1067,8 +1067,7 @@
 #endif
 #ifdef __LDSO_LDD_SUPPORT__
 					if (_dl_trace_loaded_objects && tpnt1->usage_count==1) {
-						name = _dl_get_last_path_component(tpnt1->libname);
-						_dl_dprintf(1, "\t%s => %s (%x)\n", lpntstr, --name, 
+						_dl_dprintf(1, "\t%s => %s (%x)\n", lpntstr, tpnt1->libname, 
 								(unsigned) tpnt1->loadaddr);
 					}
 #endif