diff options
| author | Eric Andersen <andersen@codepoet.org> | 2001-08-08 17:03:36 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2001-08-08 17:03:36 +0000 |
| commit | c3bbc0eafdae7a50c46ec61f3352821b7c28ea85 (patch) | |
| tree | a3f8e5d23017c4301813b6c6302d1277ed216efd /ldso/ldso | |
| parent | c4257d720039474be6804b20c4d133a65aa1d265 (diff) | |
This syncs things up with my local tree. Mainly changes installer
issues, and syns things (as far as I am willing) with Dave Schleef's
tree. We may need to go another round or so, but we do seem to be
converging...
Diffstat (limited to 'ldso/ldso')
| -rw-r--r-- | ldso/ldso/Makefile | 4 | ||||
| -rw-r--r-- | ldso/ldso/dl-elf.c | 4 | ||||
| -rw-r--r-- | ldso/ldso/readelflib1.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/ldso/ldso/Makefile b/ldso/ldso/Makefile index 95ed01caf..617784ec9 100644 --- a/ldso/ldso/Makefile +++ b/ldso/ldso/Makefile @@ -24,12 +24,12 @@ TOPDIR=../../ include $(TOPDIR)Rules.mak -TARGET_CFLAGS += #-DUSE_CACHE #-DDL_DEBUG #-funroll-loops +TARGET_CFLAGS += #-DDL_DEBUG #-funroll-loops LDSO_FULLNAME=ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).so -TARGET_CFLAGS+=-fPIC -D__PIC__ -DUCLIBC_PREFIX=\"$(PREFIX)\" \ +TARGET_CFLAGS+=-fPIC -D__PIC__ -DUCLIBC_TARGET_PREFIX=\"$(TARGET_PREFIX)\" \ -DUCLIBC_DEVEL_PREFIX=\"$(DEVEL_PREFIX)\" \ -DUCLIBC_BUILD_DIR=\"$(shell cd $(TOPDIR); pwd)\" CSRC= boot1.c hash.c readelflib1.c $(TARGET_ARCH)/elfinterp.c diff --git a/ldso/ldso/dl-elf.c b/ldso/ldso/dl-elf.c index 049452bfa..ebc9bc8dc 100644 --- a/ldso/ldso/dl-elf.c +++ b/ldso/ldso/dl-elf.c @@ -249,7 +249,7 @@ struct elf_resolve *_dl_load_shared_library(int secure, #endif /* Check in <prefix>/usr/lib */ - pnt1 = UCLIBC_PREFIX "/usr/lib/"; + pnt1 = UCLIBC_TARGET_PREFIX "/usr/lib/"; pnt = mylibname; while (*pnt1) *pnt++ = *pnt1++; @@ -262,7 +262,7 @@ struct elf_resolve *_dl_load_shared_library(int secure, return tpnt1; /* Check in <prefix>/lib */ - pnt1 = UCLIBC_PREFIX "/lib/"; + pnt1 = UCLIBC_TARGET_PREFIX "/lib/"; pnt = mylibname; while (*pnt1) *pnt++ = *pnt1++; diff --git a/ldso/ldso/readelflib1.c b/ldso/ldso/readelflib1.c index 049452bfa..ebc9bc8dc 100644 --- a/ldso/ldso/readelflib1.c +++ b/ldso/ldso/readelflib1.c @@ -249,7 +249,7 @@ struct elf_resolve *_dl_load_shared_library(int secure, #endif /* Check in <prefix>/usr/lib */ - pnt1 = UCLIBC_PREFIX "/usr/lib/"; + pnt1 = UCLIBC_TARGET_PREFIX "/usr/lib/"; pnt = mylibname; while (*pnt1) *pnt++ = *pnt1++; @@ -262,7 +262,7 @@ struct elf_resolve *_dl_load_shared_library(int secure, return tpnt1; /* Check in <prefix>/lib */ - pnt1 = UCLIBC_PREFIX "/lib/"; + pnt1 = UCLIBC_TARGET_PREFIX "/lib/"; pnt = mylibname; while (*pnt1) *pnt++ = *pnt1++; |