summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile18
-rw-r--r--Rules.mak2
-rw-r--r--utils/Makefile62
3 files changed, 53 insertions, 29 deletions
diff --git a/Makefile b/Makefile
index 636bd6c89..47503c27f 100644
--- a/Makefile
+++ b/Makefile
@@ -179,7 +179,7 @@ $(patsubst %, _dir_%, $(DIRS)) : dummy
tags:
ctags -R
-install: install_dev install_runtime install_utils finished2
+install: install_runtime install_dev finished2
# Installs header files and development library links.
@@ -270,26 +270,16 @@ ifeq ($(strip $(HAVE_SHARED)),y)
fi;
endif
+.PHONY: utils
ifeq ($(strip $(HAVE_SHARED)),y)
-utils: $(TOPDIR)utils/ldd
+utils:
$(MAKE) -C utils
else
utils: dummy
endif
install_utils: utils
-ifeq ($(strip $(HAVE_SHARED)),y)
- $(INSTALL) -d $(PREFIX)$(RUNTIME_PREFIX)sbin
- $(INSTALL) -d $(PREFIX)$(RUNTIME_PREFIX)usr/bin
- $(INSTALL) -m 755 ldso/util/ldd \
- $(PREFIX)$(RUNTIME_PREFIX)usr/bin/ldd
- $(INSTALL) -m 755 ldso/util/ldconfig \
- $(PREFIX)$(RUNTIME_PREFIX)sbin/ldconfig;
- # For now, don't bother with readelf since surely the host
- # system has binutils, or we couldn't have gotten this far...
- #$(INSTALL) -m 755 ldso/util/readelf \
- # $(PREFIX)$(RUNTIME_PREFIX)usr/bin/readelf
-endif
+ $(MAKE) CFLAGS= LDFLAGS= -C utils install
ifeq ($(strip $(UCLIBC_HAS_LOCALE)),y)
@$(MAKE) -C libc/misc/wchar iconv.target
$(INSTALL) -d $(PREFIX)$(RUNTIME_PREFIX)/usr/bin;
diff --git a/Rules.mak b/Rules.mak
index 469427b30..f6c2f5091 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -194,11 +194,9 @@ ifeq ($(HAVE_SHARED),y)
ifeq ($(BUILD_UCLIBC_LDSO),y)
LDSO:=$(TOPDIR)lib/$(UCLIBC_LDSO)
DYNAMIC_LINKER:=$(SHARED_LIB_LOADER_PREFIX)/$(UCLIBC_LDSO)
- BUILD_DYNAMIC_LINKER:=$(shell cd $(TOPDIR) && pwd)/lib/$(UCLIBC_LDSO)
else
LDSO:=$(SYSTEM_LDSO)
DYNAMIC_LINKER:=/lib/$(strip $(subst ",, $(notdir $(SYSTEM_LDSO))))
- BUILD_DYNAMIC_LINKER:=/lib/$(strip $(subst ",, $(notdir $(SYSTEM_LDSO))))
endif
endif
diff --git a/utils/Makefile b/utils/Makefile
index 3d0a5c3a9..f8e3bcc37 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -17,20 +17,21 @@
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# Pull in the user's uClibc configuration, but do not
-# include Rules.mak.....
+# pull in Rules.mak.....
TOPDIR=../
include $(TOPDIR).config
+MAJOR_VERSION=0
+UCLIBC_LDSO=ld-uClibc.so.$(MAJOR_VERSION)
+
# A nifty macro to make testing gcc features easier
check_gcc=$(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \
then echo "$(1)"; else echo "$(2)"; fi)
# use '-Os' optimization if available, else use -O2, allow Config to override
-OPTIMIZATION+=$(call check_gcc,-Os,-O2)
-XWARNINGS=$(subst ",, $(strip $(WARNINGS))) -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing
-
-MAJOR_VERSION:=0
-UCLIBC_LDSO:=ld-uClibc.so.$(MAJOR_VERSION)
+OPTIMIZATION=$(call check_gcc,-Os,-O2)
+UWARNINGS=$(subst ",, $(strip $(WARNINGS))) -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing
+XARCH_CFLAGS=$(subst ",, $(strip $(ARCH_CFLAGS)))
ifndef CROSS
CROSS=
@@ -42,24 +43,46 @@ NM= $(CROSS)nm
STRIP= $(CROSS)strip
LN=ln
+override CFLAGS=$(UWARNINGS) $(OPTIMIZATION) #$(XARCH_CFLAGS)
+override LDFLAGS=-s
ifeq ($(DODEBUG),y)
- CFLAGS = $(XWARNINGS) -O0 -g3
- LDFLAGS =
-else
- CFLAGS=$(XWARNINGS) $(OPTIMIZATION)
- LDFLAGS = -s
+ override CFLAGS=$(UWARNINGS) -O0 -g3 #$(XARCH_CFLAGS)
+ override LDFLAGS=
endif
# Make certain these contain a final "/", but no "//"s.
RUNTIME_PREFIX:=$(strip $(subst //,/, $(subst ,/, $(subst ",, $(strip $(RUNTIME_PREFIX))))))
DEVEL_PREFIX:=$(strip $(subst //,/, $(subst ,/, $(subst ",, $(strip $(DEVEL_PREFIX))))))
-export RUNTIME_PREFIX DEVEL_PREFIX
TARGETS = ldd ldconfig readelf
+ifeq ($(HAVE_SHARED),y)
+ LIBRARY_CACHE=#-DUSE_CACHE
+ ifeq ($(BUILD_UCLIBC_LDSO),y)
+ LDSO=$(TOPDIR)lib/$(UCLIBC_LDSO)
+ DYNAMIC_LINKER=$(SHARED_LIB_LOADER_PREFIX)/$(UCLIBC_LDSO)
+ else
+ LDSO=$(SYSTEM_LDSO)
+ DYNAMIC_LINKER=/lib/$(strip $(subst ",, $(notdir $(SYSTEM_LDSO))))
+ endif
+endif
+
+
+XXFLAGS=
ifeq ($(strip $(LDSO_LDD_SUPPORT)),y)
-XXFLAGS = -D__LDSO_LDD_SUPPORT
+XXFLAGS= -D__LDSO_LDD_SUPPORT
+else
+XXFLAGS=
+endif
+
+LDADD_LIBFLOAT=
+ifeq ($(strip $(UCLIBC_HAS_SOFT_FLOAT)),y)
+ CFLAGS += $(call check_gcc,-msoft-float,)
+ #LDFLAGS+= -Wa,-mno-fpu
+ifeq ($(strip $(TARGET_ARCH)),arm)
+ LDADD_LIBFLOAT=-lfloat
+endif
endif
ifeq ($(strip $(HAVE_SHARED)),y)
@@ -92,4 +115,17 @@ ldd: ldd.c
clean:
$(RM) $(TARGETS) *.o *~ core *.target elf.h
+
readelf.c readsoname.c ldconfig.c ldd.c: headers
+
+install: all
+ifeq ($(strip $(HAVE_SHARED)),y)
+ $(INSTALL) -d $(PREFIX)$(RUNTIME_PREFIX)sbin
+ $(INSTALL) -d $(PREFIX)$(RUNTIME_PREFIX)usr/bin
+ $(INSTALL) -m 755 ldd $(PREFIX)$(RUNTIME_PREFIX)usr/bin/ldd
+ $(INSTALL) -m 755 ldconfig $(PREFIX)$(RUNTIME_PREFIX)sbin/ldconfig;
+ # For now, don't bother with readelf since surely the host
+ # system has binutils, or we couldn't have gotten this far...
+ #$(INSTALL) -m 755 readelf $(PREFIX)$(RUNTIME_PREFIX)usr/bin/readelf
+endif
+