From 2f01dd180f8a82b833efd7ec01fa90196d2aee99 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Sat, 8 Nov 2003 21:21:44 +0000
Subject: Darn.  Fix compilation for soft-float, which I inadvertantly broke a
 couple of days ago.  :-(

---
 libc/sysdeps/linux/alpha/Makefile      |  4 ++++
 libc/sysdeps/linux/arm/Makefile        | 14 ++++----------
 libc/sysdeps/linux/cris/Makefile       |  4 ++++
 libc/sysdeps/linux/e1/Makefile         |  4 ++++
 libc/sysdeps/linux/h8300/Makefile      |  4 +++-
 libc/sysdeps/linux/i386/Makefile       | 12 +++++++-----
 libc/sysdeps/linux/i960/Makefile       |  4 ++++
 libc/sysdeps/linux/m68k/Makefile       |  4 ++++
 libc/sysdeps/linux/microblaze/Makefile |  4 ++++
 libc/sysdeps/linux/mips/Makefile       |  4 ++++
 libc/sysdeps/linux/powerpc/Makefile    | 11 +++++++----
 libc/sysdeps/linux/sh/Makefile         | 11 +++++++----
 libc/sysdeps/linux/sh64/Makefile       |  5 ++++-
 libc/sysdeps/linux/sparc/Makefile      |  3 +++
 libc/sysdeps/linux/v850/Makefile       |  4 ++++
 15 files changed, 67 insertions(+), 25 deletions(-)

diff --git a/libc/sysdeps/linux/alpha/Makefile b/libc/sysdeps/linux/alpha/Makefile
index 0a85da17d..a5f8b2cc9 100644
--- a/libc/sysdeps/linux/alpha/Makefile
+++ b/libc/sysdeps/linux/alpha/Makefile
@@ -33,6 +33,10 @@ COBJS=$(patsubst %.c,%.o, $(CSRC))
 
 OBJS=$(SOBJS) $(COBJS)
 
+ifeq ($(strip $(UCLIBC_HAS_SOFT_FLOAT)),y)
+SAFECFLAGS += $(call check_gcc,-msoft-float,)
+endif
+
 
 all: $(OBJS) $(LIBC)
 
diff --git a/libc/sysdeps/linux/arm/Makefile b/libc/sysdeps/linux/arm/Makefile
index 93b19013e..2f5bb0af5 100644
--- a/libc/sysdeps/linux/arm/Makefile
+++ b/libc/sysdeps/linux/arm/Makefile
@@ -34,6 +34,10 @@ COBJS=$(patsubst %.c,%.o, $(CSRC))
 
 OBJS=$(SOBJS) $(MOBJ) $(COBJS)
 
+ifeq ($(strip $(UCLIBC_HAS_SOFT_FLOAT)),y)
+SAFECFLAGS += $(call check_gcc,-msoft-float,)
+endif
+
 
 all: $(OBJS) $(LIBC)
 
@@ -55,16 +59,6 @@ $(COBJS): %.o : %.c
 	$(CC) $(CFLAGS) -c $< -o $@
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
-ifeq ($(strip $(UCLIBC_PROFILING)),y)
-SAFECFLAGS := $(filter-out -g,$(CFLAGS))
-ifeq ($(strip $(UCLIBC_HAS_SOFT_FLOAT)),y)
-SAFECFLAGS += $(call check_gcc,-msoft-float,)
-endif
-gmon-start.S: ../common/gmon-start.c
-	$(CC) $(SAFECFLAGS) -c $< -S -o $*.S
-gcrt1.o: $(CRT0_DEPS)
-endif
-
 ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y)
 crti.o: crti.S
 	$(CC) $(SAFECFLAGS) -c crti.S -o crti.o
diff --git a/libc/sysdeps/linux/cris/Makefile b/libc/sysdeps/linux/cris/Makefile
index 3bf6d0dcf..73680a6ad 100644
--- a/libc/sysdeps/linux/cris/Makefile
+++ b/libc/sysdeps/linux/cris/Makefile
@@ -35,6 +35,10 @@ COBJS=$(patsubst %.c,%.o, $(CSRC))
 
 OBJS=$(SOBJS) $(COBJS)
 
