Sync with trunk.

1 files changed, 102 insertions, 74 deletions

diff --git a/Rules.mak b/Rules.mak
index 8525cab7c..e59a57e00 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -1,22 +1,10 @@
 # Rules.make for uClibc
 #
 # Copyright (C) 2000 by Lineo, inc.
-# Copyright (C) 2000-2002 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
 #
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Library General Public License as published by the Free
-# Software Foundation; either version 2 of the License, or (at your option) any
-# later version.
+# Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Library General Public License
-# along with this program; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
 
 #-----------------------------------------------------------
 # This file contains rules which are shared between multiple
@@ -49,6 +37,8 @@ INSTALL    = install
 LN         = ln
 RM         = rm -f
 
+STRIP_FLAGS ?= -x -R .note -R .comment
+
 # Select the compiler needed to build binaries for your development system
 HOSTCC     = gcc
 HOSTCFLAGS = -O2 -Wall
@@ -66,9 +56,15 @@ VERSION       := $(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL)
 LC_ALL := C
 export MAJOR_VERSION MINOR_VERSION SUBLEVEL VERSION LC_ALL
 
-SHARED_MAJORNAME:=libc.so.$(MAJOR_VERSION)
-UCLIBC_LDSO:=ld-uClibc.so.$(MAJOR_VERSION)
-NONSHARED_LIBNAME:=uclibc_nonshared.a
+LIBC := libc
+SHARED_MAJORNAME := $(LIBC).so.$(MAJOR_VERSION)
+UCLIBC_LDSO := ld-uClibc.so.$(MAJOR_VERSION)
+NONSHARED_LIBNAME := uclibc_nonshared.a
+libc := $(top_builddir)lib/$(LIBC).so
+interp := $(top_builddir)libc/misc/internals/interp.os
+
+#LIBS :=$(interp) -L$(top_builddir)lib -lc
+LIBS := $(interp) -L$(top_builddir)lib $(libc)
 
 # Make sure DESTDIR and PREFIX can be used to install
 # PREFIX is a uClibcism while DESTDIR is a common GNUism
@@ -78,7 +74,7 @@ endif
 
 # Pull in the user's uClibc configuration
 ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
--include $(TOPDIR).config
+-include $(top_builddir).config
 endif
 
 ifndef CROSS
@@ -94,7 +90,7 @@ check_as=$(shell \
 	then echo "-Wa,$(1)"; fi)
 
 # Setup some shortcuts so that silent mode is silent like it should be
-ifeq ($(subst s,,$(MAKEFLAGS)),$(MAKEFLAGS))
+ifeq ($(findstring s,$(MAKEFLAGS)),)
 export MAKE_IS_SILENT=n
 SECHO=@echo
 SHELL_SET_X=set -x
@@ -105,7 +101,8 @@ 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')
+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))))
 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))))))
@@ -118,7 +115,7 @@ PICFLAG:=-fPIC
 PIEFLAG_NAME:=-fPIE
 
 # Some nice CPU specific optimizations
-ifeq ($(strip $(TARGET_ARCH)),i386)
+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_CFLAGS-$(CONFIG_386)+=-march=i386
@@ -139,14 +136,14 @@ ifeq ($(strip $(TARGET_ARCH)),i386)
 	CPU_CFLAGS-$(CONFIG_NEHEMIAH)+=$(call check_gcc,-march=c3-2,-march=i686)
 endif
 
