[uClibc-cvs] uClibc/ldso/ldso .cvsignore, 1.7, 1.8 Makefile, 1.54, 1.55 dl-startup.c, 1.3, 1.4 ldso.c, 1.90, 1.91 hash.c, 1.16, NONE readelflib1.c, 1.65, NONE startup.c, 1.3, NONE

[Erik Andersen]

Update of /var/cvs/uClibc/ldso/ldso
In directory nail:/tmp/cvs-serv25363/ldso

Modified Files:
	.cvsignore Makefile dl-startup.c ldso.c 
Removed Files:
	hash.c readelflib1.c startup.c 
Log Message:
Rework file naming, aiming for at least a vague level of consistancy


Index: .cvsignore
===================================================================
RCS file: /var/cvs/uClibc/ldso/ldso/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- .cvsignore	19 Aug 2003 06:05:31 -0000	1.7
+++ .cvsignore	10 Feb 2004 09:26:47 -0000	1.8
@@ -1,2 +1,2 @@
 ld-uclibc.so*
-_dl_progname.h
+dl-progname.h

Index: ldso.c
===================================================================
RCS file: /var/cvs/uClibc/ldso/ldso/ldso.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- ldso.c	10 Feb 2004 06:50:28 -0000	1.90
+++ ldso.c	10 Feb 2004 09:26:47 -0000	1.91
@@ -35,7 +35,7 @@
 #define ALLOW_ZERO_PLTGOT
 
 /* Pull in the value of _dl_progname */
-#include "_dl_progname.h"
+#include "dl-progname.h"
 
 /* Global variables used within the shared library loader */
 char *_dl_library_path         = 0;		/* Where we look for libraries */
@@ -767,5 +767,5 @@
 	return 0;
 }
 
-#include "hash.c"
-#include "readelflib1.c"
+#include "dl-hash.c"
+#include "dl-elf.c"

--- startup.c DELETED ---

Index: Makefile
===================================================================
RCS file: /var/cvs/uClibc/ldso/ldso/Makefile,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- Makefile	7 Feb 2004 10:40:15 -0000	1.54
+++ Makefile	10 Feb 2004 09:26:47 -0000	1.55
@@ -41,7 +41,7 @@
 LDFLAGS=$(CPU_LDFLAGS-y) -shared --warn-common --export-dynamic --sort-common \
 	-z combreloc --discard-locals --discard-all --no-undefined
 
-CSRC= ldso.c startup.c #hash.c readelflib1.c $(TARGET_ARCH)/elfinterp.c
+CSRC= ldso.c dl-startup.c
 COBJS=$(patsubst %.c,%.o, $(CSRC))
 ASRC=$(shell ls $(TARGET_ARCH)/*.S)
 AOBJS=$(patsubst %.S,%.o, $(ASRC))
@@ -68,16 +68,16 @@
 
 all: lib
 
-lib:: _dl_progname.h $(OBJS) $(DLINK_OBJS)
+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
 	$(LN) -sf $(LDSO_FULLNAME) $(TOPDIR)lib/$(UCLIBC_LDSO)
 
-_dl_progname.h: Makefile
-	echo "const char *_dl_progname=\""$(UCLIBC_LDSO)"\";" > _dl_progname.h
-	echo "#include \"$(TARGET_ARCH)/elfinterp.c\"" >> _dl_progname.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
@@ -91,4 +91,4 @@
 ldso.o: $(CSRC)
 
 clean:
-	$(RM) $(UCLIBC_LDSO)* $(OBJS) $(LDSO_FULLNAME)* core *.o *.a *.s *.i _dl_progname.h ldso.h *~
+	$(RM) $(UCLIBC_LDSO)* $(OBJS) $(LDSO_FULLNAME)* core *.o *.a *.s *.i dl-progname.h ldso.h *~

Index: dl-startup.c
===================================================================
RCS file: /var/cvs/uClibc/ldso/ldso/dl-startup.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- dl-startup.c	8 Feb 2004 10:57:59 -0000	1.3
+++ dl-startup.c	10 Feb 2004 09:26:47 -0000	1.4
@@ -90,7 +90,7 @@
 
 #include "ldso.h"
 
-/*  Some arches may need to override this in boot1_arch.h */
+/*  Some arches may need to override this in dl-startup.h */
 #define	ELFMAGIC ELFMAG
 
 /* This is a poor man's malloc, used prior to resolving our internal poor man's malloc */
@@ -102,7 +102,7 @@
 #define REALIGN() malloc_buffer = (char *) (((unsigned long) malloc_buffer + 3) & ~(3))
 
 /* Pull in all the arch specific stuff */
-#include "boot1_arch.h"
+#include "dl-startup.h"
 
 /* Static declarations */
 int (*_dl_elf_main) (int, char **, char **);

--- hash.c DELETED ---

--- readelflib1.c DELETED ---