commit 2a312f425502701db11c914b4ac53c5376787b0b parent 1ac0965d7f7933b1dbd555bef0e6f7014870210c Author: Roberto E. Vargas Caballero <k0ga@shike2.com> Date: Mon, 11 Dec 2017 15:10:17 +0000 [lib/c] Rethink the build process The build process was broken since long time ago because the multiarch support was wrong. This change it is a first step to make it right. Diffstat:
113 files changed, 129 insertions(+), 125 deletions(-)
diff --git a/lib/c/Makefile b/lib/c/Makefile @@ -1,6 +1,4 @@ .POSIX: -include ../../config.mk - all dep clean distclean: - cd src && CC=scc $(MAKE) -e $@ + cd target && $(MAKE) $@ diff --git a/lib/c/src/__abs.c b/lib/c/__abs.c diff --git a/lib/c/src/__getc.c b/lib/c/__getc.c diff --git a/lib/c/src/__labs.c b/lib/c/__labs.c diff --git a/lib/c/src/__llabs.c b/lib/c/__llabs.c diff --git a/lib/c/src/__putc.c b/lib/c/__putc.c diff --git a/lib/c/src/_fpopen.c b/lib/c/_fpopen.c diff --git a/lib/c/src/abort.c b/lib/c/abort.c diff --git a/lib/c/src/abs.c b/lib/c/abs.c diff --git a/lib/c/amd64-sysv-linux/Makefile b/lib/c/amd64-sysv-linux/Makefile @@ -1,5 +0,0 @@ -.POSIX: - -include ../../../config.mk -include ../common.mk - diff --git a/lib/c/src/assert.c b/lib/c/assert.c diff --git a/lib/c/src/atexit.c b/lib/c/atexit.c diff --git a/lib/c/src/atoi.c b/lib/c/atoi.c diff --git a/lib/c/src/atol.c b/lib/c/atol.c diff --git a/lib/c/src/atoll.c b/lib/c/atoll.c diff --git a/lib/c/src/bsearch.c b/lib/c/bsearch.c diff --git a/lib/c/src/calloc.c b/lib/c/calloc.c diff --git a/lib/c/src/clearerr.c b/lib/c/clearerr.c diff --git a/lib/c/common.mk b/lib/c/common.mk @@ -1,17 +0,0 @@ -SRC=$(OBJ:.o=.c) - -all: libc.a - -libc.a: $(OBJ) - $(AR) $(ARFLAGS) $@ $? - ranlib $@ - -dep: - ../gendep.sh - -clean: - rm -f $(OBJ) - -distclean: clean - rm -f $(SRC) - rm -f makefile diff --git a/lib/c/src/ctype.c b/lib/c/ctype.c diff --git a/lib/c/src/exit.c b/lib/c/exit.c diff --git a/lib/c/src/fclose.c b/lib/c/fclose.c diff --git a/lib/c/src/feof.c b/lib/c/feof.c diff --git a/lib/c/src/ferror.c b/lib/c/ferror.c diff --git a/lib/c/src/fgetc.c b/lib/c/fgetc.c diff --git a/lib/c/src/fgets.c b/lib/c/fgets.c diff --git a/lib/c/src/fopen.c b/lib/c/fopen.c diff --git a/lib/c/src/fprintf.c b/lib/c/fprintf.c diff --git a/lib/c/src/fputc.c b/lib/c/fputc.c diff --git a/lib/c/src/fputs.c b/lib/c/fputs.c diff --git a/lib/c/src/fread.c b/lib/c/fread.c diff --git a/lib/c/src/freopen.c b/lib/c/freopen.c diff --git a/lib/c/src/fseek.c b/lib/c/fseek.c diff --git a/lib/c/src/fwrite.c b/lib/c/fwrite.c diff --git a/lib/c/gendep.sh b/lib/c/gendep.sh @@ -1,17 +0,0 @@ -#!/bin/sh - -sed 's/\.o/.c/' ../obj.lst | -while read src -do - echo '#include "../src/'$src'"' > $src -done - -(cat Makefile -echo -printf "OBJ =" -while read i -do - printf " %s" $i -done < ../obj.lst -echo) > makefile - diff --git a/lib/c/src/getc.c b/lib/c/getc.c diff --git a/lib/c/src/getchar.c b/lib/c/getchar.c diff --git a/lib/c/src/gets.c b/lib/c/gets.c diff --git a/lib/c/src/isalnum.c b/lib/c/isalnum.c diff --git a/lib/c/src/isalpha.c b/lib/c/isalpha.c diff --git a/lib/c/src/isascii.c b/lib/c/isascii.c diff --git a/lib/c/src/isblank.c b/lib/c/isblank.c diff --git a/lib/c/src/iscntrl.c b/lib/c/iscntrl.c diff --git a/lib/c/src/isdigit.c b/lib/c/isdigit.c diff --git a/lib/c/src/isgraph.c b/lib/c/isgraph.c diff --git a/lib/c/src/islower.c b/lib/c/islower.c diff --git a/lib/c/src/isprint.c b/lib/c/isprint.c diff --git a/lib/c/src/ispunct.c b/lib/c/ispunct.c diff --git a/lib/c/src/isspace.c b/lib/c/isspace.c diff --git a/lib/c/src/isupper.c b/lib/c/isupper.c diff --git a/lib/c/src/isxdigit.c b/lib/c/isxdigit.c diff --git a/lib/c/src/labs.c b/lib/c/labs.c diff --git a/lib/c/src/llabs.c b/lib/c/llabs.c diff --git a/lib/c/src/localeconv.c b/lib/c/localeconv.c diff --git a/lib/c/src/malloc.c b/lib/c/malloc.c diff --git a/lib/c/src/malloc.h b/lib/c/malloc.h diff --git a/lib/c/src/memchr.c b/lib/c/memchr.c diff --git a/lib/c/src/memcmp.c b/lib/c/memcmp.c diff --git a/lib/c/src/memcpy.c b/lib/c/memcpy.c diff --git a/lib/c/src/memmove.c b/lib/c/memmove.c diff --git a/lib/c/src/memset.c b/lib/c/memset.c diff --git a/lib/c/obj.lst b/lib/c/obj.lst @@ -1,49 +0,0 @@ -assert.o -strcpy.o -strcmp.o -strlen.o -strchr.o -strrchr.o -strcat.o -strncmp.o -strncpy.o -strncat.o -strcoll.o -strxfrm.o -strstr.o -strspn.o -strcspn.o -strpbrk.o -strtok.o -memset.o -memcpy.o -memmove.o -memcmp.o -memchr.o -isalnum.o -isalpha.o -isascii.o -isblank.o -iscntrl.o -isdigit.o -isgraph.o -islower.o -isprint.o -ispunct.o -isspace.o -isupper.o -isxdigit.o -toupper.o -tolower.o -ctype.o -setlocale.o -localeconv.o -atoi.o -atexit.o -exit.o -printf.o -fprintf.o -vfprintf.o -realloc.o -calloc.o -malloc.o diff --git a/lib/c/src/perror.c b/lib/c/perror.c diff --git a/lib/c/src/printf.c b/lib/c/printf.c diff --git a/lib/c/src/putc.c b/lib/c/putc.c diff --git a/lib/c/src/putchar.c b/lib/c/putchar.c diff --git a/lib/c/src/puts.c b/lib/c/puts.c diff --git a/lib/c/src/qsort.c b/lib/c/qsort.c diff --git a/lib/c/src/rand.c b/lib/c/rand.c diff --git a/lib/c/src/realloc.c b/lib/c/realloc.c diff --git a/lib/c/src/rewind.c b/lib/c/rewind.c diff --git a/lib/c/src/setbuf.c b/lib/c/setbuf.c diff --git a/lib/c/src/setlocale.c b/lib/c/setlocale.c diff --git a/lib/c/src/setvbuf.c b/lib/c/setvbuf.c diff --git a/lib/c/src/snprintf.c b/lib/c/snprintf.c diff --git a/lib/c/src/sprintf.c b/lib/c/sprintf.c diff --git a/lib/c/src/Makefile b/lib/c/src/Makefile @@ -1,34 +0,0 @@ -.POSIX: - -include ../../../config.mk - -OBJ = bsearch.o qsort.o \ - abs.o __abs.o labs.o __labs.o llabs.o __llabs.o \ - perror.o strerror.o \ - tmpnam.o \ - sprintf.o snprintf.o vsprintf.o vsnprintf.o \ - printf.o fprintf.o vfprintf.o \ - fgets.o gets.of fgetc.o fputc.o getchar.o putchar.o \ - fputs.o puts.o fread.o fwrite.o \ - getc.o putc.o __putc.o __getc.o \ - rewind.o fseek.o ferror.o feof.o clearerr.o \ - setbuf.o setvbuf.o \ - fclose.o fopen.c freopen.c _fpopen.o stdio.o \ - realloc.o calloc.o malloc.o \ - assert.o strcpy.o strcmp.o strlen.o strchr.o \ - strrchr.o strcat.o strncmp.o strncpy.o strncat.o strcoll.o \ - strxfrm.o strstr.o strspn.o strcspn.o strpbrk.o strtok.o \ - memset.o memcpy.o memmove.o memcmp.o memchr.o \ - isalnum.o isalpha.o isascii.o isblank.o iscntrl.o isdigit.o \ - isgraph.o islower.o isprint.o ispunct.o isspace.o isupper.o \ - isxdigit.o toupper.o tolower.o ctype.o setlocale.o \ - localeconv.o atoi.o atol.o atoll.o atexit.o abort.o exit.o - -all: $(ARCH)-libc.a - -clean distclean: - rm -f *.o *-libc.a - -$(ARCH)-libc.a: $(OBJ) - $(AR) $(ARFLAGS) $@ $? - ranlib $@ diff --git a/lib/c/src/stdio.c b/lib/c/stdio.c diff --git a/lib/c/src/strcat.c b/lib/c/strcat.c diff --git a/lib/c/src/strchr.c b/lib/c/strchr.c diff --git a/lib/c/src/strcmp.c b/lib/c/strcmp.c diff --git a/lib/c/src/strcoll.c b/lib/c/strcoll.c diff --git a/lib/c/src/strcpy.c b/lib/c/strcpy.c diff --git a/lib/c/src/strcspn.c b/lib/c/strcspn.c diff --git a/lib/c/src/strerror.c b/lib/c/strerror.c diff --git a/lib/c/src/strlen.c b/lib/c/strlen.c diff --git a/lib/c/src/strncat.c b/lib/c/strncat.c diff --git a/lib/c/src/strncmp.c b/lib/c/strncmp.c diff --git a/lib/c/src/strncpy.c b/lib/c/strncpy.c diff --git a/lib/c/src/strpbrk.c b/lib/c/strpbrk.c diff --git a/lib/c/src/strrchr.c b/lib/c/strrchr.c diff --git a/lib/c/src/strspn.c b/lib/c/strspn.c diff --git a/lib/c/src/strstr.c b/lib/c/strstr.c diff --git a/lib/c/src/strtok.c b/lib/c/strtok.c diff --git a/lib/c/src/strxfrm.c b/lib/c/strxfrm.c diff --git a/lib/c/src/syscall.h b/lib/c/syscall.h diff --git a/lib/c/target/Makefile b/lib/c/target/Makefile @@ -0,0 +1,7 @@ + +include ../../../config.mk + +DIRS = $(TARGETS) + +all dep clean distclean: + $(FORALL) diff --git a/lib/c/target/amd64-sysv-linux-elf/Makefile b/lib/c/target/amd64-sysv-linux-elf/Makefile @@ -0,0 +1,5 @@ +.POSIX: + +include ../../../../config.mk +include ../objlst.mk +include ../common.mk diff --git a/lib/c/target/amd64-sysv-linux-elf/gendep.sh b/lib/c/target/amd64-sysv-linux-elf/gendep.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +set -e + +rm -f makefile +trap "rm -f $$.mk" 0 2 3 + +(cat Makefile +for i +do + cat <<EOF +$i: ../${i%.o}.c + \$(CC) \$(TF_CFLAGS) ../${i%.o}.c -c + +EOF +done) > $$.mk && mv $$.mk makefile diff --git a/lib/c/target/amd64-sysv-openbsd-elf/Makefile b/lib/c/target/amd64-sysv-openbsd-elf/Makefile @@ -0,0 +1,5 @@ +.POSIX: + +include ../../../../config.mk +include ../objlst.mk +include ../common.mk diff --git a/lib/c/target/amd64-sysv-openbsd-elf/gendep.sh b/lib/c/target/amd64-sysv-openbsd-elf/gendep.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +set -e + +rm -f makefile +trap "rm -f $$.mk" 0 2 3 + +(cat Makefile +for i +do + cat <<EOF +$i: ../${i%.o}.c + \$(CC) \$(TF_CFLAGS) ../${i%.o}.c -c + +EOF +done) > $$.mk && mv $$.mk makefile diff --git a/lib/c/target/common.mk b/lib/c/target/common.mk @@ -0,0 +1,15 @@ + +all: libc.a + +libc.a: $(OBJ) + $(AR) $(ARFLAGS) $@ $? + ranlib $@ + +dep: + gendep.sh + +clean: + rm -f *.o + +distclean: clean + rm -f makefile diff --git a/lib/c/target/i386-sysv-linux-elf/Makefile b/lib/c/target/i386-sysv-linux-elf/Makefile @@ -0,0 +1,5 @@ +.POSIX: + +include ../../../../config.mk +include ../objlst.mk +include ../common.mk diff --git a/lib/c/target/i386-sysv-linux-elf/gendep.sh b/lib/c/target/i386-sysv-linux-elf/gendep.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +set -e + +rm -f makefile +trap "rm -f $$.mk" 0 2 3 + +(cat Makefile +for i +do + cat <<EOF +$i: ../${i%.o}.c + \$(CC) \$(TF_CFLAGS) ../${i%.o}.c -c + +EOF +done) > $$.mk && mv $$.mk makefile diff --git a/lib/c/target/objlst.mk b/lib/c/target/objlst.mk @@ -0,0 +1,22 @@ + +OBJ = bsearch.o qsort.o \ + abs.o __abs.o labs.o __labs.o llabs.o __llabs.o \ + perror.o strerror.o \ + tmpnam.o \ + sprintf.o snprintf.o vsprintf.o vsnprintf.o \ + printf.o fprintf.o vfprintf.o \ + fgets.o gets.of fgetc.o fputc.o getchar.o putchar.o \ + fputs.o puts.o fread.o fwrite.o \ + getc.o putc.o __putc.o __getc.o \ + rewind.o fseek.o ferror.o feof.o clearerr.o \ + setbuf.o setvbuf.o \ + fclose.o fopen.c freopen.c _fpopen.o stdio.o \ + realloc.o calloc.o malloc.o \ + assert.o strcpy.o strcmp.o strlen.o strchr.o \ + strrchr.o strcat.o strncmp.o strncpy.o strncat.o strcoll.o \ + strxfrm.o strstr.o strspn.o strcspn.o strpbrk.o strtok.o \ + memset.o memcpy.o memmove.o memcmp.o memchr.o \ + isalnum.o isalpha.o isascii.o isblank.o iscntrl.o isdigit.o \ + isgraph.o islower.o isprint.o ispunct.o isspace.o isupper.o \ + isxdigit.o toupper.o tolower.o ctype.o setlocale.o \ + localeconv.o atoi.o atol.o atoll.o atexit.o abort.o exit.o diff --git a/lib/c/target/z80-scc-none-none/Makefile b/lib/c/target/z80-scc-none-none/Makefile @@ -0,0 +1,5 @@ +.POSIX: + +include ../../../../config.mk +include ../objlst.mk +include ../common.mk diff --git a/lib/c/target/z80-scc-none-none/gendep.sh b/lib/c/target/z80-scc-none-none/gendep.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +set -e + +rm -f makefile +trap "rm -f $$.mk" 0 2 3 + +(cat Makefile +for i +do + cat <<EOF +$i: ../${i%.o}.c + \$(CC) \$(TF_CFLAGS) ../${i%.o}.c -c + +EOF +done) > $$.mk && mv $$.mk makefile diff --git a/lib/c/src/tmpnam.c b/lib/c/tmpnam.c diff --git a/lib/c/src/tolower.c b/lib/c/tolower.c diff --git a/lib/c/src/toupper.c b/lib/c/toupper.c diff --git a/lib/c/src/vfprintf.c b/lib/c/vfprintf.c diff --git a/lib/c/src/vsnprintf.c b/lib/c/vsnprintf.c diff --git a/lib/c/src/vsprintf.c b/lib/c/vsprintf.c