OSDN Git Service

Fix the manditory typo in my last minute untested fix.
[uclinux-h8/uClibc.git] / Rules.mak
index 8513fd5..bca1dc8 100644 (file)
--- a/Rules.mak
+++ b/Rules.mak
@@ -31,8 +31,8 @@
 # your compiler is broken, you should not need to specify TARGET_ARCH
 #
 # Most people will set this stuff on the command line, i.e.
-#        make CROSS=mipsel-linux-
-# will build uClibc for 'mipsel'.
+#        make CROSS=arm-linux-
+# will build uClibc for 'arm'.
 
 ifndef CROSS
 CROSS=
@@ -43,6 +43,10 @@ LD= $(CROSS)ld
 NM= $(CROSS)nm
 STRIPTOOL= $(CROSS)strip
 
+INSTALL= install
+LN= ln
+RM= rm -f
+
 # Select the compiler needed to build binaries for your development system
 HOSTCC=gcc
 HOSTCFLAGS=-O2 -Wall
@@ -54,7 +58,7 @@ HOSTCFLAGS=-O2 -Wall
 # this stuff alone.
 MAJOR_VERSION:=0
 MINOR_VERSION:=9
-SUBLEVEL:=19
+SUBLEVEL:=24
 VERSION:=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL)
 # Ensure consistent sort order, 'gcc -print-search-dirs' behavior, etc. 
 LC_ALL:= C
@@ -75,87 +79,95 @@ 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)
-
-HOST_ARCH:= $(shell uname -m | sed \
-               -e 's/i.86/i386/' \
-               -e 's/sparc.*/sparc/' \
-               -e 's/arm.*/arm/g' \
-               -e 's/m68k.*/m68k/' \
-               -e 's/ppc/powerpc/g' \
-               -e 's/v850.*/v850/g' \
-               -e 's/sh[234].*/sh/' \
-               -e 's/mips.*/mips/' \
-               )
-ifeq ($(strip $(TARGET_ARCH)),)
-TARGET_ARCH:=$(shell $(CC) -dumpmachine | sed -e s'/-.*//' \
-               -e 's/i.86/i386/' \
-               -e 's/sparc.*/sparc/' \
-               -e 's/arm.*/arm/g' \
-               -e 's/m68k.*/m68k/' \
-               -e 's/ppc/powerpc/g' \
-               -e 's/v850.*/v850/g' \
-               -e 's/sh[234]/sh/' \
-               -e 's/mips-.*/mips/' \
-               -e 's/mipsel-.*/mipsel/' \
-               -e 's/cris.*/cris/' \
-               )
-endif
-export TARGET_ARCH
+# 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
 
 ARFLAGS:=r
 
 OPTIMIZATION:=
+PICFLAG:=-fPIC
 # Some nice CPU specific optimizations
 ifeq ($(strip $(TARGET_ARCH)),i386)
        OPTIMIZATION+=$(call check_gcc,-mpreferred-stack-boundary=2,)
        OPTIMIZATION+=$(call check_gcc,-falign-jumps=0 -falign-loops=0,-malign-jumps=0 -malign-loops=0)
-       CPU_CFLAGS-$(CONFIG_386):="-march=i386"
-       CPU_CFLAGS-$(CONFIG_486):="-march=i486"
-       CPU_CFLAGS-$(CONFIG_586):="-march=i586"
-       CPU_CFLAGS-$(CONFIG_586MMX):="$(call check_gcc,-march=pentium-mmx,-march=i586)"
-       CPU_CFLAGS-$(CONFIG_686):="-march=i686"
-       CPU_CFLAGS-$(CONFIG_PENTIUMIII):="$(call check_gcc,-march=pentium3,-march=i686)"
-       CPU_CFLAGS-$(CONFIG_PENTIUM4):="$(call check_gcc,-march=pentium4,-march=i686)"
-       CPU_CFLAGS-$(CONFIG_K6):="$(call check_gcc,-march=k6,-march=i586)"
-       CPU_CFLAGS-$(CONFIG_K7):="$(call check_gcc,-march=athlon,-malign-functions=4 -march=i686)"
-       CPU_CFLAGS-$(CONFIG_CRUSOE):="-march=i686 -malign-functions=0 -malign-jumps=0 -malign-loops=0"
-       CPU_CFLAGS-$(CONFIG_WINCHIPC6):="$(call check_gcc,-march=winchip-c6,-march=i586)"
-       CPU_CFLAGS-$(CONFIG_WINCHIP2):="$(call check_gcc,-march=winchip2,-march=i586)"
-       CPU_CFLAGS-$(CONFIG_CYRIXIII):="$(call check_gcc,-march=c3,-march=i586)"
+       CPU_CFLAGS-$(CONFIG_386)+=-march=i386
+       CPU_CFLAGS-$(CONFIG_486)+=-march=i486
+       CPU_CFLAGS-$(CONFIG_586)+=-march=i586
+       CPU_CFLAGS-$(CONFIG_586MMX)+=$(call check_gcc,-march=pentium-mmx,-march=i586)
+       CPU_CFLAGS-$(CONFIG_686)+=-march=i686
+       CPU_CFLAGS-$(CONFIG_PENTIUMIII)+=$(call check_gcc,-march=pentium3,-march=i686)
+       CPU_CFLAGS-$(CONFIG_PENTIUM4)+=$(call check_gcc,-march=pentium4,-march=i686)
+       CPU_CFLAGS-$(CONFIG_K6)+=$(call check_gcc,-march=k6,-march=i586)
+       CPU_CFLAGS-$(CONFIG_K7)+=$(call check_gcc,-march=athlon,-malign-functions=4 -march=i686)
+       CPU_CFLAGS-$(CONFIG_CRUSOE)+=-march=i686 -malign-functions=0 -malign-jumps=0 -malign-loops=0
+       CPU_CFLAGS-$(CONFIG_WINCHIPC6)+=$(call check_gcc,-march=winchip-c6,-march=i586)
+       CPU_CFLAGS-$(CONFIG_WINCHIP2)+=$(call check_gcc,-march=winchip2,-march=i586)
+       CPU_CFLAGS-$(CONFIG_CYRIXIII)+=$(call check_gcc,-march=c3,-march=i586)
 endif
 
 ifeq ($(strip $(TARGET_ARCH)),arm)
        OPTIMIZATION+=-fstrict-aliasing