-ifeq ($(strip $(TARGET_ARCH)),sparc)
+ifeq ($(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)
+ifeq ($(TARGET_ARCH),arm)
 	OPTIMIZATION+=-fstrict-aliasing
 	CPU_LDFLAGS-$(ARCH_LITTLE_ENDIAN)+=-EL
 	CPU_LDFLAGS-$(ARCH_BIG_ENDIAN)+=-EB
@@ -166,7 +163,7 @@ ifeq ($(strip $(TARGET_ARCH)),arm)
 	CPU_CFLAGS-$(CONFIG_ARM_XSCALE)+=-march=armv4 -Wa,-mcpu=xscale
 endif
 
-ifeq ($(strip $(TARGET_ARCH)),mips)
+ifeq ($(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
@@ -175,7 +172,7 @@ ifeq ($(strip $(TARGET_ARCH)),mips)
 	CPU_CFLAGS-$(CONFIG_MIPS_ISA_MIPS64)+=-mips64 -mtune=mips32
 endif
 
-ifeq ($(strip $(TARGET_ARCH)),sh)
+ifeq ($(TARGET_ARCH),sh)
 	OPTIMIZATION+=-fstrict-aliasing
 	OPTIMIZATION+= $(call check_gcc,-mprefergot,)
 	CPU_LDFLAGS-$(ARCH_LITTLE_ENDIAN)+=-EL
@@ -184,7 +181,7 @@ ifeq ($(strip $(TARGET_ARCH)),sh)
 	CPU_CFLAGS-$(ARCH_BIG_ENDIAN)+=-mb
 	CPU_CFLAGS-$(CONFIG_SH2)+=-m2
 	CPU_CFLAGS-$(CONFIG_SH3)+=-m3
-ifeq ($(strip $(UCLIBC_HAS_FLOATS)),y)
+ifeq ($(UCLIBC_HAS_FLOATS),y)
 	CPU_CFLAGS-$(CONFIG_SH2A)+=-m2a
 	CPU_CFLAGS-$(CONFIG_SH4)+=-m4
 else
@@ -193,7 +190,7 @@ else
 endif
 endif
 
-ifeq ($(strip $(TARGET_ARCH)),sh64)
+ifeq ($(TARGET_ARCH),sh64)
 	OPTIMIZATION+=-fstrict-aliasing
 	CPU_LDFLAGS-$(ARCH_LITTLE_ENDIAN):=-EL
 	CPU_LDFLAGS-$(ARCH_BIG_ENDIAN):=-EB
@@ -202,21 +199,21 @@ ifeq ($(strip $(TARGET_ARCH)),sh64)
 	CPU_CFLAGS-$(CONFIG_SH5)+=-m5-32media
 endif
 
-ifeq ($(strip $(TARGET_ARCH)),h8300)
+ifeq ($(TARGET_ARCH),h8300)
 	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)
+ifeq ($(TARGET_ARCH),cris)
 	CPU_LDFLAGS-$(CONFIG_CRIS)+=-mcrislinux
 	CPU_CFLAGS-$(CONFIG_CRIS)+=-mlinux
 	PICFLAG:=-fpic
 	PIEFLAG_NAME:=-fpie
 endif
 
-ifeq ($(strip $(TARGET_ARCH)),powerpc)
+ifeq ($(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.
@@ -224,7 +221,7 @@ ifeq ($(strip $(TARGET_ARCH)),powerpc)
 	PIEFLAG_NAME:=-fpie
 endif
 
-ifeq ($(strip $(TARGET_ARCH)),frv)
+ifeq ($(TARGET_ARCH),frv)
 	CPU_LDFLAGS-$(CONFIG_FRV)+=-melf32frvfd
 	CPU_CFLAGS-$(CONFIG_FRV)+=-mfdpic
 	# Using -pie causes the program to have an interpreter, which is
@@ -255,6 +252,15 @@ export LDPIEFLAG:=$(shell $(LD) --help | grep -q pie && echo "-Wl,-pie")
 endif
 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
+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
@@ -266,63 +272,90 @@ XARCH_CFLAGS=$(subst ",, $(strip $(ARCH_CFLAGS)))
 CPU_CFLAGS=$(subst ",, $(strip $(CPU_CFLAGS-y)))
 
 LDADD_LIBFLOAT=
-ifeq ($(strip $(UCLIBC_HAS_SOFT_FLOAT)),y)
+ifeq ($(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)
+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
 endif
 
-SSP_DISABLE_FLAGS:=$(call check_gcc,-fno-stack-protector,)
+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,)
+SSP_ALL_CFLAGS?=$(call check_gcc,-fstack-protector-all,)
 else
 SSP_CFLAGS:=$(SSP_DISABLE_FLAGS)
 endif
 
 # Some nice CFLAGS to work with
 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
+	-fno-builtin -nostdinc -D_LIBC -I$(top_builddir)include -I.
 
+LDFLAGS_NOSTRIP:=$(CPU_LDFLAGS-y) -shared --warn-common --warn-once -z combreloc
+
+ifeq ($(UCLIBC_BUILD_RELRO),y)
+LDFLAGS_NOSTRIP+=-z relro
+endif
+
+ifeq ($(UCLIBC_BUILD_NOW),y)
+LDFLAGS_NOSTRIP+=-z now
+endif
+
+LDFLAGS:=$(LDFLAGS_NOSTRIP) -z defs
 ifeq ($(DODEBUG),y)
-ifeq ($(strip $(TARGET_ARCH)),mips)
-    CFLAGS += -O1 -g3
-else
+    #CFLAGS += -g3
     CFLAGS += -O0 -g3
-endif
-    LDFLAGS := $(LDFLAGS_NOSTRIP)
     STRIPTOOL:= true -Since_we_are_debugging
 else
     CFLAGS += $(OPTIMIZATION) $(XARCH_CFLAGS)
-    LDFLAGS := $(LDFLAGS_NOSTRIP) -s
+    LDFLAGS += -s
+endif
+
+ifeq ($(DOMULTI),y)
+# we try to compile all sources at once into an object (IMA), but
+# gcc-3.3.x does not support it
+# gcc-3.4.x supports it, but does not need and support --combine. though fails on many sources
+# gcc-4.0.x supports it, supports the --combine flag, but does not need it
+# gcc-4.1(200506xx) supports it, but needs the --combine flag, else libs are useless
+GCC_VER?=$(shell $(CC) -dumpversion | cut -d . -f 1)
+ifeq ($(GCC_VER),3)
+DOMULTI:=n
+else
+CFLAGS+=$(call check_gcc,--combine,)
+endif
+else
+DOMULTI:=n
 endif
 
 ifeq ($(UCLIBC_HAS_THREADS),y)
-ifeq ($(strip $(UCLIBC_HAS_THREADS_NATIVE)),y)
+ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
 	PTNAME := nptl
 else
+ifeq ($(LINUXTHREADS_OLD),y)
+	PTNAME := linuxthreads.old
+else
 	PTNAME := linuxthreads
 endif
-PTDIR := $(TOPDIR)libpthread/$(PTNAME)
+endif
+PTDIR := $(top_builddir)libpthread/$(PTNAME)
 # set up system dependencies include dirs (NOTE: order matters!)
-ifeq ($(strip $(UCLIBC_HAS_THREADS_NATIVE)),y)
-PTINC := -I$(PTDIR)/compat					\
-	 -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				\
-	 -include $(PTDIR)/compat/libc-symbols.h
+ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
+PTINC:=	-I$(PTDIR)/compat					\
+	-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				\
+	-Ildso/include						\
+	-include $(PTDIR)/compat/libc-symbols.h
 #
 # Test for TLS if NPTL support was selected.
 #
@@ -341,19 +374,10 @@ gcc_tls_test_fail:
 	@exit 1;
 endif
 else
-# psm: the next 2 are probably incorrect, the generic header will
-# win over the arch specific one
-PTINC := -I$(PTDIR)/sysdeps/pthread				\
-         -I$(PTDIR)/sysdeps/$(TARGET_ARCH)
-endif
-endif
-
-ifeq ($(UCLIBC_BUILD_RELRO),y)
-LDFLAGS+=-z relro
+PTINC:=	-I$(PTDIR)/sysdeps/$(TARGET_ARCH)			\
+	-I$(PTDIR)/sysdeps/pthread
 endif
-
-ifeq ($(UCLIBC_BUILD_NOW),y)
-LDFLAGS+=-z now
+CFLAGS+=$(PTINC)
 endif
 
 # Sigh, some stupid versions of gcc can't seem to cope with '-iwithprefix include'
@@ -361,16 +385,16 @@ endif
 CFLAGS+=-isystem $(shell $(CC) -print-file-name=include)
 
 ifneq ($(DOASSERTS),y)
-    CFLAGS += -DNDEBUG
+CFLAGS+=-DNDEBUG
 endif
 
-CFLAGS_NOPIC:=$(CFLAGS)
-ifeq ($(DOPIC),y)
-    CFLAGS += $(PICFLAG)
+# moved from ldso/{ldso,libdl}
+# BEWARE!!! At least mips* will die if -O0 is used!!!
+ifeq ($(TARGET_ARCH),mips)
+CFLAGS:=$(CFLAGS:-O0=-O1)
 endif
 
 # 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)
@@ -378,12 +402,18 @@ else
 export ASFLAGS_NOEXEC :=
 endif
 endif
-ASFLAGS += $(ASFLAGS_NOEXEC)
+ASFLAGS = $(ASFLAGS_NOEXEC)
 
 LIBGCC_CFLAGS ?= $(CFLAGS) $(CPU_CFLAGS-y)
 LIBGCC:=$(shell $(CC) $(LIBGCC_CFLAGS) -print-libgcc-file-name)
 LIBGCC_DIR:=$(dir $(LIBGCC))
 
+# moved from libpthread/linuxthreads
+ifeq ($(UCLIBC_CTOR_DTOR),y)
+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
+
 ########################################
 #
 # uClinux shared lib support
@@ -396,5 +426,3 @@ ifeq ($(CONFIG_BINFMT_SHARED_FLAT),y)
   export LIBID FLTFLAGS
   SHARED_TARGET = lib/libc
 endif
-
-TARGET_ARCH:=$(strip $(subst ",, $(strip $(TARGET_ARCH))))