Patch from "D. Jeff Dionne / VE3DJF" <jeff@rt-control.com>

to allow uC-libc to compile under x86.
 -Erik

9 files changed, 35 insertions, 35 deletions

diff --git a/libc/inet/Makefile b/libc/inet/Makefile
index 28565cecd..0b8797488 100644
--- a/libc/inet/Makefile
+++ b/libc/inet/Makefile
@@ -6,11 +6,11 @@
 
 LIBC=../libc.a
 
-CC=m68k-pic-coff-gcc
-AR=m68k-pic-coff-ar
-RANLIB=m68k-pic-coff-ranlib
+CC=$(CROSS)gcc
+AR=$(CROSS)ar
+RANLIB=$(CROSS)ranlib
 
-CCFLAGS= -O2 -m68000 -msoft-float -fno-builtin -I../include
+CCFLAGS= -O2 $(CPUFLAGS) -fno-builtin -I../include
 
 ASRC=addr.c
 AOBJ=inet_aton.o inet_addr.o inet_ntoa.o
diff --git a/libc/inet/rpc/Makefile b/libc/inet/rpc/Makefile
index 388434165..8c2229374 100644
--- a/libc/inet/rpc/Makefile
+++ b/libc/inet/rpc/Makefile
@@ -1,6 +1,6 @@
-CC=m68k-pic-coff-gcc
-AR=m68k-pic-coff-ar
-RANLIB=m68k-pic-coff-ranlib
+CC=$(CROSS)gcc
+AR=$(CROSS)ar
+RANLIB=$(CROSS)ranlib
 
 CFLAGS= -O2 -fomit-frame-pointer -Dlinux -I../include
 
diff --git a/libc/misc/time/Makefile b/libc/misc/time/Makefile
index ab47a7e47..e68ee5dc7 100644
--- a/libc/misc/time/Makefile
+++ b/libc/misc/time/Makefile
@@ -4,11 +4,11 @@
 
 LIBC=../libc.a
 
-CC=m68k-pic-coff-gcc
-AR=m68k-pic-coff-ar
-RANLIB=m68k-pic-coff-ranlib
+CC=$(CROSS)gcc
+AR=$(CROSS)ar
+RANLIB=$(CROSS)ranlib
 
-CCFLAGS= -O2 -m68000 -msoft-float -I../include
+CCFLAGS= -O2 $(CPUFLAGS) -I../include
 
 OBJ=localtime.o gmtime.o asctime.o ctime.o asc_conv.o tm_conv.o mktime.o \
 	localtime_r.o gmtime_r.o asctime_r.o ctime_r.o
diff --git a/libc/pwd_grp/Makefile b/libc/pwd_grp/Makefile
index ce5064852..48b2b3aab 100644
--- a/libc/pwd_grp/Makefile
+++ b/libc/pwd_grp/Makefile
@@ -4,11 +4,11 @@
 
 LIBC=../libc.a
 
-CC=m68k-pic-coff-gcc
-AR=m68k-pic-coff-ar
-RANLIB=m68k-pic-coff-ranlib
+CC=$(CROSS)gcc
+AR=$(CROSS)ar
+RANLIB=$(CROSS)ranlib
 
-CCFLAGS= -O2 -m68000 -msoft-float -I../include
+CCFLAGS= -O2 $(CPUFLAGS) -I../include
 
 CFLAGS=$(ARCH) -ansi $(CCFLAGS) $(DEFS)
 
diff --git a/libc/stdio/Makefile b/libc/stdio/Makefile
index badf78c56..72836d9d1 100644
--- a/libc/stdio/Makefile
+++ b/libc/stdio/Makefile
@@ -4,11 +4,11 @@
 
 LIBC=../libc.a
 
-CC=m68k-pic-coff-gcc
-AR=m68k-pic-coff-ar
-RANLIB=m68k-pic-coff-ranlib
+CC=$(CROSS)gcc
+AR=$(CROSS)ar
+RANLIB=$(CROSS)ranlib
 
-CCFLAGS= -O2 -m68000 -msoft-float -I../include
+CCFLAGS= -O2 $(CPUFLAGS) -I../include
 
 ASRC=stdio.c
 AOBJ=_stdio_init.o fputc.o fgetc.o fflush.o fgets.o gets.o fputs.o	\
diff --git a/libc/stdlib/Makefile b/libc/stdlib/Makefile
index da8053f1d..c45cd2840 100644
--- a/libc/stdlib/Makefile
+++ b/libc/stdlib/Makefile
@@ -4,11 +4,11 @@
 
 LIBC=../libc.a
 
-CC=m68k-pic-coff-gcc
-AR=m68k-pic-coff-ar
-RANLIB=m68k-pic-coff-ranlib
+CC=$(CROSS)gcc
+AR=$(CROSS)ar
+RANLIB=$(CROSS)ranlib
 
-CCFLAGS= -O2 -m68000 -msoft-float -fno-builtin -I../include
+CCFLAGS= -O2 $(CPUFLAGS) -fno-builtin -I../include
 
 MSRC=aliases.c
 MOBJ=abs.o remove.o creat.o bcopy.o bzero.o
diff --git a/libc/stdlib/malloc/Makefile b/libc/stdlib/malloc/Makefile
index 36872c301..26cfb6930 100644
--- a/libc/stdlib/malloc/Makefile
+++ b/libc/stdlib/malloc/Makefile
@@ -4,11 +4,11 @@
 
 LIBC=../libc.a
 
-CC=m68k-pic-coff-gcc
-AR=m68k-pic-coff-ar
-RANLIB=m68k-pic-coff-ranlib
+CC=$(CROSS)gcc
+AR=$(CROSS)ar
+RANLIB=$(CROSS)ranlib
 
-CCFLAGS= -O2 -m68000 -msoft-float -I../include
+CCFLAGS= -O2 $(CPUFLAGS) -I../include
 
 
 MSRC=alloc.c
diff --git a/libc/string/Makefile b/libc/string/Makefile
index af288e6e6..de79004ba 100644
--- a/libc/string/Makefile
+++ b/libc/string/Makefile
@@ -4,11 +4,11 @@
 
 LIBC=../libc.a
 
-CC=m68k-pic-coff-gcc
-AR=m68k-pic-coff-ar
-RANLIB=m68k-pic-coff-ranlib
+CC=$(CROSS)gcc
+AR=$(CROSS)ar
+RANLIB=$(CROSS)ranlib
 
-CCFLAGS= -O2 -m68000 -msoft-float -I../include
+CCFLAGS= -O2 $(CPUFLAGS) -I../include
 
 SSRC=string.c
 SOBJ=strlen.o strcat.o strcpy.o strcmp.o strncat.o strncpy.o strncmp.o	\
diff --git a/libc/termios/Makefile b/libc/termios/Makefile
index 089fdc0c4..d0d64681d 100644
--- a/libc/termios/Makefile
+++ b/libc/termios/Makefile
@@ -4,11 +4,11 @@
 
 LIBC=../libc.a
 
-CC=m68k-pic-coff-gcc
-AR=m68k-pic-coff-ar
-RANLIB=m68k-pic-coff-ranlib
+CC=$(CROSS)gcc
+AR=$(CROSS)ar
+RANLIB=$(CROSS)ranlib
 
-CCFLAGS= -O2 -m68000 -msoft-float -I../include
+CCFLAGS= -O2 $(CPUFLAGS) -I../include
 
 TSRC=termios.c
 TOBJ=tcsetattr.o tcgetattr.o tcdrain.o tcflow.o tcflush.o tcsendbreak.o	\