build: Modify include path - scc - simple c99 compiler
(HTM) git clone git://git.simple-cc.org/scc
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) Submodules
(DIR) README
(DIR) LICENSE
---
(DIR) commit 6d9a517cf4c6b5133030b9744531340d22cef719
(DIR) parent 6c3c992dc8f759f8c4052a4fb0d47d7681282664
(HTM) Author: Roberto E. Vargas Caballero <k0ga@shike2.net>
Date: Thu, 16 Oct 2025 13:22:18 +0200
build: Modify include path
Diffstat:
M Makefile | 2 +-
D include/bits/scc/Makefile | 28 ----------------------------
D include/bits/scc/sys-scc.h | 31 -------------------------------
D include/bits/scc/sys-scc_clang.h | 34 -------------------------------
R include/assert.h -> include/scc/as… | 0
R include/bits/amd64/arch/cdefs.h ->… | 0
R include/bits/amd64/arch/float.h ->… | 0
R include/bits/amd64/arch/limits.h -… | 0
R include/bits/amd64/arch/setjmp.h -… | 0
R include/bits/amd64/arch/stdlib.h -… | 0
R include/bits/amd64/arch/string.h -… | 0
R include/bits/arm/arch/cdefs.h -> i… | 0
R include/bits/arm/arch/limits.h -> … | 0
R include/bits/arm/arch/setjmp.h -> … | 0
R include/bits/arm/arch/stdlib.h -> … | 0
R include/bits/arm/arch/string.h -> … | 0
R include/bits/arm64/arch/cdefs.h ->… | 0
R include/bits/arm64/arch/limits.h -… | 0
R include/bits/arm64/arch/setjmp.h -… | 0
R include/bits/arm64/arch/stdlib.h -… | 0
R include/bits/arm64/arch/string.h -… | 0
R include/bits/darwin/amd64/arch/int… | 0
R include/bits/darwin/amd64/arch/sig… | 0
R include/bits/darwin/amd64/arch/std… | 0
R include/bits/darwin/amd64/arch/tim… | 0
R include/bits/darwin/sys.h -> inclu… | 0
R include/bits/darwin/sys/cdefs.h ->… | 0
R include/bits/darwin/sys/errno.h ->… | 0
R include/bits/darwin/sys/signal.h -… | 0
R include/bits/darwin/sys/stdio.h ->… | 0
R include/bits/darwin/sys/stdlib.h -… | 0
R include/bits/dragonfly/amd64/arch/… | 0
R include/bits/dragonfly/amd64/arch/… | 0
R include/bits/dragonfly/amd64/arch/… | 0
R include/bits/dragonfly/amd64/arch/… | 0
R include/bits/dragonfly/sys.h -> in… | 0
R include/bits/dragonfly/sys/cdefs.h… | 0
R include/bits/dragonfly/sys/errno.h… | 0
R include/bits/dragonfly/sys/signal.… | 0
R include/bits/dragonfly/sys/stdio.h… | 0
R include/bits/dragonfly/sys/stdlib.… | 0
R include/bits/freebsd/amd64/arch/in… | 0
R include/bits/freebsd/amd64/arch/si… | 0
R include/bits/freebsd/amd64/arch/st… | 0
R include/bits/freebsd/amd64/arch/ti… | 0
R include/bits/freebsd/sys.h -> incl… | 0
R include/bits/freebsd/sys/cdefs.h -… | 0
R include/bits/freebsd/sys/errno.h -… | 0
R include/bits/freebsd/sys/signal.h … | 0
R include/bits/freebsd/sys/stdio.h -… | 0
R include/bits/freebsd/sys/stdlib.h … | 0
R include/bits/i386/arch/cdefs.h -> … | 0
R include/bits/i386/arch/limits.h ->… | 0
R include/bits/i386/arch/setjmp.h ->… | 0
R include/bits/i386/arch/stdlib.h ->… | 0
R include/bits/i386/arch/string.h ->… | 0
R include/bits/linux/amd64/arch/intt… | 0
R include/bits/linux/amd64/arch/siga… | 0
R include/bits/linux/amd64/arch/stdi… | 0
R include/bits/linux/amd64/arch/time… | 0
R include/bits/linux/arm/arch/inttyp… | 0
R include/bits/linux/arm/arch/sigact… | 0
R include/bits/linux/arm/arch/stdint… | 0
R include/bits/linux/arm/arch/time.h… | 0
R include/bits/linux/arm64/arch/intt… | 0
R include/bits/linux/arm64/arch/siga… | 0
R include/bits/linux/arm64/arch/stdi… | 0
R include/bits/linux/arm64/arch/time… | 0
R include/bits/linux/i386/arch/intty… | 0
R include/bits/linux/i386/arch/sigac… | 0
R include/bits/linux/i386/arch/stdin… | 0
R include/bits/linux/i386/arch/time.… | 0
R include/bits/linux/ppc/arch/inttyp… | 0
R include/bits/linux/ppc/arch/sigact… | 0
R include/bits/linux/ppc/arch/stdint… | 0
R include/bits/linux/ppc/arch/time.h… | 0
R include/bits/linux/sys.h -> includ… | 0
R include/bits/linux/sys/cdefs.h -> … | 0
R include/bits/linux/sys/errno.h -> … | 0
R include/bits/linux/sys/signal.h ->… | 0
R include/bits/linux/sys/stdio.h -> … | 0
R include/bits/linux/sys/stdlib.h ->… | 0
R include/bits/netbsd/amd64/arch/int… | 0
R include/bits/netbsd/amd64/arch/sig… | 0
R include/bits/netbsd/amd64/arch/std… | 0
R include/bits/netbsd/amd64/arch/tim… | 0
R include/bits/netbsd/sys.h -> inclu… | 0
R include/bits/netbsd/sys/cdefs.h ->… | 0
R include/bits/netbsd/sys/errno.h ->… | 0
R include/bits/netbsd/sys/signal.h -… | 0
R include/bits/netbsd/sys/stdio.h ->… | 0
R include/bits/netbsd/sys/stdlib.h -… | 0
R include/bits/openbsd/amd64/arch/in… | 0
R include/bits/openbsd/amd64/arch/si… | 0
R include/bits/openbsd/amd64/arch/st… | 0
R include/bits/openbsd/amd64/arch/ti… | 0
R include/bits/openbsd/sys.h -> incl… | 0
R include/bits/openbsd/sys/cdefs.h -… | 0
R include/bits/openbsd/sys/errno.h -… | 0
R include/bits/openbsd/sys/signal.h … | 0
R include/bits/openbsd/sys/stdio.h -… | 0
R include/bits/openbsd/sys/stdlib.h … | 0
R include/bits/ppc/arch/cdefs.h -> i… | 0
R include/bits/ppc/arch/limits.h -> … | 0
R include/bits/ppc/arch/setjmp.h -> … | 0
R include/bits/ppc/arch/stdlib.h -> … | 0
R include/bits/ppc/arch/string.h -> … | 0
R include/bits/scc/.gitignore -> inc… | 0
A include/scc/bits/scc/Makefile | 28 ++++++++++++++++++++++++++++
R include/bits/scc/ar.h -> include/s… | 0
R include/bits/scc/arg.h -> include/… | 0
R include/bits/scc/coff32.h -> inclu… | 0
R include/bits/scc/coff32/aouthdr.h … | 0
R include/bits/scc/coff32/filehdr.h … | 0
R include/bits/scc/coff32/linenum.h … | 0
R include/bits/scc/coff32/reloc.h ->… | 0
R include/bits/scc/coff32/scnhdr.h -… | 0
R include/bits/scc/coff32/storclass.… | 0
R include/bits/scc/coff32/syms.h -> … | 0
R include/bits/scc/cstd-c89.h -> inc… | 0
R include/bits/scc/cstd-c99.h -> inc… | 0
R include/bits/scc/elf.h -> include/… | 0
R include/bits/scc/elf/elfent.h -> i… | 0
R include/bits/scc/elf/elfhdr.h -> i… | 0
R include/bits/scc/elf/elfphdr.h -> … | 0
R include/bits/scc/elf/elfrel.h -> i… | 0
R include/bits/scc/elf/elfshdr.h -> … | 0
R include/bits/scc/elf/elftypes.h ->… | 0
R include/bits/scc/elf64.h -> includ… | 0
R include/bits/scc/mach.h -> include… | 0
R include/bits/scc/scc.h -> include/… | 0
R include/bits/scc/sys-musl.h -> inc… | 0
A include/scc/bits/scc/sys-scc.h | 31 +++++++++++++++++++++++++++++++
A include/scc/bits/scc/sys-scc_clang… | 34 +++++++++++++++++++++++++++++++
R include/bits/z80/arch/cdefs.h -> i… | 0
R include/bits/z80/arch/limits.h -> … | 0
R include/bits/z80/arch/setjmp.h -> … | 0
R include/bits/z80/arch/stdint.h -> … | 0
R include/bits/z80/arch/stdlib.h -> … | 0
R include/bits/z80/arch/string.h -> … | 0
R include/ctype.h -> include/scc/cty… | 0
R include/errno.h -> include/scc/err… | 0
R include/float.h -> include/scc/flo… | 0
R include/inttypes.h -> include/scc/… | 0
R include/iso646.h -> include/scc/is… | 0
R include/limits.h -> include/scc/li… | 0
R include/locale.h -> include/scc/lo… | 0
R include/math.h -> include/scc/math… | 0
R include/setjmp.h -> include/scc/se… | 0
R include/signal.h -> include/scc/si… | 0
R include/stdarg.h -> include/scc/st… | 0
R include/stdbool.h -> include/scc/s… | 0
R include/stddef.h -> include/scc/st… | 0
R include/stdint.h -> include/scc/st… | 0
R include/stdio.h -> include/scc/std… | 0
R include/stdlib.h -> include/scc/st… | 0
R include/string.h -> include/scc/st… | 0
R include/time.h -> include/scc/time… | 0
R include/wchar.h -> include/scc/wch… | 0
R include/wctype.h -> include/scc/wc… | 0
M main.mk | 10 +++++-----
M scripts/proto.all | 353 ++++++++++++++++---------------
M scripts/rules.mk | 2 +-
M scripts/update-proto.all | 2 +-
M src/libc/gcc-scc.sh | 2 +-
165 files changed, 280 insertions(+), 277 deletions(-)
---
(DIR) diff --git a/Makefile b/Makefile
@@ -36,7 +36,7 @@ config-musl: scc-make FORCE
sed -En '/COLLECT_LTO_WRAPPER=/ s/.*=(.*)\/lto-wrapper/\1/p' |\
(read -r path; \
printf "g/define GCCLIBPATH/ s@.*@#define GCCLIBPATH \"$$path/\"@\nw\n") |\
- ed -s include/bits/scc/sys.h
+ ed -s include/scc/bits/scc/sys.h
clean: FORCE
touch config.mk
(DIR) diff --git a/include/bits/scc/Makefile b/include/bits/scc/Makefile
@@ -1,28 +0,0 @@
-.POSIX:
-
-PROJECTDIR = ../../..
-include $(PROJECTDIR)/scripts/rules.mk
-
-NODEP = 1
-
-all: config.h sys.h cstd.h
-
-cstd.h: FORCE
- cp cstd-$(STD).h $@
-
-config.h: FORCE
- rm -f $@;\
- trap "rm -f $$$$.h" EXIT INT QUIT HUP TERM;\
- (echo '#define PREFIX "$(PREFIX)"';\
- echo '#define ARCH "$(ARCH)"';\
- echo '#define SYS "$(SYS)"';\
- echo '#define ABI "$(ABI)"';\
- echo '#define LIBPREFIX "$(LIBPREFIX)"';\
- echo '#define FORMAT "$(FORMAT)"') > $$$$.h && mv $$$$.h $@
-
-sys.h: FORCE
- rm -f $@;\
- trap "rm -f $$$$.tmp" INT QUIT TERM HUP;\
- sed -e 's/%NOPIE%/"$(NOPIE_LDFLAGS)",/' \
- -e 's/"",//' sys-$(LIBPROFILE).h > $$$$.tmp && \
- mv $$$$.tmp $@
(DIR) diff --git a/include/bits/scc/sys-scc.h b/include/bits/scc/sys-scc.h
@@ -1,31 +0,0 @@
-#define LDBIN "ld"
-#define ASBIN "as"
-
-/* configure below your standard sys include paths */
-char *sysincludes[] = {
- "%p/include/bits/%a/",
- "%p/include/bits/%s/",
- "%p/include/bits/%s/%a/",
- "%p/include/",
- NULL
-};
-
-/* configure below your system linker command line */
-char *ldcmd[] = {
- "-static",
- "-z","nodefaultlib",
- %NOPIE%
- "-o","%o",
- "-L","%p/lib/scc/%a-%s",
- "%p/lib/scc/%a-%s/crt.o",
- "%c",
- "-lc",
- "-lcrt",
- NULL
-};
-
-/* configure below your system assembler command line */
-char *ascmd[] = {
- "-o", "%o",
- NULL
-};
(DIR) diff --git a/include/bits/scc/sys-scc_clang.h b/include/bits/scc/sys-scc_clang.h
@@ -1,34 +0,0 @@
-#define LDBIN "ld.lld"
-#define ASBIN "clang"
-
-/* configure below your standard sys include paths */
-char *sysincludes[] = {
- "%p/include/bits/%a/",
- "%p/include/bits/%s/",
- "%p/include/bits/%s/%a/",
- "%p/include/",
- NULL
-};
-
-/* configure below your system linker command line */
-char *ldcmd[] = {
- "-static",
- "-z","nodefaultlib",
- %NOPIE%
- "-o","%o",
- "-L","%p/lib/scc/%a-%s",
- "%p/lib/scc/%a-%s/crt.o",
- "%c",
- "-lc",
- "-lcrt",
- NULL
-};
-
-/* configure below your system assembler command line */
-char *ascmd[] = {
- "-x","assembler",
- "-c",
- "-o","%o",
- "-",
- NULL
-};
(DIR) diff --git a/include/assert.h b/include/scc/assert.h
(DIR) diff --git a/include/bits/amd64/arch/cdefs.h b/include/scc/bits/amd64/arch/cdefs.h
(DIR) diff --git a/include/bits/amd64/arch/float.h b/include/scc/bits/amd64/arch/float.h
(DIR) diff --git a/include/bits/amd64/arch/limits.h b/include/scc/bits/amd64/arch/limits.h
(DIR) diff --git a/include/bits/amd64/arch/setjmp.h b/include/scc/bits/amd64/arch/setjmp.h
(DIR) diff --git a/include/bits/amd64/arch/stdlib.h b/include/scc/bits/amd64/arch/stdlib.h
(DIR) diff --git a/include/bits/amd64/arch/string.h b/include/scc/bits/amd64/arch/string.h
(DIR) diff --git a/include/bits/arm/arch/cdefs.h b/include/scc/bits/arm/arch/cdefs.h
(DIR) diff --git a/include/bits/arm/arch/limits.h b/include/scc/bits/arm/arch/limits.h
(DIR) diff --git a/include/bits/arm/arch/setjmp.h b/include/scc/bits/arm/arch/setjmp.h
(DIR) diff --git a/include/bits/arm/arch/stdlib.h b/include/scc/bits/arm/arch/stdlib.h
(DIR) diff --git a/include/bits/arm/arch/string.h b/include/scc/bits/arm/arch/string.h
(DIR) diff --git a/include/bits/arm64/arch/cdefs.h b/include/scc/bits/arm64/arch/cdefs.h
(DIR) diff --git a/include/bits/arm64/arch/limits.h b/include/scc/bits/arm64/arch/limits.h
(DIR) diff --git a/include/bits/arm64/arch/setjmp.h b/include/scc/bits/arm64/arch/setjmp.h
(DIR) diff --git a/include/bits/arm64/arch/stdlib.h b/include/scc/bits/arm64/arch/stdlib.h
(DIR) diff --git a/include/bits/arm64/arch/string.h b/include/scc/bits/arm64/arch/string.h
(DIR) diff --git a/include/bits/darwin/amd64/arch/inttypes.h b/include/scc/bits/darwin/amd64/arch/inttypes.h
(DIR) diff --git a/include/bits/darwin/amd64/arch/sigaction.h b/include/scc/bits/darwin/amd64/arch/sigaction.h
(DIR) diff --git a/include/bits/darwin/amd64/arch/stdint.h b/include/scc/bits/darwin/amd64/arch/stdint.h
(DIR) diff --git a/include/bits/darwin/amd64/arch/time.h b/include/scc/bits/darwin/amd64/arch/time.h
(DIR) diff --git a/include/bits/darwin/sys.h b/include/scc/bits/darwin/sys.h
(DIR) diff --git a/include/bits/darwin/sys/cdefs.h b/include/scc/bits/darwin/sys/cdefs.h
(DIR) diff --git a/include/bits/darwin/sys/errno.h b/include/scc/bits/darwin/sys/errno.h
(DIR) diff --git a/include/bits/darwin/sys/signal.h b/include/scc/bits/darwin/sys/signal.h
(DIR) diff --git a/include/bits/darwin/sys/stdio.h b/include/scc/bits/darwin/sys/stdio.h
(DIR) diff --git a/include/bits/darwin/sys/stdlib.h b/include/scc/bits/darwin/sys/stdlib.h
(DIR) diff --git a/include/bits/dragonfly/amd64/arch/inttypes.h b/include/scc/bits/dragonfly/amd64/arch/inttypes.h
(DIR) diff --git a/include/bits/dragonfly/amd64/arch/sigaction.h b/include/scc/bits/dragonfly/amd64/arch/sigaction.h
(DIR) diff --git a/include/bits/dragonfly/amd64/arch/stdint.h b/include/scc/bits/dragonfly/amd64/arch/stdint.h
(DIR) diff --git a/include/bits/dragonfly/amd64/arch/time.h b/include/scc/bits/dragonfly/amd64/arch/time.h
(DIR) diff --git a/include/bits/dragonfly/sys.h b/include/scc/bits/dragonfly/sys.h
(DIR) diff --git a/include/bits/dragonfly/sys/cdefs.h b/include/scc/bits/dragonfly/sys/cdefs.h
(DIR) diff --git a/include/bits/dragonfly/sys/errno.h b/include/scc/bits/dragonfly/sys/errno.h
(DIR) diff --git a/include/bits/dragonfly/sys/signal.h b/include/scc/bits/dragonfly/sys/signal.h
(DIR) diff --git a/include/bits/dragonfly/sys/stdio.h b/include/scc/bits/dragonfly/sys/stdio.h
(DIR) diff --git a/include/bits/dragonfly/sys/stdlib.h b/include/scc/bits/dragonfly/sys/stdlib.h
(DIR) diff --git a/include/bits/freebsd/amd64/arch/inttypes.h b/include/scc/bits/freebsd/amd64/arch/inttypes.h
(DIR) diff --git a/include/bits/freebsd/amd64/arch/sigaction.h b/include/scc/bits/freebsd/amd64/arch/sigaction.h
(DIR) diff --git a/include/bits/freebsd/amd64/arch/stdint.h b/include/scc/bits/freebsd/amd64/arch/stdint.h
(DIR) diff --git a/include/bits/freebsd/amd64/arch/time.h b/include/scc/bits/freebsd/amd64/arch/time.h
(DIR) diff --git a/include/bits/freebsd/sys.h b/include/scc/bits/freebsd/sys.h
(DIR) diff --git a/include/bits/freebsd/sys/cdefs.h b/include/scc/bits/freebsd/sys/cdefs.h
(DIR) diff --git a/include/bits/freebsd/sys/errno.h b/include/scc/bits/freebsd/sys/errno.h
(DIR) diff --git a/include/bits/freebsd/sys/signal.h b/include/scc/bits/freebsd/sys/signal.h
(DIR) diff --git a/include/bits/freebsd/sys/stdio.h b/include/scc/bits/freebsd/sys/stdio.h
(DIR) diff --git a/include/bits/freebsd/sys/stdlib.h b/include/scc/bits/freebsd/sys/stdlib.h
(DIR) diff --git a/include/bits/i386/arch/cdefs.h b/include/scc/bits/i386/arch/cdefs.h
(DIR) diff --git a/include/bits/i386/arch/limits.h b/include/scc/bits/i386/arch/limits.h
(DIR) diff --git a/include/bits/i386/arch/setjmp.h b/include/scc/bits/i386/arch/setjmp.h
(DIR) diff --git a/include/bits/i386/arch/stdlib.h b/include/scc/bits/i386/arch/stdlib.h
(DIR) diff --git a/include/bits/i386/arch/string.h b/include/scc/bits/i386/arch/string.h
(DIR) diff --git a/include/bits/linux/amd64/arch/inttypes.h b/include/scc/bits/linux/amd64/arch/inttypes.h
(DIR) diff --git a/include/bits/linux/amd64/arch/sigaction.h b/include/scc/bits/linux/amd64/arch/sigaction.h
(DIR) diff --git a/include/bits/linux/amd64/arch/stdint.h b/include/scc/bits/linux/amd64/arch/stdint.h
(DIR) diff --git a/include/bits/linux/amd64/arch/time.h b/include/scc/bits/linux/amd64/arch/time.h
(DIR) diff --git a/include/bits/linux/arm/arch/inttypes.h b/include/scc/bits/linux/arm/arch/inttypes.h
(DIR) diff --git a/include/bits/linux/arm/arch/sigaction.h b/include/scc/bits/linux/arm/arch/sigaction.h
(DIR) diff --git a/include/bits/linux/arm/arch/stdint.h b/include/scc/bits/linux/arm/arch/stdint.h
(DIR) diff --git a/include/bits/linux/arm/arch/time.h b/include/scc/bits/linux/arm/arch/time.h
(DIR) diff --git a/include/bits/linux/arm64/arch/inttypes.h b/include/scc/bits/linux/arm64/arch/inttypes.h
(DIR) diff --git a/include/bits/linux/arm64/arch/sigaction.h b/include/scc/bits/linux/arm64/arch/sigaction.h
(DIR) diff --git a/include/bits/linux/arm64/arch/stdint.h b/include/scc/bits/linux/arm64/arch/stdint.h
(DIR) diff --git a/include/bits/linux/arm64/arch/time.h b/include/scc/bits/linux/arm64/arch/time.h
(DIR) diff --git a/include/bits/linux/i386/arch/inttypes.h b/include/scc/bits/linux/i386/arch/inttypes.h
(DIR) diff --git a/include/bits/linux/i386/arch/sigaction.h b/include/scc/bits/linux/i386/arch/sigaction.h
(DIR) diff --git a/include/bits/linux/i386/arch/stdint.h b/include/scc/bits/linux/i386/arch/stdint.h
(DIR) diff --git a/include/bits/linux/i386/arch/time.h b/include/scc/bits/linux/i386/arch/time.h
(DIR) diff --git a/include/bits/linux/ppc/arch/inttypes.h b/include/scc/bits/linux/ppc/arch/inttypes.h
(DIR) diff --git a/include/bits/linux/ppc/arch/sigaction.h b/include/scc/bits/linux/ppc/arch/sigaction.h
(DIR) diff --git a/include/bits/linux/ppc/arch/stdint.h b/include/scc/bits/linux/ppc/arch/stdint.h
(DIR) diff --git a/include/bits/linux/ppc/arch/time.h b/include/scc/bits/linux/ppc/arch/time.h
(DIR) diff --git a/include/bits/linux/sys.h b/include/scc/bits/linux/sys.h
(DIR) diff --git a/include/bits/linux/sys/cdefs.h b/include/scc/bits/linux/sys/cdefs.h
(DIR) diff --git a/include/bits/linux/sys/errno.h b/include/scc/bits/linux/sys/errno.h
(DIR) diff --git a/include/bits/linux/sys/signal.h b/include/scc/bits/linux/sys/signal.h
(DIR) diff --git a/include/bits/linux/sys/stdio.h b/include/scc/bits/linux/sys/stdio.h
(DIR) diff --git a/include/bits/linux/sys/stdlib.h b/include/scc/bits/linux/sys/stdlib.h
(DIR) diff --git a/include/bits/netbsd/amd64/arch/inttypes.h b/include/scc/bits/netbsd/amd64/arch/inttypes.h
(DIR) diff --git a/include/bits/netbsd/amd64/arch/sigaction.h b/include/scc/bits/netbsd/amd64/arch/sigaction.h
(DIR) diff --git a/include/bits/netbsd/amd64/arch/stdint.h b/include/scc/bits/netbsd/amd64/arch/stdint.h
(DIR) diff --git a/include/bits/netbsd/amd64/arch/time.h b/include/scc/bits/netbsd/amd64/arch/time.h
(DIR) diff --git a/include/bits/netbsd/sys.h b/include/scc/bits/netbsd/sys.h
(DIR) diff --git a/include/bits/netbsd/sys/cdefs.h b/include/scc/bits/netbsd/sys/cdefs.h
(DIR) diff --git a/include/bits/netbsd/sys/errno.h b/include/scc/bits/netbsd/sys/errno.h
(DIR) diff --git a/include/bits/netbsd/sys/signal.h b/include/scc/bits/netbsd/sys/signal.h
(DIR) diff --git a/include/bits/netbsd/sys/stdio.h b/include/scc/bits/netbsd/sys/stdio.h
(DIR) diff --git a/include/bits/netbsd/sys/stdlib.h b/include/scc/bits/netbsd/sys/stdlib.h
(DIR) diff --git a/include/bits/openbsd/amd64/arch/inttypes.h b/include/scc/bits/openbsd/amd64/arch/inttypes.h
(DIR) diff --git a/include/bits/openbsd/amd64/arch/sigaction.h b/include/scc/bits/openbsd/amd64/arch/sigaction.h
(DIR) diff --git a/include/bits/openbsd/amd64/arch/stdint.h b/include/scc/bits/openbsd/amd64/arch/stdint.h
(DIR) diff --git a/include/bits/openbsd/amd64/arch/time.h b/include/scc/bits/openbsd/amd64/arch/time.h
(DIR) diff --git a/include/bits/openbsd/sys.h b/include/scc/bits/openbsd/sys.h
(DIR) diff --git a/include/bits/openbsd/sys/cdefs.h b/include/scc/bits/openbsd/sys/cdefs.h
(DIR) diff --git a/include/bits/openbsd/sys/errno.h b/include/scc/bits/openbsd/sys/errno.h
(DIR) diff --git a/include/bits/openbsd/sys/signal.h b/include/scc/bits/openbsd/sys/signal.h
(DIR) diff --git a/include/bits/openbsd/sys/stdio.h b/include/scc/bits/openbsd/sys/stdio.h
(DIR) diff --git a/include/bits/openbsd/sys/stdlib.h b/include/scc/bits/openbsd/sys/stdlib.h
(DIR) diff --git a/include/bits/ppc/arch/cdefs.h b/include/scc/bits/ppc/arch/cdefs.h
(DIR) diff --git a/include/bits/ppc/arch/limits.h b/include/scc/bits/ppc/arch/limits.h
(DIR) diff --git a/include/bits/ppc/arch/setjmp.h b/include/scc/bits/ppc/arch/setjmp.h
(DIR) diff --git a/include/bits/ppc/arch/stdlib.h b/include/scc/bits/ppc/arch/stdlib.h
(DIR) diff --git a/include/bits/ppc/arch/string.h b/include/scc/bits/ppc/arch/string.h
(DIR) diff --git a/include/bits/scc/.gitignore b/include/scc/bits/scc/.gitignore
(DIR) diff --git a/include/scc/bits/scc/Makefile b/include/scc/bits/scc/Makefile
@@ -0,0 +1,28 @@
+.POSIX:
+
+PROJECTDIR = ../../../..
+include $(PROJECTDIR)/scripts/rules.mk
+
+NODEP = 1
+
+all: config.h sys.h cstd.h
+
+cstd.h: FORCE
+ cp cstd-$(STD).h $@
+
+config.h: FORCE
+ rm -f $@;\
+ trap "rm -f $$$$.h" EXIT INT QUIT HUP TERM;\
+ (echo '#define PREFIX "$(PREFIX)"';\
+ echo '#define ARCH "$(ARCH)"';\
+ echo '#define SYS "$(SYS)"';\
+ echo '#define ABI "$(ABI)"';\
+ echo '#define LIBPREFIX "$(LIBPREFIX)"';\
+ echo '#define FORMAT "$(FORMAT)"') > $$$$.h && mv $$$$.h $@
+
+sys.h: FORCE
+ rm -f $@;\
+ trap "rm -f $$$$.tmp" INT QUIT TERM HUP;\
+ sed -e 's/%NOPIE%/"$(NOPIE_LDFLAGS)",/' \
+ -e 's/"",//' sys-$(LIBPROFILE).h > $$$$.tmp && \
+ mv $$$$.tmp $@
(DIR) diff --git a/include/bits/scc/ar.h b/include/scc/bits/scc/ar.h
(DIR) diff --git a/include/bits/scc/arg.h b/include/scc/bits/scc/arg.h
(DIR) diff --git a/include/bits/scc/coff32.h b/include/scc/bits/scc/coff32.h
(DIR) diff --git a/include/bits/scc/coff32/aouthdr.h b/include/scc/bits/scc/coff32/aouthdr.h
(DIR) diff --git a/include/bits/scc/coff32/filehdr.h b/include/scc/bits/scc/coff32/filehdr.h
(DIR) diff --git a/include/bits/scc/coff32/linenum.h b/include/scc/bits/scc/coff32/linenum.h
(DIR) diff --git a/include/bits/scc/coff32/reloc.h b/include/scc/bits/scc/coff32/reloc.h
(DIR) diff --git a/include/bits/scc/coff32/scnhdr.h b/include/scc/bits/scc/coff32/scnhdr.h
(DIR) diff --git a/include/bits/scc/coff32/storclass.h b/include/scc/bits/scc/coff32/storclass.h
(DIR) diff --git a/include/bits/scc/coff32/syms.h b/include/scc/bits/scc/coff32/syms.h
(DIR) diff --git a/include/bits/scc/cstd-c89.h b/include/scc/bits/scc/cstd-c89.h
(DIR) diff --git a/include/bits/scc/cstd-c99.h b/include/scc/bits/scc/cstd-c99.h
(DIR) diff --git a/include/bits/scc/elf.h b/include/scc/bits/scc/elf.h
(DIR) diff --git a/include/bits/scc/elf/elfent.h b/include/scc/bits/scc/elf/elfent.h
(DIR) diff --git a/include/bits/scc/elf/elfhdr.h b/include/scc/bits/scc/elf/elfhdr.h
(DIR) diff --git a/include/bits/scc/elf/elfphdr.h b/include/scc/bits/scc/elf/elfphdr.h
(DIR) diff --git a/include/bits/scc/elf/elfrel.h b/include/scc/bits/scc/elf/elfrel.h
(DIR) diff --git a/include/bits/scc/elf/elfshdr.h b/include/scc/bits/scc/elf/elfshdr.h
(DIR) diff --git a/include/bits/scc/elf/elftypes.h b/include/scc/bits/scc/elf/elftypes.h
(DIR) diff --git a/include/bits/scc/elf64.h b/include/scc/bits/scc/elf64.h
(DIR) diff --git a/include/bits/scc/mach.h b/include/scc/bits/scc/mach.h
(DIR) diff --git a/include/bits/scc/scc.h b/include/scc/bits/scc/scc.h
(DIR) diff --git a/include/bits/scc/sys-musl.h b/include/scc/bits/scc/sys-musl.h
(DIR) diff --git a/include/scc/bits/scc/sys-scc.h b/include/scc/bits/scc/sys-scc.h
@@ -0,0 +1,31 @@
+#define LDBIN "ld"
+#define ASBIN "as"
+
+/* configure below your standard sys include paths */
+char *sysincludes[] = {
+ "%p/include/scc/bits/%a/",
+ "%p/include/scc/bits/%s/",
+ "%p/include/scc/bits/%s/%a/",
+ "%p/include/scc/",
+ NULL
+};
+
+/* configure below your system linker command line */
+char *ldcmd[] = {
+ "-static",
+ "-z","nodefaultlib",
+ %NOPIE%
+ "-o","%o",
+ "-L","%p/lib/scc/%a-%s",
+ "%p/lib/scc/%a-%s/crt.o",
+ "%c",
+ "-lc",
+ "-lcrt",
+ NULL
+};
+
+/* configure below your system assembler command line */
+char *ascmd[] = {
+ "-o", "%o",
+ NULL
+};
(DIR) diff --git a/include/scc/bits/scc/sys-scc_clang.h b/include/scc/bits/scc/sys-scc_clang.h
@@ -0,0 +1,34 @@
+#define LDBIN "ld.lld"
+#define ASBIN "clang"
+
+/* configure below your standard sys include paths */
+char *sysincludes[] = {
+ "%p/include/scc/bits/%a/",
+ "%p/include/scc/bits/%s/",
+ "%p/include/scc/bits/%s/%a/",
+ "%p/include/scc",
+ NULL
+};
+
+/* configure below your system linker command line */
+char *ldcmd[] = {
+ "-static",
+ "-z","nodefaultlib",
+ %NOPIE%
+ "-o","%o",
+ "-L","%p/lib/scc/%a-%s",
+ "%p/lib/scc/%a-%s/crt.o",
+ "%c",
+ "-lc",
+ "-lcrt",
+ NULL
+};
+
+/* configure below your system assembler command line */
+char *ascmd[] = {
+ "-x","assembler",
+ "-c",
+ "-o","%o",
+ "-",
+ NULL
+};
(DIR) diff --git a/include/bits/z80/arch/cdefs.h b/include/scc/bits/z80/arch/cdefs.h
(DIR) diff --git a/include/bits/z80/arch/limits.h b/include/scc/bits/z80/arch/limits.h
(DIR) diff --git a/include/bits/z80/arch/setjmp.h b/include/scc/bits/z80/arch/setjmp.h
(DIR) diff --git a/include/bits/z80/arch/stdint.h b/include/scc/bits/z80/arch/stdint.h
(DIR) diff --git a/include/bits/z80/arch/stdlib.h b/include/scc/bits/z80/arch/stdlib.h
(DIR) diff --git a/include/bits/z80/arch/string.h b/include/scc/bits/z80/arch/string.h
(DIR) diff --git a/include/ctype.h b/include/scc/ctype.h
(DIR) diff --git a/include/errno.h b/include/scc/errno.h
(DIR) diff --git a/include/float.h b/include/scc/float.h
(DIR) diff --git a/include/inttypes.h b/include/scc/inttypes.h
(DIR) diff --git a/include/iso646.h b/include/scc/iso646.h
(DIR) diff --git a/include/limits.h b/include/scc/limits.h
(DIR) diff --git a/include/locale.h b/include/scc/locale.h
(DIR) diff --git a/include/math.h b/include/scc/math.h
(DIR) diff --git a/include/setjmp.h b/include/scc/setjmp.h
(DIR) diff --git a/include/signal.h b/include/scc/signal.h
(DIR) diff --git a/include/stdarg.h b/include/scc/stdarg.h
(DIR) diff --git a/include/stdbool.h b/include/scc/stdbool.h
(DIR) diff --git a/include/stddef.h b/include/scc/stddef.h
(DIR) diff --git a/include/stdint.h b/include/scc/stdint.h
(DIR) diff --git a/include/stdio.h b/include/scc/stdio.h
(DIR) diff --git a/include/stdlib.h b/include/scc/stdlib.h
(DIR) diff --git a/include/string.h b/include/scc/string.h
(DIR) diff --git a/include/time.h b/include/scc/time.h
(DIR) diff --git a/include/wchar.h b/include/scc/wchar.h
(DIR) diff --git a/include/wctype.h b/include/scc/wctype.h
(DIR) diff --git a/main.mk b/main.mk
@@ -4,7 +4,7 @@ DIRS =\
src\
src/libc\
src/libcrt\
- include/bits/scc\
+ include/scc/bits/scc\
tests\
PROJECTDIR = .
@@ -18,7 +18,7 @@ all:
+@$(MAKE) -f main.mk $(ARCH)
config: FORCE
- +@cd include/bits/scc && $(MAKE)
+ +@cd include/scc/bits/scc && $(MAKE)
install: all
$(SCRIPTDIR)/install $(ROOT)
@@ -44,9 +44,9 @@ clean:
rm -rf dirs coverage
distclean: clean
- rm -f include/bits/scc/cstd.h
- rm -f include/bits/scc/sys.h
- rm -f include/bits/scc/config.h
+ rm -f include/scc/bits/scc/cstd.h
+ rm -f include/scc/bits/scc/sys.h
+ rm -f include/scc/bits/scc/config.h
include scripts/amd64.mk
include scripts/arm.mk
(DIR) diff --git a/scripts/proto.all b/scripts/proto.all
@@ -6,189 +6,191 @@ f 755 bin/scc-ar
f 755 bin/scc-as
f 755 bin/scc-cc
f 755 bin/scc-cpp
+f 755 bin/scc-dump
f 755 bin/scc-ld
f 755 bin/scc-make
f 755 bin/scc-nm
f 755 bin/scc-objcopy
-f 755 bin/scc-dump
+f 755 bin/scc-objdump
f 755 bin/scc-ranlib
f 755 bin/scc-size
f 755 bin/scc-strip
d 755 include
-f 644 include/assert.h
-d 755 include/bits
-d 755 include/bits/amd64
-d 755 include/bits/amd64/arch
-f 644 include/bits/amd64/arch/cdefs.h
-f 644 include/bits/amd64/arch/float.h
-f 644 include/bits/amd64/arch/limits.h
-f 644 include/bits/amd64/arch/setjmp.h
-f 644 include/bits/amd64/arch/stdlib.h
-f 644 include/bits/amd64/arch/string.h
-d 755 include/bits/arm
-d 755 include/bits/arm/arch
-f 644 include/bits/arm/arch/cdefs.h
-f 644 include/bits/arm/arch/limits.h
-f 644 include/bits/arm/arch/setjmp.h
-f 644 include/bits/arm/arch/stdlib.h
-f 644 include/bits/arm/arch/string.h
-d 755 include/bits/arm64
-d 755 include/bits/arm64/arch
-f 644 include/bits/arm64/arch/cdefs.h
-f 644 include/bits/arm64/arch/limits.h
-f 644 include/bits/arm64/arch/setjmp.h
-f 644 include/bits/arm64/arch/stdlib.h
-f 644 include/bits/arm64/arch/string.h
-d 755 include/bits/darwin
-d 755 include/bits/darwin/amd64
-d 755 include/bits/darwin/amd64/arch
-f 644 include/bits/darwin/amd64/arch/inttypes.h
-f 644 include/bits/darwin/amd64/arch/sigaction.h
-f 644 include/bits/darwin/amd64/arch/stdint.h
-f 644 include/bits/darwin/amd64/arch/time.h
-d 755 include/bits/darwin/sys
-f 644 include/bits/darwin/sys.h
-f 644 include/bits/darwin/sys/cdefs.h
-f 644 include/bits/darwin/sys/errno.h
-f 644 include/bits/darwin/sys/signal.h
-f 644 include/bits/darwin/sys/stdio.h
-f 644 include/bits/darwin/sys/stdlib.h
-d 755 include/bits/dragonfly
-d 755 include/bits/dragonfly/amd64
-d 755 include/bits/dragonfly/amd64/arch
-f 644 include/bits/dragonfly/amd64/arch/inttypes.h
-f 644 include/bits/dragonfly/amd64/arch/sigaction.h
-f 644 include/bits/dragonfly/amd64/arch/stdint.h
-f 644 include/bits/dragonfly/amd64/arch/time.h
-d 755 include/bits/dragonfly/sys
-f 644 include/bits/dragonfly/sys.h
-f 644 include/bits/dragonfly/sys/cdefs.h
-f 644 include/bits/dragonfly/sys/errno.h
-f 644 include/bits/dragonfly/sys/signal.h
-f 644 include/bits/dragonfly/sys/stdio.h
-f 644 include/bits/dragonfly/sys/stdlib.h
-d 755 include/bits/freebsd
-d 755 include/bits/freebsd/amd64
-d 755 include/bits/freebsd/amd64/arch
-f 644 include/bits/freebsd/amd64/arch/inttypes.h
-f 644 include/bits/freebsd/amd64/arch/sigaction.h
-f 644 include/bits/freebsd/amd64/arch/stdint.h
-f 644 include/bits/freebsd/amd64/arch/time.h
-d 755 include/bits/freebsd/sys
-f 644 include/bits/freebsd/sys.h
-f 644 include/bits/freebsd/sys/cdefs.h
-f 644 include/bits/freebsd/sys/errno.h
-f 644 include/bits/freebsd/sys/signal.h
-f 644 include/bits/freebsd/sys/stdio.h
-f 644 include/bits/freebsd/sys/stdlib.h
-d 755 include/bits/i386
-d 755 include/bits/i386/arch
-f 644 include/bits/i386/arch/cdefs.h
-f 644 include/bits/i386/arch/limits.h
-f 644 include/bits/i386/arch/setjmp.h
-f 644 include/bits/i386/arch/stdlib.h
-f 644 include/bits/i386/arch/string.h
-d 755 include/bits/linux
-d 755 include/bits/linux/amd64
-d 755 include/bits/linux/amd64/arch
-f 644 include/bits/linux/amd64/arch/inttypes.h
-f 644 include/bits/linux/amd64/arch/sigaction.h
-f 644 include/bits/linux/amd64/arch/stdint.h
-f 644 include/bits/linux/amd64/arch/time.h
-d 755 include/bits/linux/arm
-d 755 include/bits/linux/arm/arch
-f 644 include/bits/linux/arm/arch/inttypes.h
-f 644 include/bits/linux/arm/arch/sigaction.h
-f 644 include/bits/linux/arm/arch/stdint.h
-f 644 include/bits/linux/arm/arch/time.h
-d 755 include/bits/linux/arm64
-d 755 include/bits/linux/arm64/arch
-f 644 include/bits/linux/arm64/arch/inttypes.h
-f 644 include/bits/linux/arm64/arch/sigaction.h
-f 644 include/bits/linux/arm64/arch/stdint.h
-f 644 include/bits/linux/arm64/arch/time.h
-d 755 include/bits/linux/i386
-d 755 include/bits/linux/i386/arch
-f 644 include/bits/linux/i386/arch/inttypes.h
-f 644 include/bits/linux/i386/arch/sigaction.h
-f 644 include/bits/linux/i386/arch/stdint.h
-f 644 include/bits/linux/i386/arch/time.h
-d 755 include/bits/linux/ppc
-d 755 include/bits/linux/ppc/arch
-f 644 include/bits/linux/ppc/arch/inttypes.h
-f 644 include/bits/linux/ppc/arch/sigaction.h
-f 644 include/bits/linux/ppc/arch/stdint.h
-f 644 include/bits/linux/ppc/arch/time.h
-d 755 include/bits/linux/sys
-f 644 include/bits/linux/sys.h
-f 644 include/bits/linux/sys/cdefs.h
-f 644 include/bits/linux/sys/errno.h
-f 644 include/bits/linux/sys/signal.h
-f 644 include/bits/linux/sys/stdio.h
-f 644 include/bits/linux/sys/stdlib.h
-d 755 include/bits/netbsd
-d 755 include/bits/netbsd/amd64
-d 755 include/bits/netbsd/amd64/arch
-f 644 include/bits/netbsd/amd64/arch/inttypes.h
-f 644 include/bits/netbsd/amd64/arch/sigaction.h
-f 644 include/bits/netbsd/amd64/arch/stdint.h
-f 644 include/bits/netbsd/amd64/arch/time.h
-d 755 include/bits/netbsd/sys
-f 644 include/bits/netbsd/sys.h
-f 644 include/bits/netbsd/sys/cdefs.h
-f 644 include/bits/netbsd/sys/errno.h
-f 644 include/bits/netbsd/sys/signal.h
-f 644 include/bits/netbsd/sys/stdio.h
-f 644 include/bits/netbsd/sys/stdlib.h
-d 755 include/bits/openbsd
-d 755 include/bits/openbsd/amd64
-d 755 include/bits/openbsd/amd64/arch
-f 644 include/bits/openbsd/amd64/arch/inttypes.h
-f 644 include/bits/openbsd/amd64/arch/sigaction.h
-f 644 include/bits/openbsd/amd64/arch/stdint.h
-f 644 include/bits/openbsd/amd64/arch/time.h
-d 755 include/bits/openbsd/sys
-f 644 include/bits/openbsd/sys.h
-f 644 include/bits/openbsd/sys/cdefs.h
-f 644 include/bits/openbsd/sys/errno.h
-f 644 include/bits/openbsd/sys/signal.h
-f 644 include/bits/openbsd/sys/stdio.h
-f 644 include/bits/openbsd/sys/stdlib.h
-d 755 include/bits/ppc
-d 755 include/bits/ppc/arch
-f 644 include/bits/ppc/arch/cdefs.h
-f 644 include/bits/ppc/arch/limits.h
-f 644 include/bits/ppc/arch/setjmp.h
-f 644 include/bits/ppc/arch/stdlib.h
-f 644 include/bits/ppc/arch/string.h
-d 755 include/bits/z80
-d 755 include/bits/z80/arch
-f 644 include/bits/z80/arch/cdefs.h
-f 644 include/bits/z80/arch/limits.h
-f 644 include/bits/z80/arch/setjmp.h
-f 644 include/bits/z80/arch/stdint.h
-f 644 include/bits/z80/arch/stdlib.h
-f 644 include/bits/z80/arch/string.h
-f 644 include/ctype.h
-f 644 include/errno.h
-f 644 include/float.h
-f 644 include/inttypes.h
-f 644 include/iso646.h
-f 644 include/limits.h
-f 644 include/locale.h
-f 644 include/math.h
-f 644 include/setjmp.h
-f 644 include/signal.h
-f 644 include/stdarg.h
-f 644 include/stdbool.h
-f 644 include/stddef.h
-f 644 include/stdint.h
-f 644 include/stdio.h
-f 644 include/stdlib.h
-f 644 include/string.h
-f 644 include/time.h
-f 644 include/wchar.h
-f 644 include/wctype.h
+d 755 include/scc
+f 644 include/scc/assert.h
+d 755 include/scc/bits
+d 755 include/scc/bits/amd64
+d 755 include/scc/bits/amd64/arch
+f 644 include/scc/bits/amd64/arch/cdefs.h
+f 644 include/scc/bits/amd64/arch/float.h
+f 644 include/scc/bits/amd64/arch/limits.h
+f 644 include/scc/bits/amd64/arch/setjmp.h
+f 644 include/scc/bits/amd64/arch/stdlib.h
+f 644 include/scc/bits/amd64/arch/string.h
+d 755 include/scc/bits/arm
+d 755 include/scc/bits/arm/arch
+f 644 include/scc/bits/arm/arch/cdefs.h
+f 644 include/scc/bits/arm/arch/limits.h
+f 644 include/scc/bits/arm/arch/setjmp.h
+f 644 include/scc/bits/arm/arch/stdlib.h
+f 644 include/scc/bits/arm/arch/string.h
+d 755 include/scc/bits/arm64
+d 755 include/scc/bits/arm64/arch
+f 644 include/scc/bits/arm64/arch/cdefs.h
+f 644 include/scc/bits/arm64/arch/limits.h
+f 644 include/scc/bits/arm64/arch/setjmp.h
+f 644 include/scc/bits/arm64/arch/stdlib.h
+f 644 include/scc/bits/arm64/arch/string.h
+d 755 include/scc/bits/darwin
+d 755 include/scc/bits/darwin/amd64
+d 755 include/scc/bits/darwin/amd64/arch
+f 644 include/scc/bits/darwin/amd64/arch/inttypes.h
+f 644 include/scc/bits/darwin/amd64/arch/sigaction.h
+f 644 include/scc/bits/darwin/amd64/arch/stdint.h
+f 644 include/scc/bits/darwin/amd64/arch/time.h
+d 755 include/scc/bits/darwin/sys
+f 644 include/scc/bits/darwin/sys.h
+f 644 include/scc/bits/darwin/sys/cdefs.h
+f 644 include/scc/bits/darwin/sys/errno.h
+f 644 include/scc/bits/darwin/sys/signal.h
+f 644 include/scc/bits/darwin/sys/stdio.h
+f 644 include/scc/bits/darwin/sys/stdlib.h
+d 755 include/scc/bits/dragonfly
+d 755 include/scc/bits/dragonfly/amd64
+d 755 include/scc/bits/dragonfly/amd64/arch
+f 644 include/scc/bits/dragonfly/amd64/arch/inttypes.h
+f 644 include/scc/bits/dragonfly/amd64/arch/sigaction.h
+f 644 include/scc/bits/dragonfly/amd64/arch/stdint.h
+f 644 include/scc/bits/dragonfly/amd64/arch/time.h
+d 755 include/scc/bits/dragonfly/sys
+f 644 include/scc/bits/dragonfly/sys.h
+f 644 include/scc/bits/dragonfly/sys/cdefs.h
+f 644 include/scc/bits/dragonfly/sys/errno.h
+f 644 include/scc/bits/dragonfly/sys/signal.h
+f 644 include/scc/bits/dragonfly/sys/stdio.h
+f 644 include/scc/bits/dragonfly/sys/stdlib.h
+d 755 include/scc/bits/freebsd
+d 755 include/scc/bits/freebsd/amd64
+d 755 include/scc/bits/freebsd/amd64/arch
+f 644 include/scc/bits/freebsd/amd64/arch/inttypes.h
+f 644 include/scc/bits/freebsd/amd64/arch/sigaction.h
+f 644 include/scc/bits/freebsd/amd64/arch/stdint.h
+f 644 include/scc/bits/freebsd/amd64/arch/time.h
+d 755 include/scc/bits/freebsd/sys
+f 644 include/scc/bits/freebsd/sys.h
+f 644 include/scc/bits/freebsd/sys/cdefs.h
+f 644 include/scc/bits/freebsd/sys/errno.h
+f 644 include/scc/bits/freebsd/sys/signal.h
+f 644 include/scc/bits/freebsd/sys/stdio.h
+f 644 include/scc/bits/freebsd/sys/stdlib.h
+d 755 include/scc/bits/i386
+d 755 include/scc/bits/i386/arch
+f 644 include/scc/bits/i386/arch/cdefs.h
+f 644 include/scc/bits/i386/arch/limits.h
+f 644 include/scc/bits/i386/arch/setjmp.h
+f 644 include/scc/bits/i386/arch/stdlib.h
+f 644 include/scc/bits/i386/arch/string.h
+d 755 include/scc/bits/linux
+d 755 include/scc/bits/linux/amd64
+d 755 include/scc/bits/linux/amd64/arch
+f 644 include/scc/bits/linux/amd64/arch/inttypes.h
+f 644 include/scc/bits/linux/amd64/arch/sigaction.h
+f 644 include/scc/bits/linux/amd64/arch/stdint.h
+f 644 include/scc/bits/linux/amd64/arch/time.h
+d 755 include/scc/bits/linux/arm
+d 755 include/scc/bits/linux/arm/arch
+f 644 include/scc/bits/linux/arm/arch/inttypes.h
+f 644 include/scc/bits/linux/arm/arch/sigaction.h
+f 644 include/scc/bits/linux/arm/arch/stdint.h
+f 644 include/scc/bits/linux/arm/arch/time.h
+d 755 include/scc/bits/linux/arm64
+d 755 include/scc/bits/linux/arm64/arch
+f 644 include/scc/bits/linux/arm64/arch/inttypes.h
+f 644 include/scc/bits/linux/arm64/arch/sigaction.h
+f 644 include/scc/bits/linux/arm64/arch/stdint.h
+f 644 include/scc/bits/linux/arm64/arch/time.h
+d 755 include/scc/bits/linux/i386
+d 755 include/scc/bits/linux/i386/arch
+f 644 include/scc/bits/linux/i386/arch/inttypes.h
+f 644 include/scc/bits/linux/i386/arch/sigaction.h
+f 644 include/scc/bits/linux/i386/arch/stdint.h
+f 644 include/scc/bits/linux/i386/arch/time.h
+d 755 include/scc/bits/linux/ppc
+d 755 include/scc/bits/linux/ppc/arch
+f 644 include/scc/bits/linux/ppc/arch/inttypes.h
+f 644 include/scc/bits/linux/ppc/arch/sigaction.h
+f 644 include/scc/bits/linux/ppc/arch/stdint.h
+f 644 include/scc/bits/linux/ppc/arch/time.h
+d 755 include/scc/bits/linux/sys
+f 644 include/scc/bits/linux/sys.h
+f 644 include/scc/bits/linux/sys/cdefs.h
+f 644 include/scc/bits/linux/sys/errno.h
+f 644 include/scc/bits/linux/sys/signal.h
+f 644 include/scc/bits/linux/sys/stdio.h
+f 644 include/scc/bits/linux/sys/stdlib.h
+d 755 include/scc/bits/netbsd
+d 755 include/scc/bits/netbsd/amd64
+d 755 include/scc/bits/netbsd/amd64/arch
+f 644 include/scc/bits/netbsd/amd64/arch/inttypes.h
+f 644 include/scc/bits/netbsd/amd64/arch/sigaction.h
+f 644 include/scc/bits/netbsd/amd64/arch/stdint.h
+f 644 include/scc/bits/netbsd/amd64/arch/time.h
+d 755 include/scc/bits/netbsd/sys
+f 644 include/scc/bits/netbsd/sys.h
+f 644 include/scc/bits/netbsd/sys/cdefs.h
+f 644 include/scc/bits/netbsd/sys/errno.h
+f 644 include/scc/bits/netbsd/sys/signal.h
+f 644 include/scc/bits/netbsd/sys/stdio.h
+f 644 include/scc/bits/netbsd/sys/stdlib.h
+d 755 include/scc/bits/openbsd
+d 755 include/scc/bits/openbsd/amd64
+d 755 include/scc/bits/openbsd/amd64/arch
+f 644 include/scc/bits/openbsd/amd64/arch/inttypes.h
+f 644 include/scc/bits/openbsd/amd64/arch/sigaction.h
+f 644 include/scc/bits/openbsd/amd64/arch/stdint.h
+f 644 include/scc/bits/openbsd/amd64/arch/time.h
+d 755 include/scc/bits/openbsd/sys
+f 644 include/scc/bits/openbsd/sys.h
+f 644 include/scc/bits/openbsd/sys/cdefs.h
+f 644 include/scc/bits/openbsd/sys/errno.h
+f 644 include/scc/bits/openbsd/sys/signal.h
+f 644 include/scc/bits/openbsd/sys/stdio.h
+f 644 include/scc/bits/openbsd/sys/stdlib.h
+d 755 include/scc/bits/ppc
+d 755 include/scc/bits/ppc/arch
+f 644 include/scc/bits/ppc/arch/cdefs.h
+f 644 include/scc/bits/ppc/arch/limits.h
+f 644 include/scc/bits/ppc/arch/setjmp.h
+f 644 include/scc/bits/ppc/arch/stdlib.h
+f 644 include/scc/bits/ppc/arch/string.h
+d 755 include/scc/bits/z80
+d 755 include/scc/bits/z80/arch
+f 644 include/scc/bits/z80/arch/cdefs.h
+f 644 include/scc/bits/z80/arch/limits.h
+f 644 include/scc/bits/z80/arch/setjmp.h
+f 644 include/scc/bits/z80/arch/stdint.h
+f 644 include/scc/bits/z80/arch/stdlib.h
+f 644 include/scc/bits/z80/arch/string.h
+f 644 include/scc/ctype.h
+f 644 include/scc/errno.h
+f 644 include/scc/float.h
+f 644 include/scc/inttypes.h
+f 644 include/scc/iso646.h
+f 644 include/scc/limits.h
+f 644 include/scc/locale.h
+f 644 include/scc/math.h
+f 644 include/scc/setjmp.h
+f 644 include/scc/signal.h
+f 644 include/scc/stdarg.h
+f 644 include/scc/stdbool.h
+f 644 include/scc/stddef.h
+f 644 include/scc/stdint.h
+f 644 include/scc/stdio.h
+f 644 include/scc/stdlib.h
+f 644 include/scc/string.h
+f 644 include/scc/time.h
+f 644 include/scc/wchar.h
+f 644 include/scc/wctype.h
d 755 libexec
d 755 libexec/scc
f 755 libexec/scc/as-amd64
@@ -200,4 +202,5 @@ f 755 libexec/scc/as-z80
f 755 libexec/scc/cc1
f 755 libexec/scc/cc2-qbe_amd64-sysv
f 755 libexec/scc/cc2-qbe_arm64-sysv
+f 755 libexec/scc/cc2-qbe_riscv64-sysv
f 755 libexec/scc/cc2-z80-scc
(DIR) diff --git a/scripts/rules.mk b/scripts/rules.mk
@@ -12,7 +12,7 @@ include $(PROJECTDIR)/config.mk
# Define helper macros for project directories
DOCDIR = $(PROJECTDIR)/doc
-INCDIR = $(PROJECTDIR)/include
+INCDIR = $(PROJECTDIR)/include/scc
BINDIR = $(PROJECTDIR)/bin
SRCDIR = $(PROJECTDIR)/src
SCRIPTDIR = $(PROJECTDIR)/scripts
(DIR) diff --git a/scripts/update-proto.all b/scripts/update-proto.all
@@ -3,5 +3,5 @@
{
scripts/mkproto bin
scripts/mkproto libexec
- scripts/mkproto include | grep -F -v /scc
+ scripts/mkproto include | grep -F -v bits/scc
} | sort -k 3 > scripts/proto.all
(DIR) diff --git a/src/libc/gcc-scc.sh b/src/libc/gcc-scc.sh
@@ -39,7 +39,7 @@ sys=${sys:-`uname | tr 'A-Z' 'a-z'`}
abi=${abi:-amd64}
out=${out:-a.out}
root=${root:-${SCCPREFIX:-`dirname $0`/..}}
-inc=$root/include
+inc=$root/include/scc
arch_inc=$inc/bits/$abi
sys_inc=$inc/bits/$sys
sys_arch_inc=$inc/bits/$sys/$abi