+ifeq ($(strip $(UCLIBC_HAS_SOFT_FLOAT)),y)
+SAFECFLAGS += $(call check_gcc,-msoft-float,)
+endif
+
 
 all: $(OBJS) $(LIBC)
 
diff --git a/libc/sysdeps/linux/e1/Makefile b/libc/sysdeps/linux/e1/Makefile
index 4c9290ae6..d23016108 100644
--- a/libc/sysdeps/linux/e1/Makefile
+++ b/libc/sysdeps/linux/e1/Makefile
@@ -38,6 +38,10 @@ COBJS=$(patsubst %.c,%.o, $(CSRC))
 
 OBJS=$(SOBJS) $(MOBJ) $(COBJS) $(CRT0_OBJ)
 
+ifeq ($(strip $(UCLIBC_HAS_SOFT_FLOAT)),y)
+SAFECFLAGS += $(call check_gcc,-msoft-float,)
+endif
+
 all: $(OBJS) $(LIBC)
 
 $(LIBC): ar-target 
diff --git a/libc/sysdeps/linux/h8300/Makefile b/libc/sysdeps/linux/h8300/Makefile
index 5ea06d888..c57feb32c 100644
--- a/libc/sysdeps/linux/h8300/Makefile
+++ b/libc/sysdeps/linux/h8300/Makefile
@@ -35,7 +35,9 @@ COBJS=$(patsubst %.c,%.o, $(CSRC))
 
 OBJS=$(SOBJS) $(COBJS)
 
-
+ifeq ($(strip $(UCLIBC_HAS_SOFT_FLOAT)),y)
+SAFECFLAGS += $(call check_gcc,-msoft-float,)
+endif
 
 all: $(OBJS) $(LIBC)
 
diff --git a/libc/sysdeps/linux/i386/Makefile b/libc/sysdeps/linux/i386/Makefile
index 02918f8ae..8ca4f3c6c 100644
--- a/libc/sysdeps/linux/i386/Makefile
+++ b/libc/sysdeps/linux/i386/Makefile
@@ -37,6 +37,13 @@ COBJS=$(patsubst %.c,%.o, $(CSRC))
 
 OBJS=$(SOBJS) $(COBJS)
 
+ifeq ($(strip $(UCLIBC_PROFILING)),y)
+SAFECFLAGS := $(filter-out -g,$(CFLAGS))
+endif
+ifeq ($(strip $(UCLIBC_HAS_SOFT_FLOAT)),y)
+SAFECFLAGS += $(call check_gcc,-msoft-float,)
+endif
+
 
 all: $(OBJS) $(LIBC)
 
@@ -59,16 +66,11 @@ $(COBJS): %.o : %.c
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 ifeq ($(strip $(UCLIBC_PROFILING)),y)
-SAFECFLAGS := $(filter-out -g,$(CFLAGS))
-ifeq ($(strip $(UCLIBC_HAS_SOFT_FLOAT)),y)
-SAFECFLAGS += $(call check_gcc,-msoft-float,)
-endif
 gmon-start.S: ../common/gmon-start.c
 	$(CC) $(SAFECFLAGS) -c $< -S -o $*.S
 gcrt1.o: $(CRT0_DEPS)
 endif
 
-
 ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y)
 crti.o: crti.S
 	$(CC) $(SAFECFLAGS) -c crti.S -o crti.o
diff --git a/libc/sysdeps/linux/i960/Makefile b/libc/sysdeps/linux/i960/Makefile
index 258814dd5..3efcc8e28 100644
--- a/libc/sysdeps/linux/i960/Makefile
+++ b/libc/sysdeps/linux/i960/Makefile
@@ -35,6 +35,10 @@ COBJS=$(patsubst %.c,%.o, $(CSRC))
 
 OBJS=$(SOBJS) $(COBJS)
 
