X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=Rules.mak;h=00e8481b8564310160b4794e40e2ecd20d216fbf;hb=03a008e27f61ee805ec1cc914fbe60f6eb34887c;hp=bb19c7efdf03495b54290a15eea21deeb60c96b0;hpb=15ba174656c69b0304a0b155b7eb741a5a5592d5;p=uclinux-h8%2FuClibc.git diff --git a/Rules.mak b/Rules.mak index bb19c7efd..00e8481b8 100644 --- a/Rules.mak +++ b/Rules.mak @@ -30,24 +30,24 @@ endif #----------------------------------------------------------- # If you are running a cross compiler, you will want to set -# 'CROSS' to something more interesting ... Target +# 'CROSS_COMPILE' to something more interesting ... Target # architecture is determined by asking the CC compiler what # arch it compiles things for, so unless 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=arm-linux- +# make CROSS_COMPILE=arm-linux- # will build uClibc for 'arm'. +# CROSS is still supported for backward compatibily only -ifndef CROSS -CROSS= -endif -CC = $(CROSS)gcc -AR = $(CROSS)ar -LD = $(CROSS)ld -NM = $(CROSS)nm -OBJDUMP = $(CROSS)objdump -STRIPTOOL = $(CROSS)strip +CROSS_COMPILE ?= $(CROSS) + +CC = $(CROSS_COMPILE)gcc +AR = $(CROSS_COMPILE)ar +LD = $(CROSS_COMPILE)ld +NM = $(CROSS_COMPILE)nm +OBJDUMP = $(CROSS_COMPILE)objdump +STRIPTOOL = $(CROSS_COMPILE)strip INSTALL = install LN = ln @@ -93,29 +93,31 @@ endif export ARCH # Make certain these contain a final "/", but no "//"s. -TARGET_SUBARCH:=$(call qstrip,$(shell grep -s '^TARGET_SUBARCH' $(top_builddir)/.config | $(SED) -e 's/^TARGET_SUBARCH=//')) TARGET_SUBARCH:=$(call qstrip,$(TARGET_SUBARCH)) RUNTIME_PREFIX:=$(strip $(subst //,/, $(subst ,/, $(call qstrip,$(RUNTIME_PREFIX))))) DEVEL_PREFIX:=$(strip $(subst //,/, $(subst ,/, $(call qstrip,$(DEVEL_PREFIX))))) +MULTILIB_DIR:=$(strip $(subst //,/, $(subst ,/, $(call qstrip,$(MULTILIB_DIR))))) KERNEL_HEADERS:=$(strip $(subst //,/, $(subst ,/, $(call qstrip,$(KERNEL_HEADERS))))) -export RUNTIME_PREFIX DEVEL_PREFIX KERNEL_HEADERS +export RUNTIME_PREFIX DEVEL_PREFIX KERNEL_HEADERS MULTILIB_DIR # Now config hard core MAJOR_VERSION := 0 MINOR_VERSION := 9 -SUBLEVEL := 30 +SUBLEVEL := 34 EXTRAVERSION :=-git VERSION := $(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL) +ABI_VERSION := $(MAJOR_VERSION) 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 +export MAJOR_VERSION MINOR_VERSION SUBLEVEL VERSION ABI_VERSION LC_ALL LIBC := libc -SHARED_MAJORNAME := $(LIBC).so.$(MAJOR_VERSION) +SHARED_LIBNAME := $(LIBC).so.$(ABI_VERSION) +UBACKTRACE_DSO := libubacktrace.so.$(ABI_VERSION) ifneq ($(findstring $(TARGET_ARCH) , hppa64 ia64 mips64 powerpc64 s390x sparc64 x86_64 ),) UCLIBC_LDSO_NAME := ld64-uClibc ARCH_NATIVE_BIT := 64 @@ -123,17 +125,23 @@ else UCLIBC_LDSO_NAME := ld-uClibc ARCH_NATIVE_BIT := 32 endif -UCLIBC_LDSO := $(UCLIBC_LDSO_NAME).so.$(MAJOR_VERSION) +UCLIBC_LDSO := $(UCLIBC_LDSO_NAME).so.$(ABI_VERSION) NONSHARED_LIBNAME := uclibc_nonshared.a -libc := $(top_builddir)lib/$(SHARED_MAJORNAME) -libc.depend := $(top_builddir)lib/$(SHARED_MAJORNAME:.$(MAJOR_VERSION)=) +libc := $(top_builddir)lib/$(SHARED_LIBNAME) +libc.depend := $(top_builddir)lib/$(SHARED_LIBNAME:.$(ABI_VERSION)=) +ifneq ($(ARCH_HAS_NO_SHARED),y) +libdl.depend := $(top_builddir)lib/libdl.so +endif +ifneq ($(HAS_NO_THREADS),y) +libpthread.depend := $(top_builddir)lib/libpthread.so +endif interp := $(top_builddir)lib/interp.os ldso := $(top_builddir)lib/$(UCLIBC_LDSO) headers_dep := $(top_builddir)include/bits/sysnum.h sub_headers := $(headers_dep) #LIBS :=$(interp) -L$(top_builddir)lib -lc -LIBS := $(interp) -L$(top_builddir)lib $(libc:.$(MAJOR_VERSION)=) +LIBS := $(interp) -L$(top_builddir)lib $(libc:.$(ABI_VERSION)=) # Make sure DESTDIR and PREFIX can be used to install # PREFIX is a uClibcism while DESTDIR is a common GNUism @@ -150,8 +158,8 @@ endif comma:=, space:= # -ifndef CROSS -CROSS=$(call qstrip,$(CROSS_COMPILER_PREFIX)) +ifeq ($(CROSS_COMPILE),) +CROSS_COMPILE=$(call qstrip,$(CROSS_COMPILER_PREFIX)) endif # A nifty macro to make testing gcc features easier @@ -165,6 +173,52 @@ check_ld=$(shell \ if $(LD) $(1) -o /dev/null -b binary /dev/null > /dev/null 2>&1; \ then echo "$(1)"; fi) +# Use variable indirection here so that we can have variable +# names with fun chars in them like equal signs +define check-tool-var +ifeq ($(filter $(clean_targets) CLEAN_%,$(MAKECMDGOALS)),) +_v = $(2)_$(3) +ifndef $$(_v) +$$(_v) := $$(call $(1),$(subst %, ,$(3))) +export $$(_v) +endif +endif +endef + +# Usage: check-gcc-var, +# Check the C compiler to see if it supports . +# Export the variable CFLAG_ if it does. +define check-gcc-var +$(call check-tool-var,check_gcc,CFLAG,$(1)) +endef +# Usage: check-as-var, +# Check the assembler to see if it supports . Export the +# variable ASFLAG_ if it does (for invoking the assembler), +# as well CFLAG_-Wa (for invoking the compiler driver). +define check-as-var +$(call check-tool-var,check_as,ASFLAG,$(1)) +_v = CFLAG_-Wa$(1) +export $$(_v) = $$(if $$(ASFLAG_$(1)),-Wa$$(comma)$$(ASFLAG_$(1))) +endef +# Usage: check-ld-var, +# Check the linker to see if it supports . Export the +# variable LDFLAG_ if it does (for invoking the linker), +# as well CFLAG_-Wl (for invoking the compiler driver). +define check-ld-var +$(call check-tool-var,check_ld,LDFLAG,$(1)) +_v = CFLAG_-Wl$(1) +export $$(_v) = $$(if $$(LDFLAG_$(1)),-Wl$$(comma)$$(LDFLAG_$(1))) +endef +# Usage: cache-output-var,, +# Execute and cache the output in . +define cache-output-var +ifndef $(1) +$(1) := $$(shell $(2)) +export $(1) +endif +endef + + ARFLAGS:=cr @@ -172,23 +226,37 @@ ARFLAGS:=cr OPTIMIZATION:= # Use '-Os' optimization if available, else use -O2, allow Config to override -OPTIMIZATION+=$(call check_gcc,-Os,-O2) +$(eval $(call check-gcc-var,-Os)) +ifneq ($(CFLAG_-Os),) +OPTIMIZATION += $(CFLAG_-Os) +else +$(eval $(call check-gcc-var,-O2)) +OPTIMIZATION += $(CFLAG_-O2) +endif # Use the gcc 3.4 -funit-at-a-time optimization when available -OPTIMIZATION+=$(call check_gcc,-funit-at-a-time,) +$(eval $(call check-gcc-var,-funit-at-a-time)) +OPTIMIZATION += $(CFLAG_-funit-at-a-time) # shrinks code by about 0.1% -OPTIMIZATION+=$(call check_gcc,-fmerge-all-constants) +$(eval $(call check-gcc-var,-fmerge-all-constants)) +$(eval $(call check-gcc-var,-fstrict-aliasing)) +OPTIMIZATION += $(CFLAG_-fmerge-all-constants) $(CFLAG_-fstrict-aliasing) -GCC_MAJOR_VER?=$(shell $(CC) -dumpversion | cut -d . -f 1) -#GCC_MINOR_VER?=$(shell $(CC) -dumpversion | cut -d . -f 2) +$(eval $(call cache-output-var,GCC_VER,$(CC) -dumpversion)) +GCC_VER := $(subst ., ,$(GCC_VER)) +GCC_MAJOR_VER ?= $(word 1,$(GCC_VER)) +#GCC_MINOR_VER ?= $(word 2,$(GCC_VER)) ifeq ($(GCC_MAJOR_VER),4) # shrinks code, results are from 4.0.2 # 0.36% -OPTIMIZATION+=$(call check_gcc,-fno-tree-loop-optimize,) +$(eval $(call check-gcc-var,-fno-tree-loop-optimize)) +OPTIMIZATION += $(CFLAG_-fno-tree-loop-optimize) # 0.34% -OPTIMIZATION+=$(call check_gcc,-fno-tree-dominator-opts,) +$(eval $(call check-gcc-var,-fno-tree-dominator-opts)) +OPTIMIZATION += $(CFLAG_-fno-tree-dominator-opts) # 0.1% -OPTIMIZATION+=$(call check_gcc,-fno-strength-reduce,) +$(eval $(call check-gcc-var,-fno-strength-reduce)) +OPTIMIZATION += $(CFLAG_-fno-strength-reduce) endif @@ -199,7 +267,8 @@ endif # sign extension of 'char' type for 10 hours straight. Not fun. CPU_CFLAGS-y := -funsigned-char -fno-builtin -CPU_CFLAGS-y += $(call check_gcc,-fno-asm,) +$(eval $(call check-gcc-var,-fno-asm)) +CPU_CFLAGS-y += $(CFLAG_-fno-asm) LDADD_LIBFLOAT= ifeq ($(UCLIBC_HAS_SOFT_FLOAT),y) @@ -209,10 +278,12 @@ ifeq ($(UCLIBC_HAS_SOFT_FLOAT),y) ifneq ($(TARGET_ARCH),nios) ifneq ($(TARGET_ARCH),nios2) ifneq ($(TARGET_ARCH),sh) +ifneq ($(TARGET_ARCH),c6x) CPU_CFLAGS-y += -msoft-float endif endif endif +endif ifeq ($(TARGET_ARCH),arm) # No longer needed with current toolchains, but leave it here for now. # If anyone is actually still using gcc 2.95 (say), they can uncomment it. @@ -220,7 +291,8 @@ ifeq ($(TARGET_ARCH),arm) endif endif -CPU_CFLAGS-y += $(call check_gcc,-std=gnu99,) +$(eval $(call check-gcc-var,-std=gnu99)) +CPU_CFLAGS-y += $(CFLAG_-std=gnu99) CPU_CFLAGS-$(UCLIBC_FORMAT_SHARED_FLAT) += -mid-shared-library CPU_CFLAGS-$(UCLIBC_FORMAT_FLAT_SEP_DATA) += -msep-data @@ -230,12 +302,14 @@ CPU_LDFLAGS-$(ARCH_BIG_ENDIAN) += -Wl,-EB PICFLAG-y := -fPIC PICFLAG-$(UCLIBC_FORMAT_FDPIC_ELF) := -mfdpic +PICFLAG-$(UCLIBC_FORMAT_DSBT_ELF) := -mdsbt -fpic PICFLAG := $(PICFLAG-y) PIEFLAG_NAME:=-fPIE # Some nice CPU specific optimizations ifeq ($(TARGET_ARCH),i386) - OPTIMIZATION+=$(call check_gcc,-fomit-frame-pointer,) +$(eval $(call check-gcc-var,-fomit-frame-pointer)) + OPTIMIZATION += $(CFLAG_-fomit-frame-pointer) ifeq ($(CONFIG_386)$(CONFIG_486)$(CONFIG_586)$(CONFIG_586MMX),y) # Non-SSE capable processor. @@ -245,7 +319,8 @@ ifeq ($(CONFIG_386)$(CONFIG_486)$(CONFIG_586)$(CONFIG_586MMX),y) # -m32 is needed if host is 64-bit OPTIMIZATION+=$(call check_gcc,-m32 -mpreferred-stack-boundary=2,) else - OPTIMIZATION+=$(call check_gcc,-mpreferred-stack-boundary=4,) +$(eval $(call check-gcc-var,-mpreferred-stack-boundary=4)) + OPTIMIZATION += $(CFLAG_-mpreferred-stack-boundary=4) endif # Choice of alignment (please document why!) @@ -284,13 +359,10 @@ endif # It specifies 4 byte align for .text even if not told to do so: # Idx Name Size VMA LMA File off Algn # 0 .text xxxxxxxx 00000000 00000000 xxxxxxxx 2**2 <===! - CPU_CFLAGS-y += $(call check_gcc,-ffunction-sections -fdata-sections,) -ifneq ($(call check_ld,--sort-common),) - CPU_LDFLAGS-y += -Wl,--sort-common -endif -ifneq ($(call check_ld,--sort-section alignment),) - CPU_LDFLAGS-y += -Wl,--sort-section,alignment -endif + CPU_CFLAGS-y += $(CFLAG_-ffunction-sections) $(CFLAG_-fdata-sections) + CPU_LDFLAGS-y += $(CFLAG_-Wl--sort-common) +$(eval $(call check-ld-var,--sort-section=alignment)) + CPU_LDFLAGS-y += $(CFLAG_-Wl--sort-section=alignment) CPU_LDFLAGS-y+=-m32 CPU_CFLAGS-y+=-m32 @@ -320,32 +392,13 @@ ifeq ($(TARGET_ARCH),sparc) endif ifeq ($(TARGET_ARCH),arm) - OPTIMIZATION+=-fstrict-aliasing 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_ARM7TDMI)+=-mtune=arm7tdmi -march=armv4t - CPU_CFLAGS-$(CONFIG_ARM720T)+=-mtune=arm7tdmi -march=armv4t - CPU_CFLAGS-$(CONFIG_ARM920T)+=-mtune=arm9tdmi -march=armv4t - CPU_CFLAGS-$(CONFIG_ARM922T)+=-mtune=arm9tdmi -march=armv4t - 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 + CPU_CFLAGS-$(COMPILE_IN_THUMB_MODE)+=-mthumb endif ifeq ($(TARGET_ARCH),mips) - OPTIMIZATIONS+=-mno-split-addresses + OPTIMIZATION+=-mno-split-addresses 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 @@ -367,14 +420,14 @@ ifeq ($(TARGET_ARCH),mips) endif ifeq ($(TARGET_ARCH),nios) - OPTIMIZATIONS+=-funaligned-struct-hack + OPTIMIZATION+=-funaligned-struct-hack CPU_LDFLAGS-y+=-Wl,-m32 CPU_CFLAGS-y+=-Wl,-m32 endif ifeq ($(TARGET_ARCH),sh) - OPTIMIZATION+=-fstrict-aliasing - OPTIMIZATION+= $(call check_gcc,-mprefergot,) +$(eval $(call check-gcc-var,-mprefergot)) + OPTIMIZATION += $(CFLAG_-mprefergot) CPU_CFLAGS-$(ARCH_LITTLE_ENDIAN)+=-ml CPU_CFLAGS-$(ARCH_BIG_ENDIAN)+=-mb CPU_CFLAGS-$(CONFIG_SH2)+=-m2 @@ -389,7 +442,6 @@ endif endif ifeq ($(TARGET_ARCH),sh64) - OPTIMIZATION+=-fstrict-aliasing CPU_CFLAGS-$(ARCH_LITTLE_ENDIAN):=-ml CPU_CFLAGS-$(ARCH_BIG_ENDIAN):=-mb CPU_CFLAGS-$(CONFIG_SH5)+=-m5-32media @@ -404,11 +456,11 @@ ifeq ($(TARGET_ARCH),h8300) endif ifeq ($(TARGET_ARCH),i960) - OPTIMIZATIONS+=-mh -mint32 #-fsigned-char + OPTIMIZATION+=-mh -mint32 #-fsigned-char endif ifeq ($(TARGET_ARCH),e1) - OPTIMIZATIONS+=-mgnu-param + OPTIMIZATION+=-mgnu-param endif ifeq ($(TARGET_ARCH),cris) @@ -472,25 +524,29 @@ ifeq ($(TARGET_ARCH),i960) SYMBOL_PREFIX=_ endif -ifeq ($(TARGET_ARCH),microblaze) +ifeq ($(TARGET_ARCH),v850) SYMBOL_PREFIX=_ endif -ifeq ($(TARGET_ARCH),v850) - SYMBOL_PREFIX=_ +ifeq ($(TARGET_ARCH),c6x) + PIEFLAG:= + CPU_CFLAGS-$(CONFIG_TMS320C64X) += -march=c64x + CPU_CFLAGS-$(CONFIG_TMS320C64XPLUS) += -march=c64x+ + CPU_CFLAGS-$(ARCH_LITTLE_ENDIAN)+=-mlittle-endian + CPU_CFLAGS-$(ARCH_BIG_ENDIAN)+=-mbig-endian + CPU_LDFLAGS-y += $(CPU_CFLAGS) endif -# Keep the check_gcc from being needlessly executed -ifndef PIEFLAG -export PIEFLAG:=$(call check_gcc,$(PIEFLAG_NAME),$(PICFLAG)) +$(eval $(call check-gcc-var,$(PIEFLAG_NAME))) +PIEFLAG := $(CFLAG_$(PIEFLAG_NAME)) +ifeq ($(PIEFLAG),) +PIEFLAG := $(PICFLAG) endif # We need to keep track of both the CC PIE flag (above) as # well as the LD PIE flag (below) because we can't rely on # gcc passing -pie if we used -fPIE. We need to directly use -pie # instead of -Wl,-pie as gcc picks up the wrong startfile/endfile -ifndef LDPIEFLAG -export LDPIEFLAG:=$(shell $(LD) --help 2>/dev/null | grep -q -- -pie && echo "-pie") -endif +$(eval $(call cache-output-var,LDPIEFLAG,$(LD) --help 2>/dev/null | grep -q -- -pie && echo "-pie")) # Check for --as-needed support in linker ifndef LD_FLAG_ASNEEDED @@ -514,34 +570,60 @@ ifdef LD_FLAG_NO_ASNEEDED export CC_FLAG_NO_ASNEEDED:=-Wl,$(LD_FLAG_NO_ASNEEDED) endif endif -link.asneeded = $(if $(and $(CC_FLAG_ASNEEDED),$(CC_FLAG_NO_ASNEEDED)),$(CC_FLAG_ASNEEDED) $(1) $(CC_FLAG_NO_ASNEEDED)) +link.asneeded = $(if $(findstring yy,$(CC_FLAG_ASNEEDED)$(CC_FLAG_NO_ASNEEDED)),$(CC_FLAG_ASNEEDED) $(1) $(CC_FLAG_NO_ASNEEDED)) # Check for AS_NEEDED support in linker script (binutils>=2.16.1 has it) ifndef ASNEEDED export ASNEEDED:=$(shell $(LD) --help 2>/dev/null | grep -q -- --as-needed && echo "AS_NEEDED ( $(UCLIBC_LDSO) )" || echo "$(UCLIBC_LDSO)") +ifeq ($(UCLIBC_HAS_BACKTRACE),y) +# Only used in installed libc.so linker script +UBACKTRACE_FULL_NAME := $(RUNTIME_PREFIX)lib/$(UBACKTRACE_DSO) +export UBACKTRACE_ASNEEDED:=$(shell $(LD) --help 2>/dev/null | grep -q -- --as-needed && echo "AS_NEEDED ( $(UBACKTRACE_FULL_NAME) )" || echo "$(UBACKTRACE_FULL_NAME)") +else +export UBACKTRACE_ASNEEDED:="" +endif endif # Add a bunch of extra pedantic annoyingly strict checks -XWARNINGS=$(call qstrip,$(WARNINGS)) -Wstrict-prototypes -fno-strict-aliasing +WARNING_FLAGS = -Wstrict-prototypes -Wstrict-aliasing ifeq ($(EXTRA_WARNINGS),y) -XWARNINGS+=-Wnested-externs -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wformat=2 -XWARNINGS+=-Wmissing-prototypes -Wmissing-declarations -XWARNINGS+=-Wnonnull -Wundef +WARNING_FLAGS += \ + -Wformat=2 \ + -Wmissing-noreturn \ + -Wmissing-format-attribute \ + -Wmissing-prototypes \ + -Wmissing-declarations \ + -Wnested-externs \ + -Wnonnull \ + -Wold-style-declaration \ + -Wold-style-definition \ + -Wshadow \ + -Wundef # Works only w/ gcc-3.4 and up, can't be checked for gcc-3.x w/ check_gcc() -#XWARNINGS+=-Wdeclaration-after-statement +WARNING_FLAGS-gcc-4 += -Wdeclaration-after-statement endif +WARNING_FLAGS += $(WARNING_FLAGS-gcc-$(GCC_MAJOR_VER)) +$(foreach w,$(WARNING_FLAGS),$(eval $(call check-gcc-var,$(w)))) +XWARNINGS = $(call qstrip,$(WARNINGS)) $(foreach w,$(WARNING_FLAGS),$(CFLAG_$(w))) + CPU_CFLAGS=$(call qstrip,$(CPU_CFLAGS-y)) -SSP_DISABLE_FLAGS ?= $(call check_gcc,-fno-stack-protector,) +# Save the tested flag in a single variable and force it to be +# evaluated just once. Then use that computed value. +$(eval $(call check-gcc-var,-fno-stack-protector)) +SSP_DISABLE_FLAGS ?= $(CFLAG_-fno-stack-protector) ifeq ($(UCLIBC_BUILD_SSP),y) -SSP_CFLAGS := $(call check_gcc,-fno-stack-protector-all,) -SSP_CFLAGS += $(call check_gcc,-fstack-protector,) -SSP_ALL_CFLAGS ?= $(call check_gcc,-fstack-protector-all,) +$(eval $(call check-gcc-var,-fno-stack-protector-all)) +$(eval $(call check-gcc-var,-fstack-protector)) +$(eval $(call check-gcc-var,-fstack-protector-all)) +SSP_CFLAGS := $(CFLAG_-fno-stack-protector-all) +SSP_CFLAGS += $(CFLAG_-fstack-protector) +SSP_ALL_CFLAGS ?= $(CFLAG_-fstack-protector-all) else SSP_CFLAGS := $(SSP_DISABLE_FLAGS) endif -NOSTDLIB_CFLAGS:=$(call check_gcc,-nostdlib,) +$(eval $(call check-gcc-var,-nostdlib)) # Collect all CFLAGS components CFLAGS := -include $(top_srcdir)include/libc-symbols.h \ @@ -549,22 +631,23 @@ CFLAGS := -include $(top_srcdir)include/libc-symbols.h \ -nostdinc -I$(top_builddir)include -I$(top_srcdir)include -I. \ -I$(top_srcdir)libc/sysdeps/linux \ -I$(top_srcdir)libc/sysdeps/linux/$(TARGET_ARCH) -ifneq ($(strip $(UCLIBC_EXTRA_CFLAGS)),"") -CFLAGS += $(call qstrip,$(UCLIBC_EXTRA_CFLAGS)) -endif # We need this to be checked within libc-symbols.h ifneq ($(HAVE_SHARED),y) CFLAGS += -DSTATIC endif -LDFLAG_WARN_ONCE:=$(if $(call check_ld,--warn-once),-Wl$(comma)--warn-once) -LDFLAG_SORT_COMMON:=$(if $(call check_ld,--sort-common),-Wl$(comma)--sort-common) -LDFLAG_DISCARD_ALL:=$(if $(call check_ld,--discard-all),-Wl$(comma)--discard-all) +$(eval $(call check-ld-var,--warn-once)) +$(eval $(call check-ld-var,--sort-common)) +$(eval $(call check-ld-var,--discard-all)) LDFLAGS_NOSTRIP:=$(CPU_LDFLAGS-y) -shared \ - -Wl,--warn-common $(LDFLAG_WARN_ONCE) -Wl,-z,combreloc + -Wl,--warn-common $(CFLAG_-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) +#$(eval $(call check-ld-var,--gc-sections)) +#LDFLAGS_NOSTRIP += $(LDFLAG_--gc-sections) + +$(eval $(call check-gcc-var,-fdata-sections)) +$(eval $(call check-gcc-var,-ffunction-sections)) ifeq ($(UCLIBC_BUILD_RELRO),y) LDFLAGS_NOSTRIP+=-Wl,-z,relro @@ -576,19 +659,19 @@ endif ifeq ($(LDSO_GNU_HASH_SUPPORT),y) # Be sure that binutils support it -LDFLAGS_GNUHASH:=$(call check_ld,--hash-style=gnu) -ifeq ($(LDFLAGS_GNUHASH),) -ifneq ($(filter-out install_headers headers-y,$(MAKECMDGOALS)),) +$(eval $(call check-ld-var,--hash-style=gnu)) +ifeq ($(LDFLAG_--hash-style=gnu),) +ifneq ($(filter-out $(clean_targets) CLEAN_% install_headers headers-y,$(MAKECMDGOALS)),) $(error Your binutils do not support --hash-style option, while you want to use it) endif else -LDFLAGS_NOSTRIP += -Wl,$(LDFLAGS_GNUHASH) +LDFLAGS_NOSTRIP += $(CFLAG_-Wl--hash-style=gnu) endif endif LDFLAGS:=$(LDFLAGS_NOSTRIP) -Wl,-z,defs ifeq ($(DODEBUG),y) -CFLAGS += -O0 -g3 +CFLAGS += -O0 -g3 -DDEBUG else CFLAGS += $(OPTIMIZATION) endif @@ -597,6 +680,9 @@ LDFLAGS += -Wl,-s else STRIPTOOL := true -Stripping_disabled endif +ifneq ($(strip $(UCLIBC_EXTRA_CFLAGS)),"") +CFLAGS += $(call qstrip,$(UCLIBC_EXTRA_CFLAGS)) +endif ifeq ($(DOMULTI),y) # we try to compile all sources at once into an object (IMA), but @@ -607,7 +693,8 @@ ifeq ($(DOMULTI),y) ifeq ($(GCC_MAJOR_VER),3) DOMULTI:=n else -CFLAGS+=$(call check_gcc,--combine,) +$(eval $(call check-gcc-var,--combine)) +CFLAGS += $(CFLAG_--combine) endif else DOMULTI:=n @@ -620,6 +707,7 @@ endif ifeq ($(UCLIBC_HAS_THREADS),y) ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y) PTNAME := nptl + CFLAGS += -DHAVE_FORCED_UNWIND else ifeq ($(LINUXTHREADS_OLD),y) PTNAME := linuxthreads.old @@ -630,14 +718,18 @@ endif PTDIR := libpthread/$(PTNAME) # set up system dependencies include dirs (NOTE: order matters!) ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y) -PTINC:= -I$(top_srcdir)$(PTDIR) \ +PTINC:= -I$(top_builddir)$(PTDIR) \ + -I$(top_srcdir)$(PTDIR) \ + $(if $(TARGET_ARCH),-I$(top_srcdir)$(PTDIR)/sysdeps/unix/sysv/linux/$(TARGET_ARCH)/$(TARGET_SUBARCH)) \ -I$(top_srcdir)$(PTDIR)/sysdeps/unix/sysv/linux/$(TARGET_ARCH) \ + -I$(top_builddir)$(PTDIR)/sysdeps/$(TARGET_ARCH) \ -I$(top_srcdir)$(PTDIR)/sysdeps/$(TARGET_ARCH) \ + -I$(top_builddir)$(PTDIR)/sysdeps/unix/sysv/linux \ -I$(top_srcdir)$(PTDIR)/sysdeps/unix/sysv/linux \ -I$(top_srcdir)$(PTDIR)/sysdeps/pthread \ - -I$(top_srcdir)$(PTDIR)/sysdeps/pthread/bits \ + -I$(top_srcdir)$(PTDIR)/sysdeps/pthread/bits \ -I$(top_srcdir)$(PTDIR)/sysdeps/generic \ - -I$(top_srcdir)ldso/ldso/$(TARGET_ARCH) \ + -I$(top_srcdir)ldso/ldso/$(TARGET_ARCH) \ -I$(top_srcdir)ldso/include # # Test for TLS if NPTL support was selected. @@ -670,10 +762,11 @@ else PTNAME := PTINC := endif +CFLAGS += -I$(top_srcdir)libc/sysdeps/linux/common CFLAGS += -I$(KERNEL_HEADERS) #CFLAGS += -iwithprefix include-fixed -iwithprefix include -CC_IPREFIX := $(shell $(CC) --print-file-name=include) +$(eval $(call cache-output-var,CC_IPREFIX,$(CC) -print-file-name=include)) CC_INC := -isystem $(dir $(CC_IPREFIX))include-fixed -isystem $(CC_IPREFIX) CFLAGS += $(CC_INC) @@ -686,17 +779,13 @@ CFLAGS+=-D__UCLIBC_UNDERSCORES__ endif # Keep the check_as from being needlessly executed -ifndef ASFLAGS_NOEXEC ifeq ($(UCLIBC_BUILD_NOEXECSTACK),y) -export ASFLAGS_NOEXEC := $(call check_as,--noexecstack) -else -export ASFLAGS_NOEXEC := -endif +$(eval $(call check-as-var,--noexecstack)) endif -ASFLAGS = $(ASFLAGS_NOEXEC) +ASFLAGS = $(ASFLAG_--noexecstack) LIBGCC_CFLAGS ?= $(CFLAGS) $(CPU_CFLAGS-y) -LIBGCC:=$(shell $(CC) $(LIBGCC_CFLAGS) -print-libgcc-file-name) +$(eval $(call cache-output-var,LIBGCC,$(CC) $(LIBGCC_CFLAGS) -print-libgcc-file-name)) LIBGCC_DIR:=$(dir $(LIBGCC)) # moved from libpthread/linuxthreads