summaryrefslogtreecommitdiff
path: root/test/Rules.mak
diff options
context:
space:
mode:
authorAustin Foxley <austinf@cetoncorp.com>2009-11-22 11:46:31 -0800
committerAustin Foxley <austinf@cetoncorp.com>2009-11-22 11:51:37 -0800
commitf757db2d319ccc5f7034165046fb2bb58901afb1 (patch)
tree7dc465febb3a802d3f0e8856fcda856b13b04c0a /test/Rules.mak
parent76c0c0ed99f74b8a5965be6e1c6a0c0e7a72513c (diff)
parentb71274eebd68b7c68ab95c856f8075bdf4524cd7 (diff)
Merge remote branch 'origin/master' into nptl_merge
Conflicts: Rules.mak libc/misc/sysvipc/msgq.c test/Rules.mak Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'test/Rules.mak')
-rw-r--r--test/Rules.mak88
1 files changed, 28 insertions, 60 deletions
diff --git a/test/Rules.mak b/test/Rules.mak
index d31372f78..492b99706 100644
--- a/test/Rules.mak
+++ b/test/Rules.mak
@@ -31,9 +31,10 @@ export LC_ALL
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/sun.*/sparc/' -e 's/sparc.*/sparc/' \
+ -e 's/sa110/arm/' -e 's/arm.*/arm/g' \
-e 's/m68k.*/m68k/' \
+ -e 's/parisc.*/hppa/' \
-e 's/ppc/powerpc/g' \
-e 's/v850.*/v850/g' \
-e 's/sh[234]/sh/' \
@@ -44,76 +45,42 @@ TARGET_ARCH:=$(shell $(CC) -dumpmachine | sed -e s'/-.*//' \
endif
export 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'.
-
-CROSS = $(subst ",, $(strip $(CROSS_COMPILER_PREFIX)))
-CC = $(CROSS)gcc
-RM = rm -f
-RM_R = $(RM) -r
-
-# Select the compiler needed to build binaries for your development system
-HOSTCC = gcc
-
-
-#--------------------------------------------------------
-# 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; \
- then echo "$(1)"; else echo "$(2)"; fi)
-
-# use '-Os' optimization if available, else use -O2, allow Config to override
-# Override optimization settings when debugging
-ifeq ($(DODEBUG),y)
-OPTIMIZATION = -O0
-else
-OPTIMIZATION += $(call check_gcc,-Os,-O2)
-endif
-
-XWARNINGS := $(subst ",, $(strip $(WARNINGS))) -Wstrict-prototypes
-XARCH_CFLAGS := $(subst ",, $(strip $(ARCH_CFLAGS))) $(CPU_CFLAGS)
-XCOMMON_CFLAGS := -D_GNU_SOURCE -I$(top_builddir)test
-CFLAGS := $(XWARNINGS) $(OPTIMIZATION) $(XCOMMON_CFLAGS) $(XARCH_CFLAGS) -nostdinc -I$(top_builddir)$(LOCAL_INSTALL_PATH)/usr/include
-
-CC_IPREFIX := $(shell $(CC) --print-file-name=include)
-CC_INC := -I$(dir $(CC_IPREFIX))include-fixed -I$(CC_IPREFIX)
-CFLAGS += $(CC_INC)
+RM_R = $(Q)$(RM) -r
ifneq ($(KERNEL_HEADERS),)
ifeq ($(patsubst /%,/,$(KERNEL_HEADERS)),/)
# Absolute path in KERNEL_HEADERS
-CFLAGS += -I$(KERNEL_HEADERS)
+KERNEL_INCLUDES += -I$(KERNEL_HEADERS)
else
# Relative path in KERNEL_HEADERS
-CFLAGS += -I$(top_builddir)$(KERNEL_HEADERS)
+KERNEL_INCLUDES += -I$(top_builddir)$(KERNEL_HEADERS)
endif
endif
+XCOMMON_CFLAGS := -I$(top_builddir)test -D_GNU_SOURCE
+XWARNINGS += $(call check_gcc,-Wstrict-prototypes,)
+CFLAGS := -nostdinc -I$(top_builddir)$(LOCAL_INSTALL_PATH)/usr/include
+CFLAGS += $(XCOMMON_CFLAGS) $(KERNEL_INCLUDES) $(CC_INC)
+CFLAGS += $(OPTIMIZATION) $(CPU_CFLAGS) $(XWARNINGS)
+
# Can't add $(OPTIMIZATION) here, it may be target-specific.
# Just adding -Os for now.
-HOST_CFLAGS += $(XWARNINGS) -Os $(XCOMMON_CFLAGS)
+HOST_CFLAGS += $(XCOMMON_CFLAGS) -Os $(XWARNINGS)
-LDFLAGS := $(CPU_LDFLAGS)
+LDFLAGS := $(CPU_LDFLAGS-y)
ifeq ($(DODEBUG),y)
CFLAGS += -g
HOST_CFLAGS += -g
- LDFLAGS += -g
- HOST_LDFLAGS += -g
+ LDFLAGS += -Wl,-g
+ HOST_LDFLAGS += -Wl,-g
else
- LDFLAGS += -s
- HOST_LDFLAGS += -s
+ LDFLAGS += -Wl,-s
+ HOST_LDFLAGS += -Wl,-s
endif
-ifeq ($(strip $(UCLIBC_STATIC)),y)
- STATIC_LDFLAGS := -static
- HOST_LDFLAGS += -static
+ifneq ($(HAVE_SHARED),y)
+ LDFLAGS += -Wl,-static
+ HOST_LDFLAGS += -Wl,-static
endif
LDFLAGS += -B$(top_builddir)lib -Wl,-rpath,$(top_builddir)lib -Wl,-rpath-link,$(top_builddir)lib
@@ -124,7 +91,7 @@ UCLIBC_LDSO_ABSPATH=$(SHARED_LIB_LOADER_PREFIX)
endif
ifeq ($(findstring -static,$(LDFLAGS)),)
- LDFLAGS += -Wl,--dynamic-linker,$(UCLIBC_LDSO_ABSPATH)/$(UCLIBC_LDSO)
+LDFLAGS += -Wl,--dynamic-linker,$(UCLIBC_LDSO_ABSPATH)/$(UCLIBC_LDSO)
endif
ifeq ($(LDSO_GNU_HASH_SUPPORT),y)
@@ -133,9 +100,7 @@ LDFLAGS += -Wl,${LDFLAGS_GNUHASH}
endif
-# Filter output
-MAKEFLAGS += --no-print-directory
-ifneq ($(findstring s,$(MAKEFLAGS)),)
+ifneq ($(findstring -s,$(MAKEFLAGS)),)
DISP := sil
Q := @
SCAT := -@true
@@ -150,12 +115,15 @@ Q := @
SCAT := -@true
endif
endif
+ifneq ($(Q),)
+MAKEFLAGS += --no-print-directory
+endif
banner := ---------------------------------
pur_showclean = echo " "CLEAN $(notdir $(CURDIR))
pur_showdiff = echo " "TEST_DIFF $(notdir $(CURDIR))/
pur_showlink = echo " "TEST_LINK $(notdir $(CURDIR))/ $@
-pur_showtest = echo " "TEST_EXEC $(notdir $(CURDIR))/ $(patsubst %.exe,%,$@)
+pur_showtest = echo " "TEST_EXEC $(notdir $(CURDIR))/ $(@:.exe=)
sil_showclean =
sil_showdiff = true
sil_showlink = true
@@ -163,7 +131,7 @@ sil_showtest = true
ver_showclean =
ver_showdiff = true echo
ver_showlink = true echo
-ver_showtest = printf "\n$(banner)\nTEST $(notdir $(PWD))/ $(patsubst %.exe,%,$@)\n$(banner)\n"
+ver_showtest = printf "\n$(banner)\nTEST $(notdir $(CURDIR))/ $(@:.exe=)\n$(banner)\n"
do_showclean = $($(DISP)_showclean)
do_showdiff = $($(DISP)_showdiff)
do_showlink = $($(DISP)_showlink)