+ifeq ($(strip $(UCLIBC_HAS_SOFT_FLOAT)),y)
+SAFECFLAGS += $(call check_gcc,-msoft-float,)
+endif
+
 
 all: $(OBJS) $(LIBC)
 
diff --git a/libc/sysdeps/linux/m68k/Makefile b/libc/sysdeps/linux/m68k/Makefile
index bff5144a6..e8421b306 100644
--- a/libc/sysdeps/linux/m68k/Makefile
+++ b/libc/sysdeps/linux/m68k/Makefile
@@ -39,6 +39,10 @@ COBJS=$(patsubst %.c,%.o, $(CSRC))
 
 OBJS=$(SOBJS) $(MOBJ) $(COBJS)
 
+ifeq ($(strip $(UCLIBC_HAS_SOFT_FLOAT)),y)
+SAFECFLAGS += $(call check_gcc,-msoft-float,)
+endif
+
 
 
 all: $(OBJS) $(LIBC)
diff --git a/libc/sysdeps/linux/microblaze/Makefile b/libc/sysdeps/linux/microblaze/Makefile
index 889234fb6..f808739e3 100644
--- a/libc/sysdeps/linux/microblaze/Makefile
+++ b/libc/sysdeps/linux/microblaze/Makefile
@@ -40,6 +40,10 @@ COBJS = $(patsubst %.c,%.o, $(CSRC))
 
 OBJS = $(SOBJS) $(COBJS)
 
+ifeq ($(strip $(UCLIBC_HAS_SOFT_FLOAT)),y)
+SAFECFLAGS += $(call check_gcc,-msoft-float,)
+endif
+
 
 all: $(OBJS) $(LIBC)
 
diff --git a/libc/sysdeps/linux/mips/Makefile b/libc/sysdeps/linux/mips/Makefile
index a10933c66..6b5d9c2ae 100644
--- a/libc/sysdeps/linux/mips/Makefile
+++ b/libc/sysdeps/linux/mips/Makefile
@@ -32,6 +32,10 @@ COBJS=$(patsubst %.c,%.o, $(CSRC))
 
 OBJS=$(SOBJS) $(MOBJ) $(COBJS)
 
+ifeq ($(strip $(UCLIBC_HAS_SOFT_FLOAT)),y)
+SAFECFLAGS += $(call check_gcc,-msoft-float,)
+endif
+
 
 all: $(OBJS) $(LIBC)
 
diff --git a/libc/sysdeps/linux/powerpc/Makefile b/libc/sysdeps/linux/powerpc/Makefile
index f9fdcd123..02c4492fe 100644
--- a/libc/sysdeps/linux/powerpc/Makefile
+++ b/libc/sysdeps/linux/powerpc/Makefile
@@ -37,6 +37,13 @@ COBJS=$(patsubst %.c,%.o, $(CSRC))
 
 OBJS=$(SOBJS) $(COBJS)
 
+ifeq ($(strip $(UCLIBC_PROFILING)),y)
+SAFECFLAGS := $(filter-out -g,$(CFLAGS))
+endif
+ifeq ($(strip $(UCLIBC_HAS_SOFT_FLOAT)),y)
+SAFECFLAGS += $(call check_gcc,-msoft-float,)
+endif
+
 
 all: $(OBJS) $(LIBC)
 
@@ -59,10 +66,6 @@ $(COBJS): %.o : %.c
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 ifeq ($(strip $(UCLIBC_PROFILING)),y)
-SAFECFLAGS := $(filter-out -g,$(CFLAGS))
-ifeq ($(strip $(UCLIBC_HAS_SOFT_FLOAT)),y)
-SAFECFLAGS += $(call check_gcc,-msoft-float,)
-endif
 gmon-start.S: ../common/gmon-start.c
 	$(CC) $(SAFECFLAGS) -c $< -S -o $*.S
 gcrt1.o: $(CRT0_DEPS)
