From 91ccaa5ba94c0dd234a0f057b0de3a18bc0bb21c Mon Sep 17 00:00:00 2001
From: Olaf Barthel <obarthel@gmx.net>
Date: Mon, 10 Mar 2008 16:31:56 +0000
Subject: [PATCH] - Added "-msoft-float" to the non-FPU libm build rules, which
 ought to   resolve the issues with FPU code popping up in the
 mathieee#?.library   software floating point code.

git-svn-id: file:///Users/olsen/Code/migration-svn-zu-git/logical-line-staging/clib2/trunk@15179 87f5fb63-7c3d-0410-a384-fd976d0f7a62
---
 library/GNUmakefile.68k | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/library/GNUmakefile.68k b/library/GNUmakefile.68k
index 4085713..2b29a78 100644
--- a/library/GNUmakefile.68k
+++ b/library/GNUmakefile.68k
@@ -1,5 +1,5 @@
 #
-# $Id: GNUmakefile.68k,v 1.103 2008-03-10 14:59:54 obarthel Exp $
+# $Id: GNUmakefile.68k,v 1.104 2008-03-10 16:31:56 obarthel Exp $
 #
 # :ts=8
 #
@@ -68,11 +68,11 @@ $(LIBUNIX_OBJS)/%.o : %.c
 
 $(LIBM_OBJS)/%.o : %.c
 	@echo "Compiling $< [$(TYPE):m]"
-	@$(CC) -o $(LIBM_OBJS)/$*.o -c $(CFLAGS) -DIEEE_FLOATING_POINT_SUPPORT -msoft-float $<
+	@$(CC) -o $(LIBM_OBJS)/$*.o -c $(CFLAGS) -msoft-float -DIEEE_FLOATING_POINT_SUPPORT $<
 
 $(LIBM881_OBJS)/%.o : %.c
 	@echo "Compiling $< [$(TYPE):m881]"
-	@$(CC) -o $(LIBM881_OBJS)/$*.o -c $(CFLAGS) -DM68881_FLOATING_POINT_SUPPORT -m68881 $<
+	@$(CC) -o $(LIBM881_OBJS)/$*.o -c $(CFLAGS) -m68881 -DM68881_FLOATING_POINT_SUPPORT $<
 
 $(LIBNET_OBJS)/%.o : %.c
 	@echo "Compiling $< [$(TYPE):net]"
@@ -150,7 +150,7 @@ INCLUDES = -Iinclude -I. -Inetinclude
 
 CFLAGS = \
 	$(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) \
-	$(CODE_FLAGS) $(CODE_TYPE) $(INCLUDES)
+	$(CODE_FLAGS) $(INCLUDES) $(CODE_TYPE)
 
 ##############################################################################
 
@@ -1325,7 +1325,7 @@ nrcrt0.o : nrcrt0.S
 
 nr32crt0.o : nrcrt0.S
 	@echo "Assembling $< [resident32]"
-	@$(CC) -traditional -m68020 -msoft-float -DSMALL_DATA32 -o $@ -c nrcrt0.S
+	@$(CC) -traditional -m68020 -DSMALL_DATA32 -o $@ -c nrcrt0.S
 
 nbcrt0.o : ncrt0.S
 	@echo "Assembling $< [small_data]"
@@ -1333,7 +1333,7 @@ nbcrt0.o : ncrt0.S
 
 nb32crt0.o : ncrt0.S
 	@echo "Assembling $< [small_data32]"
-	@$(CC) -traditional -m68020 -msoft-float -DSMALL_DATA32 -o $@ -c ncrt0.S
+	@$(CC) -traditional -m68020 -DSMALL_DATA32 -o $@ -c ncrt0.S
 
 ncrt0.o : ncrt0.S
 	@echo "Assembling $< [large_data]"