-       CPU_CFLAGS-$(CONFIG_GENERIC_ARM):=
-       CPU_CFLAGS-$(CONFIG_ARM7TDMI):="-march=arm7tdmi"
-       CPU_CFLAGS-$(CONFIG_STRONGARM):="-march=strongarm"
-       CPU_CFLAGS-$(CONFIG_XSCALE):="-march=xscale"
+       CPU_LDFLAGS-$(ARCH_LITTLE_ENDIAN)+=-EL
+       CPU_LDFLAGS-$(ARCH_BIG_ENDIAN)+=-EB
+       CPU_CFLAGS-$(ARCH_LITTLE_ENDIAN)+=-mlittle-endian
+       CPU_CFLAGS-$(ARCH_BIG_ENDIAN)+=-mbig-endian
+       CPU_CFLAGS-$(CONFIG_GENERIC_ARM)+=
+       CPU_CFLAGS-$(CONFIG_ARM610)+=-mtune=arm610 -march=armv3
+       CPU_CFLAGS-$(CONFIG_ARM710)+=-mtune=arm710 -march=armv3
+       CPU_CFLAGS-$(CONFIG_ARM720T)+=-mtune=arm7tdmi -march=armv4 
+       CPU_CFLAGS-$(CONFIG_ARM920T)+=-mtune=arm9tdmi -march=armv4
+       CPU_CFLAGS-$(CONFIG_ARM922T)+=-mtune=arm9tdmi -march=armv4
+       CPU_CFLAGS-$(CONFIG_ARM926T)+=-mtune=arm9tdmi -march=armv4
+       CPU_CFLAGS-$(CONFIG_ARM_SA110)+=-mtune=strongarm110 -march=armv4
+       CPU_CFLAGS-$(CONFIG_ARM_SA1100)+=-mtune=strongarm1100 -march=armv4
+       CPU_CFLAGS-$(CONFIG_ARM_XSCALE)+=$(call check_gcc,-mtune=xscale,-mtune=strongarm110)
+       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,)
-       CPU_LDFLAGS-$(ARCH_LITTLE_ENDIAN):="-EL"
-       CPU_LDFLAGS-$(ARCH_BIG_ENDIAN):="-EB"
-       CPU_CFLAGS-$(ARCH_LITTLE_ENDIAN):="-ml"
-       CPU_CFLAGS-$(ARCH_BIG_ENDIAN):="-mb"
-       CPU_CFLAGS-$(CONFIG_SH2)+="-m2"
-       CPU_CFLAGS-$(CONFIG_SH3)+="-m3"
-       CPU_CFLAGS-$(CONFIG_SH4)+="-m4"
-       CPU_CFLAGS-$(CONFIG_SH5)+="-m5"
+       CPU_LDFLAGS-$(ARCH_LITTLE_ENDIAN)+=-EL
+       CPU_LDFLAGS-$(ARCH_BIG_ENDIAN)+=-EB
+       CPU_CFLAGS-$(ARCH_LITTLE_ENDIAN)+=-ml
+       CPU_CFLAGS-$(ARCH_BIG_ENDIAN)+=-mb
+       CPU_CFLAGS-$(CONFIG_SH2)+=-m2
+       CPU_CFLAGS-$(CONFIG_SH3)+=-m3
+       CPU_CFLAGS-$(CONFIG_SH4)+=-m4
+endif
+
+ifeq ($(strip $(TARGET_ARCH)),sh64)
+       OPTIMIZATION+=-fstrict-aliasing
+       CPU_LDFLAGS-$(ARCH_LITTLE_ENDIAN):=-EL
+       CPU_LDFLAGS-$(ARCH_BIG_ENDIAN):=-EB
+       CPU_CFLAGS-$(ARCH_LITTLE_ENDIAN):=-ml
+       CPU_CFLAGS-$(ARCH_BIG_ENDIAN):=-mb
+       CPU_CFLAGS-$(CONFIG_SH5)+=-m5-32media
 endif
 
 ifeq ($(strip $(TARGET_ARCH)),h8300)
