OSDN Git Service

Fix bug 430 and reduce ldso size with 1KB :). Not sure if I need to use fstat64,...
[uclinux-h8/uclibc-ng.git] / Rules.mak
index abe7696..c79b36c 100644 (file)
--- a/Rules.mak
+++ b/Rules.mak
 # 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 
-#--------------------------------------------------------
-# This file contains rules which are shared between multiple Makefiles.
-# All normal configuration options live in the file named ".config".
-# Don't mess with this file unless you know what you are doing.
+#-----------------------------------------------------------
+# This file contains rules which are shared between multiple
+# Makefiles.  All normal configuration options live in the 
+# file named ".config".  Don't mess with this file unless 
+# you know what you are doing.
 
 
-#--------------------------------------------------------
-# If you are running a cross compiler, you will want to set 'CROSS'
-# 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
+#-----------------------------------------------------------
+# If you are running a cross compiler, you will want to set 
+# 'CROSS' 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=mipsel-linux-
-# will build uClibc for 'mipsel'.
+#        make CROSS=arm-linux-
+# will build uClibc for 'arm'.
 
+ifndef CROSS
 CROSS=
-CC= $(CROSS)gcc
-AR= $(CROSS)ar
-LD= $(CROSS)ld
-NM= $(CROSS)nm
-STRIPTOOL= $(CROSS)strip
+endif
+CC         = $(CROSS)gcc
+AR         = $(CROSS)ar
+LD         = $(CROSS)ld
+NM         = $(CROSS)nm
+RANLIB     = $(CROSS)ranlib
+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
-
-
-#--------------------------------------------------------
-# 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.
-MAJOR_VERSION:=0
-MINOR_VERSION:=9
-SUBLEVEL:=16
-VERSION:=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL)
-# Ensure consistent filename sort order
-LC_COLLATE:= C
-export MAJOR_VERSION MINOR_VERSION SUBLEVEL VERSION LC_COLLATE
+HOSTCC     = gcc
+HOSTCFLAGS = -O2 -Wall
+
+
+#---------------------------------------------------------
+# 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.
+MAJOR_VERSION := 0
+MINOR_VERSION := 9
+SUBLEVEL      := 28
+VERSION       := $(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL)
+# Ensure consistent sort order, 'gcc -print-search-dirs' behavior, etc.
+LC_ALL := C
+export MAJOR_VERSION MINOR_VERSION SUBLEVEL VERSION LC_ALL
 
 SHARED_FULLNAME:=libuClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
 SHARED_MAJORNAME:=libc.so.$(MAJOR_VERSION)
@@ -64,157 +73,286 @@ UCLIBC_LDSO:=ld-uClibc.so.$(MAJOR_VERSION)
 LIBNAME:=libc.a
 LIBC:=$(TOPDIR)libc/$(LIBNAME)
 
+# Make sure DESTDIR and PREFIX can be used to install
+# PREFIX is a uClibcism while DESTDIR is a common GNUism
+ifndef PREFIX
+PREFIX = $(DESTDIR)
+endif
+
 # Pull in the user's uClibc configuration
 ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
-include_config := 1
 -include $(TOPDIR).config
 endif
 
