diff options
Diffstat (limited to 'Rules.mak')
| -rw-r--r-- | Rules.mak | 705 |
1 files changed, 431 insertions, 274 deletions
@@ -1,12 +1,23 @@ # Rules.make for uClibc # -# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> +# Copyright (C) 2000-2008 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # +# make nano-doc +# FOO = bar -- recursively expanded variable. Value is remebered verbatim. +# If it contains references to other variables, these references +# are expanded whenever this variable is _substituted_. +# FOO := bar -- simply expanded variable. Right hand is expanded when +# the variable is _defined_. Therefore faster than =. +# FOO ?= bar -- set a value only if it is not already set +# (behaves as =, not :=). +# FOO += bar -- append; if FOO is not defined, acts like = (not :=). + + # check for proper make version -ifneq ($(findstring 3.7,$(MAKE_VERSION)),) +ifneq ($(findstring x3.7,x$(MAKE_VERSION)),) $(error Your make is too old $(MAKE_VERSION). Go get at least 3.80) endif @@ -16,98 +27,150 @@ endif # file named ".config". Don't mess with this file unless # you know what you are doing. +clean_targets := clean realclean distclean \ + objclean-y headers_clean-y CLEAN_utils +noconfig_targets := menuconfig config nconfig \ + oldaskconfig silentoldconfig oldconfig allnoconfig allyesconfig \ + alldefconfig randconfig defconfig savedefconfig listnewconfig \ + olddefconfig \ + xconfig gconfig update-po-config mconf qconf gconf nconf conf \ + release dist tags help + #----------------------------------------------------------- # 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 -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 RM = rm -f TAR = tar +SED = sed +AWK = awk STRIP_FLAGS ?= -x -R .note -R .comment -UNIFDEF := $(top_builddir)extra/scripts/unifdef -UUCLIBC_INTERNAL - # Select the compiler needed to build binaries for your development system HOSTCC = gcc -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/xtensa.*/xtensa/ ) - +BUILD_CFLAGS = -Os #--------------------------------------------------------- # Nothing beyond this point should ever be touched by mere # mortals. Unless you hang out with the gods, you should # probably leave all this stuff alone. +# strip quotes +qstrip = $(strip $(subst ",,$(1))) +#")) + +# kconfig stuff +KCONFIG_CONFIG ?= $(top_builddir).config +KCONFIG_CONFIG := $(abspath $(KCONFIG_CONFIG)) +export KCONFIG_CONFIG +KCONFIG_AUTOCONFIG := $(dir $(KCONFIG_CONFIG))include/config/auto.conf +export KCONFIG_AUTOCONFIG +KCONFIG_TRISTATE := $(dir $(KCONFIG_CONFIG))include/config/tristate.conf +export KCONFIG_TRISTATE +srctree := $(abspath $(top_srcdir)) +export srctree +KCONFIG_AUTOHEADER := $(dir $(KCONFIG_CONFIG))include/generated/autoconf.h +export KCONFIG_AUTOHEADER +Kconfig := $(abspath $(top_srcdir)extra/Configs/Config.in) + # Pull in the user's uClibc configuration -ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),) --include $(top_builddir).config +ifeq ($(filter $(noconfig_targets) clean CLEAN_%,$(MAKECMDGOALS)),) +-include $(KCONFIG_CONFIG) endif +TARGET_ARCH:=$(call qstrip,$(TARGET_ARCH)) +ifeq ($(TARGET_ARCH),) +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/xtensa.*/xtensa/ ) +else +ARCH = $(TARGET_ARCH) +endif +export ARCH + # Make certain these contain a final "/", but no "//"s. -TARGET_ARCH:=$(shell grep -s '^TARGET_ARCH' $(top_builddir)/.config | sed -e 's/^TARGET_ARCH=//' -e 's/"//g') -TARGET_ARCH:=$(strip $(subst ",, $(strip $(TARGET_ARCH)))) -TARGET_SUBARCH:=$(shell grep -s '^TARGET_SUBARCH' $(top_builddir)/.config | sed -e 's/^TARGET_SUBARCH=//' -e 's/"//g') -TARGET_SUBARCH:=$(strip $(subst ",, $(strip $(TARGET_SUBARCH)))) -RUNTIME_PREFIX:=$(strip $(subst //,/, $(subst ,/, $(subst ",, $(strip $(RUNTIME_PREFIX)))))) -DEVEL_PREFIX:=$(strip $(subst //,/, $(subst ,/, $(subst ",, $(strip $(DEVEL_PREFIX)))))) -KERNEL_HEADERS:=$(strip $(subst //,/, $(subst ,/, $(subst ",, $(strip $(KERNEL_HEADERS)))))) -export RUNTIME_PREFIX DEVEL_PREFIX KERNEL_HEADERS +scrub_path = $(strip $(subst //,/, $(subst ,/, $(call qstrip,$(1))))) +TARGET_SUBARCH := $(call qstrip,$(TARGET_SUBARCH)) +RUNTIME_PREFIX := $(call scrub_path,$(RUNTIME_PREFIX)) +DEVEL_PREFIX := $(call scrub_path,$(DEVEL_PREFIX)) +MULTILIB_DIR := $(call scrub_path,$(MULTILIB_DIR)) +KERNEL_HEADERS := $(call scrub_path,$(KERNEL_HEADERS)) +export RUNTIME_PREFIX DEVEL_PREFIX KERNEL_HEADERS MULTILIB_DIR # Now config hard core -MAJOR_VERSION := 0 -MINOR_VERSION := 9 -SUBLEVEL := 29 +MAJOR_VERSION := 1 +MINOR_VERSION := 0 +SUBLEVEL := 13 EXTRAVERSION := 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) -ifneq ($(findstring $(TARGET_ARCH) , hppa64 ia64 mips64 powerpc64 s390x sparc64 x86_64 ),) +SHARED_LIBNAME := $(LIBC).so.$(ABI_VERSION) +UBACKTRACE_DSO := libubacktrace.so.$(ABI_VERSION) + +UCLIBC_LDSO_NAME := ld-uClibc +ARCH_NATIVE_BIT := 32 +ifneq ($(findstring $(TARGET_ARCH) , hppa64 ia64 powerpc64 s390x sparc64 x86_64 ),) UCLIBC_LDSO_NAME := ld64-uClibc +ARCH_NATIVE_BIT := 64 else -UCLIBC_LDSO_NAME := ld-uClibc +ifeq ($(CONFIG_MIPS_N64_ABI),y) +UCLIBC_LDSO_NAME := ld64-uClibc +ARCH_NATIVE_BIT := 64 +endif 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 +headers_dep := $(top_builddir)include/bits/sysnum.h \ + $(top_builddir)include/bits/uClibc_config.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 @@ -124,8 +187,8 @@ endif comma:=, space:= # -ifndef CROSS -CROSS=$(subst ",, $(strip $(CROSS_COMPILER_PREFIX))) +ifeq ($(CROSS_COMPILE),) +CROSS_COMPILE=$(call qstrip,$(CROSS_COMPILER_PREFIX)) endif # A nifty macro to make testing gcc features easier @@ -136,48 +199,155 @@ check_as=$(shell \ if $(CC) -Wa,$(1) -Wa,-Z -c -o /dev/null -xassembler /dev/null > /dev/null 2>&1; \ then echo "-Wa,$(1)"; fi) check_ld=$(shell \ - if $(LD) $(1) -o /dev/null -b binary /dev/null > /dev/null 2>&1; \ + if $(CC) $(LDFLAG-fuse-ld) $(CFLAG_-Wl--no-warn-mismatch) -Wl,$(1) $(CFLAG_-nostdlib) -o /dev/null -Wl,-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,<flag> +# Check the C compiler to see if it supports <flag>. +# Export the variable CFLAG_<flag> if it does. +define check-gcc-var +$(call check-tool-var,check_gcc,CFLAG,$(1)) +endef +# Usage: check-as-var,<flag> +# Check the assembler to see if it supports <flag>. Export the +# variable ASFLAG_<flag> if it does (for invoking the assembler), +# as well CFLAG_-Wa<flag> (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,<flag> +# Check the linker to see if it supports <flag>. Export the +# variable LDFLAG_<flag> if it does (for invoking the linker), +# as well CFLAG_-Wl<flag> (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,<variable>,<shell command> +# Execute <shell command> and cache the output in <variable>. +define cache-output-var +ifndef $(1) +$(1) := $$(shell $(2)) +export $(1) +endif +endef + + ARFLAGS:=cr +# Note: The check for -nostdlib has to be before all calls to check_ld +$(eval $(call check-gcc-var,-nostdlib)) +$(eval $(call check-gcc-var,-nostartfiles)) +# deliberately not named CFLAG-fuse-ld since unchecked and from user +LDFLAG-fuse-ld := $(filter -fuse-ld=%,$(call qstrip,$(UCLIBC_EXTRA_CFLAGS))) +# failed to merge target specific data of file /dev/null +# Could use -Wl,--script,$(top_srcdir)extra/scripts/none.lds as well. +$(eval $(call check-ld-var,--no-warn-mismatch)) + +$(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)) + # Flags in OPTIMIZATION are used only for non-debug builds + OPTIMIZATION:= +OPTIMIZATION-$(GCC_MAJOR_VER):= +OPTIMIZATION-$(GCC_MAJOR_VER).$(GCC_MINOR_VER):= + # 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-3.4 += $(CFLAG_-funit-at-a-time) +$(eval $(call check-gcc-var,-fstrict-aliasing)) +OPTIMIZATION += $(CFLAG_-fstrict-aliasing) -GCC_MAJOR_VER?=$(shell $(CC) -dumpversion | cut -d . -f 1) -#GCC_MINOR_VER?=$(shell $(CC) -dumpversion | cut -d . -f 2) +# CPU_CFLAGS-y contain options which are not warnings, +# not include or library paths, and not optimizations. -ifeq ($(GCC_MAJOR_VER),4) -# shrinks code, results are from 4.0.2 -# 0.36% -OPTIMIZATION+=$(call check_gcc,-fno-tree-loop-optimize,) -# 0.34% -OPTIMIZATION+=$(call check_gcc,-fno-tree-dominator-opts,) -# 0.1% -OPTIMIZATION+=$(call check_gcc,-fno-strength-reduce,) +# Why -funsigned-char: I hunted a bug related to incorrect +# sign extension of 'char' type for 10 hours straight. Not fun. +CPU_CFLAGS-y := -funsigned-char -fno-builtin + +$(eval $(call check-gcc-var,-fno-asm)) +CPU_CFLAGS-y += $(CFLAG_-fno-asm) +$(eval $(call check-gcc-var,-fmerge-all-constants)) +CPU_CFLAGS-y += $(CFLAG_-fmerge-all-constants) + +ifeq ($(UCLIBC_HAS_SOFT_FLOAT),y) +ifneq ($(TARGET_ARCH),bfin) +ifneq ($(TARGET_ARCH),lm32) +ifneq ($(TARGET_ARCH),nios2) +ifneq ($(TARGET_ARCH),sh) +ifneq ($(TARGET_ARCH),c6x) +ifneq ($(TARGET_ARCH),h8300) +CPU_CFLAGS-y += -msoft-float +endif +endif +endif +endif +endif endif +endif + +$(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 +CPU_LDFLAGS-$(ARCH_LITTLE_ENDIAN) += -Wl,-EL +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 +$(eval $(call check-gcc-var,-fdata-sections)) +$(eval $(call check-gcc-var,-ffunction-sections)) + # 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),y) + # TODO: Change this to a gcc version check. This bug + # should be fixed with at least gcc-4.3. + # Non-SSE capable processor. # NB: this may make SSE insns segfault! # -O1 -march=pentium3, -Os -msse etc are known to be affected. - # TODO: conditionally bump to 4 - # (see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=13685) - OPTIMIZATION+=$(call check_gcc,-mpreferred-stack-boundary=4,) + # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=13685 + # -m32 is needed if host is 64-bit + OPTIMIZATION+=$(call check_gcc,-m32 -mpreferred-stack-boundary=2,) +else +$(eval $(call check-gcc-var,-mpreferred-stack-boundary=4)) + OPTIMIZATION += $(CFLAG_-mpreferred-stack-boundary=4) +endif # Choice of alignment (please document why!) # -falign-labels: in-line labels @@ -186,18 +356,6 @@ ifeq ($(TARGET_ARCH),i386) # -falign-jumps: reachable only by a jump # Generic: no alignment at all (smallest code) GCC_FALIGN=$(call check_gcc,-falign-functions=1 -falign-jumps=1 -falign-labels=1 -falign-loops=1,-malign-jumps=1 -malign-loops=1) -ifeq ($(CONFIG_K7),y) - # Align functions to four bytes, use default for jumps and loops (why?) - GCC_FALIGN=$(call check_gcc,-falign-functions=4 -falign-labels=1,-malign-functions=4) -endif -ifeq ($(CONFIG_CRUSOE),y) - # Use compiler's default for functions, jumps and loops (why?) - GCC_FALIGN=$(call check_gcc,-falign-functions=0 -falign-labels=1,-malign-functions=0) -endif -ifeq ($(CONFIG_CYRIXIII),y) - # Use compiler's default for functions, jumps and loops (why?) - GCC_FALIGN=$(call check_gcc,-falign-functions=0 -falign-labels=1,-malign-functions=0) -endif OPTIMIZATION+=$(GCC_FALIGN) # Putting each function and data object into its own section @@ -215,32 +373,13 @@ 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 - CPU_CFLAGS-$(CONFIG_386)+=-march=i386 - CPU_CFLAGS-$(CONFIG_486)+=-march=i486 - CPU_CFLAGS-$(CONFIG_ELAN)+=-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_PENTIUMII)+=$(call check_gcc,-march=pentium2,-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,-march=i686) - CPU_CFLAGS-$(CONFIG_CRUSOE)+=-march=i686 - 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=i486) - CPU_CFLAGS-$(CONFIG_NEHEMIAH)+=$(call check_gcc,-march=c3-2,-march=i686) endif ifeq ($(TARGET_ARCH),sparc) @@ -251,90 +390,44 @@ ifeq ($(TARGET_ARCH),sparc) endif ifeq ($(TARGET_ARCH),arm) - OPTIMIZATION+=-fstrict-aliasing - 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)+= - 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),metag) + SYMBOL_PREFIX=_ + CPU_CFLAGS-$(CONFIG_META_1_2)+= + CPU_CFLAGS-$(CONFIG_META_2_1)+=-Wa,-mcpu=metac21 endif ifeq ($(TARGET_ARCH),mips) - 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 - 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 - ifeq ($(strip $(ARCH_BIG_ENDIAN)),y) - 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)+=-Wl,-melf64ltsmip - CPU_LDFLAGS-$(CONFIG_MIPS_O32_ABI)+=-Wl,-melf32ltsmip - endif + OPTIMIZATION+=-mno-split-addresses CPU_CFLAGS-$(CONFIG_MIPS_N64_ABI)+=-mabi=64 CPU_CFLAGS-$(CONFIG_MIPS_O32_ABI)+=-mabi=32 CPU_CFLAGS-$(CONFIG_MIPS_N32_ABI)+=-mabi=n32 -endif - -ifeq ($(TARGET_ARCH),nios) - CPU_LDFLAGS-y+=-Wl,-m32 - CPU_CFLAGS-y+=-Wl,-m32 + CPU_LDFLAGS-y += $(CPU_CFLAGS) endif ifeq ($(TARGET_ARCH),sh) - OPTIMIZATION+=-fstrict-aliasing - OPTIMIZATION+= $(call check_gcc,-mprefergot,) - CPU_LDFLAGS-$(ARCH_LITTLE_ENDIAN)+=-Wl,-EL - CPU_LDFLAGS-$(ARCH_BIG_ENDIAN)+=-Wl,-EB +$(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 CPU_CFLAGS-$(CONFIG_SH3)+=-m3 -ifeq ($(UCLIBC_HAS_FLOATS),y) +ifeq ($(UCLIBC_HAS_FPU),y) CPU_CFLAGS-$(CONFIG_SH2A)+=-m2a CPU_CFLAGS-$(CONFIG_SH4)+=-m4 + CPU_CFLAGS-$(CONFIG_SH4A)+=-m4a else CPU_CFLAGS-$(CONFIG_SH2A)+=-m2a-nofpu CPU_CFLAGS-$(CONFIG_SH4)+=-m4-nofpu + CPU_CFLAGS-$(CONFIG_SH4A)+=-m4a-nofpu endif endif -ifeq ($(TARGET_ARCH),sh64) - OPTIMIZATION+=-fstrict-aliasing - 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) - 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 @@ -362,7 +455,7 @@ ifeq ($(TARGET_ARCH),powerpc) PIEFLAG_NAME:=-fpie PPC_HAS_REL16:=$(shell echo -e "\t.text\n\taddis 11,30,_GLOBAL_OFFSET_TABLE_-.@ha" | $(CC) -c -x assembler -o /dev/null - 2> /dev/null && echo -n y || echo -n n) CPU_CFLAGS-$(PPC_HAS_REL16)+= -DHAVE_ASM_PPC_REL16 - CPU_CFLAGS-$(CONFIG_E500) += "-D__NO_MATH_INLINES -D__NO_LONG_DOUBLE_MATH" + CPU_CFLAGS-$(CONFIG_E500) += "-D__NO_MATH_INLINES" endif @@ -380,14 +473,12 @@ endif endif ifeq ($(TARGET_ARCH),frv) - 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:=-Wl,-shared -Wl,-Bsymbolic - UCLIBC_LDSO=ld.so.1 + CPU_LDFLAGS-y += -Wl,-melf32frvfd -Wl,-Bsymbolic endif ifeq ($(strip $(TARGET_ARCH)),avr32) @@ -396,110 +487,150 @@ ifeq ($(strip $(TARGET_ARCH)),avr32) CPU_LDFLAGS-$(CONFIG_LINKRELAX) += --relax endif -ifeq ($(TARGET_ARCH),i960) - 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 -ifeq ($(TARGET_ARCH),microblaze) - SYMBOL_PREFIX=_ +ifeq ($(TARGET_ARCH),arc) + CPU_CFLAGS-y += -mlock -mswape + CPU_CFLAGS-$(CONFIG_ARC_CPU_700) += -mA7 + CPU_CFLAGS-$(CONFIG_ARC_CPU_HS) += -mcpu=archs + CPU_LDFLAGS-y += $(CPU_CFLAGS) -marclinux endif -ifeq ($(TARGET_ARCH),v850) - SYMBOL_PREFIX=_ +$(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 +$(eval $(call cache-output-var,LDPIEFLAG,$(CC) -Wl$(comma)--help 2>/dev/null | grep -q -- -pie && echo "-pie")) -# Keep the check_gcc from being needlessly executed -ifndef PIEFLAG -ifneq ($(UCLIBC_BUILD_PIE),y) -export PIEFLAG:= -else -export PIEFLAG:=$(call check_gcc,$(PIEFLAG_NAME),$(PICFLAG)) +# Check for --as-needed support in linker +ifndef LD_FLAG_ASNEEDED +_LD_FLAG_ASNEEDED:=$(shell $(CC) -Wl,--help 2>/dev/null | grep -- --as-needed) +ifneq ($(_LD_FLAG_ASNEEDED),) +export LD_FLAG_ASNEEDED:=--as-needed endif 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 -ifndef LDPIEFLAG -ifneq ($(UCLIBC_BUILD_PIE),y) -export LDPIEFLAG:= -else -export LDPIEFLAG:=$(shell $(LD) --help 2>/dev/null | grep -q -- -pie && echo "-Wl,-pie") +ifndef LD_FLAG_NO_ASNEEDED +ifdef LD_FLAG_ASNEEDED +export LD_FLAG_NO_ASNEEDED:=--no-as-needed endif endif - -# 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)") +ifndef CC_FLAG_ASNEEDED +ifdef LD_FLAG_ASNEEDED +export CC_FLAG_ASNEEDED:=-Wl,$(LD_FLAG_ASNEEDED) endif - -# Add a bunch of extra pedantic annoyingly strict checks -XWARNINGS=$(subst ",, $(strip $(WARNINGS))) -Wstrict-prototypes -fno-strict-aliasing -ifeq ($(EXTRA_WARNINGS),y) -XWARNINGS+=-Wnested-externs -Wshadow -Wmissing-noreturn -Wmissing-format-attribute -Wformat=2 -XWARNINGS+=-Wmissing-prototypes -Wmissing-declarations -XWARNINGS+=-Wnonnull -Wundef -# works only w/ gcc-3.4 and up, can't be checked for gcc-3.x w/ check_gcc() -#XWARNINGS+=-Wdeclaration-after-statement endif -XARCH_CFLAGS=$(subst ",, $(strip $(ARCH_CFLAGS))) -CPU_CFLAGS=$(subst ",, $(strip $(CPU_CFLAGS-y))) - -SSP_DISABLE_FLAGS ?= $(call check_gcc,-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,) -else -SSP_CFLAGS := $(SSP_DISABLE_FLAGS) +ifndef CC_FLAG_NO_ASNEEDED +ifdef LD_FLAG_NO_ASNEEDED +export CC_FLAG_NO_ASNEEDED:=-Wl,$(LD_FLAG_NO_ASNEEDED) endif +endif +link.asneeded = $(if $(findstring yy,$(CC_FLAG_ASNEEDED)$(CC_FLAG_NO_ASNEEDED)),$(CC_FLAG_ASNEEDED) $(1) $(CC_FLAG_NO_ASNEEDED)) -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. \ - -I$(top_srcdir)libc/sysdeps/linux/$(TARGET_ARCH) +# Check for AS_NEEDED support in linker script (binutils>=2.16.1 has it) +ifndef ASNEEDED +export ASNEEDED:=$(shell $(CC) -Wl,--help 2>/dev/null | grep -q -- --as-needed && echo "AS_NEEDED ( $(UCLIBC_LDSO) )" || echo "$(UCLIBC_LDSO)") -# Make sure that we can be built with non-C99 compilers, too. -# Use __\1__ instead. -CFLAGS += $(call check_gcc,-fno-asm,) -ifneq ($(strip $(UCLIBC_EXTRA_CFLAGS)),"") -CFLAGS += $(subst ",, $(UCLIBC_EXTRA_CFLAGS)) +# Only used in installed libc.so linker script +ifeq ($(UCLIBC_HAS_BACKTRACE),y) +ifeq ($(HARDWIRED_ABSPATH),y) +UBACKTRACE_FULL_NAME := $(subst //,/,$(RUNTIME_PREFIX)$(MULTILIB_DIR)/$(UBACKTRACE_DSO)) +else +UBACKTRACE_FULL_NAME := $(UBACKTRACE_DSO) endif - -LDADD_LIBFLOAT= -ifeq ($(UCLIBC_HAS_SOFT_FLOAT),y) -# If -msoft-float isn't supported, we want an error anyway. -# Hmm... might need to revisit this for arm since it has 2 different -# soft float encodings. -ifneq ($(TARGET_ARCH),nios) -ifneq ($(TARGET_ARCH),nios2) -ifneq ($(TARGET_ARCH),sh) -CFLAGS += -msoft-float +export UBACKTRACE_ASNEEDED:=$(shell $(CC) -Wl,--help 2>/dev/null | grep -q -- --as-needed && \ + echo "GROUP ( AS_NEEDED ( $(UBACKTRACE_FULL_NAME) ) )" || \ + echo "GROUP ( $(UBACKTRACE_FULL_NAME) )") +else +export UBACKTRACE_ASNEEDED:="" endif +ifeq ($(UCLIBC_HAS_ARGP),y) +ifeq ($(HARDWIRED_ABSPATH),y) +# Only used in installed libc.so linker script +UARGP_FULL_NAME := $(subst //,/,$(RUNTIME_PREFIX)$(MULTILIB_DIR)/libuargp.so.$(MAJOR_VERSION)) +else +UARGP_FULL_NAME := libuargp.so.$(MAJOR_VERSION) endif +export UARGP_ASNEEDED:=$(shell $(CC) -Wl,--help 2>/dev/null | grep -q -- --as-needed && \ + echo "GROUP ( AS_NEEDED ( $(UARGP_FULL_NAME) ) )" || \ + echo "GROUP ( $(UARGP_FULL_NAME) )") +else +export UARGP_ASNEEDED:="" 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. -# LDADD_LIBFLOAT=-lfloat endif + +# Add a bunch of extra pedantic annoyingly strict checks +WARNING_FLAGS = -Wstrict-prototypes -Wstrict-aliasing +ifeq ($(EXTRA_WARNINGS),y) +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() +#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)) + +# 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) +$(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 -# Please let us see private headers' parts -CFLAGS += -DUCLIBC_INTERNAL +# Collect all CFLAGS components +CFLAGS := $(XWARNINGS) $(CPU_CFLAGS) $(SSP_CFLAGS) \ + -nostdinc -I$(top_builddir)include \ + -I$(top_srcdir)include -include libc-symbols.h \ + -I$(top_srcdir)libc/sysdeps/linux/$(TARGET_ARCH) \ + -I$(top_srcdir)libc/sysdeps/linux \ + -I$(top_srcdir)ldso/ldso/$(TARGET_ARCH) \ + -I$(top_srcdir)ldso/include -I. # We need this to be checked within libc-symbols.h ifneq ($(HAVE_SHARED),y) CFLAGS += -DSTATIC endif -CFLAGS += $(call check_gcc,-std=gnu99,) - -LDFLAGS_NOSTRIP:=$(CPU_LDFLAGS-y) -Wl,-shared \ - -Wl,--warn-common -Wl,--warn-once -Wl,-z,combreloc +$(eval $(call check-ld-var,--warn-once)) +$(eval $(call check-ld-var,--sort-common)) +$(eval $(call check-ld-var,--discard-all)) +LDFLAGS_NOSTRIP:=$(LDFLAG-fuse-ld) $(CPU_LDFLAGS-y) -shared \ + -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) ifeq ($(UCLIBC_BUILD_RELRO),y) LDFLAGS_NOSTRIP+=-Wl,-z,relro @@ -511,21 +642,28 @@ 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) +$(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 += -g3 -CFLAGS += -O0 -g3 +CFLAGS += -O0 -g3 -DDEBUG else -CFLAGS += $(OPTIMIZATION) $(XARCH_CFLAGS) +CFLAGS += $(OPTIMIZATION) +CFLAGS += $(OPTIMIZATION-$(GCC_MAJOR_VER)) +CFLAGS += $(OPTIMIZATION-$(GCC_MAJOR_VER).$(GCC_MINOR_VER)) +$(eval $(call check-ld-var,-O2)) +LDFLAGS_NOSTRIP += $(CFLAG_-Wl-O2) endif + +LDFLAGS:=$(LDFLAGS_NOSTRIP) -Wl,-z,defs + ifeq ($(DOSTRIP),y) LDFLAGS += -Wl,-s else @@ -541,19 +679,28 @@ 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 endif +ifneq ($(strip $(UCLIBC_EXTRA_CFLAGS)),"") +CFLAGS += $(call qstrip,$(UCLIBC_EXTRA_CFLAGS)) +endif ifneq ($(strip $(UCLIBC_EXTRA_LDFLAGS)),"") -LDFLAGS += $(subst ",, $(UCLIBC_EXTRA_LDFLAGS)) +LDFLAGS += $(call qstrip,$(UCLIBC_EXTRA_LDFLAGS)) +endif + +ifeq ($(UCLIBC_HAS_STDIO_FUTEXES),y) +CFLAGS += -D__USE_STDIO_FUTEXES__ endif ifeq ($(UCLIBC_HAS_THREADS),y) ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y) PTNAME := nptl + CFLAGS += -DHAVE_FORCED_UNWIND -D_LIBC_REENTRANT else ifeq ($(LINUXTHREADS_OLD),y) PTNAME := linuxthreads.old @@ -561,18 +708,20 @@ else PTNAME := linuxthreads endif endif -PTDIR := $(top_builddir)libpthread/$(PTNAME) +PTDIR := libpthread/$(PTNAME) # set up system dependencies include dirs (NOTE: order matters!) ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y) -PTINC:= -I$(PTDIR) \ - -I$(PTDIR)/sysdeps/unix/sysv/linux/$(TARGET_ARCH) \ - -I$(PTDIR)/sysdeps/$(TARGET_ARCH) \ - -I$(PTDIR)/sysdeps/unix/sysv/linux \ - -I$(PTDIR)/sysdeps/pthread \ - -I$(PTDIR)/sysdeps/pthread/bits \ - -I$(PTDIR)/sysdeps/generic \ - -I$(top_srcdir)ldso/ldso/$(TARGET_ARCH) \ - -I$(top_srcdir)ldso/include +PTINC:= -I$(top_builddir)$(PTDIR) \ + -I$(top_srcdir)$(PTDIR) \ + $(if $(TARGET_SUBARCH),-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/generic # # Test for TLS if NPTL support was selected. # @@ -592,23 +741,26 @@ gcc_tls_test_fail: endif else PTINC := \ - -I$(PTDIR)/sysdeps/unix/sysv/linux/$(TARGET_ARCH) \ - -I$(PTDIR)/sysdeps/$(TARGET_ARCH) \ - -I$(PTDIR)/sysdeps/unix/sysv/linux \ - -I$(PTDIR)/sysdeps/pthread \ - -I$(PTDIR) \ - -I$(top_builddir)libpthread + -I$(top_srcdir)$(PTDIR)/sysdeps/unix/sysv/linux/$(TARGET_ARCH) \ + -I$(top_srcdir)$(PTDIR)/sysdeps/$(TARGET_ARCH) \ + -I$(top_srcdir)$(PTDIR)/sysdeps/unix/sysv/linux \ + -I$(top_srcdir)$(PTDIR)/sysdeps/pthread \ + -I$(top_srcdir)$(PTDIR) \ + -I$(top_srcdir)libpthread endif CFLAGS+=$(PTINC) else PTNAME := PTINC := endif -CFLAGS += -I$(KERNEL_HEADERS) +CFLAGS += -I$(top_srcdir)libc/sysdeps/linux/common #CFLAGS += -iwithprefix include-fixed -iwithprefix include -CC_IPREFIX:=$(shell $(CC) --print-file-name=include) -CFLAGS += -I$(dir $(CC_IPREFIX))/include-fixed -I$(CC_IPREFIX) +$(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) + +CFLAGS += -I$(KERNEL_HEADERS) ifneq ($(DOASSERTS),y) CFLAGS+=-DNDEBUG @@ -619,18 +771,21 @@ 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) -LIBGCC_DIR:=$(dir $(LIBGCC)) +$(eval $(call cache-output-var,LIBGCC_A,$(CC) $(LIBGCC_CFLAGS) -print-libgcc-file-name)) +$(eval $(call cache-output-var,LIBGCC_EH,$(CC) $(LIBGCC_CFLAGS) -print-file-name=libgcc_eh.a)) +# with -O0 we (e.g. lockf) might end up with references to +# _Unwind_Resume, so pull in gcc_eh in this case.. +# with a --disable-shared toolchain, libgcc_eh.a and libgcc.a are combined +# in libgcc.a, so check if the printed file exist, before adding to the commandline +LIBGCC_EH_FILE := $(shell if [ -f $(LIBGCC_EH) ]; then echo $(LIBGCC_EH); fi) +LIBGCC_DIR := $(dir $(LIBGCC_A)) +LIBGCC := $(LIBGCC_A) $(if $(DODEBUG),$(LIBGCC_EH_FILE)) # moved from libpthread/linuxthreads ifeq ($(UCLIBC_CTOR_DTOR),y) @@ -638,4 +793,6 @@ SHARED_START_FILES:=$(top_builddir)lib/crti.o $(LIBGCC_DIR)crtbeginS.o SHARED_END_FILES:=$(LIBGCC_DIR)crtendS.o $(top_builddir)lib/crtn.o endif -LOCAL_INSTALL_PATH := install_dir +LOCAL_INSTALL_PATH := $(if $(O),$(O)/)install_dir + +PTHREAD_GENERATE_MANGLE ?= -n "s/^.*@@@name@@@\([^@]*\)@@@value@@@[^0-9Xxa-fA-F-]*\([0-9Xxa-fA-F-][0-9Xxa-fA-F-]*\).*@@@end@@@.*\$$/\#define \1 \2/p" |