-       CPU_LDFLAGS-y:=-mh8300h
-       CPU_CFLAGS-y+=-mh -mint32 -fsigned-char
+       CPU_LDFLAGS-$(CONFIG_H8300H)+= -ms8300h
+       CPU_LDFLAGS-$(CONFIG_H8S)   += -ms8300s
+       CPU_CFLAGS-$(CONFIG_H8300H) += -mh -mint32 -fsigned-char
+       CPU_CFLAGS-$(CONFIG_H8S)    += -ms -mint32 -fsigned-char
 endif
 
 ifeq ($(strip $(TARGET_ARCH)),cris)
-       CPU_LDFLAGS-$(CONFIG_CRIS):="-mcrislinux"
-       CPU_CFLAGS-$(CONFIG_CRIS):="-mlinux"
+       CPU_LDFLAGS-$(CONFIG_CRIS)+=-mcrislinux
+       CPU_CFLAGS-$(CONFIG_CRIS)+=-mlinux
+       PICFLAG=-fpic
 endif
 
 # use '-Os' optimization if available, else use -O2, allow Config to override
@@ -166,12 +178,24 @@ 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) \
+CFLAGS=$(XWARNINGS) $(OPTIMIZATION) $(XARCH_CFLAGS) $(CPU_CFLAGS) \
        -fno-builtin -nostdinc -D_LIBC -I$(TOPDIR)include -I.
 
 ifeq ($(DODEBUG),y)
-    CFLAGS += -g
+    #CFLAGS += -g3
+    CFLAGS = $(XWARNINGS) -O0 -g3 $(CPU_CFLAGS) -fno-builtin -nostdinc -D_LIBC -I$(TOPDIR)include -I.
     LDFLAGS:= $(CPU_LDFLAGS-y) -shared --warn-common --warn-once -z combreloc
     STRIPTOOL:= true -Since_we_are_debugging
 else
@@ -190,48 +214,28 @@ ifeq ($(HAVE_SHARED),y)
     LIBRARY_CACHE:=#-DUSE_CACHE
     ifeq ($(BUILD_UCLIBC_LDSO),y)
        LDSO:=$(TOPDIR)lib/$(UCLIBC_LDSO)
-       DYNAMIC_LINKER:=$(SHARED_LIB_LOADER_PATH)/$(UCLIBC_LDSO)
-       BUILD_DYNAMIC_LINKER:=$(shell cd $(TOPDIR) && pwd)/lib/$(UCLIBC_LDSO)
+       DYNAMIC_LINKER:=$(SHARED_LIB_LOADER_PREFIX)/$(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
-ifeq ($(UCLIBC_HAS_SOFT_FLOAT),y)
-    CFLAGS += $(call check_gcc,-msoft-float,)
-endif
 
 CFLAGS_NOPIC:=$(CFLAGS)
 ifeq ($(DOPIC),y)
-ifeq ($(strip $(TARGET_ARCH)),cris)
-       CFLAGS += -fpic -mlinux
-else
-    CFLAGS += -fPIC
-endif
+    CFLAGS += $(PICFLAG)
 endif
 
 LIBGCC_CFLAGS ?= $(CFLAGS) $(CPU_CFLAGS-y)
 LIBGCC:=$(shell $(CC) $(LIBGCC_CFLAGS) -print-libgcc-file-name)
 LIBGCC_DIR:=$(dir $(LIBGCC))
 
-# TARGET_PREFIX is the directory under which which the uClibc runtime
-# environment will be installed and used on the target system.   The 
-# result will look something like the following:
-#   TARGET_PREFIX/
-#      lib/            <contains all runtime and static libs>
-#      usr/lib/        <this directory is searched for runtime libs>
-#      etc/            <weher the shared library cache and configuration 
-#                      information go if you enabled LIBRARY_CACHE above>
-# Very few people will need to change this value from the default...
-TARGET_PREFIX = /
-
 ########################################
 #
 # uClinux shared lib support
 #
 
-ifdef CONFIG_BINFMT_SHARED_FLAT
+ifeq ($(CONFIG_BINFMT_SHARED_FLAT),y)
   # For the shared version of this, we specify no stack and its library ID
   FLTFLAGS += -s 0
   LIBID=1
@@ -239,3 +243,5 @@ ifdef CONFIG_BINFMT_SHARED_FLAT
   SHARED_TARGET = lib/libc
 endif
 
+TARGET_ARCH:=$(strip $(subst ",, $(strip $(TARGET_ARCH))))
+