+ifndef CROSS
+CROSS=$(subst ",, $(strip $(CROSS_COMPILER_PREFIX)))
+endif
+
 # A nifty macro to make testing gcc features easier
-check_gcc=$(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; \
+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_as=$(shell \
+       if $(CC) -Wa,$(1) -Wa,-Z -c -o /dev/null -xassembler /dev/null > /dev/null 2>&1; \
+       then echo "-Wa,$(1)"; fi)
+
+# Setup some shortcuts so that silent mode is silent like it should be
+ifeq ($(subst s,,$(MAKEFLAGS)),$(MAKEFLAGS))
+export MAKE_IS_SILENT=n
+SECHO=@echo
+SHELL_SET_X=set -x
+else
+export MAKE_IS_SILENT=y
+SECHO=-@false
+SHELL_SET_X=set +x
+endif
+
+# Make certain these contain a final "/", but no "//"s.
+TARGET_ARCH:=$(shell grep -s ^TARGET_ARCH $(TOPDIR)/.config | sed -e 's/^TARGET_ARCH=//' -e 's/"//g')
+RUNTIME_PREFIX:=$(strip $(subst //,/, $(subst ,/, $(subst ",, $(strip $(RUNTIME_PREFIX))))))
+DEVEL_PREFIX:=$(strip $(subst //,/, $(subst ,/, $(subst ",, $(strip $(DEVEL_PREFIX))))))
+KERNEL_SOURCE:=$(strip $(subst //,/, $(subst ,/, $(subst ",, $(strip $(KERNEL_SOURCE))))))
+export RUNTIME_PREFIX DEVEL_PREFIX KERNEL_SOURCE
+
+ARFLAGS:=cr
 
-# 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
-
-ARFLAGS:=r
-
-# use '-Os' optimization if available, else use -O2, allow Config to override
 OPTIMIZATION:=
-OPTIMIZATION+=$(call check_gcc,-Os,-O2)
+PICFLAG:=-fPIC
+PIEFLAG_NAME:=-fPIE
 
 # 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_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,-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=i486) -malign-functions=0 -malign-jumps=0 -malign-loops=0
+       CPU_CFLAGS-$(CONFIG_NEHEMIAH)+=$(call check_gcc,-march=c3-2,-march=i686)
+endif
+
+ifeq ($(strip $(TARGET_ARCH)),sparc)
+       CPU_CFLAGS-$(CONFIG_SPARC_V7)+=-mcpu=v7
+       CPU_CFLAGS-$(CONFIG_SPARC_V8)+=-mcpu=v8
+       CPU_CFLAGS-$(CONFIG_SPARC_V9)+=-mcpu=v9
+       CPU_CFLAGS-$(CONFIG_SPARC_V9B)+=$(call check_gcc,-mcpu=v9b,-mcpu=ultrasparc)
 endif
 
 ifeq ($(strip $(TARGET_ARCH)),arm)
        OPTIMIZATION+=-fstrict-aliasing
-       CPU_CFLAGS-$(CONFIG_GENERIC_ARM):=
-       CPU_CFLAGS-$(CONFIG_ARM7TDMI):="-mtune=arm7tdmi"
-       CPU_CFLAGS-$(CONFIG_STRONGARM):="-mtune=strongarm"
-       CPU_CFLAGS-$(CONFIG_XSCALE):="-mtune=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=armv5
+       CPU_CFLAGS-$(CONFIG_ARM1136JF_S)+=-mtune=arm1136jf-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=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
+ifeq ($(strip $(UCLIBC_HAS_FLOATS)),y)
+       CPU_CFLAGS-$(CONFIG_SH2A)+=-m2a
+       CPU_CFLAGS-$(CONFIG_SH4)+=-m4
+else
+       CPU_CFLAGS-$(CONFIG_SH2A)+=-m2a-nofpu
+       CPU_CFLAGS-$(CONFIG_SH4)+=-m4-nofpu
+endif
+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
 
-# Override optimization settings when debugging
-ifeq ($(DODEBUG),y)
-    OPTIMIZATION=$(call check_gcc,-Os,-O2)
+ifeq ($(strip $(TARGET_ARCH)),cris)
+       CPU_LDFLAGS-$(CONFIG_CRIS)+=-mcrislinux
+       CPU_CFLAGS-$(CONFIG_CRIS)+=-mlinux
+       PICFLAG:=-fpic
+       PIEFLAG_NAME:=-fpie
 endif
 
+ifeq ($(strip $(TARGET_ARCH)),powerpc)
+# PowerPC can hold 8192 entries in its GOT with -fpic which is more than
+# enough. Therefore use -fpic which will reduce code size and generates
+# faster code.
+       PICFLAG:=-fpic
+       PIEFLAG_NAME:=-fpie
+endif
+
+ifeq ($(strip $(TARGET_ARCH)),frv)
+       CPU_LDFLAGS-$(CONFIG_FRV)+=-melf32frvfd
+       CPU_CFLAGS-$(CONFIG_FRV)+=-mfdpic
+       # 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
+       UCLIBC_LDSO=ld.so.1
+endif
+
+# 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))
+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 | grep -q pie && echo "-Wl,-pie")
+endif
+endif
+
+# Use '-Os' optimization if available, else use -O2, allow Config to override
+OPTIMIZATION+=$(call check_gcc,-Os,-O2)
+# Use the gcc 3.4 -funit-at-a-time optimization when available
+OPTIMIZATION+=$(call check_gcc,-funit-at-a-time,)
 
 # Add a bunch of extra pedantic annoyingly strict checks
-WARNINGS+=-Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing
+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.
+# Hmm... might need to revisit this for arm since it has 2 different
+# soft float encodings.
+    CPU_CFLAGS += -msoft-float
+ifeq ($(strip $(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
+endif
+
+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)
+endif
+
 # Some nice CFLAGS to work with
-CFLAGS:=$(WARNINGS) $(OPTIMIZATION) -fno-builtin -nostdinc $(CPUFLAGS) \
-       -D_LIBC $(CPU_CFLAGS-y) $(ARCH_CFLAGS) -I$(TOPDIR)include -I.
+CFLAGS:=$(XWARNINGS) $(CPU_CFLAGS) $(SSP_CFLAGS) \
+       -fno-builtin -nostdinc -D_LIBC -I$(TOPDIR)include -I.
+LDFLAGS_NOSTRIP:=$(CPU_LDFLAGS-y) -shared --warn-common --warn-once -z combreloc -z defs
 
 ifeq ($(DODEBUG),y)
-    CFLAGS += -g
-    LDFLAGS:= $(CPU_LDFLAGS-y) -shared --warn-common --warn-once -z combreloc
+    #CFLAGS += -g3
+    CFLAGS += -O0 -g3
+    LDFLAGS := $(LDFLAGS_NOSTRIP)
     STRIPTOOL:= true -Since_we_are_debugging
 else
-    LDFLAGS := $(CPU_LDFLAGS-y) -s -shared --warn-common --warn-once -z combreloc
+    CFLAGS += $(OPTIMIZATION) $(XARCH_CFLAGS)
+    LDFLAGS := $(LDFLAGS_NOSTRIP) -s
+endif
+
+ifeq ($(UCLIBC_BUILD_RELRO),y)
+LDFLAGS+=-z relro
+endif
+
+ifeq ($(UCLIBC_BUILD_NOW),y)
+LDFLAGS+=-z now
 endif
 
 # Sigh, some stupid versions of gcc can't seem to cope with '-iwithprefix include'
 #CFLAGS+=-iwithprefix include
-CFLAGS+=$(shell $(CC) -print-search-dirs | sed -ne "s/install: *\(.*\)/-I\1include/gp")
-
+CFLAGS+=-isystem $(shell $(CC) -print-file-name=include)
 
 ifneq ($(DOASSERTS),y)
     CFLAGS += -DNDEBUG
 endif
 
-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)
-    else
-       LDSO:=$(SYSTEM_LDSO)
-       DYNAMIC_LINKER:=/lib/$(notdir $(SYSTEM_LDSO))
-       BUILD_DYNAMIC_LINKER:=/lib/$(notdir $(SYSTEM_LDSO))
-   endif
-endif
+CFLAGS_NOPIC:=$(CFLAGS)
 ifeq ($(DOPIC),y)
-    CFLAGS += -fPIC
+    CFLAGS += $(PICFLAG)
 endif
-ifeq ($(UCLIBC_HAS_SOFT_FLOAT),y)
-    CFLAGS += $(call check_gcc,-msoft-float,)
+
+# Keep the check_as from being needlessly executed
+ASFLAGS = $(CFLAGS)
+ifndef ASFLAGS_NOEXEC
+ifeq ($(UCLIBC_BUILD_NOEXECSTACK),y)
+export ASFLAGS_NOEXEC := $(call check_as,--noexecstack)
+else
+export ASFLAGS_NOEXEC :=
 endif
+endif
+ASFLAGS += $(ASFLAGS_NOEXEC)
 
 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
+#
+
+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
+  export LIBID FLTFLAGS
+  SHARED_TARGET = lib/libc
+endif
 
+TARGET_ARCH:=$(strip $(subst ",, $(strip $(TARGET_ARCH))))