OSDN Git Service

- fix generation of sysnum.h for parallel builds, second take.
[uclinux-h8/uClibc.git] / Rules.mak
index 3cc699f..2535b09 100644 (file)
--- a/Rules.mak
+++ b/Rules.mak
@@ -50,7 +50,8 @@ BUILD_CFLAGS = -O2 -Wall
 export ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun.*/sparc/ -e s/sparc.*/sparc/ \
                                  -e s/arm.*/arm/ -e s/sa110/arm/ -e s/sh.*/sh/ \
                                  -e s/s390x/s390/ -e s/parisc.*/hppa/ \
-                                 -e s/ppc.*/powerpc/ -e s/mips.*/mips/ )
+                                 -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
+                                 -e s/xtensa.*/xtensa/ )
 
 
 #---------------------------------------------------------
@@ -78,14 +79,18 @@ export RUNTIME_PREFIX DEVEL_PREFIX KERNEL_HEADERS
 MAJOR_VERSION := 0
 MINOR_VERSION := 9
 SUBLEVEL      := 29
+EXTRAVERSION  :=
 VERSION       := $(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL)
+ifneq ($(EXTRAVERSION),)
+VERSION       := $(VERSION)$(EXTRAVERSION)
+endif
 # Ensure consistent sort order, 'gcc -print-search-dirs' behavior, etc.
 LC_ALL := C
 export MAJOR_VERSION MINOR_VERSION SUBLEVEL VERSION LC_ALL
 
 LIBC := libc
 SHARED_MAJORNAME := $(LIBC).so.$(MAJOR_VERSION)
-ifneq ($(findstring  $(TARGET_ARCH) , hppa64 ia64 mips64 powerpc64 s390x sh64 sparc64 x86_64 ),)
+ifneq ($(findstring  $(TARGET_ARCH) , hppa64 ia64 mips64 powerpc64 s390x sparc64 x86_64 ),)
 UCLIBC_LDSO_NAME := ld64-uClibc
 else
 UCLIBC_LDSO_NAME := ld-uClibc
@@ -113,6 +118,9 @@ interp :=
 ldso :=
 endif
 