diff --git a/libc/sysdeps/linux/sh/Makefile b/libc/sysdeps/linux/sh/Makefile
index 63f925b01..3999b51f6 100644
--- a/libc/sysdeps/linux/sh/Makefile
+++ b/libc/sysdeps/linux/sh/Makefile
@@ -36,6 +36,13 @@ COBJS=$(patsubst %.c,%.o, $(CSRC))
 
 OBJS=$(SOBJS) $(MOBJ) $(COBJS)
 
+ifeq ($(strip $(UCLIBC_PROFILING)),y)
+SAFECFLAGS := $(filter-out -g,$(CFLAGS))
+endif
+ifeq ($(strip $(UCLIBC_HAS_SOFT_FLOAT)),y)
+SAFECFLAGS += $(call check_gcc,-msoft-float,)
+endif
+
 
 all: $(OBJS) $(LIBC)
 
@@ -58,10 +65,6 @@ $(COBJS): %.o : %.c
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
 ifeq ($(strip $(UCLIBC_PROFILING)),y)
-SAFECFLAGS := $(filter-out -g,$(CFLAGS))
-ifeq ($(strip $(UCLIBC_HAS_SOFT_FLOAT)),y)
-SAFECFLAGS += $(call check_gcc,-msoft-float,)
-endif
 gmon-start.S: ../common/gmon-start.c
 	$(CC) $(SAFECFLAGS) -c $< -S -o $*.S
 gcrt1.o: $(CRT0_DEPS)
diff --git a/libc/sysdeps/linux/sh64/Makefile b/libc/sysdeps/linux/sh64/Makefile
index eaf446a9f..da9549401 100644
--- a/libc/sysdeps/linux/sh64/Makefile
+++ b/libc/sysdeps/linux/sh64/Makefile
@@ -37,6 +37,10 @@ COBJS = $(patsubst %.c,%.o, $(CSRC))
 
 OBJS = $(SOBJS) $(COBJS)
 
+ifeq ($(strip $(UCLIBC_HAS_SOFT_FLOAT)),y)
+SAFECFLAGS += $(call check_gcc,-msoft-float,)
+endif
+
 
 all: $(OBJS) $(LIBC)
 
@@ -58,7 +62,6 @@ $(COBJS): %.o : %.c
 	$(CC) $(CFLAGS) -c $< -o $@
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
-
 ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y)
 crti.o: crti.S
 	$(CC) $(SAFECFLAGS) -c crti.S -o crti.o
diff --git a/libc/sysdeps/linux/sparc/Makefile b/libc/sysdeps/linux/sparc/Makefile
index 784322dce..26127baea 100644
--- a/libc/sysdeps/linux/sparc/Makefile
+++ b/libc/sysdeps/linux/sparc/Makefile
@@ -33,6 +33,9 @@ COBJS=$(patsubst %.c,%.o, $(CSRC))
 
 OBJS=$(SOBJS) $(MOBJ) $(COBJS)
 
+ifeq ($(strip $(UCLIBC_HAS_SOFT_FLOAT)),y)
+SAFECFLAGS += $(call check_gcc,-msoft-float,)
+endif
 
 
 all: $(OBJS) $(LIBC)
diff --git a/libc/sysdeps/linux/v850/Makefile b/libc/sysdeps/linux/v850/Makefile
index 6a3d5ce52..a2a23d47f 100644
--- a/libc/sysdeps/linux/v850/Makefile
+++ b/libc/sysdeps/linux/v850/Makefile
@@ -37,6 +37,10 @@ COBJS = $(patsubst %.c,%.o, $(CSRC))
 
 OBJS = $(SOBJS) $(COBJS)
 
+ifeq ($(strip $(UCLIBC_HAS_SOFT_FLOAT)),y)
+SAFECFLAGS += $(call check_gcc,-msoft-float,)
+endif
+
 
 all: $(OBJS) $(LIBC)
 
-- 
cgit v1.2.3