[uClibc-cvs] svn commit: trunk/uClibc/ldso: include ldso
jocke at uclibc.org
jocke at uclibc.org
Fri Aug 12 23:10:22 UTC 2005
Author: jocke
Date: 2005-08-12 17:10:22 -0600 (Fri, 12 Aug 2005)
New Revision: 11124
Log:
Remove hardcoded ld-uClibc.so.0 name in ldso.
Modified:
trunk/uClibc/ldso/Makefile
trunk/uClibc/ldso/include/ldso.h
trunk/uClibc/ldso/ldso/Makefile
trunk/uClibc/ldso/ldso/ldso.c
Changeset:
Modified: trunk/uClibc/ldso/Makefile
===================================================================
--- trunk/uClibc/ldso/Makefile 2005-08-12 22:51:08 UTC (rev 11123)
+++ trunk/uClibc/ldso/Makefile 2005-08-12 23:10:22 UTC (rev 11124)
@@ -44,10 +44,8 @@
$(LN_ARCH_HEADERS):
$(LN) -fs ../ldso/$(TARGET_ARCH)/$(patsubst include/%,%,$@) $@
include/dl-progname.h:
- echo 'const char *_dl_progname="$(UCLIBC_LDSO)";' \
- > include/dl-progname.h
echo '#include "$(TARGET_ARCH)/elfinterp.c"' \
- >> include/dl-progname.h
+ > include/dl-progname.h
clean:
set -e ; for d in $(DIRS) ; do $(MAKE) -C $$d $@ ; done
Modified: trunk/uClibc/ldso/include/ldso.h
===================================================================
--- trunk/uClibc/ldso/include/ldso.h 2005-08-12 22:51:08 UTC (rev 11123)
+++ trunk/uClibc/ldso/include/ldso.h 2005-08-12 23:10:22 UTC (rev 11124)
@@ -44,7 +44,6 @@
extern const char *_dl_progname; /* The name of the executable being run */
extern int _dl_secure; /* Are we dealing with setuid stuff? */
extern size_t _dl_pagesize; /* Store the page size for use later */
-extern const char *_dl_progname; /* The name of the shared library loader */
#ifdef __SUPPORT_LD_DEBUG__
extern char *_dl_debug;
Modified: trunk/uClibc/ldso/ldso/Makefile
===================================================================
--- trunk/uClibc/ldso/ldso/Makefile 2005-08-12 22:51:08 UTC (rev 11123)
+++ trunk/uClibc/ldso/ldso/Makefile 2005-08-12 23:10:22 UTC (rev 11124)
@@ -40,7 +40,7 @@
else
XXFLAGS+=$(OPTIMIZATION)
endif
-XXFLAGS+= $(XARCH_CFLAGS) $(CPU_CFLAGS) $(PICFLAG) \
+XXFLAGS+= -DUCLIBC_LDSO=\"$(UCLIBC_LDSO)\" $(XARCH_CFLAGS) $(CPU_CFLAGS) $(PICFLAG) \
-DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" \
-fno-builtin -nostdinc -D_LIBC -I$(TOPDIR)ldso/include -I. -I$(TOPDIR)include
Modified: trunk/uClibc/ldso/ldso/ldso.c
===================================================================
--- trunk/uClibc/ldso/ldso/ldso.c 2005-08-12 22:51:08 UTC (rev 11123)
+++ trunk/uClibc/ldso/ldso/ldso.c 2005-08-12 23:10:22 UTC (rev 11124)
@@ -64,7 +64,7 @@
/* Needed for standalone execution. */
unsigned long attribute_hidden _dl_skip_args = 0;
-
+const char *_dl_progname = UCLIBC_LDSO; /* The name of the executable being run */
#include "dl-startup.c"
/* Forward function declarations */
static int _dl_suid_ok(void);
@@ -83,7 +83,6 @@
static struct elf_resolve **init_fini_list;
static int nlist; /* # items in init_fini_list */
-
extern void _start(void);
static void __attribute__ ((destructor)) __attribute_used__ _dl_fini(void)
@@ -539,7 +538,7 @@
lpntstr = (char*) (tcurr->dynamic_info[DT_STRTAB] + dpnt->d_un.d_val);
name = _dl_get_last_path_component(lpntstr);
- if (_dl_strcmp(name, "ld-uClibc.so.0") == 0)
+ if (_dl_strcmp(name, UCLIBC_LDSO) == 0)
continue;
_dl_if_debug_dprint("\tfile='%s'; needed by '%s'\n", lpntstr, _dl_progname);
More information about the uClibc-cvs
mailing list