Fix the manditory typo in my last minute untested fix.

[uclinux-h8/uClibc.git] / Rules.mak

diff --git a/Rules.mak b/Rules.mak
index 0883a72..bca1dc8 100644 (file)
--- a/Rules.mak
+++ b/Rules.mak
@@ -58,7 +58,7 @@ HOSTCFLAGS=-O2 -Wall
 # this stuff alone.
 MAJOR_VERSION:=0
 MINOR_VERSION:=9
-SUBLEVEL:=22
+SUBLEVEL:=24
 VERSION:=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL)
 # Ensure consistent sort order, 'gcc -print-search-dirs' behavior, etc. 
 LC_ALL:= C
@@ -79,11 +79,8 @@ endif
 check_gcc=$(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \
        then echo "$(1)"; else echo "$(2)"; fi)
 
-# check if we have nawk, otherwise user awk
-AWK:=$(shell if [ -x /usr/bin/nawk ]; then echo "/usr/bin/nawk"; \
-       else echo "/usr/bin/awk"; fi)
-
 # Make certain these contain a final "/", but no "//"s.
+TARGET_ARCH:=$(strip $(subst ",, $(strip $(TARGET_ARCH))))
 RUNTIME_PREFIX:=$(strip $(subst //,/, $(subst ,/, $(subst ",, $(strip $(RUNTIME_PREFIX))))))
 DEVEL_PREFIX:=$(strip $(subst //,/, $(subst ,/, $(subst ",, $(strip $(DEVEL_PREFIX))))))
 export RUNTIME_PREFIX DEVEL_PREFIX
@@ -130,6 +127,15 @@ ifeq ($(strip $(TARGET_ARCH)),arm)
        CPU_CFLAGS-$(CONFIG_ARM_XSCALE)+=-march=armv4 -Wa,-mcpu=xscale
 endif
 
+ifeq ($(strip $(TARGET_ARCH)),mips)
+       CPU_CFLAGS-$(CONFIG_MIPS_ISA_1)+=-mips1
+       CPU_CFLAGS-$(CONFIG_MIPS_ISA_2)+=-mips2 -mtune=mips2
+       CPU_CFLAGS-$(CONFIG_MIPS_ISA_3)+=-mips3 -mtune=mips3
+       CPU_CFLAGS-$(CONFIG_MIPS_ISA_4)+=-mips4 -mtune=mips4
+       CPU_CFLAGS-$(CONFIG_MIPS_ISA_MIPS32)+=-mips32 -mtune=mips32
+       CPU_CFLAGS-$(CONFIG_MIPS_ISA_MIPS64)+=-mips64 -mtune=mips32
+endif
+
 ifeq ($(strip $(TARGET_ARCH)),sh)
        OPTIMIZATION+=-fstrict-aliasing
        OPTIMIZATION+= $(call check_gcc,-mprefergot,)
@@ -172,6 +178,17 @@ OPTIMIZATION+=$(call check_gcc,-Os,-O2)
 XWARNINGS=$(subst ",, $(strip $(WARNINGS))) -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing
 XARCH_CFLAGS=$(subst ",, $(strip $(ARCH_CFLAGS)))
 CPU_CFLAGS=$(subst ",, $(strip $(CPU_CFLAGS-y)))
+
+LDADD_LIBFLOAT=
+ifeq ($(strip $(UCLIBC_HAS_SOFT_FLOAT)),y)
+# Add -msoft-float to the CPU_FLAGS since ldso and libdl ignore CFLAGS.
+# If -msoft-float isn't supported, we want an error anyway.
+    CPU_CFLAGS += -msoft-float
+ifeq ($(strip $(TARGET_ARCH)),arm)
+    LDADD_LIBFLOAT=-lfloat
+endif
+endif
+
 # Some nice CFLAGS to work with
 CFLAGS=$(XWARNINGS) $(OPTIMIZATION) $(XARCH_CFLAGS) $(CPU_CFLAGS) \
        -fno-builtin -nostdinc -D_LIBC -I$(TOPDIR)include -I.
@@ -198,23 +215,12 @@ 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
 
-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
-
 CFLAGS_NOPIC:=$(CFLAGS)
 ifeq ($(DOPIC),y)
     CFLAGS += $(PICFLAG)