+comma:=,
+space:= #
+
 ifndef CROSS
 CROSS=$(subst ",, $(strip $(CROSS_COMPILER_PREFIX)))
 endif
@@ -149,17 +157,20 @@ OPTIMIZATION+=$(call check_gcc,-fno-tree-dominator-opts,)
 OPTIMIZATION+=$(call check_gcc,-fno-strength-reduce,)
 endif
 
-ifeq ($(UCLIBC_FORMAT_FDPIC_ELF),y)
-       PICFLAG:=-mfdpic
-else
-       PICFLAG:=-fPIC
-endif
+CPU_CFLAGS-$(UCLIBC_FORMAT_SHARED_FLAT) += -mid-shared-library
+CPU_CFLAGS-$(UCLIBC_FORMAT_FLAT_SEP_DATA) += -msep-data
+
+PICFLAG-y := -fPIC
+PICFLAG-$(UCLIBC_FORMAT_FDPIC_ELF) := -mfdpic
+PICFLAG := $(PICFLAG-y)
 PIEFLAG_NAME:=-fPIE
 
 # Some nice CPU specific optimizations
 ifeq ($(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_LDFLAGS-y+=-m32
+       CPU_CFLAGS-y+=-m32
        CPU_CFLAGS-$(CONFIG_386)+=-march=i386
        CPU_CFLAGS-$(CONFIG_486)+=-march=i486
        CPU_CFLAGS-$(CONFIG_ELAN)+=-march=i486
@@ -187,8 +198,8 @@ endif
 
 ifeq ($(TARGET_ARCH),arm)
        OPTIMIZATION+=-fstrict-aliasing
-       CPU_LDFLAGS-$(ARCH_LITTLE_ENDIAN)+=-EL
-       CPU_LDFLAGS-$(ARCH_BIG_ENDIAN)+=-EB
+       CPU_LDFLAGS-$(ARCH_LITTLE_ENDIAN)+=-Wl,-EL
+       CPU_LDFLAGS-$(ARCH_BIG_ENDIAN)+=-Wl,-EB
        CPU_CFLAGS-$(ARCH_LITTLE_ENDIAN)+=-mlittle-endian
        CPU_CFLAGS-$(ARCH_BIG_ENDIAN)+=-mbig-endian
        CPU_CFLAGS-$(CONFIG_GENERIC_ARM)+=
@@ -201,16 +212,20 @@ ifeq ($(TARGET_ARCH),arm)
        CPU_CFLAGS-$(CONFIG_ARM926T)+=-mtune=arm9tdmi -march=armv5t
        CPU_CFLAGS-$(CONFIG_ARM10T)+=-mtune=arm10tdmi -march=armv5t
        CPU_CFLAGS-$(CONFIG_ARM1136JF_S)+=-mtune=arm1136jf-s -march=armv6
+       CPU_CFLAGS-$(CONFIG_ARM1176JZ_S)+=-mtune=arm1176jz-s -march=armv6
+       CPU_CFLAGS-$(CONFIG_ARM1176JZF_S)+=-mtune=arm1176jzf-s -march=armv6
        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=armv5te -Wa,-mcpu=xscale
        CPU_CFLAGS-$(CONFIG_ARM_IWMMXT)+=-march=iwmmxt -Wa,-mcpu=iwmmxt -mabi=iwmmxt
+       CPU_CFLAGS-$(CONFIG_ARM_CORTEX_M3)+=-mcpu=cortex-m3 -mthumb
+       CPU_CFLAGS-$(CONFIG_ARM_CORTEX_M1)+=-mcpu=cortex-m1 -mthumb
 endif
 
 ifeq ($(TARGET_ARCH),mips)
-       CPU_LDFLAGS-$(ARCH_LITTLE_ENDIAN)+=-EL
-       CPU_LDFLAGS-$(ARCH_BIG_ENDIAN)+=-EB
+       CPU_LDFLAGS-$(ARCH_LITTLE_ENDIAN)+=-Wl,-EL
+       CPU_LDFLAGS-$(ARCH_BIG_ENDIAN)+=-Wl,-EB
        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
@@ -218,12 +233,12 @@ ifeq ($(TARGET_ARCH),mips)
        CPU_CFLAGS-$(CONFIG_MIPS_ISA_MIPS32)+=-mips32 -mtune=mips32
        CPU_CFLAGS-$(CONFIG_MIPS_ISA_MIPS64)+=-mips64 -mtune=mips32
        ifeq ($(strip $(ARCH_BIG_ENDIAN)),y)
-               CPU_LDFLAGS-$(CONFIG_MIPS_N64_ABI)+=-melf64btsmip
-               CPU_LDFLAGS-$(CONFIG_MIPS_O32_ABI)+=-melf32btsmip
+               CPU_LDFLAGS-$(CONFIG_MIPS_N64_ABI)+=-Wl,-melf64btsmip
+               CPU_LDFLAGS-$(CONFIG_MIPS_O32_ABI)+=-Wl,-melf32btsmip
        endif
        ifeq ($(strip $(ARCH_LITTLE_ENDIAN)),y)
-               CPU_LDFLAGS-$(CONFIG_MIPS_N64_ABI)+=-melf64ltsmip
-               CPU_LDFLAGS-$(CONFIG_MIPS_O32_ABI)+=-melf32ltsmip
+               CPU_LDFLAGS-$(CONFIG_MIPS_N64_ABI)+=-Wl,-melf64ltsmip
+               CPU_LDFLAGS-$(CONFIG_MIPS_O32_ABI)+=-Wl,-melf32ltsmip
        endif
        CPU_CFLAGS-$(CONFIG_MIPS_N64_ABI)+=-mabi=64
        CPU_CFLAGS-$(CONFIG_MIPS_O32_ABI)+=-mabi=32
@@ -231,15 +246,15 @@ ifeq ($(TARGET_ARCH),mips)
 endif
 
 ifeq ($(TARGET_ARCH),nios)
-       CPU_LDFLAGS-y+=-m32
-       CPU_CFLAGS-y+=-m32
+       CPU_LDFLAGS-y+=-Wl,-m32
+       CPU_CFLAGS-y+=-Wl,-m32
 endif
 
 ifeq ($(TARGET_ARCH),sh)
        OPTIMIZATION+=-fstrict-aliasing
        OPTIMIZATION+= $(call check_gcc,-mprefergot,)
-       CPU_LDFLAGS-$(ARCH_LITTLE_ENDIAN)+=-EL
-       CPU_LDFLAGS-$(ARCH_BIG_ENDIAN)+=-EB
+       CPU_LDFLAGS-$(ARCH_LITTLE_ENDIAN)+=-Wl,-EL
+       CPU_LDFLAGS-$(ARCH_BIG_ENDIAN)+=-Wl,-EB
        CPU_CFLAGS-$(ARCH_LITTLE_ENDIAN)+=-ml
        CPU_CFLAGS-$(ARCH_BIG_ENDIAN)+=-mb
        CPU_CFLAGS-$(CONFIG_SH2)+=-m2
@@ -255,23 +270,24 @@ endif
 
 ifeq ($(TARGET_ARCH),sh64)
        OPTIMIZATION+=-fstrict-aliasing
-       CPU_LDFLAGS-$(ARCH_LITTLE_ENDIAN):=-EL
-       CPU_LDFLAGS-$(ARCH_BIG_ENDIAN):=-EB
+       CPU_LDFLAGS-$(ARCH_LITTLE_ENDIAN):=-Wl,-EL
+       CPU_LDFLAGS-$(ARCH_BIG_ENDIAN):=-Wl,-EB
        CPU_CFLAGS-$(ARCH_LITTLE_ENDIAN):=-ml
        CPU_CFLAGS-$(ARCH_BIG_ENDIAN):=-mb
        CPU_CFLAGS-$(CONFIG_SH5)+=-m5-32media
 endif
 
 ifeq ($(TARGET_ARCH),h8300)
-       CPU_LDFLAGS-$(CONFIG_H8300H)+= -ms8300h
-       CPU_LDFLAGS-$(CONFIG_H8S)   += -ms8300s
+       SYMBOL_PREFIX=_
+       CPU_LDFLAGS-$(CONFIG_H8300H)+= -Wl,-ms8300h
+       CPU_LDFLAGS-$(CONFIG_H8S)   += -Wl,-ms8300s
        CPU_CFLAGS-$(CONFIG_H8300H) += -mh -mint32
        CPU_CFLAGS-$(CONFIG_H8S)    += -ms -mint32
 endif
 
 ifeq ($(TARGET_ARCH),cris)
-       CPU_LDFLAGS-$(CONFIG_CRIS)+=-mcrislinux
-       CPU_LDFLAGS-$(CONFIG_CRISV32)+=-mcrislinux
+       CPU_LDFLAGS-$(CONFIG_CRIS)+=-Wl,-mcrislinux
+       CPU_LDFLAGS-$(CONFIG_CRISV32)+=-Wl,-mcrislinux
        CPU_CFLAGS-$(CONFIG_CRIS)+=-mlinux
        PICFLAG:=-fpic
        PIEFLAG_NAME:=-fpie
@@ -296,17 +312,48 @@ ifeq ($(TARGET_ARCH),powerpc)
 
 endif
 
+ifeq ($(TARGET_ARCH),bfin)
+       SYMBOL_PREFIX=_
+ifeq ($(UCLIBC_FORMAT_FDPIC_ELF),y)
+       CPU_CFLAGS-y:=-mfdpic
+       CPU_LDFLAGS-y += -Wl,-melf32bfinfd
+       PICFLAG:=-fpic
+       PIEFLAG_NAME:=-fpie
+endif
+ifeq ($(UCLIBC_FORMAT_SHARED_FLAT),y)
+       PICFLAG := -mleaf-id-shared-library
+endif
+endif
+
 ifeq ($(TARGET_ARCH),frv)
-       CPU_LDFLAGS-$(CONFIG_FRV)+=-melf32frvfd
+       CPU_LDFLAGS-$(CONFIG_FRV)+=-Wl,-melf32frvfd
        # Using -pie causes the program to have an interpreter, which is
        # forbidden, so we must make do with -shared.  Unfortunately,
        # -shared by itself would get us global function descriptors
        # and calls through PLTs, dynamic resolution of symbols, etc,
        # which would break as well, but -Bsymbolic comes to the rescue.
-       export LDPIEFLAG:=-shared -Bsymbolic
+       export LDPIEFLAG:=-Wl,-shared -Wl,-Bsymbolic
        UCLIBC_LDSO=ld.so.1
 endif
 
+ifeq ($(strip $(TARGET_ARCH)),avr32)
+       CPU_CFLAGS-$(CONFIG_AVR32_AP7)  += -march=ap
+       CPU_CFLAGS-$(CONFIG_LINKRELAX)  += -mrelax
+       CPU_LDFLAGS-$(CONFIG_LINKRELAX) += --relax
+endif
+
+ifeq ($(TARGET_ARCH),i960)
+      SYMBOL_PREFIX=_
+endif
+
+ifeq ($(TARGET_ARCH),microblaze)
+      SYMBOL_PREFIX=_
+endif
+
+ifeq ($(TARGET_ARCH),v850)
+      SYMBOL_PREFIX=_
+endif
+
 # Keep the check_gcc from being needlessly executed
 ifndef PIEFLAG
 ifneq ($(UCLIBC_BUILD_PIE),y)
@@ -328,11 +375,7 @@ endif
 
 # Check for AS_NEEDED support in linker script (binutils>=2.16.1 has it)
 ifndef ASNEEDED
-ifneq ($(UCLIBC_HAS_SSP),y)
-export ASNEEDED:=
-else
-export ASNEEDED:=$(shell (LD_TMP=$(mktemp LD_XXXXXX) ; echo "GROUP ( AS_NEEDED ( /usr/lib/libc.so ) )" > $LD_TMP && if $(LD) -T $LD_TMP -o /dev/null > /dev/null 2>&1; then echo "AS_NEEDED ( $(UCLIBC_LDSO) )"; else echo "$(UCLIBC_LDSO)"; fi; rm -f $LD_TMP ) )
-endif
+export ASNEEDED:=$(shell $(LD) --help 2>/dev/null | grep -q -- --as-needed && echo "AS_NEEDED ( $(UCLIBC_LDSO) )" || echo "$(UCLIBC_LDSO)")
 endif
 
 # Add a bunch of extra pedantic annoyingly strict checks
@@ -356,10 +399,12 @@ else
 SSP_CFLAGS := $(SSP_DISABLE_FLAGS)
 endif
 
+NOSTDLIB_CFLAGS:=$(call check_gcc,-nostdlib,)
 # Some nice CFLAGS to work with
 CFLAGS := -include $(top_builddir)include/libc-symbols.h \
        $(XWARNINGS) $(CPU_CFLAGS) $(SSP_CFLAGS) \
-       -fno-builtin -nostdinc -I$(top_builddir)include -I.
+       -fno-builtin -nostdinc -I$(top_builddir)include -I. \
+       -I$(top_srcdir)libc/sysdeps/linux/$(TARGET_ARCH)
 
 ifneq ($(strip $(UCLIBC_EXTRA_CFLAGS)),"")
 CFLAGS += $(subst ",, $(UCLIBC_EXTRA_CFLAGS))
@@ -382,9 +427,6 @@ ifeq ($(TARGET_ARCH),arm)
 endif
 endif
 
-# Make sure "char" behavior is the same everywhere
-CFLAGS += -fsigned-char
-
 # We need this to be checked within libc-symbols.h
 ifneq ($(HAVE_SHARED),y)
 CFLAGS += -DSTATIC
@@ -392,19 +434,30 @@ endif
 
 CFLAGS += $(call check_gcc,-std=gnu99,)
 
-LDFLAGS_NOSTRIP:=$(CPU_LDFLAGS-y) -shared --warn-common --warn-once -z combreloc
+LDFLAGS_NOSTRIP:=$(CPU_LDFLAGS-y) -Wl,-shared \
+       -Wl,--warn-common -Wl,--warn-once -Wl,-z,combreloc
 # binutils-2.16.1 warns about ignored sections, 2.16.91.0.3 and newer are ok
 #LDFLAGS_NOSTRIP+=$(call check_ld,--gc-sections)
 
 ifeq ($(UCLIBC_BUILD_RELRO),y)
-LDFLAGS_NOSTRIP+=-relro
+LDFLAGS_NOSTRIP+=-Wl,-z,relro
 endif
 
 ifeq ($(UCLIBC_BUILD_NOW),y)
-LDFLAGS_NOSTRIP+=-z now
+LDFLAGS_NOSTRIP+=-Wl,-z,now
+endif
+
+ifeq ($(LDSO_GNU_HASH_SUPPORT),y)
+# Be sure that binutils support it
+LDFLAGS_GNUHASH:=$(call check_ld,--hash-style=gnu)
+ifeq ($(LDFLAGS_GNUHASH),)
+$(error Your binutils don't support --hash-style option, while you want to use it)
+else
+LDFLAGS_NOSTRIP += -Wl,$(LDFLAGS_GNUHASH)
+endif
 endif
 
-LDFLAGS:=$(LDFLAGS_NOSTRIP) -defs
+LDFLAGS:=$(LDFLAGS_NOSTRIP) -Wl,-z,defs
 ifeq ($(DODEBUG),y)
 #CFLAGS += -g3
 CFLAGS += -O0 -g3
@@ -412,7 +465,7 @@ else
 CFLAGS += $(OPTIMIZATION) $(XARCH_CFLAGS)
 endif
 ifeq ($(DOSTRIP),y)
-LDFLAGS += -s
+LDFLAGS += -Wl,-s
 else
 STRIPTOOL := true -Stripping_disabled
 endif
@@ -432,6 +485,10 @@ else
 DOMULTI:=n
 endif
 
+ifneq ($(strip $(UCLIBC_EXTRA_LDFLAGS)),"")
+LDFLAGS += $(subst ",, $(UCLIBC_EXTRA_LDFLAGS))
+endif
+
 ifeq ($(UCLIBC_HAS_THREADS),y)
 ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
        PTNAME := nptl
@@ -487,14 +544,16 @@ else
 endif
 CFLAGS += -I$(KERNEL_HEADERS)
 
-# Sigh, some stupid versions of gcc can't seem to cope with '-iwithprefix include'
-#CFLAGS+=-iwithprefix include
-CFLAGS+=-isystem $(shell $(CC) -print-file-name=include)
+CFLAGS += -iwithprefix include-fixed -iwithprefix include
 
 ifneq ($(DOASSERTS),y)
 CFLAGS+=-DNDEBUG
 endif
 
+ifeq ($(SYMBOL_PREFIX),_)
+CFLAGS+=-D__UCLIBC_UNDERSCORES__
+endif
+
 # Keep the check_as from being needlessly executed
 ifndef ASFLAGS_NOEXEC
 ifeq ($(UCLIBC_BUILD_NOEXECSTACK),y)