fix static linking of pthread apps

[uclinux-h8/uclibc-ng.git] / Rules.mak

diff --git a/Rules.mak b/Rules.mak
index 218eb1f..d93a77e 100644 (file)
--- a/Rules.mak
+++ b/Rules.mak
@@ -67,9 +67,6 @@ AWK        = awk
 
 STRIP_FLAGS ?= -x -R .note -R .comment
 
-## unused? if yes, remove after 0.9.31
-## UNIFDEF := $(top_builddir)extra/scripts/unifdef
-
 # Select the compiler needed to build binaries for your development system
 HOSTCC     = gcc
 BUILD_CFLAGS = -Os
@@ -297,10 +294,7 @@ CPU_CFLAGS-y += $(CFLAG_-fno-asm)
 
 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),bfin)
 ifneq ($(TARGET_ARCH),nios2)
 ifneq ($(TARGET_ARCH),sh)
 ifneq ($(TARGET_ARCH),c6x)
@@ -309,11 +303,6 @@ 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.
-#    LDADD_LIBFLOAT=-lfloat
-endif
 endif
 
 $(eval $(call check-gcc-var,-std=gnu99))
@@ -404,23 +393,10 @@ endif
 
 ifeq ($(TARGET_ARCH),mips)
        OPTIMIZATION+=-mno-split-addresses
-       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
        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)
-       OPTIMIZATION+=-funaligned-struct-hack
-       CPU_LDFLAGS-y+=-Wl,-m32
-       CPU_CFLAGS-y+=-Wl,-m32
+       CPU_LDFLAGS-y += $(CPU_CFLAGS)
 endif
 
 ifeq ($(TARGET_ARCH),sh)
@@ -439,12 +415,6 @@ else
 endif
 endif
 
-ifeq ($(TARGET_ARCH),sh64)
-       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
@@ -457,10 +427,6 @@ ifeq ($(TARGET_ARCH),i960)
        OPTIMIZATION+=-mh -mint32 #-fsigned-char
 endif
 
-ifeq ($(TARGET_ARCH),e1)
-       OPTIMIZATION+=-mgnu-param
-endif
-
 ifeq ($(TARGET_ARCH),cris)
        CPU_LDFLAGS-$(CONFIG_CRIS)+=-Wl,-mcrislinux
        CPU_LDFLAGS-$(CONFIG_CRISV32)+=-Wl,-mcrislinux
@@ -538,6 +504,7 @@ endif
 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
 
@@ -726,9 +693,7 @@ ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
        PTNAME := nptl
        CFLAGS += -DHAVE_FORCED_UNWIND -D_LIBC_REENTRANT
 else
-ifeq ($(LINUXTHREADS_OLD),y)
-       PTNAME := linuxthreads.old
-else
+ifeq ($(UCLIBC_HAS_LINUXTHREADS),y)
        PTNAME := linuxthreads
 endif
 endif