ARM updates

Due to the ABI we are using we have to use the earm architecture
moniker for the build system to behave correctly. This involves
then some headers to move around.

There is also a few related Makefile updates as well as minor
source code corrections.

diff --git a/common/lib/libc/arch/arm/gen/divsi3.S b/common/lib/libc/arch/arm/gen/divsi3.S
index d93db001bd1144f0b272cb570595e1b83b4eb824..04b1eac3acf98ae91fae2c9c10a52d2edd90e43d 100644 (file)
--- a/common/lib/libc/arch/arm/gen/divsi3.S
+++ b/common/lib/libc/arch/arm/gen/divsi3.S
@@ -22,7 +22,7 @@
  */
 
 .L_overflow:
-#if !defined(_KERNEL) && !defined(_STANDALONE)
+#if !defined(_KERNEL) && !defined(_STANDALONE) && !defined(__minix)
        mov     r0, #8                  /* SIGFPE */
        bl      PIC_SYM(_C_LABEL(raise), PLT)   /* raise it */
        mov     r0, #0

diff --git a/distrib/sets/lists/minix/md.evbarm b/distrib/sets/lists/minix/md.evbarm
new file mode 100644 (file)
index 0000000..85c5eec
--- /dev/null
+++ b/distrib/sets/lists/minix/md.evbarm
@@ -0,0 +1,93 @@
+./boot/minix/.temp/mod07_tty           minix-sys
+./boot/minix/.temp/mod08_mfs           minix-sys
+./boot/minix/.temp/mod09_vm            minix-sys
+./boot/minix/.temp/mod10_pfs           minix-sys
+./boot/minix/.temp/mod11_init          minix-sys
+./multiboot/mod07_tty                  minix-sys
+./multiboot/mod08_mfs                  minix-sys
+./multiboot/mod09_vm                   minix-sys
+./multiboot/mod10_pfs                  minix-sys
+./multiboot/mod11_init                 minix-sys
+./usr/include/arm/aeabi.h              minix-sys
+./usr/include/arm/ansi.h               minix-sys
+./usr/include/arm/arm26                        minix-sys
+./usr/include/arm/arm26/types.h                minix-sys
+./usr/include/arm/arm32                        minix-sys
+./usr/include/arm/arm32/param.h                minix-sys
+./usr/include/arm/arm32/types.h                minix-sys
+./usr/include/arm/arm32/vmparam.h      minix-sys
+./usr/include/arm/asm.h                        minix-sys
+./usr/include/arm/bswap.h              minix-sys
+./usr/include/arm/byte_swap.h          minix-sys
+./usr/include/arm/cdefs.h              minix-sys
+./usr/include/arm/cpu.h                        minix-sys
+./usr/include/arm/disklabel.h          minix-sys
+./usr/include/arm/elf_machdep.h                minix-sys
+./usr/include/arm/endian.h             minix-sys
+./usr/include/arm/endian_machdep.h     minix-sys
+./usr/include/arm/float.h              minix-sys
+./usr/include/arm/ieeefp.h             minix-sys
+./usr/include/arm/ieee.h               minix-sys
+./usr/include/arm/int_const.h          minix-sys
+./usr/include/arm/int_fmtio.h          minix-sys
+./usr/include/arm/int_limits.h         minix-sys
+./usr/include/arm/int_mwgwtypes.h      minix-sys
+./usr/include/arm/int_types.h          minix-sys
+./usr/include/arm/limits.h             minix-sys
+./usr/include/arm/lock.h               minix-sys
+./usr/include/arm/math.h               minix-sys
+./usr/include/arm/mcontext.h           minix-sys
+./usr/include/arm                      minix-sys
+./usr/include/arm/mutex.h              minix-sys
+./usr/include/arm/param.h              minix-sys
+./usr/include/arm/profile.h            minix-sys
+./usr/include/arm/rwlock.h             minix-sys
+./usr/include/arm/setjmp.h             minix-sys
+./usr/include/arm/signal.h             minix-sys
+./usr/include/arm/types.h              minix-sys
+./usr/include/arm/wchar_limits.h       minix-sys
+./usr/include/evbarm/ansi.h            minix-sys
+./usr/include/evbarm/archconst.h       minix-sys
+./usr/include/evbarm/archtypes.h       minix-sys
+./usr/include/evbarm/asm.h             minix-sys
+./usr/include/evbarm/bswap.h           minix-sys
+./usr/include/evbarm/cdefs.h           minix-sys
+./usr/include/evbarm/compat_jmp_buf.h  minix-sys
+./usr/include/evbarm/cpu.h             minix-sys
+./usr/include/evbarm/disklabel.h       minix-sys
+./usr/include/evbarm/diskparm.h                minix-sys
+./usr/include/evbarm/elf.h             minix-sys
+./usr/include/evbarm/elf_machdep.h     minix-sys
+./usr/include/evbarm/endian.h          minix-sys
+./usr/include/evbarm/endian_machdep.h  minix-sys
+./usr/include/evbarm/float.h           minix-sys
+./usr/include/evbarm/ieeefp.h          minix-sys
+./usr/include/evbarm/ieee.h            minix-sys
+./usr/include/evbarm/int_const.h       minix-sys
+./usr/include/evbarm/interrupt.h       minix-sys
+./usr/include/evbarm/int_fmtio.h       minix-sys
+./usr/include/evbarm/int_limits.h      minix-sys
+./usr/include/evbarm/int_mwgwtypes.h   minix-sys
+./usr/include/evbarm/int_types.h       minix-sys
+./usr/include/evbarm/ipcconst.h                minix-sys
+./usr/include/evbarm/limits.h          minix-sys
+./usr/include/evbarm/lock.h            minix-sys
+./usr/include/evbarm/math.h            minix-sys
+./usr/include/evbarm/mcontext.h                minix-sys
+./usr/include/evbarm/memory.h          minix-sys
+./usr/include/evbarm                   minix-sys
+./usr/include/evbarm/multiboot.h       minix-sys
+./usr/include/evbarm/mutex.h           minix-sys
+./usr/include/evbarm/param.h           minix-sys
+./usr/include/evbarm/partition.h       minix-sys
+./usr/include/evbarm/profile.h         minix-sys
+./usr/include/evbarm/rwlock.h          minix-sys
+./usr/include/evbarm/setjmp.h          minix-sys
+./usr/include/evbarm/signal.h          minix-sys
+./usr/include/evbarm/stackframe.h      minix-sys
+./usr/include/evbarm/types.h           minix-sys
+./usr/include/evbarm/vm.h              minix-sys
+./usr/include/evbarm/vmparam.h         minix-sys
+./usr/include/evbarm/wchar_limits.h    minix-sys
+./usr/include/i386                     minix-sys       obsolete
+./usr/mdec                             minix-sys

diff --git a/distrib/sets/lists/minix/md.i386 b/distrib/sets/lists/minix/md.i386
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..b34398cedcc56b2ca2a4ba4285da208c2ffa655a 100644 (file)
--- a/distrib/sets/lists/minix/md.i386
+++ b/distrib/sets/lists/minix/md.i386
@@ -0,0 +1,151 @@
+./boot/minix/.temp/mod07_log           minix-sys
+./boot/minix/.temp/mod08_tty           minix-sys
+./boot/minix/.temp/mod09_mfs           minix-sys
+./boot/minix/.temp/mod10_vm            minix-sys
+./boot/minix/.temp/mod11_pfs           minix-sys
+./boot/minix/.temp/mod12_init          minix-sys
+./etc/system.conf.d/atl2               minix-sys
+./etc/system.conf.d/dec21140A          minix-sys
+./etc/system.conf.d/e1000              minix-sys
+./etc/system.conf.d/fxp                        minix-sys
+./etc/system.conf.d/lance              minix-sys
+./etc/system.conf.d/rtl8139            minix-sys
+./etc/system.conf.d/rtl8169            minix-sys
+./multiboot/mod07_log                  minix-sys
+./multiboot/mod08_tty                  minix-sys
+./multiboot/mod09_mfs                  minix-sys
+./multiboot/mod10_vm                   minix-sys
+./multiboot/mod11_pfs                  minix-sys
+./multiboot/mod12_init                 minix-sys
+./sbin/ahci                            minix-sys
+./sbin/at_wini                         minix-sys
+./sbin/floppy                          minix-sys
+./sbin/hgfs                            minix-sys
+./sbin/readclock.drv                   minix-sys
+./sbin/vbfs                            minix-sys
+./usr/bin/atnormalize                  minix-sys
+./usr/bin/autopart                     minix-sys
+./usr/bin/dosdir                       minix-sys
+./usr/bin/dosread                      minix-sys
+./usr/bin/doswrite                     minix-sys
+./usr/bin/fdisk                                minix-sys
+./usr/bin/loadfont                     minix-sys
+./usr/bin/partition                    minix-sys
+./usr/bin/part                         minix-sys
+./usr/bin/playwave                     minix-sys
+./usr/bin/recwave                      minix-sys
+./usr/bin/repartition                  minix-sys
+./usr/bin/screendump                   minix-sys
+./usr/include/i386                     minix-sys
+./usr/include/i386/ansi.h              minix-sys
+./usr/include/i386/archconst.h         minix-sys
+./usr/include/i386/archtypes.h         minix-sys
+./usr/include/i386/asm.h               minix-sys
+./usr/include/i386/bios.h              minix-sys
+./usr/include/i386/bootinfo.h          minix-sys
+./usr/include/i386/bswap.h             minix-sys
+./usr/include/i386/byte_swap.h         minix-sys
+./usr/include/i386/cdefs.h             minix-sys
+./usr/include/i386/cmos.h              minix-sys
+./usr/include/i386/compat_jmp_buf.h    minix-sys
+./usr/include/i386/cpu.h               minix-sys
+./usr/include/i386/disklabel.h         minix-sys
+./usr/include/i386/diskparm.h          minix-sys
+./usr/include/i386/elf.h               minix-sys
+./usr/include/i386/elf_machdep.h       minix-sys
+./usr/include/i386/endian.h            minix-sys
+./usr/include/i386/endian_machdep.h    minix-sys
+./usr/include/i386/fenv.h              minix-sys
+./usr/include/i386/float.h             minix-sys
+./usr/include/i386/fpu.h               minix-sys
+./usr/include/i386/ieeefp.h            minix-sys
+./usr/include/i386/ieee.h              minix-sys
+./usr/include/i386/int86.h             minix-sys
+./usr/include/i386/int_const.h         minix-sys
+./usr/include/i386/interrupt.h         minix-sys
+./usr/include/i386/int_fmtio.h         minix-sys
+./usr/include/i386/int_limits.h                minix-sys
+./usr/include/i386/int_mwgwtypes.h     minix-sys
+./usr/include/i386/int_types.h         minix-sys
+./usr/include/i386/ipcconst.h          minix-sys
+./usr/include/i386/limits.h            minix-sys
+./usr/include/i386/math.h              minix-sys
+./usr/include/i386/mcontext.h          minix-sys
+./usr/include/i386/memory.h            minix-sys
+./usr/include/i386/multiboot.h         minix-sys
+./usr/include/i386/mutex.h             minix-sys
+./usr/include/i386/npx.h               minix-sys
+./usr/include/i386/param.h             minix-sys
+./usr/include/i386/partition.h         minix-sys
+./usr/include/i386/pci_amd.h           minix-sys
+./usr/include/i386/pci.h               minix-sys
+./usr/include/i386/pci_intel.h         minix-sys
+./usr/include/i386/pci_sis.h           minix-sys
+./usr/include/i386/pci_via.h           minix-sys
+./usr/include/i386/pio.h               minix-sys
+./usr/include/i386/ports.h             minix-sys
+./usr/include/i386/profile.h           minix-sys
+./usr/include/i386/rwlock.h            minix-sys
+./usr/include/i386/setjmp.h            minix-sys
+./usr/include/i386/signal.h            minix-sys
+./usr/include/i386/stackframe.h                minix-sys
+./usr/include/i386/types.h             minix-sys
+./usr/include/i386/vm.h                        minix-sys
+./usr/include/i386/vmparam.h           minix-sys
+./usr/include/i386/wchar_limits.h      minix-sys
+./usr/include/minix/vassert.h          minix-sys
+./usr/include/x86/bootinfo.h           minix-sys
+./usr/include/x86/cpu.h                        minix-sys
+./usr/include/x86/float.h              minix-sys
+./usr/include/x86/ieeefp.h             minix-sys
+./usr/include/x86/ieee.h               minix-sys
+./usr/include/x86/math.h               minix-sys
+./usr/include/x86                      minix-sys
+./usr/include/x86/mutex.h              minix-sys
+./usr/include/x86/pio.h                        minix-sys
+./usr/include/x86/rwlock.h             minix-sys
+./usr/lib/libhgfs.a                    minix-sys
+./usr/lib/libhgfs_pic.a                        minix-sys
+./usr/lib/libm387.a                    minix-sys
+./usr/lib/libm387_pic.a                        minix-sys
+./usr/lib/libm387.so.0.0               minix-sys
+./usr/lib/libm387.so.0                 minix-sys
+./usr/lib/libm387.so                   minix-sys
+./usr/lib/libvassert.a                 minix-sys
+./usr/lib/libvboxfs.a                  minix-sys
+./usr/lib/libvboxfs_pic.a              minix-sys
+./usr/mdec                             minix-sys
+./usr/mdec/boot_monitor                        minix-sys
+./usr/mdec/bootxx_cd9660               minix-sys
+./usr/mdec/bootxx_ext2fs               minix-sys
+./usr/mdec/bootxx_minixfs3             minix-sys
+./usr/mdec/gptmbr.bin                  minix-sys
+./usr/mdec/mbr_bootsel                 minix-sys
+./usr/mdec/mbr_com0_9600               minix-sys
+./usr/mdec/mbr_com0                    minix-sys
+./usr/mdec/mbr_ext                     minix-sys
+./usr/mdec/mbr                         minix-sys
+./usr/sbin/acpi                                minix-sys
+./usr/sbin/amddev                      minix-sys
+./usr/sbin/atl2                                minix-sys
+./usr/sbin/dec21140A                   minix-sys
+./usr/sbin/dp8390                      minix-sys
+./usr/sbin/dpeth                       minix-sys
+./usr/sbin/e1000                       minix-sys
+./usr/sbin/es1370                      minix-sys
+./usr/sbin/es1371                      minix-sys
+./usr/sbin/fbd                         minix-sys
+./usr/sbin/filter                      minix-sys
+./usr/sbin/fxp                         minix-sys
+./usr/sbin/hello                       minix-sys
+./usr/sbin/lance                       minix-sys
+./usr/sbin/log                         minix-sys
+./usr/sbin/orinoco                     minix-sys
+./usr/sbin/pci                         minix-sys
+./usr/sbin/printer                     minix-sys
+./usr/sbin/random                      minix-sys
+./usr/sbin/rtl8139                     minix-sys
+./usr/sbin/rtl8169                     minix-sys
+./usr/sbin/sb16                                minix-sys
+./usr/sbin/ti1225                      minix-sys
+./usr/sbin/vbox                                minix-sys

diff --git a/distrib/sets/lists/minix/mi b/distrib/sets/lists/minix/mi
index 80bc074463fc6851956071b104607dab74b0f558..85a52019a09d4b7dfeec42863748ac1fc02027d4 100644 (file)
--- a/distrib/sets/lists/minix/mi
+++ b/distrib/sets/lists/minix/mi
@@ -1,5 +1,3 @@
-
-
 ./bin/cat                              minix-sys
 ./bin/cd                               minix-sys
 ./bin/chmod                            minix-sys
@@ -62,12 +60,6 @@
 ./boot/minix/.temp/mod04_sched         minix-sys
 ./boot/minix/.temp/mod05_vfs           minix-sys
 ./boot/minix/.temp/mod06_memory                minix-sys
-./boot/minix/.temp/mod07_log           minix-sys
-./boot/minix/.temp/mod08_tty           minix-sys
-./boot/minix/.temp/mod09_mfs           minix-sys
-./boot/minix/.temp/mod10_vm            minix-sys
-./boot/minix/.temp/mod11_pfs           minix-sys
-./boot/minix/.temp/mod12_init          minix-sys
 ./dev                                  minix-sys
 ./dev/mouse                            minix-sys
 ./etc/boot.cfg.default                 minix-sys
@@ -107,15 +99,8 @@
 ./etc/shells                           minix-sys
 ./etc/spwd.db                          minix-sys
 ./etc/syslog.conf                      minix-sys
-./etc/system.conf.d/atl2               minix-sys
-./etc/system.conf.d/dec21140A          minix-sys
-./etc/system.conf.d/e1000              minix-sys
-./etc/system.conf.d/fxp                        minix-sys
 ./etc/system.conf.d/ipc                        minix-sys
-./etc/system.conf.d/lance              minix-sys
 ./etc/system.conf.d                    minix-sys
-./etc/system.conf.d/rtl8139            minix-sys
-./etc/system.conf.d/rtl8169            minix-sys
 ./etc/system.conf                      minix-sys
 ./etc/termcap                          minix-sys
 ./etc/ttys                             minix-sys
@@ -136,27 +121,17 @@
 ./multiboot/mod04_sched                        minix-sys
 ./multiboot/mod05_vfs                  minix-sys
 ./multiboot/mod06_memory               minix-sys
-./multiboot/mod07_log                  minix-sys
-./multiboot/mod08_tty                  minix-sys
-./multiboot/mod09_mfs                  minix-sys
-./multiboot/mod10_vm                   minix-sys
-./multiboot/mod11_pfs                  minix-sys
-./multiboot/mod12_init                 minix-sys
 ./proc                                 minix-sys
 ./root/.ashrc                          minix-sys
 ./root/.exrc                           minix-sys
 ./root                                 minix-sys
 ./root/.profile                                minix-sys
-./sbin/ahci                            minix-sys
-./sbin/at_wini                         minix-sys
 ./sbin/devman                          minix-sys
 ./sbin/ext2                            minix-sys
-./sbin/floppy                          minix-sys
 ./sbin/fsck_ext2fs                     minix-sys
 ./sbin/fsck.ext2                       minix-sys
 ./sbin/fsck.mfs                                minix-sys
 ./sbin/fsck                            minix-sys
-./sbin/hgfs                            minix-sys
 ./sbin/is                              minix-sys
 ./sbin/isofs                           minix-sys
 ./sbin/mfs                             minix-sys
@@ -167,8 +142,6 @@
 ./sbin/newfs_ext2fs                    minix-sys
 ./sbin/newfs_ext2                      minix-sys
 ./sbin/procfs                          minix-sys
-./sbin/readclock.drv                   minix-sys
-./sbin/vbfs                            minix-sys
 ./sys                                  minix-sys
 ./tmp                                  minix-sys
 ./usr/adm                              minix-sys
@@ -184,8 +157,6 @@
 ./usr/bin/arch                         minix-sys
 ./usr/bin/arp                          minix-sys
 ./usr/bin/at                           minix-sys
-./usr/bin/atnormalize                  minix-sys
-./usr/bin/autopart                     minix-sys
 ./usr/bin/awk                          minix-sys
 ./usr/bin/backup                       minix-sys
 ./usr/bin/badblocks                    minix-sys       obsolete
@@ -239,9 +210,6 @@
 ./usr/bin/diff                         minix-sys
 ./usr/bin/dirname                      minix-sys
 ./usr/bin/diskctl                      minix-sys
-./usr/bin/dosdir                       minix-sys
-./usr/bin/dosread                      minix-sys
-./usr/bin/doswrite                     minix-sys
 ./usr/bin/du                           minix-sys
 ./usr/bin/dumpcore                     minix-sys
 ./usr/bin/egrep                                minix-sys
@@ -254,7 +222,6 @@
 ./usr/bin/expand                       minix-sys
 ./usr/bin/factor                       minix-sys
 ./usr/bin/fbdctl                       minix-sys
-./usr/bin/fdisk                                minix-sys
 ./usr/bin/fetch                                minix-sys
 ./usr/bin/fgrep                                minix-sys
 ./usr/bin/file                         minix-sys
@@ -305,7 +272,6 @@
 ./usr/bin/lesskey                      minix-sys
 ./usr/bin/less                         minix-sys
 ./usr/bin/lex                          minix-sys
-./usr/bin/loadfont                     minix-sys
 ./usr/bin/loadramdisk                  minix-sys
 ./usr/bin/logger                       minix-sys
 ./usr/bin/login                                minix-sys
@@ -343,15 +309,12 @@
 ./usr/bin/nroff                                minix-sys
 ./usr/bin/od                           minix-sys
 ./usr/bin/page                         minix-sys
-./usr/bin/partition                    minix-sys
-./usr/bin/part                         minix-sys
 ./usr/bin/passwd                       minix-sys
 ./usr/bin/paste                                minix-sys
 ./usr/bin/patch                                minix-sys
 ./usr/bin/pax                          minix-sys       obsolete
 ./usr/bin/ping                         minix-sys
 ./usr/bin/pkgin_cd                     minix-sys
-./usr/bin/playwave                     minix-sys
 ./usr/bin/postinstall                  minix-sys
 ./usr/bin/poweroff                     minix-sys
 ./usr/bin/prep                         minix-sys
@@ -370,10 +333,8 @@
 ./usr/bin/readall                      minix-sys       obsolete
 ./usr/bin/readlink                     minix-sys
 ./usr/bin/reboot                       minix-sys
-./usr/bin/recwave                      minix-sys
 ./usr/bin/ref                          minix-sys
 ./usr/bin/remsync                      minix-sys
-./usr/bin/repartition                  minix-sys
 ./usr/bin/restore                      minix-sys
 ./usr/bin/rev                          minix-sys
 ./usr/bin/rget                         minix-sys
@@ -383,7 +344,6 @@
 ./usr/bin/rput                         minix-sys
 ./usr/bin/rsh                          minix-sys
 ./usr/bin/rz                           minix-sys
-./usr/bin/screendump                   minix-sys
 ./usr/bin/sed                          minix-sys
 ./usr/bin/seq                          minix-sys
 ./usr/bin/sha1                         minix-sys
@@ -518,746 +478,668 @@
 ./usr/include/ddekit/timer.h           minix-sys
 ./usr/include/ddekit/types.h           minix-sys
 ./usr/include/ddekit/usb.h             minix-sys
-./usr/include/dirent.h                                 minix-sys
-./usr/include/disktab.h                                        minix-sys
-./usr/include/dlfcn.h                                  minix-sys
-./usr/include/elfdefinitions.h                         minix-sys
+./usr/include/dirent.h                 minix-sys
+./usr/include/disktab.h                        minix-sys
+./usr/include/dlfcn.h                  minix-sys
+./usr/include/elfdefinitions.h         minix-sys
 ./usr/include/elf.h                    minix-sys
-./usr/include/env.h                                    minix-sys
-./usr/include/err.h                                    minix-sys
-./usr/include/errno.h                                  minix-sys
-./usr/include/fcntl.h                                  minix-sys
-./usr/include/fenv.h                                   minix-sys
-./usr/include/fetch.h                                  minix-sys
-./usr/include/float.h                                  minix-sys
-./usr/include/fmtmsg.h                                 minix-sys
-./usr/include/fnmatch.h                                        minix-sys
-./usr/include/fstab.h                                  minix-sys
-./usr/include/fts.h                                    minix-sys
-./usr/include/ftw.h                                    minix-sys
-./usr/include/fuse.h                                   minix-sys
-./usr/include/fuse_opt.h                               minix-sys
-./usr/include/gelf.h                                   minix-sys
-./usr/include/getopt.h                                 minix-sys
-./usr/include/g++/FlexLexer.h                          minix-sys
-./usr/include/glob.h                                   minix-sys
-./usr/include/g++                                      minix-sys
-./usr/include/grp.h                                    minix-sys
-./usr/include/hesiod.h                                 minix-sys
-./usr/include/i386/ansi.h                                      minix-sys
-./usr/include/i386/archconst.h                                 minix-sys
-./usr/include/i386/archtypes.h                                 minix-sys
-./usr/include/i386/asm.h                                       minix-sys
-./usr/include/i386/bios.h                                      minix-sys
-./usr/include/i386/bootinfo.h                  minix-sys
-./usr/include/i386/bswap.h                                     minix-sys
-./usr/include/i386/byte_swap.h                                 minix-sys
-./usr/include/i386/cdefs.h                                     minix-sys
-./usr/include/i386/cmos.h                                      minix-sys
-./usr/include/i386/compat_jmp_buf.h                                    minix-sys
-./usr/include/i386/cpu.h                                       minix-sys
-./usr/include/i386/disklabel.h                                 minix-sys
-./usr/include/i386/diskparm.h                                  minix-sys
-./usr/include/i386/elf.h                                       minix-sys
-./usr/include/i386/elf_machdep.h                                       minix-sys
-./usr/include/i386/endian.h                                    minix-sys
-./usr/include/i386/endian_machdep.h                                    minix-sys
-./usr/include/i386/fenv.h                                      minix-sys
-./usr/include/i386/float.h                                     minix-sys
-./usr/include/i386/fpu.h                                       minix-sys
-./usr/include/i386/ieeefp.h                                    minix-sys
-./usr/include/i386/ieee.h                                      minix-sys
-./usr/include/i386/int86.h                                     minix-sys
-./usr/include/i386/int_const.h                                 minix-sys
-./usr/include/i386/interrupt.h                                 minix-sys
-./usr/include/i386/int_fmtio.h                                 minix-sys
-./usr/include/i386/int_limits.h                                        minix-sys
-./usr/include/i386/int_mwgwtypes.h                                     minix-sys
-./usr/include/i386/int_types.h                                 minix-sys
-./usr/include/i386/ipcconst.h                                  minix-sys
-./usr/include/i386/limits.h                                    minix-sys
-./usr/include/i386/math.h                                      minix-sys
-./usr/include/i386/mcontext.h                                  minix-sys
-./usr/include/i386/memory.h                                    minix-sys
-./usr/include/i386                                     minix-sys
-./usr/include/i386/multiboot.h                                 minix-sys
-./usr/include/i386/mutex.h                                     minix-sys
-./usr/include/i386/npx.h                                       minix-sys
-./usr/include/i386/param.h                                     minix-sys
-./usr/include/i386/partition.h                                 minix-sys
-./usr/include/i386/pci_amd.h                                   minix-sys
-./usr/include/i386/pci.h                                       minix-sys
-./usr/include/i386/pci_intel.h                                 minix-sys
-./usr/include/i386/pci_sis.h                                   minix-sys
-./usr/include/i386/pci_via.h                                   minix-sys
-./usr/include/i386/pio.h                       minix-sys
-./usr/include/i386/ports.h                                     minix-sys
-./usr/include/i386/profile.h                                   minix-sys
-./usr/include/i386/rwlock.h                    minix-sys
-./usr/include/i386/setjmp.h                                    minix-sys
-./usr/include/i386/signal.h                                    minix-sys
-./usr/include/i386/stackframe.h                                        minix-sys
-./usr/include/i386/stdarg.h                                    minix-sys       obsolete
-./usr/include/i386/types.h                                     minix-sys
-./usr/include/i386/vm.h                                        minix-sys
-./usr/include/i386/vmparam.h                                   minix-sys
-./usr/include/i386/wchar_limits.h                                      minix-sys
-./usr/include/iconv.h                                  minix-sys
-./usr/include/ieeefp.h                                 minix-sys
-./usr/include/ifaddrs.h                                        minix-sys
-./usr/include/inttypes.h                                       minix-sys
-./usr/include/iso646.h                                 minix-sys
-./usr/include/langinfo.h                                       minix-sys
-./usr/include/libelf.h                                 minix-sys
-./usr/include/libexec.h                                        minix-sys
-./usr/include/libgen.h                                 minix-sys
-./usr/include/lib.h                                    minix-sys
-./usr/include/libutil.h                                        minix-sys
-./usr/include/limits.h                                 minix-sys
-./usr/include/link_aout.h                                      minix-sys
-./usr/include/link_elf.h                                       minix-sys
-./usr/include/link.h                                   minix-sys
-./usr/include/locale.h                                 minix-sys
-./usr/include/login_cap.h                                      minix-sys
+./usr/include/env.h                    minix-sys
+./usr/include/err.h                    minix-sys
+./usr/include/errno.h                  minix-sys
+./usr/include/fcntl.h                  minix-sys
+./usr/include/fenv.h                   minix-sys
+./usr/include/fetch.h                  minix-sys
+./usr/include/float.h                  minix-sys
+./usr/include/fmtmsg.h                 minix-sys
+./usr/include/fnmatch.h                        minix-sys
+./usr/include/fstab.h                  minix-sys
+./usr/include/fts.h                    minix-sys
+./usr/include/ftw.h                    minix-sys
+./usr/include/fuse.h                   minix-sys
+./usr/include/fuse_opt.h               minix-sys
+./usr/include/gelf.h                   minix-sys
+./usr/include/getopt.h                 minix-sys
+./usr/include/g++/FlexLexer.h          minix-sys
+./usr/include/glob.h                   minix-sys
+./usr/include/g++                      minix-sys
+./usr/include/grp.h                    minix-sys
+./usr/include/hesiod.h                 minix-sys
+./usr/include/iconv.h                  minix-sys
+./usr/include/ieeefp.h                 minix-sys
+./usr/include/ifaddrs.h                        minix-sys
+./usr/include/inttypes.h               minix-sys
+./usr/include/iso646.h                 minix-sys
+./usr/include/langinfo.h               minix-sys
+./usr/include/libelf.h                 minix-sys
+./usr/include/libexec.h                        minix-sys
+./usr/include/libgen.h                 minix-sys
+./usr/include/lib.h                    minix-sys
+./usr/include/libutil.h                        minix-sys
+./usr/include/limits.h                 minix-sys
+./usr/include/link_aout.h              minix-sys
+./usr/include/link_elf.h               minix-sys
+./usr/include/link.h                   minix-sys
+./usr/include/locale.h                 minix-sys
+./usr/include/login_cap.h              minix-sys
 ./usr/include/lwp.h                    minix-sys
-./usr/include/lzma/base.h                                      minix-sys
-./usr/include/lzma/bcj.h                                       minix-sys
-./usr/include/lzma/block.h                                     minix-sys
-./usr/include/lzma/check.h                                     minix-sys
-./usr/include/lzma/container.h                                 minix-sys
-./usr/include/lzma/delta.h                                     minix-sys
-./usr/include/lzma/filter.h                                    minix-sys
-./usr/include/lzma/hardware.h                                  minix-sys
-./usr/include/lzma.h                                   minix-sys
-./usr/include/lzma/index_hash.h                                        minix-sys
-./usr/include/lzma/index.h                                     minix-sys
-./usr/include/lzma/lzma.h                                      minix-sys
-./usr/include/lzma                                     minix-sys
-./usr/include/lzma/stream_flags.h                                      minix-sys
-./usr/include/lzma/version.h                                   minix-sys
-./usr/include/lzma/vli.h                                       minix-sys
-./usr/include/machine                                  minix-sys
-./usr/include/magic.h                                  minix-sys
-./usr/include/malloc.h                                 minix-sys
-./usr/include/math.h                                   minix-sys
-./usr/include/md2.h                                    minix-sys
-./usr/include/md4.h                                    minix-sys
-./usr/include/md5.h                                    minix-sys
-./usr/include/memory.h                                 minix-sys
-./usr/include/minix/acpi.h                                     minix-sys
-./usr/include/minix/audio_fw.h                                 minix-sys
-./usr/include/minix/bdev.h                                     minix-sys
-./usr/include/minix/bitmap.h                                   minix-sys
-./usr/include/minix/blockdriver.h                                      minix-sys
-./usr/include/minix/blockdriver_mt.h                                   minix-sys
-./usr/include/minix/btrace.h                                   minix-sys
-./usr/include/minix/callnr.h                                   minix-sys
-./usr/include/minix/chardriver.h                                       minix-sys
-./usr/include/minix/com.h                                      minix-sys
-./usr/include/minix/compiler.h                                 minix-sys
-./usr/include/minix/config.h                                   minix-sys
-./usr/include/minix/const.h                                    minix-sys
-./usr/include/minix/cpufeature.h                                       minix-sys
-./usr/include/minix/crtso.h                                    minix-sys
-./usr/include/minix/debug.h                                    minix-sys
-./usr/include/minix/devio.h                                    minix-sys
-./usr/include/minix/devman.h                                   minix-sys
-./usr/include/minix/dirent.h                                   minix-sys
-./usr/include/minix/dmap.h                                     minix-sys
-./usr/include/minix/driver.h                                   minix-sys
-./usr/include/minix/drivers.h                                  minix-sys
-./usr/include/minix/drvlib.h                                   minix-sys
-./usr/include/minix/ds.h                                       minix-sys
-./usr/include/minix/endpoint.h                                 minix-sys
-./usr/include/minix/fslib.h                                    minix-sys
-./usr/include/minix/gcov.h                                     minix-sys
-./usr/include/minix/hash.h                                     minix-sys
-./usr/include/minix/hgfs.h                                     minix-sys
-./usr/include/minix/input.h                                    minix-sys
-./usr/include/minix/ioctl.h                                    minix-sys
-./usr/include/minix/ipcconst.h                                 minix-sys
-./usr/include/minix/ipc.h                                      minix-sys
-./usr/include/minix/keymap.h                                   minix-sys
-./usr/include/minix/libminixfs.h                                       minix-sys
-./usr/include/minix/limits.h                                   minix-sys
-./usr/include/minix                                    minix-sys
-./usr/include/minix/minlib.h                                   minix-sys
-./usr/include/minix/mount.h                                    minix-sys
-./usr/include/minix/mthread.h                                  minix-sys
-./usr/include/minix/netdriver.h                                        minix-sys
-./usr/include/minix/netsock.h                                  minix-sys
-./usr/include/minix/optset.h                                   minix-sys
-./usr/include/minix/param.h                                    minix-sys
-./usr/include/minix/partition.h                                        minix-sys
-./usr/include/minix/paths.h                                    minix-sys
-./usr/include/minix/portio.h                                   minix-sys
-./usr/include/minix/priv.h                                     minix-sys
-./usr/include/minix/procfs.h                                   minix-sys
-./usr/include/minix/profile.h                                  minix-sys
-./usr/include/minix/queryparam.h                                       minix-sys
-./usr/include/minix/rs.h                                       minix-sys
-./usr/include/minix/safecopies.h                                       minix-sys
-./usr/include/minix/sched.h                                    minix-sys
-./usr/include/minix/sef.h                                      minix-sys
-./usr/include/minix/sffs.h                                     minix-sys
-./usr/include/minix/sound.h                                    minix-sys
-./usr/include/minix/spin.h                                     minix-sys
-./usr/include                                  minix-sys
-./usr/include/minix/sys_config.h                                       minix-sys
-./usr/include/minix/sysinfo.h                                  minix-sys
-./usr/include/minix/syslib.h                                   minix-sys
-./usr/include/minix/sysutil.h                                  minix-sys
-./usr/include/minix/termios.h                                  minix-sys
-./usr/include/minix/timers.h                                   minix-sys
-./usr/include/minix/tty.h                                      minix-sys
-./usr/include/minix/type.h                                     minix-sys
-./usr/include/minix/types.h                                    minix-sys       obsolete
-./usr/include/minix/u64.h                                      minix-sys
-./usr/include/minix/usb_ch9.h                                  minix-sys
-./usr/include/minix/usb.h                                      minix-sys
-./usr/include/minix/vassert.h                                  minix-sys
-./usr/include/minix/vboxfs.h                                   minix-sys
-./usr/include/minix/vbox.h                                     minix-sys
-./usr/include/minix/vboxif.h                                   minix-sys
-./usr/include/minix/vboxtype.h                                 minix-sys
-./usr/include/minix/vfsif.h                                    minix-sys
-./usr/include/minix/vm.h                                       minix-sys
-./usr/include/minix/vtreefs.h                                  minix-sys
-./usr/include/mntopts.h                                        minix-sys
-./usr/include/monetary.h                                       minix-sys
-./usr/include/mpool.h                                  minix-sys
-./usr/include/mqueue.h                                 minix-sys
-./usr/include/ndbm.h                                   minix-sys
-./usr/include/netconfig.h                                      minix-sys
-./usr/include/netdb.h                                  minix-sys
-./usr/include/net/ethertypes.h                                 minix-sys
-./usr/include/net/gen/arp_io.h                                 minix-sys
-./usr/include/net/gen/dhcp.h                                   minix-sys
-./usr/include/net/gen/ether.h                                  minix-sys
-./usr/include/net/gen/eth_hdr.h                                        minix-sys
-./usr/include/net/gen/eth_io.h                                 minix-sys
-./usr/include/net/gen/icmp_hdr.h                                       minix-sys
-./usr/include/net/gen/icmp.h                                   minix-sys
-./usr/include/net/gen/if_ether.h                                       minix-sys
-./usr/include/net/gen/inet.h                                   minix-sys
-./usr/include/net/gen/in.h                                     minix-sys
-./usr/include/net/gen/ip_hdr.h                                 minix-sys
-./usr/include/net/gen/ip_io.h                                  minix-sys
-./usr/include/net/gen                                  minix-sys
-./usr/include/net/gen/nameser.h                                        minix-sys
-./usr/include/net/gen/netdb.h                                  minix-sys
-./usr/include/net/gen/oneCsum.h                                        minix-sys
-./usr/include/net/gen/psip_hdr.h                                       minix-sys
-./usr/include/net/gen/psip_io.h                                        minix-sys
-./usr/include/net/gen/resolv.h                                 minix-sys
-./usr/include/net/gen/rip.h                                    minix-sys
-./usr/include/net/gen/route.h                                  minix-sys
-./usr/include/net/gen/socket.h                                 minix-sys
-./usr/include/net/gen/tcp_hdr.h                                        minix-sys
-./usr/include/net/gen/tcp.h                                    minix-sys
-./usr/include/net/gen/tcp_io.h                                 minix-sys
-./usr/include/net/gen/udp_hdr.h                                        minix-sys
-./usr/include/net/gen/udp.h                                    minix-sys
-./usr/include/net/gen/udp_io_hdr.h                                     minix-sys
-./usr/include/net/gen/udp_io.h                                 minix-sys
-./usr/include/net/gen/vjhc.h                                   minix-sys
-./usr/include/netgroup.h                                       minix-sys
-./usr/include/net/hton.h                                       minix-sys
-./usr/include/net/if_ether.h                                   minix-sys
-./usr/include/net/if.h                                 minix-sys
-./usr/include/netinet6/in6.h                           minix-sys
-./usr/include/netinet6                                 minix-sys
-./usr/include/netinet/in.h                             minix-sys
-./usr/include/netinet                                  minix-sys
-./usr/include/netinet/tcp.h                            minix-sys
-./usr/include/net                                      minix-sys
-./usr/include/net/netlib.h                             minix-sys
-./usr/include/nlist.h                                  minix-sys
-./usr/include/nl_types.h                               minix-sys
-./usr/include/nsswitch.h                               minix-sys
-./usr/include/objc                                     minix-sys       obsolete
-./usr/include/paths.h                                  minix-sys
-./usr/include/poll.h                                   minix-sys
-./usr/include/prop                                     minix-sys
-./usr/include/prop/plistref.h                          minix-sys
-./usr/include/prop/prop_array.h                                minix-sys
-./usr/include/prop/prop_bool.h                         minix-sys
-./usr/include/prop/prop_data.h                         minix-sys
-./usr/include/prop/prop_dictionary.h                   minix-sys
-./usr/include/prop/prop_ingest.h                       minix-sys
-./usr/include/prop/proplib.h                           minix-sys
-./usr/include/prop/prop_number.h                       minix-sys
-./usr/include/prop/prop_object.h                       minix-sys
-./usr/include/prop/prop_string.h                       minix-sys
-./usr/include/protocols/dumprestore.h                  minix-sys
-./usr/include/protocols                                        minix-sys
-./usr/include/protocols/routed.h                       minix-sys
-./usr/include/protocols/rwhod.h                                minix-sys
-./usr/include/protocols/talkd.h                                minix-sys
-./usr/include/protocols/timed.h                                minix-sys
-./usr/include/puffs.h                                  minix-sys
-./usr/include/puffs_msgif.h                            minix-sys
-./usr/include/pwd.h                                    minix-sys
-./usr/include/randomid.h                                       minix-sys
-./usr/include/ranlib.h                                 minix-sys
-./usr/include/re_comp.h                                        minix-sys
-./usr/include/regex.h                                  minix-sys
-./usr/include/regexp.h                                 minix-sys
-./usr/include/resolv.h                                 minix-sys
-./usr/include/res_update.h                                     minix-sys
-./usr/include/rmd160.h                                 minix-sys
-./usr/include/rmt.h                                    minix-sys
-./usr/include/rpcsvc                                   minix-sys
-./usr/include/rpcsvc/ypclnt.h                                  minix-sys
-./usr/include/rpcsvc/yp_prot.h                                 minix-sys
-./usr/include/sched.h                                  minix-sys
-./usr/include/search.h                                 minix-sys
-./usr/include/semaphore.h                                      minix-sys
-./usr/include/setjmp.h                                 minix-sys
-./usr/include/sgtty.h                                  minix-sys
-./usr/include/sha1.h                                   minix-sys
-./usr/include/sha2.h                                   minix-sys
-./usr/include/signal.h                                 minix-sys
-./usr/include/ssp                                      minix-sys
-./usr/include/ssp/ssp.h                                        minix-sys
-./usr/include/ssp/stdio.h                                      minix-sys
-./usr/include/ssp/string.h                                     minix-sys
-./usr/include/ssp/strings.h                                    minix-sys
-./usr/include/ssp/unistd.h                                     minix-sys
-./usr/include/stab.h                                   minix-sys
-./usr/include/stdarg.h                                 minix-sys
-./usr/include/stdbool.h                                        minix-sys
-./usr/include/stddef.h                                 minix-sys
-./usr/include/stdint.h                                 minix-sys
-./usr/include/stdio.h                                  minix-sys
-./usr/include/stdlib.h                                 minix-sys
-./usr/include/string.h                                 minix-sys
-./usr/include/stringlist.h                                     minix-sys
-./usr/include/strings.h                                        minix-sys
-./usr/include/struct.h                                 minix-sys
-./usr/include/sys/ansi.h                                       minix-sys
-./usr/include/sys/asynchio.h                                   minix-sys
-./usr/include/sys/atomic.h                                     minix-sys
-./usr/include/sys/bitops.h                                     minix-sys
-./usr/include/sys/bootblock.h                                  minix-sys
-./usr/include/sys/bswap.h                                      minix-sys
-./usr/include/sys/cdefs_aout.h                                 minix-sys
-./usr/include/sys/cdefs_elf.h                                  minix-sys
-./usr/include/sys/cdefs.h                                      minix-sys
-./usr/include/sys/condvar.h                    minix-sys
-./usr/include/sys/ctype_bits.h                                 minix-sys
-./usr/include/sys/ctype_inline.h                                       minix-sys
-./usr/include/sys/dirent.h                                     minix-sys
-./usr/include/sys/disk.h                                       minix-sys
-./usr/include/sys/disklabel_gpt.h                                      minix-sys
-./usr/include/sys/disklabel.h                                  minix-sys
-./usr/include/sys/dkbad.h                                      minix-sys
-./usr/include/sys/dkio.h                                       minix-sys
-./usr/include/sys/elf64.h                                      minix-sys
-./usr/include/sys/elf_common.h                                 minix-sys
-./usr/include/sys/elf_core.h                                   minix-sys
-./usr/include/sys/elf_generic.h                                        minix-sys
-./usr/include/sys/endian.h                                     minix-sys
-./usr/include/sys/errno.h                                      minix-sys
-./usr/include/sys/exec_elf.h                                   minix-sys
-./usr/include/sys/exec.h                                       minix-sys
-./usr/include/sysexits.h                                       minix-sys
-./usr/include/sys/extattr.h                                    minix-sys
-./usr/include/sys/fcntl.h                                      minix-sys
-./usr/include/sys/fd_set.h                                     minix-sys
-./usr/include/sys/featuretest.h                                        minix-sys
-./usr/include/sys/file.h                                       minix-sys
-./usr/include/sys/float_ieee754.h                                      minix-sys
-./usr/include/sys/fstypes.h                    minix-sys
-./usr/include/sys/gcq.h                                        minix-sys
-./usr/include/sys/gmon.h                                       minix-sys
-./usr/include/sys/hash.h                                       minix-sys
-./usr/include/sys/ieee754.h                                    minix-sys
-./usr/include/sys/inttypes.h                                   minix-sys
-./usr/include/sys/ioc_block.h                                  minix-sys
-./usr/include/sys/ioccom.h                                     minix-sys
-./usr/include/sys/ioc_disk.h                                   minix-sys
-./usr/include/sys/ioc_fbd.h                                    minix-sys
-./usr/include/sys/ioc_file.h                                   minix-sys
-./usr/include/sys/ioc_memory.h                                 minix-sys
-./usr/include/sys/ioc_net.h                                    minix-sys
-./usr/include/sys/ioc_sound.h                                  minix-sys
-./usr/include/sys/ioc_tape.h                                   minix-sys
-./usr/include/sys/ioctl.h                                      minix-sys
-./usr/include/sys/ioc_tty.h                                    minix-sys
-./usr/include/sys/iostat.h                                     minix-sys
-./usr/include/sys/ipc.h                                        minix-sys
-./usr/include/sys/jmp_buf.h                                    minix-sys
-./usr/include/sys/kbdio.h                                      minix-sys
-./usr/include/sys/localedef.h                                  minix-sys
-./usr/include/sys/lock.h                                       minix-sys
-./usr/include/syslog.h                                 minix-sys
+./usr/include/lzma/base.h              minix-sys
+./usr/include/lzma/bcj.h               minix-sys
+./usr/include/lzma/block.h             minix-sys
+./usr/include/lzma/check.h             minix-sys
+./usr/include/lzma/container.h         minix-sys
+./usr/include/lzma/delta.h             minix-sys
+./usr/include/lzma/filter.h            minix-sys
+./usr/include/lzma/hardware.h          minix-sys
+./usr/include/lzma.h                   minix-sys
+./usr/include/lzma/index_hash.h                minix-sys
+./usr/include/lzma/index.h             minix-sys
+./usr/include/lzma/lzma.h              minix-sys
+./usr/include/lzma                     minix-sys
+./usr/include/lzma/stream_flags.h      minix-sys
+./usr/include/lzma/version.h           minix-sys
+./usr/include/lzma/vli.h               minix-sys
+./usr/include/machine                  minix-sys
+./usr/include/magic.h                  minix-sys
+./usr/include/malloc.h                 minix-sys
+./usr/include/math.h                   minix-sys
+./usr/include/md2.h                    minix-sys
+./usr/include/md4.h                    minix-sys
+./usr/include/md5.h                    minix-sys
+./usr/include/memory.h                 minix-sys
+./usr/include/minix/acpi.h             minix-sys
+./usr/include/minix/audio_fw.h         minix-sys
+./usr/include/minix/bdev.h             minix-sys
+./usr/include/minix/bitmap.h           minix-sys
+./usr/include/minix/blockdriver.h      minix-sys
+./usr/include/minix/blockdriver_mt.h   minix-sys
+./usr/include/minix/btrace.h           minix-sys
+./usr/include/minix/callnr.h           minix-sys
+./usr/include/minix/chardriver.h       minix-sys
+./usr/include/minix/com.h              minix-sys
+./usr/include/minix/compiler.h         minix-sys
+./usr/include/minix/config.h           minix-sys
+./usr/include/minix/const.h            minix-sys
+./usr/include/minix/cpufeature.h       minix-sys
+./usr/include/minix/crtso.h            minix-sys
+./usr/include/minix/debug.h            minix-sys
+./usr/include/minix/devio.h            minix-sys
+./usr/include/minix/devman.h           minix-sys
+./usr/include/minix/dirent.h           minix-sys
+./usr/include/minix/dmap.h             minix-sys
+./usr/include/minix/driver.h           minix-sys
+./usr/include/minix/drivers.h          minix-sys
+./usr/include/minix/drvlib.h           minix-sys
+./usr/include/minix/ds.h               minix-sys
+./usr/include/minix/endpoint.h         minix-sys
+./usr/include/minix/fslib.h            minix-sys
+./usr/include/minix/gcov.h             minix-sys
+./usr/include/minix/hash.h             minix-sys
+./usr/include/minix/hgfs.h             minix-sys
+./usr/include/minix/input.h            minix-sys
+./usr/include/minix/ioctl.h            minix-sys
+./usr/include/minix/ipcconst.h         minix-sys
+./usr/include/minix/ipc.h              minix-sys
+./usr/include/minix/keymap.h           minix-sys
+./usr/include/minix/libminixfs.h       minix-sys
+./usr/include/minix/limits.h           minix-sys
+./usr/include/minix                    minix-sys
+./usr/include/minix/minlib.h           minix-sys
+./usr/include/minix/mount.h            minix-sys
+./usr/include/minix/mthread.h          minix-sys
+./usr/include/minix/netdriver.h                minix-sys
+./usr/include/minix/netsock.h          minix-sys
+./usr/include/minix/optset.h           minix-sys
+./usr/include/minix/param.h            minix-sys
+./usr/include/minix/partition.h                minix-sys
+./usr/include/minix/paths.h            minix-sys
+./usr/include/minix/portio.h           minix-sys
+./usr/include/minix/priv.h             minix-sys
+./usr/include/minix/procfs.h           minix-sys
+./usr/include/minix/profile.h          minix-sys
+./usr/include/minix/queryparam.h       minix-sys
+./usr/include/minix/rs.h               minix-sys
+./usr/include/minix/safecopies.h       minix-sys
+./usr/include/minix/sched.h            minix-sys
+./usr/include/minix/sef.h              minix-sys
+./usr/include/minix/sffs.h             minix-sys
+./usr/include/minix/sound.h            minix-sys
+./usr/include/minix/spin.h             minix-sys
+./usr/include                          minix-sys
+./usr/include/minix/sys_config.h       minix-sys
+./usr/include/minix/sysinfo.h          minix-sys
+./usr/include/minix/syslib.h           minix-sys
+./usr/include/minix/sysutil.h          minix-sys
+./usr/include/minix/termios.h          minix-sys
+./usr/include/minix/timers.h           minix-sys
+./usr/include/minix/tty.h              minix-sys
+./usr/include/minix/type.h             minix-sys
+./usr/include/minix/types.h            minix-sys       obsolete
+./usr/include/minix/u64.h              minix-sys
+./usr/include/minix/usb_ch9.h          minix-sys
+./usr/include/minix/usb.h              minix-sys
+./usr/include/minix/vboxfs.h           minix-sys
+./usr/include/minix/vbox.h             minix-sys
+./usr/include/minix/vboxif.h           minix-sys
+./usr/include/minix/vboxtype.h         minix-sys
+./usr/include/minix/vfsif.h            minix-sys
+./usr/include/minix/vm.h               minix-sys
+./usr/include/minix/vtreefs.h          minix-sys
+./usr/include/mntopts.h                        minix-sys
+./usr/include/monetary.h               minix-sys
+./usr/include/mpool.h                  minix-sys
+./usr/include/mqueue.h                 minix-sys
+./usr/include/ndbm.h                   minix-sys
+./usr/include/netconfig.h              minix-sys
+./usr/include/netdb.h                  minix-sys
+./usr/include/net/ethertypes.h         minix-sys
+./usr/include/net/gen/arp_io.h         minix-sys
+./usr/include/net/gen/dhcp.h           minix-sys
+./usr/include/net/gen/ether.h          minix-sys
+./usr/include/net/gen/eth_hdr.h                minix-sys
+./usr/include/net/gen/eth_io.h         minix-sys
+./usr/include/net/gen/icmp_hdr.h       minix-sys
+./usr/include/net/gen/icmp.h           minix-sys
+./usr/include/net/gen/if_ether.h       minix-sys
+./usr/include/net/gen/inet.h           minix-sys
+./usr/include/net/gen/in.h             minix-sys
+./usr/include/net/gen/ip_hdr.h         minix-sys
+./usr/include/net/gen/ip_io.h          minix-sys
+./usr/include/net/gen                  minix-sys
+./usr/include/net/gen/nameser.h                minix-sys
+./usr/include/net/gen/netdb.h          minix-sys
+./usr/include/net/gen/oneCsum.h                minix-sys
+./usr/include/net/gen/psip_hdr.h       minix-sys
+./usr/include/net/gen/psip_io.h                minix-sys
+./usr/include/net/gen/resolv.h         minix-sys
+./usr/include/net/gen/rip.h            minix-sys
+./usr/include/net/gen/route.h          minix-sys
+./usr/include/net/gen/socket.h         minix-sys
+./usr/include/net/gen/tcp_hdr.h                minix-sys
+./usr/include/net/gen/tcp.h            minix-sys
+./usr/include/net/gen/tcp_io.h         minix-sys
+./usr/include/net/gen/udp_hdr.h                minix-sys
+./usr/include/net/gen/udp.h            minix-sys
+./usr/include/net/gen/udp_io_hdr.h     minix-sys
+./usr/include/net/gen/udp_io.h         minix-sys
+./usr/include/net/gen/vjhc.h           minix-sys
+./usr/include/netgroup.h               minix-sys
+./usr/include/net/hton.h               minix-sys
+./usr/include/net/if_ether.h           minix-sys
+./usr/include/net/if.h                 minix-sys
+./usr/include/netinet6/in6.h           minix-sys
+./usr/include/netinet6                 minix-sys
+./usr/include/netinet/in.h             minix-sys
+./usr/include/netinet                  minix-sys
+./usr/include/netinet/tcp.h            minix-sys
+./usr/include/net                      minix-sys
+./usr/include/net/netlib.h             minix-sys
+./usr/include/nlist.h                  minix-sys
+./usr/include/nl_types.h               minix-sys
+./usr/include/nsswitch.h               minix-sys
+./usr/include/objc                     minix-sys       obsolete
+./usr/include/paths.h                  minix-sys
+./usr/include/poll.h                   minix-sys
+./usr/include/prop                     minix-sys
+./usr/include/prop/plistref.h          minix-sys
+./usr/include/prop/prop_array.h                minix-sys
+./usr/include/prop/prop_bool.h         minix-sys
+./usr/include/prop/prop_data.h         minix-sys
+./usr/include/prop/prop_dictionary.h   minix-sys
+./usr/include/prop/prop_ingest.h       minix-sys
+./usr/include/prop/proplib.h           minix-sys
+./usr/include/prop/prop_number.h       minix-sys
+./usr/include/prop/prop_object.h       minix-sys
+./usr/include/prop/prop_string.h       minix-sys
+./usr/include/protocols/dumprestore.h  minix-sys
+./usr/include/protocols                        minix-sys
+./usr/include/protocols/routed.h       minix-sys
+./usr/include/protocols/rwhod.h                minix-sys
+./usr/include/protocols/talkd.h                minix-sys
+./usr/include/protocols/timed.h                minix-sys
+./usr/include/puffs.h                  minix-sys
+./usr/include/puffs_msgif.h            minix-sys
+./usr/include/pwd.h                    minix-sys
+./usr/include/randomid.h               minix-sys
+./usr/include/ranlib.h                 minix-sys
+./usr/include/re_comp.h                        minix-sys
+./usr/include/regex.h                  minix-sys
+./usr/include/regexp.h                 minix-sys
+./usr/include/resolv.h                 minix-sys
+./usr/include/res_update.h             minix-sys
+./usr/include/rmd160.h                 minix-sys
+./usr/include/rmt.h                    minix-sys
+./usr/include/rpcsvc                   minix-sys
+./usr/include/rpcsvc/ypclnt.h          minix-sys
+./usr/include/rpcsvc/yp_prot.h         minix-sys
+./usr/include/sched.h                  minix-sys
+./usr/include/search.h                 minix-sys
+./usr/include/semaphore.h              minix-sys
+./usr/include/setjmp.h                 minix-sys
+./usr/include/sgtty.h                  minix-sys
+./usr/include/sha1.h                   minix-sys
+./usr/include/sha2.h                   minix-sys
+./usr/include/signal.h                 minix-sys
+./usr/include/ssp                      minix-sys
+./usr/include/ssp/ssp.h                        minix-sys
+./usr/include/ssp/stdio.h              minix-sys
+./usr/include/ssp/string.h             minix-sys
+./usr/include/ssp/strings.h            minix-sys
+./usr/include/ssp/unistd.h             minix-sys
+./usr/include/stab.h                   minix-sys
+./usr/include/stdarg.h                 minix-sys
+./usr/include/stdbool.h                        minix-sys
+./usr/include/stddef.h                 minix-sys
+./usr/include/stdint.h                 minix-sys
+./usr/include/stdio.h                  minix-sys
+./usr/include/stdlib.h                 minix-sys
+./usr/include/string.h                 minix-sys
+./usr/include/stringlist.h             minix-sys
+./usr/include/strings.h                        minix-sys
+./usr/include/struct.h                 minix-sys
+./usr/include/sys/ansi.h               minix-sys
+./usr/include/sys/asynchio.h           minix-sys
+./usr/include/sys/atomic.h             minix-sys
+./usr/include/sys/bitops.h             minix-sys
+./usr/include/sys/bootblock.h          minix-sys
+./usr/include/sys/bswap.h              minix-sys
+./usr/include/sys/cdefs_aout.h         minix-sys
+./usr/include/sys/cdefs_elf.h          minix-sys
+./usr/include/sys/cdefs.h              minix-sys
+./usr/include/sys/condvar.h            minix-sys
+./usr/include/sys/ctype_bits.h         minix-sys
+./usr/include/sys/ctype_inline.h       minix-sys
+./usr/include/sys/dirent.h             minix-sys
+./usr/include/sys/disk.h               minix-sys
+./usr/include/sys/disklabel_acorn.h    minix-sys
+./usr/include/sys/disklabel_gpt.h      minix-sys
+./usr/include/sys/disklabel.h          minix-sys
+./usr/include/sys/dkbad.h              minix-sys
+./usr/include/sys/dkio.h               minix-sys
+./usr/include/sys/elf64.h              minix-sys
+./usr/include/sys/elf_common.h         minix-sys
+./usr/include/sys/elf_core.h           minix-sys
+./usr/include/sys/elf_generic.h                minix-sys
+./usr/include/sys/endian.h             minix-sys
+./usr/include/sys/errno.h              minix-sys
+./usr/include/sys/exec_elf.h           minix-sys
+./usr/include/sys/exec.h               minix-sys
+./usr/include/sysexits.h               minix-sys
+./usr/include/sys/extattr.h            minix-sys
+./usr/include/sys/fcntl.h              minix-sys
+./usr/include/sys/fd_set.h             minix-sys
+./usr/include/sys/featuretest.h                minix-sys
+./usr/include/sys/file.h               minix-sys
+./usr/include/sys/float_ieee754.h      minix-sys
+./usr/include/sys/fstypes.h            minix-sys
+./usr/include/sys/gcq.h                        minix-sys
+./usr/include/sys/gmon.h               minix-sys
+./usr/include/sys/hash.h               minix-sys
+./usr/include/sys/ieee754.h            minix-sys
+./usr/include/sys/inttypes.h           minix-sys
+./usr/include/sys/ioc_block.h          minix-sys
+./usr/include/sys/ioccom.h             minix-sys
+./usr/include/sys/ioc_disk.h           minix-sys
+./usr/include/sys/ioc_fbd.h            minix-sys
+./usr/include/sys/ioc_file.h           minix-sys
+./usr/include/sys/ioc_memory.h         minix-sys
+./usr/include/sys/ioc_net.h            minix-sys
+./usr/include/sys/ioc_sound.h          minix-sys
+./usr/include/sys/ioc_tape.h           minix-sys
+./usr/include/sys/ioctl.h              minix-sys
+./usr/include/sys/ioc_tty.h            minix-sys
+./usr/include/sys/iostat.h             minix-sys
+./usr/include/sys/ipc.h                        minix-sys
+./usr/include/sys/jmp_buf.h            minix-sys
+./usr/include/sys/kbdio.h              minix-sys
+./usr/include/sys/localedef.h          minix-sys
+./usr/include/sys/lock.h               minix-sys
+./usr/include/syslog.h                 minix-sys
 ./usr/include/sys/lwp.h                        minix-sys
-./usr/include/sys/md4.h                                        minix-sys
-./usr/include/sys/md5.h                                        minix-sys
-./usr/include/sys                                      minix-sys
-./usr/include/sys/mman.h                                       minix-sys
-./usr/include/sys/mount.h                                      minix-sys
-./usr/include/sys/mtio.h                                       minix-sys
-./usr/include/sys/mutex.h                                      minix-sys
-./usr/include/sys/null.h                                       minix-sys
-./usr/include/sys/param.h                                      minix-sys
-./usr/include/sys/poll.h                                       minix-sys
-./usr/include/sys/procfs.h                                     minix-sys
-./usr/include/sys/ptrace.h                                     minix-sys
-./usr/include/sys/ptree.h                                      minix-sys
-./usr/include/sys/queue.h                                      minix-sys
-./usr/include/sys/ras.h                                        minix-sys
-./usr/include/sys/rbtree.h                                     minix-sys
-./usr/include/sys/reboot.h                                     minix-sys
-./usr/include/sys/resource.h                                   minix-sys
-./usr/include/sys/rmd160.h                                     minix-sys
-./usr/include/sys/rwlock.h                     minix-sys
-./usr/include/sys/select.h                                     minix-sys
-./usr/include/sys/sem.h                                        minix-sys
-./usr/include/sys/sha1.h                                       minix-sys
-./usr/include/sys/sha2.h                                       minix-sys
-./usr/include/sys/shm.h                                        minix-sys
-./usr/include/sys/siginfo.h                                    minix-sys
-./usr/include/sys/signal.h                                     minix-sys
-./usr/include/sys/sigtypes.h                                   minix-sys
-./usr/include/sys/socket.h                                     minix-sys
-./usr/include/sys/specificdata.h                       minix-sys
-./usr/include/sys/statfs.h                                     minix-sys
-./usr/include/sys/stat.h                                       minix-sys
-./usr/include/sys/statvfs.h                                    minix-sys
-./usr/include/sys/stdarg.h                     minix-sys
-./usr/include/sys/stdint.h                                     minix-sys
-./usr/include/sys/svrctl.h                                     minix-sys
-./usr/include/sys/sysctl.h                                     minix-sys
-./usr/include/sys/syslimits.h                                  minix-sys
-./usr/include/sys/syslog.h                                     minix-sys
-./usr/include/sys/termios.h                                    minix-sys
-./usr/include/sys/time.h                                       minix-sys
-./usr/include/sys/times.h                                      minix-sys
+./usr/include/sys/md4.h                        minix-sys
+./usr/include/sys/md5.h                        minix-sys
+./usr/include/sys                      minix-sys
+./usr/include/sys/mman.h               minix-sys
+./usr/include/sys/mount.h              minix-sys
+./usr/include/sys/mtio.h               minix-sys
+./usr/include/sys/mutex.h              minix-sys
+./usr/include/sys/null.h               minix-sys
+./usr/include/sys/param.h              minix-sys
+./usr/include/sys/poll.h               minix-sys
+./usr/include/sys/procfs.h             minix-sys
+./usr/include/sys/ptrace.h             minix-sys
+./usr/include/sys/ptree.h              minix-sys
+./usr/include/sys/queue.h              minix-sys
+./usr/include/sys/ras.h                        minix-sys
+./usr/include/sys/rbtree.h             minix-sys
+./usr/include/sys/reboot.h             minix-sys
+./usr/include/sys/resource.h           minix-sys
+./usr/include/sys/rmd160.h             minix-sys
+./usr/include/sys/rwlock.h             minix-sys
+./usr/include/sys/select.h             minix-sys
+./usr/include/sys/sem.h                        minix-sys
+./usr/include/sys/sha1.h               minix-sys
+./usr/include/sys/sha2.h               minix-sys
+./usr/include/sys/shm.h                        minix-sys
+./usr/include/sys/siginfo.h            minix-sys
+./usr/include/sys/signal.h             minix-sys
+./usr/include/sys/sigtypes.h           minix-sys
+./usr/include/sys/socket.h             minix-sys
+./usr/include/sys/specificdata.h       minix-sys
+./usr/include/sys/statfs.h             minix-sys
+./usr/include/sys/stat.h               minix-sys
+./usr/include/sys/statvfs.h            minix-sys
+./usr/include/sys/stdarg.h             minix-sys
+./usr/include/sys/stdint.h             minix-sys
+./usr/include/sys/svrctl.h             minix-sys
+./usr/include/sys/sysctl.h             minix-sys
+./usr/include/sys/syslimits.h          minix-sys
+./usr/include/sys/syslog.h             minix-sys
+./usr/include/sys/termios.h            minix-sys
+./usr/include/sys/time.h               minix-sys
+./usr/include/sys/times.h              minix-sys
 ./usr/include/sys/tls.h                        minix-sys
-./usr/include/sys/tree.h                                       minix-sys
-./usr/include/sys/ttycom.h                                     minix-sys
-./usr/include/sys/ttydefaults.h                                        minix-sys
-./usr/include/sys/types.h                                      minix-sys
-./usr/include/sys/ucontext.h                                   minix-sys
-./usr/include/sys/ucred.h                                      minix-sys
-./usr/include/sys/uio.h                                        minix-sys
-./usr/include/sys/un.h                                 minix-sys
-./usr/include/sys/unistd.h                                     minix-sys
-./usr/include/sys/utsname.h                                    minix-sys
-./usr/include/sys/uuid.h                                       minix-sys
-./usr/include/sys/video.h                                      minix-sys
-./usr/include/sys/vm.h                                 minix-sys
-./usr/include/sys/wait.h                                       minix-sys
-./usr/include/tar.h                                    minix-sys
-./usr/include/termcap.h                                        minix-sys
-./usr/include/term.h                                   minix-sys
-./usr/include/termios.h                                        minix-sys
-./usr/include/time.h                                   minix-sys
-./usr/include/timers.h                                 minix-sys
-./usr/include/tools.h                                  minix-sys       obsolete
-./usr/include/ttyent.h                                 minix-sys
-./usr/include/tzfile.h                                 minix-sys
-./usr/include/ucontext.h                                       minix-sys
-./usr/include/ucontextoffsets.h                                        minix-sys
-./usr/include/ufs/chfs                                 minix-sys
-./usr/include/ufs/ext2fs/ext2fs_dinode.h                                       minix-sys
-./usr/include/ufs/ext2fs/ext2fs_dir.h                                  minix-sys
-./usr/include/ufs/ext2fs/ext2fs_extern.h                                       minix-sys
-./usr/include/ufs/ext2fs/ext2fs.h                                      minix-sys
-./usr/include/ufs/ext2fs                                       minix-sys
-./usr/include/ufs/ffs/ffs_extern.h                                     minix-sys
-./usr/include/ufs/ffs/fs.h                                     minix-sys
-./usr/include/ufs/ffs                                  minix-sys
-./usr/include/ufs/lfs/lfs_extern.h                                     minix-sys
-./usr/include/ufs/lfs/lfs.h                                    minix-sys
-./usr/include/ufs/lfs                                  minix-sys
-./usr/include/ufs/mfs/mfs_extern.h                                     minix-sys
-./usr/include/ufs/mfs/mfsnode.h                                        minix-sys
-./usr/include/ufs/mfs                                  minix-sys
-./usr/include/ufs                                      minix-sys
-./usr/include/ufs/ufs/dinode.h                                 minix-sys
-./usr/include/ufs/ufs/dir.h                                    minix-sys
-./usr/include/ufs/ufs/extattr.h                                        minix-sys
-./usr/include/ufs/ufs/inode.h                                  minix-sys
-./usr/include/ufs/ufs                                  minix-sys
-./usr/include/ufs/ufs/quota1.h                                 minix-sys
-./usr/include/ufs/ufs/quota2.h                                 minix-sys
-./usr/include/ufs/ufs/quota.h                                  minix-sys
-./usr/include/ufs/ufs/ufs_bswap.h                                      minix-sys
-./usr/include/ufs/ufs/ufs_extern.h                                     minix-sys
-./usr/include/ufs/ufs/ufsmount.h                                       minix-sys
-./usr/include/ufs/ufs/ufs_wapbl.h                                      minix-sys
-./usr/include/ulimit.h                                 minix-sys
-./usr/include/unctrl.h                                 minix-sys
-./usr/include/unistd.h                                 minix-sys
-./usr/include/util.h                                   minix-sys
-./usr/include/utime.h                                  minix-sys
-./usr/include/utmp.h                                   minix-sys
-./usr/include/utmpx.h                                  minix-sys
-./usr/include/uuid.h                                   minix-sys
-./usr/include/varargs.h                                        minix-sys
-./usr/include/vis.h                                    minix-sys
-./usr/include/wchar.h                                  minix-sys
-./usr/include/wctype.h                                 minix-sys
-./usr/include/wordexp.h                                        minix-sys
-./usr/include/x86/bootinfo.h                   minix-sys
-./usr/include/x86/cpu.h                        minix-sys
-./usr/include/x86/float.h                                      minix-sys
-./usr/include/x86/ieeefp.h                                     minix-sys
-./usr/include/x86/ieee.h                                       minix-sys
-./usr/include/x86/math.h                                       minix-sys
-./usr/include/x86                                      minix-sys
-./usr/include/x86/mutex.h                                      minix-sys
-./usr/include/x86/pio.h                        minix-sys
-./usr/include/x86/rwlock.h                     minix-sys
-./usr/include/zconf.h                                  minix-sys
-./usr/include/zlib.h                                   minix-sys
-./usr/lib/cawf/common                                  minix-sys
-./usr/lib/cawf/device.cf                                       minix-sys
-./usr/lib/cawf/dumb.dev                                        minix-sys
-./usr/lib/cawf/man.mac                                 minix-sys
-./usr/lib/cawf/me.mac                                  minix-sys
-./usr/lib/cawf                                 minix-sys
-./usr/lib/cawf/mnx.mac                                 minix-sys
-./usr/lib/cawf/ms.mac                                  minix-sys
-./usr/lib/compat_minix.pc                                      minix-sys
-./usr/lib/cpp                                  minix-sys
+./usr/include/sys/tree.h               minix-sys
+./usr/include/sys/ttycom.h             minix-sys
+./usr/include/sys/ttydefaults.h                minix-sys
+./usr/include/sys/types.h              minix-sys
+./usr/include/sys/ucontext.h           minix-sys
+./usr/include/sys/ucred.h              minix-sys
+./usr/include/sys/uio.h                        minix-sys
+./usr/include/sys/un.h                 minix-sys
+./usr/include/sys/unistd.h             minix-sys
+./usr/include/sys/utsname.h            minix-sys
+./usr/include/sys/uuid.h               minix-sys
+./usr/include/sys/video.h              minix-sys
+./usr/include/sys/vm.h                 minix-sys
+./usr/include/sys/wait.h               minix-sys
+./usr/include/tar.h                    minix-sys
+./usr/include/termcap.h                        minix-sys
+./usr/include/term.h                   minix-sys
+./usr/include/termios.h                        minix-sys
+./usr/include/time.h                   minix-sys
+./usr/include/timers.h                 minix-sys
+./usr/include/tools.h                  minix-sys       obsolete
+./usr/include/ttyent.h                 minix-sys
+./usr/include/tzfile.h                 minix-sys
+./usr/include/ucontext.h               minix-sys
+./usr/include/ucontextoffsets.h                minix-sys
+./usr/include/ufs/chfs                 minix-sys
+./usr/include/ufs/ext2fs/ext2fs_dinode.h       minix-sys
+./usr/include/ufs/ext2fs/ext2fs_dir.h  minix-sys
+./usr/include/ufs/ext2fs/ext2fs_extern.h       minix-sys
+./usr/include/ufs/ext2fs/ext2fs.h      minix-sys
+./usr/include/ufs/ext2fs               minix-sys
+./usr/include/ufs/ffs/ffs_extern.h     minix-sys
+./usr/include/ufs/ffs/fs.h             minix-sys
+./usr/include/ufs/ffs                  minix-sys
+./usr/include/ufs/lfs/lfs_extern.h     minix-sys
+./usr/include/ufs/lfs/lfs.h            minix-sys
+./usr/include/ufs/lfs                  minix-sys
+./usr/include/ufs/mfs/mfs_extern.h     minix-sys
+./usr/include/ufs/mfs/mfsnode.h                minix-sys
+./usr/include/ufs/mfs                  minix-sys
+./usr/include/ufs                      minix-sys
+./usr/include/ufs/ufs/dinode.h         minix-sys
+./usr/include/ufs/ufs/dir.h            minix-sys
+./usr/include/ufs/ufs/extattr.h                minix-sys
+./usr/include/ufs/ufs/inode.h          minix-sys
+./usr/include/ufs/ufs                  minix-sys
+./usr/include/ufs/ufs/quota1.h         minix-sys
+./usr/include/ufs/ufs/quota2.h         minix-sys
+./usr/include/ufs/ufs/quota.h          minix-sys
+./usr/include/ufs/ufs/ufs_bswap.h      minix-sys
+./usr/include/ufs/ufs/ufs_extern.h     minix-sys
+./usr/include/ufs/ufs/ufsmount.h       minix-sys
+./usr/include/ufs/ufs/ufs_wapbl.h      minix-sys
+./usr/include/ulimit.h                 minix-sys
+./usr/include/unctrl.h                 minix-sys
+./usr/include/unistd.h                 minix-sys
+./usr/include/util.h                   minix-sys
+./usr/include/utime.h                  minix-sys
+./usr/include/utmp.h                   minix-sys
+./usr/include/utmpx.h                  minix-sys
+./usr/include/uuid.h                   minix-sys
+./usr/include/varargs.h                        minix-sys
+./usr/include/vis.h                    minix-sys
+./usr/include/wchar.h                  minix-sys
+./usr/include/wctype.h                 minix-sys
+./usr/include/wordexp.h                        minix-sys
+./usr/include/zconf.h                  minix-sys
+./usr/include/zlib.h                   minix-sys
+./usr/lib/cawf/common                  minix-sys
+./usr/lib/cawf/device.cf               minix-sys
+./usr/lib/cawf/dumb.dev                        minix-sys
+./usr/lib/cawf/man.mac                 minix-sys
+./usr/lib/cawf/me.mac                  minix-sys
+./usr/lib/cawf                         minix-sys
+./usr/lib/cawf/mnx.mac                 minix-sys
+./usr/lib/cawf/ms.mac                  minix-sys
+./usr/lib/compat_minix.pc              minix-sys
+./usr/lib/cpp                          minix-sys
 ./usr/lib/crontab                      minix-sys
-./usr/lib/crt0.o                                       minix-sys
-./usr/lib/crt1.o                                       minix-sys       obsolete
-./usr/lib/crtbegin.o                                   minix-sys
-./usr/lib/crtbeginS.o                                  minix-sys
-./usr/lib/crtbeginT.o                                  minix-sys
-./usr/lib/crtend.o                                     minix-sys
-./usr/lib/crtendS.o                                    minix-sys
-./usr/lib/crti.o                                       minix-sys
-./usr/lib/crtn.o                                       minix-sys
-./usr/lib/dict                                 minix-sys
-./usr/libexec/ld.elf_so                                        minix-sys
-./usr/libexec/makewhatis                                       minix-sys
-./usr/libexec                                  minix-sys
-./usr/lib/flex                                 minix-sys
-./usr/lib/fonts/cp1251.fnt                                     minix-sys
-./usr/lib/fonts/cp437.fnt                                      minix-sys
-./usr/lib/fonts/cp850.fnt                                      minix-sys
-./usr/lib/fonts/cp865.fnt                                      minix-sys
-./usr/lib/fonts/cp866.fnt                                      minix-sys
-./usr/lib/fonts/iso1.fnt                                       minix-sys
-./usr/lib/fonts/koi8-r.fnt                                     minix-sys
-./usr/lib/fonts/koi8-u.fnt                                     minix-sys
-./usr/lib/fonts                                        minix-sys
-./usr/lib/fonts/polish.fnt                                     minix-sys
-./usr/lib/fortune.dat                                  minix-sys
-./usr/lib/gcrt0.o                                      minix-sys
-./usr/lib/keymaps/abnt2.map                                    minix-sys
-./usr/lib/keymaps/dvorak.map                                   minix-sys
-./usr/lib/keymaps/french.map                                   minix-sys
-./usr/lib/keymaps/german.map                                   minix-sys
-./usr/lib/keymaps/italian.map                                  minix-sys
-./usr/lib/keymaps/japanese.map                                 minix-sys
-./usr/lib/keymaps/latin-america.map                                    minix-sys
-./usr/lib/keymaps                                      minix-sys
-./usr/lib/keymaps/olivetti.map                                 minix-sys
-./usr/lib/keymaps/polish.map                                   minix-sys
-./usr/lib/keymaps/portuguese.map                                       minix-sys
-./usr/lib/keymaps/russian-cp1251.map                                   minix-sys
-./usr/lib/keymaps/russian-cp866.map                                    minix-sys
-./usr/lib/keymaps/russian.map                                  minix-sys
-./usr/lib/keymaps/scandinavian.map                                     minix-sys
-./usr/lib/keymaps/spanish.map                                  minix-sys
-./usr/lib/keymaps/uk.map                                       minix-sys
-./usr/lib/keymaps/ukraine-koi8-u.map                                   minix-sys
-./usr/lib/keymaps/us-std-esc.map                                       minix-sys
-./usr/lib/keymaps/us-std.map                                   minix-sys
-./usr/lib/keymaps/us-swap.map                                  minix-sys
-./usr/lib/libarchive.a                                 minix-sys
-./usr/lib/libarchive_pic.a                                     minix-sys
-./usr/lib/libarchive.so.0.0                                    minix-sys
-./usr/lib/libarchive.so.0                                      minix-sys
-./usr/lib/libarchive.so                                        minix-sys
-./usr/lib/libasyn.a                                    minix-sys
-./usr/lib/libasyn_pic.a                                        minix-sys
-./usr/lib/libaudiodriver.a                                     minix-sys
-./usr/lib/libaudiodriver_pic.a                                 minix-sys
-./usr/lib/libbdev.a                                    minix-sys
-./usr/lib/libbdev_pic.a                                        minix-sys
-./usr/lib/libblockdriver.a                                     minix-sys
-./usr/lib/libblockdriver_pic.a                                 minix-sys
-./usr/lib/libbz2.a                                     minix-sys
-./usr/lib/libbz2_pic.a                                 minix-sys
-./usr/lib/libbz2.so.0.0                                        minix-sys
-./usr/lib/libbz2.so.0                                  minix-sys
-./usr/lib/libbz2.so                                    minix-sys
-./usr/lib/libc.a                                       minix-sys
-./usr/lib/libchardriver.a                                      minix-sys
-./usr/lib/libchardriver_pic.a                                  minix-sys
-./usr/lib/libcompat_minix.a                                    minix-sys
-./usr/lib/libcompat_minix_pic.a                                        minix-sys
-./usr/lib/libcompat_minix.so.0.0                                       minix-sys
-./usr/lib/libcompat_minix.so.0                                 minix-sys
-./usr/lib/libcompat_minix.so                                   minix-sys
-./usr/lib/libc.pc                                      minix-sys
-./usr/lib/libc_pic.a                                   minix-sys
-./usr/lib/libcrypt.a                                   minix-sys
-./usr/lib/libcrypt_pic.a                                       minix-sys
-./usr/lib/libcrypt.so.0.0                                      minix-sys
-./usr/lib/libcrypt.so.0                                        minix-sys
-./usr/lib/libcrypt.so                                  minix-sys
-./usr/lib/libc.so.0.0                                  minix-sys
-./usr/lib/libc.so.0                                    minix-sys
-./usr/lib/libc.so                                      minix-sys
-./usr/lib/libcurses.a                                  minix-sys
-./usr/lib/libcurses_pic.a                                      minix-sys
-./usr/lib/libcurses.so.0.0                                     minix-sys
-./usr/lib/libcurses.so.0                                       minix-sys
-./usr/lib/libcurses.so                                 minix-sys
-./usr/lib/libddekit.a                                  minix-sys
-./usr/lib/libddekit_pic.a                                      minix-sys
-./usr/lib/libddekit_usb_client.a                                       minix-sys
-./usr/lib/libddekit_usb_client_pic.a                                   minix-sys
-./usr/lib/libddekit_usb_server.a                                       minix-sys
-./usr/lib/libddekit_usb_server_pic.a                                   minix-sys
-./usr/lib/libdevman.a                                  minix-sys
-./usr/lib/libdevman_pic.a                                      minix-sys
-./usr/lib/libedit.a                                    minix-sys
-./usr/lib/libedit_pic.a                                        minix-sys
-./usr/lib/libelf.a                                     minix-sys
-./usr/lib/libelf_pic.a                                 minix-sys
-./usr/lib/libelf.so.0                                  minix-sys
-./usr/lib/libelf.so                                    minix-sys
-./usr/lib/libexec.a                                    minix-sys
-./usr/lib/libexec_pic.a                                        minix-sys
-./usr/lib/libfetch.a                                   minix-sys
-./usr/lib/libfl.a                                      minix-sys
-./usr/lib/libgcc.a                                     minix-sys
-./usr/lib/libhgfs.a                                    minix-sys
-./usr/lib/libhgfs_pic.a                                        minix-sys
-./usr/lib/libl.a                                       minix-sys
-./usr/lib/liblzma.a                                    minix-sys
-./usr/lib/liblzma_pic.a                                        minix-sys
-./usr/lib/liblzma.so.0.0                                       minix-sys
-./usr/lib/liblzma.so.0                                 minix-sys
-./usr/lib/liblzma.so                                   minix-sys
-./usr/lib/libm387.a                                    minix-sys
-./usr/lib/libm387_pic.a                                        minix-sys
-./usr/lib/libm387.so.0.0                                       minix-sys
-./usr/lib/libm387.so.0                                 minix-sys
-./usr/lib/libm387.so                                   minix-sys
-./usr/lib/libmagic.a                                   minix-sys
-./usr/lib/libmagic_pic.a                                       minix-sys
-./usr/lib/libmagic.so.0.0                                      minix-sys
-./usr/lib/libmagic.so.0                                        minix-sys
-./usr/lib/libmagic.so                                  minix-sys
-./usr/lib/libm.a                                       minix-sys
-./usr/lib/libminc.a                                    minix-sys
-./usr/lib/libminc_pic.a                                        minix-sys
-./usr/lib/libminixfs.a                                 minix-sys
-./usr/lib/libminixfs_pic.a                                     minix-sys
-./usr/lib/libminlib.a                                  minix-sys
-./usr/lib/libminlib_pic.a                                      minix-sys
-./usr/lib/libminlib.so.0.0                                     minix-sys
-./usr/lib/libminlib.so.0                                       minix-sys
-./usr/lib/libminlib.so                                 minix-sys
-./usr/lib/libm_pic.a                                   minix-sys
-./usr/lib/libm.so.0.0                                  minix-sys
-./usr/lib/libm.so.0                                    minix-sys
-./usr/lib/libm.so                                      minix-sys
-./usr/lib/libmthread.a                                 minix-sys
-./usr/lib/libmthread_pic.a                                     minix-sys
-./usr/lib/libnetdriver.a                                       minix-sys
-./usr/lib/libnetdriver_pic.a                                   minix-sys
-./usr/lib/libnetsock.a                                 minix-sys
-./usr/lib/libnetsock_pic.a                                     minix-sys
-./usr/lib/libprop.a                                    minix-sys
-./usr/lib/libprop_pic.a                                        minix-sys
-./usr/lib/libprop.so.0.0                                       minix-sys
-./usr/lib/libprop.so.0                                 minix-sys
-./usr/lib/libprop.so                                   minix-sys
-./usr/lib/libpuffs.a                                   minix-sys
-./usr/lib/libpuffs_pic.a                                       minix-sys
-./usr/lib/libpuffs.so.0.0                                      minix-sys
-./usr/lib/libpuffs.so.0                                        minix-sys
-./usr/lib/libpuffs.so                                  minix-sys
-./usr/lib/librefuse.a                                  minix-sys
-./usr/lib/librefuse_pic.a                                      minix-sys
-./usr/lib/librefuse.so.0.0                                     minix-sys
-./usr/lib/librefuse.so.0                                       minix-sys
-./usr/lib/librefuse.so                                 minix-sys
+./usr/lib/crt0.o                       minix-sys
+./usr/lib/crt1.o                       minix-sys
+./usr/lib/crtbegin.o                   minix-sys
+./usr/lib/crtbeginS.o                  minix-sys
+./usr/lib/crtbeginT.o                  minix-sys
+./usr/lib/crtend.o                     minix-sys
+./usr/lib/crtendS.o                    minix-sys
+./usr/lib/crti.o                       minix-sys
+./usr/lib/crtn.o                       minix-sys
+./usr/lib/dict                         minix-sys
+./usr/libexec/ld.elf_so                        minix-sys
+./usr/libexec/makewhatis               minix-sys
+./usr/libexec                          minix-sys
+./usr/lib/flex                         minix-sys
+./usr/lib/fonts/cp1251.fnt             minix-sys
+./usr/lib/fonts/cp437.fnt              minix-sys
+./usr/lib/fonts/cp850.fnt              minix-sys
+./usr/lib/fonts/cp865.fnt              minix-sys
+./usr/lib/fonts/cp866.fnt              minix-sys
+./usr/lib/fonts/iso1.fnt               minix-sys
+./usr/lib/fonts/koi8-r.fnt             minix-sys
+./usr/lib/fonts/koi8-u.fnt             minix-sys
+./usr/lib/fonts                                minix-sys
+./usr/lib/fonts/polish.fnt             minix-sys
+./usr/lib/fortune.dat                  minix-sys
+./usr/lib/gcrt0.o                      minix-sys
+./usr/lib/keymaps/abnt2.map            minix-sys
+./usr/lib/keymaps/dvorak.map           minix-sys
+./usr/lib/keymaps/french.map           minix-sys
+./usr/lib/keymaps/german.map           minix-sys
+./usr/lib/keymaps/italian.map          minix-sys
+./usr/lib/keymaps/japanese.map         minix-sys
+./usr/lib/keymaps/latin-america.map    minix-sys
+./usr/lib/keymaps                      minix-sys
+./usr/lib/keymaps/olivetti.map         minix-sys
+./usr/lib/keymaps/polish.map           minix-sys
+./usr/lib/keymaps/portuguese.map       minix-sys
+./usr/lib/keymaps/russian-cp1251.map   minix-sys
+./usr/lib/keymaps/russian-cp866.map    minix-sys
+./usr/lib/keymaps/russian.map          minix-sys
+./usr/lib/keymaps/scandinavian.map     minix-sys
+./usr/lib/keymaps/spanish.map          minix-sys
+./usr/lib/keymaps/uk.map               minix-sys
+./usr/lib/keymaps/ukraine-koi8-u.map   minix-sys
+./usr/lib/keymaps/us-std-esc.map       minix-sys
+./usr/lib/keymaps/us-std.map           minix-sys
+./usr/lib/keymaps/us-swap.map          minix-sys
+./usr/lib/libarchive.a                 minix-sys
+./usr/lib/libarchive_pic.a             minix-sys
+./usr/lib/libarchive.so.0.0            minix-sys
+./usr/lib/libarchive.so.0              minix-sys
+./usr/lib/libarchive.so                        minix-sys
+./usr/lib/libasyn.a                    minix-sys
+./usr/lib/libasyn_pic.a                        minix-sys
+./usr/lib/libaudiodriver.a             minix-sys
+./usr/lib/libaudiodriver_pic.a         minix-sys
+./usr/lib/libbdev.a                    minix-sys
+./usr/lib/libbdev_pic.a                        minix-sys
+./usr/lib/libblockdriver.a             minix-sys
+./usr/lib/libblockdriver_pic.a         minix-sys
+./usr/lib/libbz2.a                     minix-sys
+./usr/lib/libbz2_pic.a                 minix-sys
+./usr/lib/libbz2.so.0.0                        minix-sys
+./usr/lib/libbz2.so.0                  minix-sys
+./usr/lib/libbz2.so                    minix-sys
+./usr/lib/libc.a                       minix-sys
+./usr/lib/libchardriver.a              minix-sys
+./usr/lib/libchardriver_pic.a          minix-sys
+./usr/lib/libcompat_minix.a            minix-sys
+./usr/lib/libcompat_minix_pic.a                minix-sys
+./usr/lib/libcompat_minix.so.0.0       minix-sys
+./usr/lib/libcompat_minix.so.0         minix-sys
+./usr/lib/libcompat_minix.so           minix-sys
+./usr/lib/libc.pc                      minix-sys
+./usr/lib/libc_pic.a                   minix-sys
+./usr/lib/libcrypt.a                   minix-sys
+./usr/lib/libcrypt_pic.a               minix-sys
+./usr/lib/libcrypt.so.0.0              minix-sys
+./usr/lib/libcrypt.so.0                        minix-sys
+./usr/lib/libcrypt.so                  minix-sys
+./usr/lib/libc.so.0.0                  minix-sys
+./usr/lib/libc.so.0                    minix-sys
+./usr/lib/libc.so                      minix-sys
+./usr/lib/libcurses.a                  minix-sys
+./usr/lib/libcurses_pic.a              minix-sys
+./usr/lib/libcurses.so.0.0             minix-sys
+./usr/lib/libcurses.so.0               minix-sys
+./usr/lib/libcurses.so                 minix-sys
+./usr/lib/libddekit.a                  minix-sys
+./usr/lib/libddekit_pic.a              minix-sys
+./usr/lib/libddekit_usb_client.a       minix-sys
+./usr/lib/libddekit_usb_client_pic.a   minix-sys
+./usr/lib/libddekit_usb_server.a       minix-sys
+./usr/lib/libddekit_usb_server_pic.a   minix-sys
+./usr/lib/libdevman.a                  minix-sys
+./usr/lib/libdevman_pic.a              minix-sys
+./usr/lib/libedit.a                    minix-sys
+./usr/lib/libedit_pic.a                        minix-sys
+./usr/lib/libelf.a                     minix-sys
+./usr/lib/libelf_pic.a                 minix-sys
+./usr/lib/libelf.so.0                  minix-sys
+./usr/lib/libelf.so                    minix-sys
+./usr/lib/libexec.a                    minix-sys
+./usr/lib/libexec_pic.a                        minix-sys
+./usr/lib/libfetch.a                   minix-sys
+./usr/lib/libfl.a                      minix-sys
+./usr/lib/libgcc.a                     minix-sys
+./usr/lib/libl.a                       minix-sys
+./usr/lib/liblzma.a                    minix-sys
+./usr/lib/liblzma_pic.a                        minix-sys
+./usr/lib/liblzma.so.0.0               minix-sys
+./usr/lib/liblzma.so.0                 minix-sys
+./usr/lib/liblzma.so                   minix-sys
+./usr/lib/libmagic.a                   minix-sys
+./usr/lib/libmagic_pic.a               minix-sys
+./usr/lib/libmagic.so.0.0              minix-sys
+./usr/lib/libmagic.so.0                        minix-sys
+./usr/lib/libmagic.so                  minix-sys
+./usr/lib/libm.a                       minix-sys
+./usr/lib/libminc.a                    minix-sys
+./usr/lib/libminc_pic.a                        minix-sys
+./usr/lib/libminixfs.a                 minix-sys
+./usr/lib/libminixfs_pic.a             minix-sys
+./usr/lib/libminlib.a                  minix-sys
+./usr/lib/libminlib_pic.a              minix-sys
+./usr/lib/libminlib.so.0.0             minix-sys
+./usr/lib/libminlib.so.0               minix-sys
+./usr/lib/libminlib.so                 minix-sys
+./usr/lib/libm_pic.a                   minix-sys
+./usr/lib/libm.so.0.0                  minix-sys
+./usr/lib/libm.so.0                    minix-sys
+./usr/lib/libm.so                      minix-sys
+./usr/lib/libmthread.a                 minix-sys
+./usr/lib/libmthread_pic.a             minix-sys
+./usr/lib/libnetdriver.a               minix-sys
+./usr/lib/libnetdriver_pic.a           minix-sys
+./usr/lib/libnetsock.a                 minix-sys
+./usr/lib/libnetsock_pic.a             minix-sys
+./usr/lib/libprop.a                    minix-sys
+./usr/lib/libprop_pic.a                        minix-sys
+./usr/lib/libprop.so.0.0               minix-sys
+./usr/lib/libprop.so.0                 minix-sys
+./usr/lib/libprop.so                   minix-sys
+./usr/lib/libpuffs.a                   minix-sys
+./usr/lib/libpuffs_pic.a               minix-sys
+./usr/lib/libpuffs.so.0.0              minix-sys
+./usr/lib/libpuffs.so.0                        minix-sys
+./usr/lib/libpuffs.so                  minix-sys
+./usr/lib/librefuse.a                  minix-sys
+./usr/lib/librefuse_pic.a              minix-sys
+./usr/lib/librefuse.so.0.0             minix-sys
+./usr/lib/librefuse.so.0               minix-sys
+./usr/lib/librefuse.so                 minix-sys
 ./usr/lib/librmt.a                     minix-sys
-./usr/lib/libsffs.a                                    minix-sys
-./usr/lib/libsffs_pic.a                                        minix-sys
-./usr/lib/libsys.a                                     minix-sys
-./usr/lib/libsys_pic.a                                 minix-sys
-./usr/lib/libsys.so.0.0                                        minix-sys
-./usr/lib/libsys.so.0                                  minix-sys
-./usr/lib/libsys.so                                    minix-sys
-./usr/lib/libtermcap.a                                 minix-sys
-./usr/lib/libtermcap_pic.a                                     minix-sys
-./usr/lib/libtermcap.so.0.6                                    minix-sys
-./usr/lib/libtermcap.so.0                                      minix-sys
-./usr/lib/libtermcap.so                                        minix-sys
-./usr/lib/libterminfo.a                                        minix-sys
-./usr/lib/libterminfo_pic.a                                    minix-sys
-./usr/lib/libterminfo.so.0.0                                   minix-sys
-./usr/lib/libterminfo.so.0                                     minix-sys
-./usr/lib/libterminfo.so                                       minix-sys
-./usr/lib/libtermlib.a                                 minix-sys
-./usr/lib/libtermlib_pic.a                                     minix-sys
-./usr/lib/libtermlib.so.0.6                                    minix-sys
-./usr/lib/libtermlib.so.0                                      minix-sys
-./usr/lib/libtermlib.so                                        minix-sys
-./usr/lib/libtimers.a                                  minix-sys
-./usr/lib/libtimers_pic.a                                      minix-sys
-./usr/lib/libusb.a                                     minix-sys
-./usr/lib/libusb_pic.a                                 minix-sys
-./usr/lib/libutil.a                                    minix-sys
-./usr/lib/libutil_pic.a                                        minix-sys
-./usr/lib/libutil.so.0.0                                       minix-sys
-./usr/lib/libutil.so.0                                 minix-sys
-./usr/lib/libutil.so                                   minix-sys
-./usr/lib/libvassert.a                                 minix-sys
-./usr/lib/libvboxfs.a                                  minix-sys
-./usr/lib/libvboxfs_pic.a                                      minix-sys
-./usr/lib/libvtreefs.a                                 minix-sys
-./usr/lib/libvtreefs_pic.a                                     minix-sys
-./usr/lib/libz.a                                       minix-sys
-./usr/lib/libz_pic.a                                   minix-sys
-./usr/lib/libz.so.0.0                                  minix-sys
-./usr/lib/libz.so.0                                    minix-sys
-./usr/lib/libz.so                                      minix-sys
-./usr/lib                                      minix-sys
-./usr/lib/minlib.pc                                    minix-sys
-./usr/lib/pwdauth                                      minix-sys
-./usr/log                                      minix-sys
-./usr/Makefile                                 minix-sys
-./usr/man/man1/..1                                     minix-sys
-./usr/man/man1/[.1                                     minix-sys
-./usr/man/man1/acksize.1                                       minix-sys
-./usr/man/man1/apropos.1                                       minix-sys
-./usr/man/man1/ash.1                                   minix-sys
-./usr/man/man1/at.1                                    minix-sys
-./usr/man/man1/awk.1                                   minix-sys
-./usr/man/man1/banner.1                                        minix-sys
-./usr/man/man1/basename.1                                      minix-sys
-./usr/man/man1/break.1                                 minix-sys
-./usr/man/man1/bsdtar.1                                        minix-sys
-./usr/man/man1/bsfilt.1                                        minix-sys
-./usr/man/man1/bunzip2.1                                       minix-sys
-./usr/man/man1/bzcat.1                                 minix-sys
-./usr/man/man1/bzip2.1                                 minix-sys
-./usr/man/man1/bzip2recover.1                                  minix-sys
-./usr/man/man1/cal.1                                   minix-sys
-./usr/man/man1/case.1                                  minix-sys
-./usr/man/man1/cat.1                                   minix-sys
-./usr/man/man1/cawf.1                                  minix-sys
-./usr/man/man1/cd.1                                    minix-sys
-./usr/man/man1/chfn.1                                  minix-sys
-./usr/man/man1/chgrp.1                                 minix-sys
-./usr/man/man1/chmod.1                                 minix-sys
-./usr/man/man1/chpass.1                                        minix-sys
-./usr/man/man1/chsh.1                                  minix-sys
+./usr/lib/libsffs.a                    minix-sys
+./usr/lib/libsffs_pic.a                        minix-sys
+./usr/lib/libsys.a                     minix-sys
+./usr/lib/libsys_pic.a                 minix-sys
+./usr/lib/libsys.so.0.0                        minix-sys
+./usr/lib/libsys.so.0                  minix-sys
+./usr/lib/libsys.so                    minix-sys
+./usr/lib/libtermcap.a                 minix-sys
+./usr/lib/libtermcap_pic.a             minix-sys
+./usr/lib/libtermcap.so.0.6            minix-sys
+./usr/lib/libtermcap.so.0              minix-sys
+./usr/lib/libtermcap.so                        minix-sys
+./usr/lib/libterminfo.a                        minix-sys
+./usr/lib/libterminfo_pic.a            minix-sys
+./usr/lib/libterminfo.so.0.0           minix-sys
+./usr/lib/libterminfo.so.0             minix-sys
+./usr/lib/libterminfo.so               minix-sys
+./usr/lib/libtermlib.a                 minix-sys
+./usr/lib/libtermlib_pic.a             minix-sys
+./usr/lib/libtermlib.so.0.6            minix-sys
+./usr/lib/libtermlib.so.0              minix-sys
+./usr/lib/libtermlib.so                        minix-sys
+./usr/lib/libtimers.a                  minix-sys
+./usr/lib/libtimers_pic.a              minix-sys
+./usr/lib/libusb.a                     minix-sys
+./usr/lib/libusb_pic.a                 minix-sys
+./usr/lib/libutil.a                    minix-sys
+./usr/lib/libutil_pic.a                        minix-sys
+./usr/lib/libutil.so.0.0               minix-sys
+./usr/lib/libutil.so.0                 minix-sys
+./usr/lib/libutil.so                   minix-sys
+./usr/lib/libvtreefs.a                 minix-sys
+./usr/lib/libvtreefs_pic.a             minix-sys
+./usr/lib/libz.a                       minix-sys
+./usr/lib/libz_pic.a                   minix-sys
+./usr/lib/libz.so.0.0                  minix-sys
+./usr/lib/libz.so.0                    minix-sys
+./usr/lib/libz.so                      minix-sys
+./usr/lib                              minix-sys
+./usr/lib/minlib.pc                    minix-sys
+./usr/lib/pwdauth                      minix-sys
+./usr/log                              minix-sys
+./usr/Makefile                         minix-sys
+./usr/man/man1/..1                     minix-sys
+./usr/man/man1/[.1                     minix-sys
+./usr/man/man1/acksize.1               minix-sys
+./usr/man/man1/apropos.1               minix-sys
+./usr/man/man1/ash.1                   minix-sys
+./usr/man/man1/at.1                    minix-sys
+./usr/man/man1/awk.1                   minix-sys
+./usr/man/man1/banner.1                        minix-sys
+./usr/man/man1/basename.1              minix-sys
+./usr/man/man1/break.1                 minix-sys
+./usr/man/man1/bsdtar.1                        minix-sys
+./usr/man/man1/bsfilt.1                        minix-sys
+./usr/man/man1/bunzip2.1               minix-sys
+./usr/man/man1/bzcat.1                 minix-sys
+./usr/man/man1/bzip2.1                 minix-sys
+./usr/man/man1/bzip2recover.1          minix-sys
+./usr/man/man1/cal.1                   minix-sys
+./usr/man/man1/case.1                  minix-sys
+./usr/man/man1/cat.1                   minix-sys
+./usr/man/man1/cawf.1                  minix-sys
+./usr/man/man1/cd.1                    minix-sys
+./usr/man/man1/chfn.1                  minix-sys
+./usr/man/man1/chgrp.1                 minix-sys
+./usr/man/man1/chmod.1                 minix-sys
+./usr/man/man1/chpass.1                        minix-sys
+./usr/man/man1/chsh.1                  minix-sys
 ./usr/man/man1/ci.1                    minix-sys
 ./usr/man/man1/cksum.1                 minix-sys
 ./usr/man/man1/clear.1                 minix-sys
@@ -1595,187 +1477,187 @@
 ./usr/man/man3/archive.3               minix-sys
 ./usr/man/man3/archive_clear_error.3   minix-sys
 ./usr/man/man3/archive_compression.3   minix-sys
-./usr/man/man3/archive_compression_name.3                                      minix-sys
-./usr/man/man3/archive_copy_error.3                                    minix-sys
-./usr/man/man3/archive_entry.3                                 minix-sys
-./usr/man/man3/archive_entry_acl_add_entry.3                                   minix-sys
-./usr/man/man3/archive_entry_acl_add_entry_w.3                                 minix-sys
-./usr/man/man3/archive_entry_acl_clear.3                                       minix-sys
-./usr/man/man3/archive_entry_acl_count.3                                       minix-sys
-./usr/man/man3/archive_entry_acl_next.3                                        minix-sys
-./usr/man/man3/archive_entry_acl_next_w.3                                      minix-sys
-./usr/man/man3/archive_entry_acl_reset.3                                       minix-sys
-./usr/man/man3/archive_entry_acl_text_w.3                                      minix-sys
-./usr/man/man3/archive_entry_atime.3                                   minix-sys
-./usr/man/man3/archive_entry_atime_nsec.3                                      minix-sys
-./usr/man/man3/archive_entry_clear.3                                   minix-sys
-./usr/man/man3/archive_entry_clone.3                                   minix-sys
-./usr/man/man3/archive_entry_copy_fflags_text.3                                        minix-sys
-./usr/man/man3/archive_entry_copy_fflags_text_w.3                                      minix-sys
-./usr/man/man3/archive_entry_copy_gname.3                                      minix-sys
-./usr/man/man3/archive_entry_copy_gname_w.3                                    minix-sys
-./usr/man/man3/archive_entry_copy_hardlink.3                                   minix-sys
-./usr/man/man3/archive_entry_copy_hardlink_w.3                                 minix-sys
-./usr/man/man3/archive_entry_copy_link.3                                       minix-sys
-./usr/man/man3/archive_entry_copy_link_w.3                                     minix-sys
-./usr/man/man3/archive_entry_copy_pathname_w.3                                 minix-sys
-./usr/man/man3/archive_entry_copy_sourcepath.3                                 minix-sys
-./usr/man/man3/archive_entry_copy_stat.3                                       minix-sys
-./usr/man/man3/archive_entry_copy_symlink.3                                    minix-sys
-./usr/man/man3/archive_entry_copy_symlink_w.3                                  minix-sys
-./usr/man/man3/archive_entry_copy_uname.3                                      minix-sys
-./usr/man/man3/archive_entry_copy_uname_w.3                                    minix-sys
-./usr/man/man3/archive_entry_dev.3                                     minix-sys
-./usr/man/man3/archive_entry_devmajor.3                                        minix-sys
-./usr/man/man3/archive_entry_devminor.3                                        minix-sys
-./usr/man/man3/archive_entry_fflags.3                                  minix-sys
-./usr/man/man3/archive_entry_fflags_text.3                                     minix-sys
-./usr/man/man3/archive_entry_filetype.3                                        minix-sys
-./usr/man/man3/archive_entry_free.3                                    minix-sys
-./usr/man/man3/archive_entry_gid.3                                     minix-sys
-./usr/man/man3/archive_entry_gname.3                                   minix-sys
-./usr/man/man3/archive_entry_hardlink.3                                        minix-sys
-./usr/man/man3/archive_entry_ino.3                                     minix-sys
-./usr/man/man3/archive_entry_mode.3                                    minix-sys
-./usr/man/man3/archive_entry_mtime.3                                   minix-sys
-./usr/man/man3/archive_entry_mtime_nsec.3                                      minix-sys
-./usr/man/man3/archive_entry_new.3                                     minix-sys
-./usr/man/man3/archive_entry_nlink.3                                   minix-sys
-./usr/man/man3/archive_entry_pathname.3                                        minix-sys
-./usr/man/man3/archive_entry_pathname_w.3                                      minix-sys
-./usr/man/man3/archive_entry_rdev.3                                    minix-sys
-./usr/man/man3/archive_entry_rdevmajor.3                                       minix-sys
-./usr/man/man3/archive_entry_rdevminor.3                                       minix-sys
-./usr/man/man3/archive_entry_set_atime.3                                       minix-sys
-./usr/man/man3/archive_entry_set_ctime.3                                       minix-sys
-./usr/man/man3/archive_entry_set_dev.3                                 minix-sys
-./usr/man/man3/archive_entry_set_devmajor.3                                    minix-sys
-./usr/man/man3/archive_entry_set_devminor.3                                    minix-sys
-./usr/man/man3/archive_entry_set_fflags.3                                      minix-sys
-./usr/man/man3/archive_entry_set_filetype.3                                    minix-sys
-./usr/man/man3/archive_entry_set_gid.3                                 minix-sys
-./usr/man/man3/archive_entry_set_gname.3                                       minix-sys
-./usr/man/man3/archive_entry_set_hardlink.3                                    minix-sys
-./usr/man/man3/archive_entry_set_link.3                                        minix-sys
-./usr/man/man3/archive_entry_set_mode.3                                        minix-sys
-./usr/man/man3/archive_entry_set_mtime.3                                       minix-sys
-./usr/man/man3/archive_entry_set_pathname.3                                    minix-sys
-./usr/man/man3/archive_entry_set_rdevmajor.3                                   minix-sys
-./usr/man/man3/archive_entry_set_rdevminor.3                                   minix-sys
-./usr/man/man3/archive_entry_set_size.3                                        minix-sys
-./usr/man/man3/archive_entry_set_symlink.3                                     minix-sys
-./usr/man/man3/archive_entry_set_uid.3                                 minix-sys
-./usr/man/man3/archive_entry_set_uname.3                                       minix-sys
-./usr/man/man3/archive_entry_size.3                                    minix-sys
-./usr/man/man3/archive_entry_sourcepath.3                                      minix-sys
-./usr/man/man3/archive_entry_stat.3                                    minix-sys
-./usr/man/man3/archive_entry_symlink.3                                 minix-sys
-./usr/man/man3/archive_entry_uid.3                                     minix-sys
-./usr/man/man3/archive_entry_uname.3                                   minix-sys
-./usr/man/man3/archive_errno.3                                 minix-sys
-./usr/man/man3/archive_error_string.3                                  minix-sys
-./usr/man/man3/archive_file_count.3                                    minix-sys
-./usr/man/man3/archive_format.3                                        minix-sys
-./usr/man/man3/archive_format_name.3                                   minix-sys
-./usr/man/man3/archive_read.3                                  minix-sys
-./usr/man/man3/archive_read_close.3                                    minix-sys
-./usr/man/man3/archive_read_data.3                                     minix-sys
-./usr/man/man3/archive_read_data_block.3                                       minix-sys
-./usr/man/man3/archive_read_data_into_buffer.3                                 minix-sys
-./usr/man/man3/archive_read_data_into_fd.3                                     minix-sys
-./usr/man/man3/archive_read_data_skip.3                                        minix-sys
-./usr/man/man3/archive_read_disk.3                                     minix-sys
-./usr/man/man3/archive_read_disk_gname.3                                       minix-sys
-./usr/man/man3/archive_read_disk_new.3                                 minix-sys
-./usr/man/man3/archive_read_disk_set_entry_from_file.3                                 minix-sys
-./usr/man/man3/archive_read_disk_set_gname_lookup.3                                    minix-sys
-./usr/man/man3/archive_read_disk_set_standard_lookup.3                                 minix-sys
-./usr/man/man3/archive_read_disk_set_symlink_hybrid.3                                  minix-sys
-./usr/man/man3/archive_read_disk_set_symlink_logical.3                                 minix-sys
-./usr/man/man3/archive_read_disk_set_symlink_physical.3                                        minix-sys
-./usr/man/man3/archive_read_disk_set_uname_lookup.3                                    minix-sys
-./usr/man/man3/archive_read_disk_uname.3                                       minix-sys
-./usr/man/man3/archive_read_extract2.3                                 minix-sys
-./usr/man/man3/archive_read_extract.3                                  minix-sys
-./usr/man/man3/archive_read_extract_set_progress_callback.3                                    minix-sys
-./usr/man/man3/archive_read_finish.3                                   minix-sys
-./usr/man/man3/archive_read_new.3                                      minix-sys
-./usr/man/man3/archive_read_next_header2.3                                     minix-sys
-./usr/man/man3/archive_read_next_header.3                                      minix-sys
-./usr/man/man3/archive_read_open2.3                                    minix-sys
-./usr/man/man3/archive_read_open.3                                     minix-sys
-./usr/man/man3/archive_read_open_fd.3                                  minix-sys
-./usr/man/man3/archive_read_open_file.3                                        minix-sys
-./usr/man/man3/archive_read_open_FILE.3                                        minix-sys
-./usr/man/man3/archive_read_open_filename.3                                    minix-sys
-./usr/man/man3/archive_read_open_memory.3                                      minix-sys
-./usr/man/man3/archive_read_set_filter_options.3                                       minix-sys
-./usr/man/man3/archive_read_set_format_options.3                                       minix-sys
-./usr/man/man3/archive_read_set_options.3                                      minix-sys
-./usr/man/man3/archive_read_support_compression_all.3                                  minix-sys
-./usr/man/man3/archive_read_support_compression_bzip2.3                                        minix-sys
-./usr/man/man3/archive_read_support_compression_compress.3                                     minix-sys
-./usr/man/man3/archive_read_support_compression_gzip.3                                 minix-sys
-./usr/man/man3/archive_read_support_compression_lzma.3                                 minix-sys
-./usr/man/man3/archive_read_support_compression_none.3                                 minix-sys
-./usr/man/man3/archive_read_support_compression_program.3                                      minix-sys
-./usr/man/man3/archive_read_support_compression_program_signature.3                                    minix-sys
-./usr/man/man3/archive_read_support_compression_xz.3                                   minix-sys
-./usr/man/man3/archive_read_support_format_all.3                                       minix-sys
-./usr/man/man3/archive_read_support_format_ar.3                                        minix-sys
-./usr/man/man3/archive_read_support_format_cpio.3                                      minix-sys
-./usr/man/man3/archive_read_support_format_empty.3                                     minix-sys
-./usr/man/man3/archive_read_support_format_iso9660.3                                   minix-sys
-./usr/man/man3/archive_read_support_format_mtree.3                                     minix-sys
-./usr/man/man3/archive_read_support_format_raw.3                                       minix-sys
-./usr/man/man3/archive_read_support_format_tar.3                                       minix-sys
-./usr/man/man3/archive_read_support_format_zip.3                                       minix-sys
-./usr/man/man3/archive_set_error.3                                     minix-sys
-./usr/man/man3/archive_util.3                                  minix-sys
-./usr/man/man3/archive_write.3                                 minix-sys
-./usr/man/man3/archive_write_close.3                                   minix-sys
-./usr/man/man3/archive_write_data.3                                    minix-sys
-./usr/man/man3/archive_write_disk.3                                    minix-sys
-./usr/man/man3/archive_write_disk_new.3                                        minix-sys
-./usr/man/man3/archive_write_disk_set_group_lookup.3                                   minix-sys
-./usr/man/man3/archive_write_disk_set_options.3                                        minix-sys
-./usr/man/man3/archive_write_disk_set_skip_file.3                                      minix-sys
-./usr/man/man3/archive_write_disk_set_standard_lookup.3                                        minix-sys
-./usr/man/man3/archive_write_disk_set_user_lookup.3                                    minix-sys
-./usr/man/man3/archive_write_finish.3                                  minix-sys
-./usr/man/man3/archive_write_finish_entry.3                                    minix-sys
-./usr/man/man3/archive_write_get_bytes_per_block.3                                     minix-sys
-./usr/man/man3/archive_write_header.3                                  minix-sys
-./usr/man/man3/archive_write_new.3                                     minix-sys
-./usr/man/man3/archive_write_open.3                                    minix-sys
-./usr/man/man3/archive_write_open_fd.3                                 minix-sys
-./usr/man/man3/archive_write_open_FILE.3                                       minix-sys
-./usr/man/man3/archive_write_open_filename.3                                   minix-sys
-./usr/man/man3/archive_write_open_memory.3                                     minix-sys
-./usr/man/man3/archive_write_options.3                                 minix-sys
-./usr/man/man3/archive_write_set_bytes_in_last_block.3                                 minix-sys
-./usr/man/man3/archive_write_set_bytes_per_block.3                                     minix-sys
-./usr/man/man3/archive_write_set_callbacks.3                                   minix-sys
-./usr/man/man3/archive_write_set_compression_bzip2.3                                   minix-sys
-./usr/man/man3/archive_write_set_compression_compress.3                                        minix-sys
-./usr/man/man3/archive_write_set_compression_gzip.3                                    minix-sys
-./usr/man/man3/archive_write_set_compression_none.3                                    minix-sys
-./usr/man/man3/archive_write_set_compression_program.3                                 minix-sys
-./usr/man/man3/archive_write_set_compressor_options.3                                  minix-sys
-./usr/man/man3/archive_write_set_format_cpio.3                                 minix-sys
-./usr/man/man3/archive_write_set_format_pax.3                                  minix-sys
-./usr/man/man3/archive_write_set_format_pax_restricted.3                                       minix-sys
-./usr/man/man3/archive_write_set_format_shar.3                                 minix-sys
-./usr/man/man3/archive_write_set_format_shar_binary.3                                  minix-sys
-./usr/man/man3/archive_write_set_format_ustar.3                                        minix-sys
-./usr/man/man3/asctime.3                                       minix-sys
-./usr/man/man3/asctime_r.3                                     minix-sys
+./usr/man/man3/archive_compression_name.3              minix-sys
+./usr/man/man3/archive_copy_error.3                    minix-sys
+./usr/man/man3/archive_entry.3                         minix-sys
+./usr/man/man3/archive_entry_acl_add_entry.3           minix-sys
+./usr/man/man3/archive_entry_acl_add_entry_w.3         minix-sys
+./usr/man/man3/archive_entry_acl_clear.3               minix-sys
+./usr/man/man3/archive_entry_acl_count.3               minix-sys
+./usr/man/man3/archive_entry_acl_next.3                        minix-sys
+./usr/man/man3/archive_entry_acl_next_w.3              minix-sys
+./usr/man/man3/archive_entry_acl_reset.3               minix-sys
+./usr/man/man3/archive_entry_acl_text_w.3              minix-sys
+./usr/man/man3/archive_entry_atime.3                   minix-sys
+./usr/man/man3/archive_entry_atime_nsec.3              minix-sys
+./usr/man/man3/archive_entry_clear.3                   minix-sys
+./usr/man/man3/archive_entry_clone.3                   minix-sys
+./usr/man/man3/archive_entry_copy_fflags_text.3                minix-sys
+./usr/man/man3/archive_entry_copy_fflags_text_w.3      minix-sys
+./usr/man/man3/archive_entry_copy_gname.3              minix-sys
+./usr/man/man3/archive_entry_copy_gname_w.3            minix-sys
+./usr/man/man3/archive_entry_copy_hardlink.3           minix-sys
+./usr/man/man3/archive_entry_copy_hardlink_w.3         minix-sys
+./usr/man/man3/archive_entry_copy_link.3               minix-sys
+./usr/man/man3/archive_entry_copy_link_w.3             minix-sys
+./usr/man/man3/archive_entry_copy_pathname_w.3         minix-sys
+./usr/man/man3/archive_entry_copy_sourcepath.3         minix-sys
+./usr/man/man3/archive_entry_copy_stat.3               minix-sys
+./usr/man/man3/archive_entry_copy_symlink.3            minix-sys
+./usr/man/man3/archive_entry_copy_symlink_w.3          minix-sys
+./usr/man/man3/archive_entry_copy_uname.3              minix-sys
+./usr/man/man3/archive_entry_copy_uname_w.3            minix-sys
+./usr/man/man3/archive_entry_dev.3                     minix-sys
+./usr/man/man3/archive_entry_devmajor.3                        minix-sys
+./usr/man/man3/archive_entry_devminor.3                        minix-sys
+./usr/man/man3/archive_entry_fflags.3                  minix-sys
+./usr/man/man3/archive_entry_fflags_text.3             minix-sys
+./usr/man/man3/archive_entry_filetype.3                        minix-sys
+./usr/man/man3/archive_entry_free.3                    minix-sys
+./usr/man/man3/archive_entry_gid.3                     minix-sys
+./usr/man/man3/archive_entry_gname.3                   minix-sys
+./usr/man/man3/archive_entry_hardlink.3                        minix-sys
+./usr/man/man3/archive_entry_ino.3                     minix-sys
+./usr/man/man3/archive_entry_mode.3                    minix-sys
+./usr/man/man3/archive_entry_mtime.3                   minix-sys
+./usr/man/man3/archive_entry_mtime_nsec.3              minix-sys
+./usr/man/man3/archive_entry_new.3                     minix-sys
+./usr/man/man3/archive_entry_nlink.3                   minix-sys
+./usr/man/man3/archive_entry_pathname.3                        minix-sys
+./usr/man/man3/archive_entry_pathname_w.3              minix-sys
+./usr/man/man3/archive_entry_rdev.3                    minix-sys
+./usr/man/man3/archive_entry_rdevmajor.3               minix-sys
+./usr/man/man3/archive_entry_rdevminor.3               minix-sys
+./usr/man/man3/archive_entry_set_atime.3               minix-sys
+./usr/man/man3/archive_entry_set_ctime.3               minix-sys
+./usr/man/man3/archive_entry_set_dev.3                 minix-sys
+./usr/man/man3/archive_entry_set_devmajor.3            minix-sys
+./usr/man/man3/archive_entry_set_devminor.3            minix-sys
+./usr/man/man3/archive_entry_set_fflags.3              minix-sys
+./usr/man/man3/archive_entry_set_filetype.3            minix-sys
+./usr/man/man3/archive_entry_set_gid.3                 minix-sys
+./usr/man/man3/archive_entry_set_gname.3               minix-sys
+./usr/man/man3/archive_entry_set_hardlink.3            minix-sys
+./usr/man/man3/archive_entry_set_link.3                        minix-sys
+./usr/man/man3/archive_entry_set_mode.3                        minix-sys
+./usr/man/man3/archive_entry_set_mtime.3               minix-sys
+./usr/man/man3/archive_entry_set_pathname.3            minix-sys
+./usr/man/man3/archive_entry_set_rdevmajor.3           minix-sys
+./usr/man/man3/archive_entry_set_rdevminor.3           minix-sys
+./usr/man/man3/archive_entry_set_size.3                        minix-sys
+./usr/man/man3/archive_entry_set_symlink.3             minix-sys
+./usr/man/man3/archive_entry_set_uid.3                 minix-sys
+./usr/man/man3/archive_entry_set_uname.3               minix-sys
+./usr/man/man3/archive_entry_size.3                    minix-sys
+./usr/man/man3/archive_entry_sourcepath.3              minix-sys
+./usr/man/man3/archive_entry_stat.3                    minix-sys
+./usr/man/man3/archive_entry_symlink.3                 minix-sys
+./usr/man/man3/archive_entry_uid.3                     minix-sys
+./usr/man/man3/archive_entry_uname.3                   minix-sys
+./usr/man/man3/archive_errno.3                         minix-sys
+./usr/man/man3/archive_error_string.3                  minix-sys
+./usr/man/man3/archive_file_count.3                    minix-sys
+./usr/man/man3/archive_format.3                                minix-sys
+./usr/man/man3/archive_format_name.3                   minix-sys
+./usr/man/man3/archive_read.3                          minix-sys
+./usr/man/man3/archive_read_close.3                    minix-sys
+./usr/man/man3/archive_read_data.3                     minix-sys
+./usr/man/man3/archive_read_data_block.3               minix-sys
+./usr/man/man3/archive_read_data_into_buffer.3         minix-sys
+./usr/man/man3/archive_read_data_into_fd.3             minix-sys
+./usr/man/man3/archive_read_data_skip.3                        minix-sys
+./usr/man/man3/archive_read_disk.3                     minix-sys
+./usr/man/man3/archive_read_disk_gname.3               minix-sys
+./usr/man/man3/archive_read_disk_new.3                 minix-sys
+./usr/man/man3/archive_read_disk_set_entry_from_file.3 minix-sys
+./usr/man/man3/archive_read_disk_set_gname_lookup.3    minix-sys
+./usr/man/man3/archive_read_disk_set_standard_lookup.3 minix-sys
+./usr/man/man3/archive_read_disk_set_symlink_hybrid.3  minix-sys
+./usr/man/man3/archive_read_disk_set_symlink_logical.3 minix-sys
+./usr/man/man3/archive_read_disk_set_symlink_physical.3        minix-sys
+./usr/man/man3/archive_read_disk_set_uname_lookup.3    minix-sys
+./usr/man/man3/archive_read_disk_uname.3               minix-sys
+./usr/man/man3/archive_read_extract2.3                 minix-sys
+./usr/man/man3/archive_read_extract.3                  minix-sys
+./usr/man/man3/archive_read_extract_set_progress_callback.3    minix-sys
+./usr/man/man3/archive_read_finish.3                   minix-sys
+./usr/man/man3/archive_read_new.3                      minix-sys
+./usr/man/man3/archive_read_next_header2.3             minix-sys
+./usr/man/man3/archive_read_next_header.3              minix-sys
+./usr/man/man3/archive_read_open2.3                    minix-sys
+./usr/man/man3/archive_read_open.3                     minix-sys
+./usr/man/man3/archive_read_open_fd.3                  minix-sys
+./usr/man/man3/archive_read_open_file.3                        minix-sys
+./usr/man/man3/archive_read_open_FILE.3                        minix-sys
+./usr/man/man3/archive_read_open_filename.3            minix-sys
+./usr/man/man3/archive_read_open_memory.3              minix-sys
+./usr/man/man3/archive_read_set_filter_options.3       minix-sys
+./usr/man/man3/archive_read_set_format_options.3       minix-sys
+./usr/man/man3/archive_read_set_options.3              minix-sys
+./usr/man/man3/archive_read_support_compression_all.3  minix-sys
+./usr/man/man3/archive_read_support_compression_bzip2.3        minix-sys
+./usr/man/man3/archive_read_support_compression_compress.3     minix-sys
+./usr/man/man3/archive_read_support_compression_gzip.3 minix-sys
+./usr/man/man3/archive_read_support_compression_lzma.3 minix-sys
+./usr/man/man3/archive_read_support_compression_none.3 minix-sys
+./usr/man/man3/archive_read_support_compression_program.3      minix-sys
+./usr/man/man3/archive_read_support_compression_program_signature.3    minix-sys
+./usr/man/man3/archive_read_support_compression_xz.3   minix-sys
+./usr/man/man3/archive_read_support_format_all.3       minix-sys
+./usr/man/man3/archive_read_support_format_ar.3                minix-sys
+./usr/man/man3/archive_read_support_format_cpio.3      minix-sys
+./usr/man/man3/archive_read_support_format_empty.3     minix-sys
+./usr/man/man3/archive_read_support_format_iso9660.3   minix-sys
+./usr/man/man3/archive_read_support_format_mtree.3     minix-sys
+./usr/man/man3/archive_read_support_format_raw.3       minix-sys
+./usr/man/man3/archive_read_support_format_tar.3       minix-sys
+./usr/man/man3/archive_read_support_format_zip.3       minix-sys
+./usr/man/man3/archive_set_error.3                     minix-sys
+./usr/man/man3/archive_util.3                          minix-sys
+./usr/man/man3/archive_write.3                         minix-sys
+./usr/man/man3/archive_write_close.3                   minix-sys
+./usr/man/man3/archive_write_data.3                    minix-sys
+./usr/man/man3/archive_write_disk.3                    minix-sys
+./usr/man/man3/archive_write_disk_new.3                        minix-sys
+./usr/man/man3/archive_write_disk_set_group_lookup.3   minix-sys
+./usr/man/man3/archive_write_disk_set_options.3                minix-sys
+./usr/man/man3/archive_write_disk_set_skip_file.3      minix-sys
+./usr/man/man3/archive_write_disk_set_standard_lookup.3        minix-sys
+./usr/man/man3/archive_write_disk_set_user_lookup.3    minix-sys
+./usr/man/man3/archive_write_finish.3                  minix-sys
+./usr/man/man3/archive_write_finish_entry.3            minix-sys
+./usr/man/man3/archive_write_get_bytes_per_block.3     minix-sys
+./usr/man/man3/archive_write_header.3                  minix-sys
+./usr/man/man3/archive_write_new.3                     minix-sys
+./usr/man/man3/archive_write_open.3                    minix-sys
+./usr/man/man3/archive_write_open_fd.3                 minix-sys
+./usr/man/man3/archive_write_open_FILE.3               minix-sys
+./usr/man/man3/archive_write_open_filename.3           minix-sys
+./usr/man/man3/archive_write_open_memory.3             minix-sys
+./usr/man/man3/archive_write_options.3                 minix-sys
+./usr/man/man3/archive_write_set_bytes_in_last_block.3 minix-sys
+./usr/man/man3/archive_write_set_bytes_per_block.3     minix-sys
+./usr/man/man3/archive_write_set_callbacks.3           minix-sys
+./usr/man/man3/archive_write_set_compression_bzip2.3   minix-sys
+./usr/man/man3/archive_write_set_compression_compress.3        minix-sys
+./usr/man/man3/archive_write_set_compression_gzip.3    minix-sys
+./usr/man/man3/archive_write_set_compression_none.3    minix-sys
+./usr/man/man3/archive_write_set_compression_program.3 minix-sys
+./usr/man/man3/archive_write_set_compressor_options.3  minix-sys
+./usr/man/man3/archive_write_set_format_cpio.3         minix-sys
+./usr/man/man3/archive_write_set_format_pax.3          minix-sys
+./usr/man/man3/archive_write_set_format_pax_restricted.3       minix-sys
+./usr/man/man3/archive_write_set_format_shar.3         minix-sys
+./usr/man/man3/archive_write_set_format_shar_binary.3  minix-sys
+./usr/man/man3/archive_write_set_format_ustar.3                minix-sys
+./usr/man/man3/asctime.3                               minix-sys
+./usr/man/man3/asctime_r.3                             minix-sys
 ./usr/man/man3/asin.3                                  minix-sys
 ./usr/man/man3/asinf.3                                 minix-sys
 ./usr/man/man3/asinh.3                                 minix-sys
 ./usr/man/man3/asinhf.3                                        minix-sys
-./usr/man/man3/asprintf.3                                      minix-sys
-./usr/man/man3/assume_default_colors.3                                 minix-sys
+./usr/man/man3/asprintf.3                              minix-sys
+./usr/man/man3/assume_default_colors.3                 minix-sys
 ./usr/man/man3/atan2.3                                 minix-sys
 ./usr/man/man3/atan2f.3                                        minix-sys
 ./usr/man/man3/atan.3                                  minix-sys
@@ -1787,24 +1669,24 @@
 ./usr/man/man3/atoi.3                                  minix-sys
 ./usr/man/man3/atol.3                                  minix-sys
 ./usr/man/man3/atoll.3                                 minix-sys
-./usr/man/man3/atomic_add_32.3                                 minix-sys
-./usr/man/man3/atomic_add_32_nv.3                                      minix-sys
-./usr/man/man3/atomic_add.3                                    minix-sys
-./usr/man/man3/atomic_add_64.3                                 minix-sys
-./usr/man/man3/atomic_add_64_nv.3                                      minix-sys
-./usr/man/man3/atomic_add_int.3                                        minix-sys
-./usr/man/man3/atomic_add_int_nv.3                                     minix-sys
-./usr/man/man3/atomic_add_long.3                                       minix-sys
-./usr/man/man3/atomic_add_long_nv.3                                    minix-sys
-./usr/man/man3/atomic_add_ptr.3                                        minix-sys
-./usr/man/man3/atomic_add_ptr_nv.3                                     minix-sys
-./usr/man/man3/atomic_and_32.3                                 minix-sys
-./usr/man/man3/atomic_and_32_nv.3                                      minix-sys
-./usr/man/man3/atomic_and.3                                    minix-sys
-./usr/man/man3/atomic_and_64.3                                 minix-sys
-./usr/man/man3/atomic_and_64_nv.3                                      minix-sys
-./usr/man/man3/atomic_and_uint.3                                       minix-sys
-./usr/man/man3/atomic_and_uint_nv.3                                    minix-sys
+./usr/man/man3/atomic_add_32.3                         minix-sys
+./usr/man/man3/atomic_add_32_nv.3                      minix-sys
+./usr/man/man3/atomic_add.3                            minix-sys
+./usr/man/man3/atomic_add_64.3                         minix-sys
+./usr/man/man3/atomic_add_64_nv.3                      minix-sys
+./usr/man/man3/atomic_add_int.3                                minix-sys
+./usr/man/man3/atomic_add_int_nv.3                     minix-sys
+./usr/man/man3/atomic_add_long.3                       minix-sys
+./usr/man/man3/atomic_add_long_nv.3                    minix-sys
+./usr/man/man3/atomic_add_ptr.3                                minix-sys
+./usr/man/man3/atomic_add_ptr_nv.3                     minix-sys
+./usr/man/man3/atomic_and_32.3                         minix-sys
+./usr/man/man3/atomic_and_32_nv.3                      minix-sys
+./usr/man/man3/atomic_and.3                            minix-sys
+./usr/man/man3/atomic_and_64.3                         minix-sys
+./usr/man/man3/atomic_and_64_nv.3                      minix-sys
+./usr/man/man3/atomic_and_uint.3                       minix-sys
+./usr/man/man3/atomic_and_uint_nv.3                    minix-sys
 ./usr/man/man3/atomic_and_ulong.3                                      minix-sys
 ./usr/man/man3/atomic_and_ulong_nv.3                                   minix-sys
 ./usr/man/man3/atomic_cas_32.3                                 minix-sys
@@ -3799,76 +3681,41 @@
 ./usr/man/man9/prop_dictionary_copyout_ioctl.9                                 minix-sys
 ./usr/man                                      minix-sys
 ./usr/man/whatis.db                                    minix-sys
-./usr/mdec/boot_monitor                                        minix-sys
-./usr/mdec/bootxx_cd9660                                       minix-sys
-./usr/mdec/bootxx_ext2fs                                       minix-sys
-./usr/mdec/bootxx_minixfs3                                     minix-sys
-./usr/mdec/gptmbr.bin                                  minix-sys
-./usr/mdec/mbr_bootsel                                 minix-sys
-./usr/mdec/mbr_com0_9600                                       minix-sys
-./usr/mdec/mbr_com0                                    minix-sys
-./usr/mdec/mbr_ext                                     minix-sys
-./usr/mdec/mbr                                 minix-sys
-./usr/mdec                                     minix-sys
 ./usr                                  minix-sys
 ./usr/pkg/etc                                  minix-sys
 ./usr/pkg/etc/rc.d                                     minix-sys
 ./usr/pkg                                      minix-sys
 ./usr/preserve                                 minix-sys
 ./usr/run                                      minix-sys
-./usr/sbin/acpi                                minix-sys
-./usr/sbin/amddev                      minix-sys
-./usr/sbin/atl2                                minix-sys
 ./usr/sbin/chroot                      minix-sys
-./usr/sbin/dec21140A                   minix-sys
-./usr/sbin/dp8390                      minix-sys
-./usr/sbin/dpeth                       minix-sys
 ./usr/sbin/ds                          minix-sys
-./usr/sbin/e1000                       minix-sys
-./usr/sbin/es1370                      minix-sys
-./usr/sbin/es1371                      minix-sys
-./usr/sbin/fbd                         minix-sys
-./usr/sbin/filter                      minix-sys
-./usr/sbin/fxp                         minix-sys
 ./usr/sbin/groupadd                    minix-sys
 ./usr/sbin/groupdel                    minix-sys
 ./usr/sbin/groupinfo                   minix-sys
 ./usr/sbin/group                       minix-sys
 ./usr/sbin/groupmod                    minix-sys
-./usr/sbin/hello                       minix-sys
 ./usr/sbin/inet                                minix-sys
 ./usr/sbin/init                                minix-sys
 ./usr/sbin/installboot_nbsd            minix-sys
 ./usr/sbin/ipc                         minix-sys
 ./usr/sbin/kernel                      minix-sys
-./usr/sbin/lance                       minix-sys
-./usr/sbin/log                         minix-sys
 ./usr/sbin/memory                      minix-sys
 ./usr/sbin                                     minix-sys
 ./usr/sbin/mkproto                     minix-sys
 ./usr/sbin/mmc                         minix-sys
 ./usr/sbin/mtree                       minix-sys
-./usr/sbin/orinoco                     minix-sys
-./usr/sbin/pci                         minix-sys
 ./usr/sbin/pfs                         minix-sys
 ./usr/sbin/pm                          minix-sys
 ./usr/sbin/postinstall                 minix-sys
-./usr/sbin/printer                     minix-sys
 ./usr/sbin/pwd_mkdb                    minix-sys
-./usr/sbin/random                      minix-sys
 ./usr/sbin/rs                          minix-sys
-./usr/sbin/rtl8139                     minix-sys
-./usr/sbin/rtl8169                     minix-sys
-./usr/sbin/sb16                                minix-sys
 ./usr/sbin/sched                       minix-sys
-./usr/sbin/ti1225                      minix-sys
 ./usr/sbin/tty                         minix-sys
 ./usr/sbin/useradd                     minix-sys
 ./usr/sbin/userdel                     minix-sys
 ./usr/sbin/userinfo                    minix-sys
 ./usr/sbin/user                                minix-sys
 ./usr/sbin/usermod                     minix-sys
-./usr/sbin/vbox                                minix-sys
 ./usr/sbin/vfs                         minix-sys
 ./usr/sbin/vipw                                minix-sys
 ./usr/sbin/vm                          minix-sys

diff --git a/drivers/Makefile b/drivers/Makefile
index a87643ef361f1f348296489ba3a56fef79d53586..ad7bce8dc3a30ab9b38d4136c8926be051193380 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -5,17 +5,29 @@
 
 .if ${MKIMAGEONLY} == "yes"
 
-# memory driver must be last for ramdisk image
-SUBDIR=        at_wini floppy log tty pci ramdisk .WAIT memory
+.if ${MACHINE_ARCH} == "i386"
+SUBDIR=        at_wini floppy log tty pci
+.endif
 
-.else
+.if ${MACHINE_ARCH} == "earm"
+SUBDIR= tty
+.endif
 
-# memory driver must be last for ramdisk image
-SUBDIR+= ahci amddev atl2 at_wini audio dec21140A dp8390 dpeth \
+.else # ${MKIMAGEONLY} != "yes"
+
+.if ${MACHINE_ARCH} == "i386"
+SUBDIR= ahci amddev atl2 at_wini audio dec21140A dp8390 dpeth \
        e1000 fbd filter floppy fxp hello lance log mmc orinoco pci printer \
-       random readclock rtl8139 rtl8169 ti1225 tty vbox acpi \
-       ramdisk .WAIT memory 
+       random readclock rtl8139 rtl8169 ti1225 tty vbox acpi
+.endif
 
+.if ${MACHINE_ARCH} == "earm"
+SUBDIR=  mmc tty
 .endif
 
+.endif # ${MKIMAGEONLY} != "yes"
+
+# memory driver must be last for ramdisk image
+SUBDIR+= ramdisk .WAIT memory
+
 .include <bsd.subdir.mk>

diff --git a/drivers/amddev/amddev.c b/drivers/amddev/amddev.c
index 8db57527f21222e999410e329eb7e780f64645f4..0b8c63537803ae880f1b55a36f2b4444da3d7d00 100644 (file)
--- a/drivers/amddev/amddev.c
+++ b/drivers/amddev/amddev.c
@@ -348,13 +348,13 @@ static int do_add(message *m)
                size, start, proc);
 #endif
 
-       if (start % I386_PAGE_SIZE)
+       if (start % PAGE_SIZE)
        {
                printf("amddev`do_add: bad start 0x%x from proc %d\n",
                        start, proc);
                return EINVAL;
        }
-       if (size % I386_PAGE_SIZE)
+       if (size % PAGE_SIZE)
        {
                printf("amddev`do_add: bad size 0x%x from proc %d\n",
                        size, proc);
@@ -393,13 +393,13 @@ static int do_add4pci(const message *m)
 "amddev`do_add4pci: got request for 0x%x@0x%lx from %d for pci dev %u.%u.%u\n",
                size, start, proc, pci_bus, pci_dev, pci_func);
 
-       if (start % I386_PAGE_SIZE)
+       if (start % PAGE_SIZE)
        {
                printf("amddev`do_add4pci: bad start 0x%lx from proc %d\n",
                        start, proc);
                return EINVAL;
        }
-       if (size % I386_PAGE_SIZE)
+       if (size % PAGE_SIZE)
        {
                printf("amddev`do_add4pci: bad size 0x%x from proc %d\n",
                        size, proc);
@@ -442,9 +442,9 @@ static void add_range(phys_bytes busaddr, phys_bytes size)
        printf("add_range: mapping 0x%x@0x%x\n", size, busaddr);
 #endif
 
-       for (o= 0; o<size; o += I386_PAGE_SIZE)
+       for (o= 0; o<size; o += PAGE_SIZE)
        {
-               u32_t bit= (busaddr+o)/I386_PAGE_SIZE;
+               u32_t bit= (busaddr+o)/PAGE_SIZE;
                table[bit/8] &= ~(1U << (bit % 8));
        }
 }
@@ -458,9 +458,9 @@ static void del_range(phys_bytes busaddr, phys_bytes size)
        printf("del_range: mapping 0x%x@0x%x\n", size, busaddr);
 #endif
 
-       for (o= 0; o<size; o += I386_PAGE_SIZE)
+       for (o= 0; o<size; o += PAGE_SIZE)
        {
-               u32_t bit= (busaddr+o)/I386_PAGE_SIZE;
+               u32_t bit= (busaddr+o)/PAGE_SIZE;
                table[bit/8] |= (1 << (bit % 8));
        }
 }

diff --git a/drivers/orinoco/orinoco.c b/drivers/orinoco/orinoco.c
index 06f260c29f88ee5cca2fa7b6b66e648e21ac219c..0958ed7240da7e43d6264b99d48b168e4d9517eb 100644 (file)
--- a/drivers/orinoco/orinoco.c
+++ b/drivers/orinoco/orinoco.c
@@ -554,21 +554,21 @@ static void map_hw_buffer(t_or *orp)
        char *buf, *abuf;       
        hermes_t *hw = &(orp->hw);      
 
-       /* This way, the buffer will be at least I386_PAGE_SIZE big: see 
+       /* This way, the buffer will be at least PAGE_SIZE big: see
         * calculation with the offset */
-       size = 2 * I386_PAGE_SIZE;      
+       size = 2 * PAGE_SIZE;
 
        buf = (char *)malloc(size);
        if(buf == NULL) 
                panic("map_hw_buffer: cannot malloc size: %d", size);
 
-       /* Let the mapped memory by I386_PAGE_SIZE aligned */
-       o = I386_PAGE_SIZE - ((vir_bytes)buf % I386_PAGE_SIZE);
+       /* Let the mapped memory by PAGE_SIZE aligned */
+       o = PAGE_SIZE - ((vir_bytes)buf % PAGE_SIZE);
        abuf = buf + o;
 
 #if 0
        r = sys_vm_map(SELF, 1, (vir_bytes)abuf, 
-                       1 * I386_PAGE_SIZE, (phys_bytes)orp->or_base_port);
+                       1 * PAGE_SIZE, (phys_bytes)orp->or_base_port);
 #else
        r = ENOSYS;
 #endif

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 41699318833957c8de5fe65c81288d15a8afe561..40d6b28d20747304a9cc5c17f43cbceb8242a7e5 100644 (file)
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1564,8 +1564,8 @@ static void complete_bars(void)
                        if (!(pcidev[i].pd_bar[j].pb_flags & PBF_INCOMPLETE))
                                continue;
                        size= pcidev[i].pd_bar[j].pb_size;
-                       if (size < I386_PAGE_SIZE)
-                               size= I386_PAGE_SIZE;
+                       if (size < PAGE_SIZE)
+                               size= PAGE_SIZE;
                        base= memgap_high-size;
                        base &= ~(u32_t)(size-1);
                        if (base < memgap_low)

diff --git a/drivers/ramdisk/Makefile b/drivers/ramdisk/Makefile
index 8fc79ae718f3a87b6c8313db084b88386c5466f2..456444777eff2b708548ab525cd180f99bf3480a 100644 (file)
--- a/drivers/ramdisk/Makefile
+++ b/drivers/ramdisk/Makefile
@@ -2,93 +2,110 @@
 
 .include <bsd.own.mk>
 
-# Remove "drivers/ramdisk" component from path
-PROGROOT:= ${.OBJDIR:S,drivers/ramdisk,,}
-
-TOOL_PWD_MKDB?= ${NETBSDSRCDIR}/usr.sbin/pwd_mkdb/pwd_mkdb
 install:
 
 all:
 
-#
 # Add a few defines we are going to use during the image
 # creation to determine what features and binaries to include
 # in the final image
 # ACPI            do we have/include the acpi binary
 # RAMDISK_SMALL   is the script called with MKSMALL=yes
 # DYNAMIC         does the ramdisk contain dynamic binaries?
-RAMDISK_INC_ACPI=0
-RAMDISK_SMALL=0
-RAMDISK_DYNAMIC=0
+RAMDISK_INC_ACPI=      0
+RAMDISK_SMALL=         0
+RAMDISK_DYNAMIC=       0
+
+RAMDISK_DEFINES= \
+       -DRAMDISK_INC_ACPI=${RAMDISK_INC_ACPI} \
+       -DRAMDISK_SMALL=${RAMDISK_SMALL} \
+       -DRAMDISK_DYNAMIC=${RAMDISK_DYNAMIC}
+
+# The name of the proto file to use
+PROTO= proto
+
+# Common to all architectures
+ETC=           system.conf master.passwd
+EXTRA=         rc mtab
+PROTO_FILES=   proto.common.etc proto.common.dynamic proto.dev
+PROG_DRIVERS=
+PROG_COMMANDS= mount fsck.mfs sh service
+PROG_SERVERS=  mfs
+PROG_USRSBIN=
+PROG_BIN=
+
+.if ${MACHINE_ARCH} == "i386"
+ETC+=          rs.single
+PROG_DRIVERS+= at_wini floppy pci
+PROG_COMMANDS+=        cdprobe loadramdisk sysenv
+PROG_SERVERS+= procfs
+PROG_USRSBIN+= pwd_mkdb
 
-# the name of the proto file to use
-PROTO= proto
-
-PROG_DRIVERS=at_wini floppy pci
-PROG_COMMANDS=cdprobe loadramdisk mount fsck.mfs sysenv sh \
-       service 
-PROG_SERVERS=mfs procfs
-PROG_USRSBIN=pwd_mkdb
-
-.if ${LDSTATIC} == "-dynamic"
-RAMDISK_DYNAMIC=1
-PROG_LIBEXEC+=ld.elf_so
-PROG_LIBS+=libc libminlib libcompat_minix libterminfo
+.if ${MKSMALL} != "yes"
+RAMDISK_SMALL= 1
+PROG_DRIVERS+= ahci
+PROG_SERVERS+= ext2
 .endif
 
-PROGRAMS=${PROG_DRIVERS} ${PROG_COMMANDS} ${PROG_SERVERS} ${PROG_USRSBIN} ${PROG_LIBEXEC}
-
-EXTRA=system.conf master.passwd rs.single 
-PROTO_FILES=proto.common.etc proto.common.dynamic proto.dev
-
-.if ${MKSMALL} != "yes"
-RAMDISK_SMALL=1
-PROG_DRIVERS+= ahci
-PROG_SERVERS+= ext2
+.if ${MKACPI} != "no"
+RAMDISK_INC_ACPI= 1
+PROG_DRIVERS+= acpi
 .endif
+.endif # ${MACHINE_ARCH} == "i386"
 
+.if ${MACHINE_ARCH} == "earm"
+EXTRA+=                mylogin.sh
+PROG_DRIVERS+= mmc tty
+PROG_COMMANDS+=        cp dd getty ls time sync sleep stty umount
+PROG_BIN+=     cat rm
+PROTO=         proto.arm.small
+.endif # ${MACHINE_ARCH} == "earm"
 
-.if ${MKACPI} != "no"
-PROG_DRIVERS+= acpi
-RAMDISK_INC_ACPI=1
+.if ${LDSTATIC} == "-dynamic"
+RAMDISK_DYNAMIC= 1
+PROG_LIBEXEC+= ld.elf_so
+PROG_LIBS+=    libc libminlib libcompat_minix libterminfo
 .endif
 
+PROGRAMS=${PROG_DRIVERS} ${PROG_COMMANDS} ${PROG_SERVERS} \
+        ${PROG_USRSBIN} ${PROG_BIN} ${PROG_LIBEXEC}
+
 CPPFLAGS+= -I${NETBSDSRCDIR}/servers
-CLEANFILES += ${PROGRAMS} ${SCRIPTS} ${EXTRA} image image.c t proto.gen
+
+# LSC We have to take care of not erasing the source file, so never add EXTRA
+# to CLEANFILES
+CLEANFILES += ${PROGRAMS} ${SCRIPTS} ${ETC} image image.c t proto.gen
 CLEANFILES += ${LIBRARIES}
 CLEANFILES += ${PROG_LIBEXEC}
 CLEANFILES += ${.OBJDIR}/etc/*
 
-image: proto.gen ${EXTRA} mtab rc pwd.db spwd.db passwd
-       ${_MKMSG_CREATE} "Generating ramdisk image"
-       ${TOOL_MKFSMFS} image proto.gen || { rm -f image; false; }
-#      if fsck.mfs -s image | grep -q CLEAN;   \
-#      then    : ;     \
-#      else    echo "CLEAN sanity check of image failed."      ;       \
-#              echo "(Perhaps install current mkfs and fsck.)" ;       \
-#              rm -f image; false;             \
-#      fi
+#############################################################
+# LSC Below this point the rules should not be modified
+#############################################################
 
-# LSC ramdisk rc file != /etc/rc
-# mtab not empty!, force execution of the rule to ensure installation
-# Conditionnally execute the command if the target file already exists
-# I have to place .PHONY for the target to work as expected, but I cannot
-# execute the command during an in-tree build (= make xxx)
-.for file in rc mtab ${PROTO} ${PROTO_FILES}
-${file}: ${.CURDIR}/${file} .PHONY
-       [ -e $@ ] || ${INSTALL} $> $@
-.endfor
+# Tool to bootstrap the password db
+TOOL_PWD_MKDB?= ${NETBSDSRCDIR}/usr.sbin/pwd_mkdb/pwd_mkdb
 
-.for driver in ${PROG_DRIVERS}
-${driver}: ${PROGROOT}/drivers/${driver}/${driver}
+# Remove "drivers/ramdisk" component from path
+PROGROOT:= ${.OBJDIR:S,drivers/ramdisk,,}
+
+# Generate dependencies rules for config files
+.for etc in ${ETC}
+${etc}: ${NETBSDSRCDIR}/etc/${etc}
        ${INSTALL} $> $@
+.endfor
 
-${PROGROOT}/drivers/${driver}/${driver}:
-       ${MAKE} -C ${NETBSDSRCDIR}/drivers/${driver} all
+# LSC Force the regeneration of the proto file as it seems sometimes 
+# they are not copied over as needed.
+# LSC ramdisk rc file != /etc/rc && mtab not empty!
+.for file in ${EXTRA} ${PROTO} ${PROTO_FILES}
+${file}: ${NETBSDSRCDIR}/drivers/ramdisk/${file} .PHONY
+       ${INSTALL} $> $@
 .endfor
 
+# Generate dependencies rules for dynamic libraries, if needed
 .for lib in ${PROG_LIBS}
-PROGRAMS+=${lib}.so.0
+PROGRAMS+= ${lib}.so.0
 CLEANFILES += ${lib}.so.0
 ${lib}.so.0:${PROGROOT}/lib/${lib}/${lib}.so.0
        ${INSTALL} $> $@
@@ -97,48 +114,37 @@ ${PROGROOT}/lib/${lib}/${lib}.so.0:
        ${MAKE} -C ${NETBSDSRCDIR}/lib/${lib} all
 .endfor
 
-.for libexec in ${PROG_LIBEXEC}
-${libexec}:${PROGROOT}/libexec/${libexec}/${libexec}
+# Generate dependencies rules for binaries
+dir.sh:= ash
+.for srcdir in bin commands drivers libexec servers
+.for prog in ${PROG_${srcdir:tu}}
+${prog}: ${PROGROOT}/${srcdir}/${dir.${prog}:U${prog}}/${prog}
        ${INSTALL} $> $@
 
-${PROGROOT}/libexec/${libexec}/${libexec}:
-       ${MAKE} -C ${NETBSDSRCDIR}/libexec/${libexec} all
-.endfor
-
+${PROGROOT}/${srcdir}/${dir.${prog}:U${prog}}/${prog}:
+       ${MAKE} -C ${NETBSDSRCDIR}/${srcdir}/${dir.${prog}:U${prog}} all
+.endfor # prog
+.endfor # srcdir
 
-.for cmd in ${PROG_COMMANDS}
-.if ${cmd} == sh
-dir.${cmd}=ash
-.else
-dir.${cmd}=${cmd}
-.endif
-${cmd}: ${PROGROOT}/commands/${dir.${cmd}}/${cmd}
+# We have to do this as a separate loop, because USR.SBIN is not a valid 
+# make variable name.
+.for prog in ${PROG_USRSBIN}
+${prog}: ${PROGROOT}/usr.sbin/${dir.${prog}:U${prog}}/${prog}
        ${INSTALL} $> $@
 
-${PROGROOT}/commands/$(dir.${cmd})/${cmd}:
-       ${MAKE} -C ${NETBSDSRCDIR}/commands/${dir.${cmd}} all
+${PROGROOT}/usr.sbin/${dir.${prog}:U${prog}}/${prog}:
+       ${MAKE} -C ${NETBSDSRCDIR}/usr.sbin/${dir.${prog}:U${prog}} all
 .endfor
 
-.for etc in ${EXTRA}
-${etc}: ${NETBSDSRCDIR}/etc/${etc}
-       ${INSTALL} $> $@
-.endfor
-
-.for cmd in ${PROG_USRSBIN}
-${cmd}: ${PROGROOT}/usr.sbin/${cmd}/${cmd}
-       ${INSTALL} $> $@
-
-${PROGROOT}/usr.sbin/${cmd}/${cmd}:
-       ${MAKE} -C ${NETBSDSRCDIR}/usr.sbin/${cmd} all
-.endfor
-
-.for server in ${PROG_SERVERS}
-${server}: ${PROGROOT}/servers/${server}/${server}
-       ${INSTALL} $> $@
-
-${PROGROOT}/servers/${server}/${server}:
-       ${MAKE} -C ${NETBSDSRCDIR}/servers/${server} all
-.endfor
+image: proto.gen ${ETC} ${EXTRA} pwd.db spwd.db passwd
+       ${_MKMSG_CREATE} "Generating ramdisk image"
+       ${TOOL_MKFSMFS} image proto.gen || { rm -f image; false; }
+#      if fsck.mfs -s image | grep -q CLEAN;   \
+#      then    : ;     \
+#      else    echo "CLEAN sanity check of image failed."      ;       \
+#              echo "(Perhaps install current mkfs and fsck.)" ;       \
+#              rm -f image; false;             \
+#      fi
 
 etc/master.passwd: ${NETBSDSRCDIR}/etc/master.passwd
        rm -rf ${.OBJDIR}/etc/
@@ -151,15 +157,12 @@ etc/master.passwd: ${NETBSDSRCDIR}/etc/master.passwd
 pwd.db spwd.db passwd: etc/master.passwd
        ${INSTALL} etc/${@F} ${@F}
 
-
 proto.gen: ${PROTO} ${PROTO_FILES} ${PROGRAMS}
        ${STRIP} ${PROGRAMS}
        # We are using the c preprocessor to generate proto.gen
        # used in the mkfs tool.
        ${TOOL_CAT} ${PROTO} | ${HOST_CC} \
-               -DRAMDISK_INC_ACPI=${RAMDISK_INC_ACPI} \
-               -DRAMDISK_SMALL=${RAMDISK_SMALL} \
-               -DRAMDISK_DYNAMIC=${RAMDISK_DYNAMIC} \
+               ${RAMDISK_DEFINES} \
                -traditional-cpp -E - | grep -v "^$$" | grep -v "#" >${.OBJDIR}/${.TARGET}
 
 .include <minix.service.mk>

diff --git a/drivers/ramdisk/mylogin.sh b/drivers/ramdisk/mylogin.sh
new file mode 100755 (executable)
index 0000000..621fb1b
--- /dev/null
+++ b/drivers/ramdisk/mylogin.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+echo Welcome
+export PATH=$PATH:/mnt/bin:/mnt/usr/bin
+exec /bin/sh

diff --git a/drivers/ramdisk/proto.arm.small b/drivers/ramdisk/proto.arm.small
new file mode 100644 (file)
index 0000000..e814e97
--- /dev/null
+++ b/drivers/ramdisk/proto.arm.small
@@ -0,0 +1,34 @@
+boot
+0 0
+d--755 0 0
+       bin d--755 0 0
+               mount ---755 0 0 mount
+               umount ---755 0 0 umount
+               sh ---755 0 0 sh
+               service ---755 0 0 service
+               getty ---755 0 0 getty
+               stty ---755 0 0 stty
+               cp ---755 0 0 cp
+               sync ---755 0 0 sync
+               sleep ---755 0 0 sleep
+               dd ---755 0 0 dd
+               time ---755 0 0 time
+               cat ---755 0 0 cat
+               ls ---755 0 0 ls
+               fsck.mfs ---755 0 0 fsck.mfs
+       $
+       sbin d--755 0 0
+               mmc ---755 0 0 mmc
+               mfs ---755 0 0 mfs
+       $
+       mnt d--755 0 0
+       $
+       usr d--755 0 0
+               bin d--755 0 0
+                       login ---755 0 0 mylogin.sh
+               $
+       $
+       dev d--755 0 0
+#include "proto.dev"
+       $
+$

diff --git a/drivers/ramdisk/proto.common.etc b/drivers/ramdisk/proto.common.etc
index b2c12f28e571c9b8be11cf0dd5eb1c1cc0df3a87..52a04735caa1b36ccad9f1cf921b8fa6bb5774eb 100644 (file)
--- a/drivers/ramdisk/proto.common.etc
+++ b/drivers/ramdisk/proto.common.etc
@@ -5,6 +5,12 @@
                pwd.db ---644 0 0 pwd.db
                spwd.db ---600 0 0 spwd.db
                master.passwd ---600 0 0 master.passwd
+#if defined(__i386)
                rc ---755 0 0 rc
                rs.single ---755 0 0 rs.single
+#endif
+#if defined(__arm__)
+               rc ---755 0 0 rc.arm
+               ttys ---644 0 0 ttys
+#endif
        $

diff --git a/drivers/ramdisk/rc.arm b/drivers/ramdisk/rc.arm
new file mode 100755 (executable)
index 0000000..5f8de51
--- /dev/null
+++ b/drivers/ramdisk/rc.arm
@@ -0,0 +1,16 @@
+#!/bin/sh
+# LSC FIXME quick hack, we should retink the rc script so we do not
+# get two different script
+set -e
+
+
+exec >/dev/log
+exec 2>/dev/log
+exec </dev/null
+
+#XXX
+#/bin/service -c up /sbin/mmc  -dev /dev/c0d0 
+#/bin/fsck.mfs  -p /dev/c0d0p1
+#/bin/mount  /dev/c0d0p1 /mnt
+
+exit

diff --git a/drivers/ramdisk/ttys b/drivers/ramdisk/ttys
new file mode 100755 (executable)
index 0000000..5adf0d4
--- /dev/null
+++ b/drivers/ramdisk/ttys
@@ -0,0 +1,44 @@
+#
+#      from: @(#)ttys  5.1 (Berkeley) 4/17/89
+#
+# name         getty           type    status          comments
+#
+console                "getty 115200"          minix   on secure
+#ttyc1         getty           minix   on secure
+#ttyc2         getty           minix   on secure
+#ttyc3         getty           minix   on secure
+tty00          ""              unknown off secure
+tty01          ""              unknown off secure
+
+ttyp0          ""              network off 
+ttyp1          ""              network off
+ttyp2          ""              network off
+ttyp3          ""              network off
+ttyp4          ""              network off
+ttyp5          ""              network off
+ttyp6          ""              network off
+ttyp7          ""              network off
+ttyp8          ""              network off
+ttyp9          ""              network off
+ttypa          ""              network off
+ttypb          ""              network off
+ttypc          ""              network off
+ttypd          ""              network off
+ttype          ""              network off
+ttypf          ""              network off
+ttyq0          ""              network off
+ttyq1          ""              network off
+ttyq2          ""              network off
+ttyq3          ""              network off
+ttyq4          ""              network off
+ttyq5          ""              network off
+ttyq6          ""              network off
+ttyq7          ""              network off
+ttyq8          ""              network off
+ttyq9          ""              network off
+ttyqa          ""              network off
+ttyqb          ""              network off
+ttyqc          ""              network off
+ttyqd          ""              network off
+ttyqe          ""              network off
+ttyqf          ""              network off

diff --git a/drivers/ti1225/ti1225.c b/drivers/ti1225/ti1225.c
index 49fa9e99705bb4d35a32d035e1fbbe6e026268cb..8c36eac3f34676d1cc3e98542a392442ca8f0f69 100644 (file)
--- a/drivers/ti1225/ti1225.c
+++ b/drivers/ti1225/ti1225.c
@@ -164,7 +164,7 @@ static void hw_init(struct port *pp, int devind)
        v32 &= PCI_BAR_MEM_MASK;        /* Clear low order bits in base */
 
        pp->csr_ptr=
-               (struct csr *) vm_map_phys(SELF, (void *) v32, I386_PAGE_SIZE);
+               (struct csr *) vm_map_phys(SELF, (void *) v32, PAGE_SIZE);
        if (pp->csr_ptr == MAP_FAILED)
                panic("hw_init: vm_map_phys failed");
 

diff --git a/drivers/tty/arch/arm/Makefile.inc b/drivers/tty/arch/earm/Makefile.inc
similarity index 100%
rename from drivers/tty/arch/arm/Makefile.inc
rename to drivers/tty/arch/earm/Makefile.inc

diff --git a/drivers/tty/arch/arm/console.c b/drivers/tty/arch/earm/console.c
similarity index 100%
rename from drivers/tty/arch/arm/console.c
rename to drivers/tty/arch/earm/console.c

diff --git a/drivers/tty/arch/arm/keyboard.c b/drivers/tty/arch/earm/keyboard.c
similarity index 100%
rename from drivers/tty/arch/arm/keyboard.c
rename to drivers/tty/arch/earm/keyboard.c

diff --git a/drivers/tty/arch/arm/omap_serial.h b/drivers/tty/arch/earm/omap_serial.h
similarity index 100%
rename from drivers/tty/arch/arm/omap_serial.h
rename to drivers/tty/arch/earm/omap_serial.h

diff --git a/drivers/tty/arch/arm/rs232.c b/drivers/tty/arch/earm/rs232.c
similarity index 100%
rename from drivers/tty/arch/arm/rs232.c
rename to drivers/tty/arch/earm/rs232.c

diff --git a/external/gpl3/gcc/lib/libgcc/arch/arm.mk b/external/gpl3/gcc/lib/libgcc/arch/arm.mk
index 8480f4b0d51977acc0acbb0aba7f1ba2ee609d1c..1925e74fd87ff58b49e59eae11072e686e8937a4 100644 (file)
--- a/external/gpl3/gcc/lib/libgcc/arch/arm.mk
+++ b/external/gpl3/gcc/lib/libgcc/arch/arm.mk
@@ -4,7 +4,9 @@
 #
 G_INCLUDES=-I. -I. -I${GNUHOSTDIST}/gcc -I${GNUHOSTDIST}/gcc/. -I${GNUHOSTDIST}/gcc/../include -I./../intl -I${GNUHOSTDIST}/gcc/../libcpp/include     -I${GNUHOSTDIST}/gcc/../libdecnumber -I${GNUHOSTDIST}/gcc/../libdecnumber/dpd -I../libdecnumber   -I/usr/include/libelf
 G_LIB2ADD=${GNUHOSTDIST}/gcc/config/floatunsidf.c ${GNUHOSTDIST}/gcc/config/floatunsisf.c
+.if !defined(__MINIX)
 G_LIB2ADDEH=${GNUHOSTDIST}/gcc/unwind-dw2.c ${GNUHOSTDIST}/gcc/unwind-dw2-fde-glibc.c ${GNUHOSTDIST}/gcc/unwind-sjlj.c ${GNUHOSTDIST}/gcc/gthr-gnat.c ${GNUHOSTDIST}/gcc/unwind-c.c
+.endif
 G_LIB2ADD_ST=
 G_LIB1ASMFUNCS=_thumb1_case_sqi _thumb1_case_uqi _thumb1_case_shi _thumb1_case_uhi _thumb1_case_si _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_tls _bb_init_func _call_via_rX _interwork_call_via_rX _arm_fixunsdfsi _arm_fixunssfsi _arm_floatdidf _arm_floatdisf _arm_floatundidf _arm_floatundisf _lshrdi3 _ashrdi3 _ashldi3 _clzsi2 _clzdi2 
 G_LIB1ASMSRC=arm/lib1funcs.asm

diff --git a/include/arch/Makefile b/include/arch/Makefile
index 377af3cda84a0cf4287e391e73bfd4cb72def16f..7e03f52aabe487a3b516fbfbdac37ef04b88f102 100644 (file)
--- a/include/arch/Makefile
+++ b/include/arch/Makefile
@@ -1,5 +1,5 @@
 .include <bsd.own.mk>
 
-SUBDIR=        ${MACHINE}
+SUBDIR=        ${MACHINE_ARCH}
 
 .include <bsd.subdir.mk>

diff --git a/include/arch/evbarm/Makefile b/include/arch/earm/Makefile
similarity index 100%
rename from include/arch/evbarm/Makefile
rename to include/arch/earm/Makefile

diff --git a/include/arch/evbarm/include/Makefile b/include/arch/earm/include/Makefile
similarity index 84%
rename from include/arch/evbarm/include/Makefile
rename to include/arch/earm/include/Makefile
index eaf08d24e765c1ad5acd55470f9837764bdb6178..a5a90fc08a1ad5a3572ff3aff776c1dfa54c56ed 100644 (file)
--- a/include/arch/evbarm/include/Makefile
+++ b/include/arch/earm/include/Makefile
@@ -1,5 +1,5 @@
 
-INCSDIR= /usr/include/arm
+INCSDIR= /usr/include/evbarm
 
 INCS=  archconst.h archtypes.h diskparm.h elf.h interrupt.h \
        ipcconst.h memory.h multiboot.h partition.h \

diff --git a/include/arch/evbarm/include/archconst.h b/include/arch/earm/include/archconst.h
similarity index 100%
rename from include/arch/evbarm/include/archconst.h
rename to include/arch/earm/include/archconst.h

diff --git a/include/arch/evbarm/include/archtypes.h b/include/arch/earm/include/archtypes.h
similarity index 94%
rename from include/arch/evbarm/include/archtypes.h
rename to include/arch/earm/include/archtypes.h
index 156ab63fde501be97bdb9b844eb76ad800fa87fd..a5e32c432e99067ee0344a9aa5679a4a97b891a4 100644 (file)
--- a/include/arch/evbarm/include/archtypes.h
+++ b/include/arch/earm/include/archtypes.h
@@ -17,6 +17,7 @@ struct cpu_info {
        u32_t   implementer;
        u32_t   part;
        u32_t   variant;
+       u32_t   freq;           /* in MHz */
        u32_t   revision;
 };
 

diff --git a/include/arch/evbarm/include/diskparm.h b/include/arch/earm/include/diskparm.h
similarity index 100%
rename from include/arch/evbarm/include/diskparm.h
rename to include/arch/earm/include/diskparm.h

diff --git a/include/arch/evbarm/include/elf.h b/include/arch/earm/include/elf.h
similarity index 100%
rename from include/arch/evbarm/include/elf.h
rename to include/arch/earm/include/elf.h

diff --git a/include/arch/evbarm/include/interrupt.h b/include/arch/earm/include/interrupt.h
similarity index 100%
rename from include/arch/evbarm/include/interrupt.h
rename to include/arch/earm/include/interrupt.h

diff --git a/include/arch/evbarm/include/ipcconst.h b/include/arch/earm/include/ipcconst.h
similarity index 100%
rename from include/arch/evbarm/include/ipcconst.h
rename to include/arch/earm/include/ipcconst.h

diff --git a/include/arch/evbarm/include/memory.h b/include/arch/earm/include/memory.h
similarity index 100%
rename from include/arch/evbarm/include/memory.h
rename to include/arch/earm/include/memory.h

diff --git a/include/arch/evbarm/include/multiboot.h b/include/arch/earm/include/multiboot.h
similarity index 100%
rename from include/arch/evbarm/include/multiboot.h
rename to include/arch/earm/include/multiboot.h

diff --git a/include/arch/evbarm/include/partition.h b/include/arch/earm/include/partition.h
similarity index 100%
rename from include/arch/evbarm/include/partition.h
rename to include/arch/earm/include/partition.h

diff --git a/include/arch/evbarm/include/stackframe.h b/include/arch/earm/include/stackframe.h
similarity index 100%
rename from include/arch/evbarm/include/stackframe.h
rename to include/arch/earm/include/stackframe.h

diff --git a/include/arch/evbarm/include/vm.h b/include/arch/earm/include/vm.h
similarity index 100%
rename from include/arch/evbarm/include/vm.h
rename to include/arch/earm/include/vm.h

diff --git a/kernel/arch/arm/Makefile.inc b/kernel/arch/arm/Makefile.inc
deleted file mode 100644 (file)
index aec758f..0000000
--- a/kernel/arch/arm/Makefile.inc
+++ /dev/null
@@ -1,58 +0,0 @@
-
-# Makefile for arch-dependent kernel code
-.include <bsd.own.mk>
-
-HERE=${.CURDIR}/arch/${MACHINE_ARCH}
-.PATH: ${HERE}
-
-# objects we want unpaged from -lminlib, -lminc
-MINLIB_OBJS_UNPAGED=get_bp.o
-MINC_OBJS_UNPAGED=strcat.o strlen.o memcpy.o strcpy.o strncmp.o memset.o \
-       memmove.o strcmp.o atoi.o ctype_.o _stdfile.o strtol.o _errno.o errno.o
-#      udivdi3.o umoddi3.o qdivrem.o
-SYS_OBJS_UNPAGED=kprintf.o vprintf.o assert.o stacktrace.o
-LIBGCC_OBJS_UNPAGED=_divsi3.o _udivsi3.o _divdi3.o  _udivdi3.o _umoddi3.o \
-       _dvmd_tls.o _aeabi_uldivmod.o _clzsi2.o bpabi.o
-
-# some object files we give a symbol prefix (or namespace) of __k_unpaged_
-# that must live in their own unique namespace.
-#
-.for UNPAGED_OBJ in head.o pre_init.o direct_tty_utils.o \
-       pg_utils.o klib.o omap_serial.o utility.o arch_reset.o \
-       ${MINLIB_OBJS_UNPAGED} ${MINC_OBJS_UNPAGED} ${SYS_OBJS_UNPAGED} ${LIBGCC_OBJS_UNPAGED}
-unpaged_${UNPAGED_OBJ}: ${UNPAGED_OBJ}
-       ${OBJCOPY} --prefix-symbols=__k_unpaged_ ${UNPAGED_OBJ} unpaged_${UNPAGED_OBJ}
-UNPAGED_OBJS += unpaged_${UNPAGED_OBJ}
-ORIG_UNPAGED_OBJS += ${UNPAGED_OBJ}
-.endfor
-
-# we have to extract some object files from libminc.a and libminlib.a
-${MINLIB_OBJS_UNPAGED} ${MINC_OBJS_UNPAGED} ${SYS_OBJS_UNPAGED} ${LIBGCC_OBJS_UNPAGED}: ${LIBMINLIB} ${LIBMINC} ${LIBSYS} ${LIBGCC}
-       ${AR} x ${LIBMINLIB} ${MINLIB_OBJS_UNPAGED}
-       ${AR} x ${LIBMINC} ${MINC_OBJS_UNPAGED}
-       ${AR} x ${LIBSYS} ${SYS_OBJS_UNPAGED}
-       ${AR} x ${LIBGCC} ${LIBGCC_OBJS_UNPAGED}
-
-CLEANFILES+= $(ORIG_UNPAGED_OBJS)
-
-SRCS+= mpx.S arch_clock.c arch_do_vmctl.c arch_system.c \
-       omap_serial.c omap_timer.c omap_intr.c exception.c \
-       io_intr.S klib.S memory.c \
-       protect.c direct_tty_utils.c arch_reset.c \
-       pg_utils.c phys_copy.S phys_memset.S exc.S
-OBJS.kernel+=  ${UNPAGED_OBJS}
-
-klib.d mpx.d head.d: procoffsets.h
-
-# It's OK to hardcode the arch as arm here as this and procoffsets.cf
-# are arm-specific.
-TMP=procoffsets.h.tmp
-INCLS=../include/arch/arm/include/
-PROCOFFSETSCF=procoffsets.cf
-
-procoffsets.h: ${PROCOFFSETSCF} kernel.h proc.h ${INCLS}/stackframe.h ${INCLS}/archtypes.h
-       ${_MKTARGET_CREATE}
-       ${TOOL_CAT} ${HERE}/${PROCOFFSETSCF} | \
-         ${TOOL_GENASSYM} -- ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} >$TMP && \
-         mv -f $TMP $@ 
-

diff --git a/kernel/arch/earm/Makefile.inc b/kernel/arch/earm/Makefile.inc
new file mode 100644 (file)
index 0000000..a9c8c63
--- /dev/null
+++ b/kernel/arch/earm/Makefile.inc
@@ -0,0 +1,88 @@
+# Makefile for arch-dependent kernel code
+.include <bsd.own.mk>
+
+HERE=${.CURDIR}/arch/${MACHINE_ARCH}
+.PATH: ${HERE}
+
+# objects we want unpaged from -lminlib
+MINLIB_OBJS_UNPAGED=get_bp.o
+get_bp.o:      ${NETBSDSRCDIR}/lib/libminlib/${MACHINE_ARCH}/get_bp.S
+
+# objects we want unpaged from -lsys
+SYS_OBJS_UNPAGED=assert.o kprintf.o stacktrace.o vprintf.o
+assert.o:      ${NETBSDSRCDIR}/lib/libsys/assert.c
+kprintf.o:     ${NETBSDSRCDIR}/lib/libsys/kprintf.c
+stacktrace.o:  ${NETBSDSRCDIR}/lib/libsys/stacktrace.c
+vprintf.o:     ${NETBSDSRCDIR}/lib/libsys/vprintf.c
+
+# objects we want unpaged from -lminc
+MINC_OBJS_UNPAGED=findfp.o strcat.o strlen.o memcpy.o strcpy.o strncmp.o \
+       memset.o memmove.o strcmp.o atoi.o ctype_.o strtol.o \
+       _errno.o errno.o udivdi3.o umoddi3.o qdivrem.o
+MINC_OBJS_UNPAGED+= divsi3.o __aeabi_uldivmod.o 
+#_udivsi3.o _divdi3.o  _udivdi3.o _umoddi3.o _dvmd_tls.o _clzsi2.o bpabi.o
+memcpy.o:      ${NETBSDSRCDIR}/common/lib/libc/string/memcpy.c
+memmove.o:     ${NETBSDSRCDIR}/common/lib/libc/string/memmove.c
+memset.o:      ${NETBSDSRCDIR}/common/lib/libc/string/memset.c
+strcat.o:      ${NETBSDSRCDIR}/common/lib/libc/string/strcat.c
+strlen.o:      ${NETBSDSRCDIR}/common/lib/libc/string/strlen.c
+strcpy.o:      ${NETBSDSRCDIR}/common/lib/libc/string/strcpy.c
+strcmp.o:      ${NETBSDSRCDIR}/common/lib/libc/string/strcmp.c
+strncmp.o:     ${NETBSDSRCDIR}/common/lib/libc/string/strncmp.c
+udivdi3.o:     ${NETBSDSRCDIR}/common/lib/libc/quad/udivdi3.c
+umoddi3.o:     ${NETBSDSRCDIR}/common/lib/libc/quad/umoddi3.c
+qdivrem.o:     ${NETBSDSRCDIR}/common/lib/libc/quad/qdivrem.c
+atoi.o:                ${NETBSDSRCDIR}/lib/libc/stdlib/atoi.c
+strtol.o:      ${NETBSDSRCDIR}/lib/libc/stdlib/strtol.c
+findfp.o:      ${NETBSDSRCDIR}/lib/libc/stdio/findfp.c
+ctype_.o:      ${NETBSDSRCDIR}/lib/libc/gen/ctype_.c
+_errno.o:      ${NETBSDSRCDIR}/lib/libc/gen/_errno.c
+errno.o:       ${NETBSDSRCDIR}/lib/libc/gen/errno.c
+divsi3.o:      ${NETBSDSRCDIR}/common/lib/libc/arch/${MACHINE_GNU_ARCH}/gen/divsi3.S
+__aeabi_uldivmod.o:    ${NETBSDSRCDIR}/common/lib/libc/arch/${MACHINE_GNU_ARCH}/quad/__aeabi_uldivmod.S
+
+# Specific flags needed to compile a few of the object files.
+CPPFLAGS.strtol.c+= -I ${NETBSDSRCDIR}/common/lib/libc/stdlib
+CPPFLAGS.ctype_.c+= -I ${NETBSDSRCDIR}/lib/libc/locale
+CPPFLAGS._errno.c+= -I ${NETBSDSRCDIR}/lib/libc/include
+CPPFLAGS.assert.c+= -I ${NETBSDSRCDIR}/lib/libc/include
+CPPFLAGS.findfp.c+= -I ${NETBSDSRCDIR}/lib/libc/include
+
+# some object files we give a symbol prefix (or namespace) of __k_unpaged_
+# that must live in their own unique namespace.
+#
+.for unpaged_obj in head.o pre_init.o direct_tty_utils.o \
+       pg_utils.o klib.o omap_serial.o utility.o arch_reset.o \
+       ${MINLIB_OBJS_UNPAGED} ${MINC_OBJS_UNPAGED} ${SYS_OBJS_UNPAGED}
+unpaged_${unpaged_obj}: ${unpaged_obj}
+       ${OBJCOPY} --prefix-symbols=__k_unpaged_ ${.OBJDIR}/${unpaged_obj} $@
+UNPAGED_OBJS += unpaged_${unpaged_obj}
+ORIG_UNPAGED_OBJS += ${unpaged_obj}
+.endfor
+
+CLEANFILES+= ${ORIG_UNPAGED_OBJS}
+
+SRCS+= mpx.S arch_clock.c arch_do_vmctl.c arch_system.c \
+       omap_serial.c omap_timer.c omap_intr.c exception.c \
+       io_intr.S klib.S memory.c \
+       protect.c direct_tty_utils.c arch_reset.c \
+       pg_utils.c phys_copy.S phys_memset.S exc.S
+OBJS.kernel+=  ${UNPAGED_OBJS}
+
+klib.o mpx.o head.o: procoffsets.h
+
+SRCS+= procoffsets.h
+
+PROCOFFSETSCF=procoffsets.cf
+
+.PATH: ${NETBSDSRCDIR}/include/arch/${MACHINE_ARCH}/include
+
+procoffsets.h: ${PROCOFFSETSCF} kernel.h proc.h stackframe.h archtypes.h
+       ${_MKTARGET_CREATE}
+       ${TOOL_CAT} ${HERE}/${PROCOFFSETSCF} | \
+         ${TOOL_GENASSYM} -- ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} >$@.tmp && \
+         mv -f $@.tmp $@ 
+
+sconst.h: procoffsets.h
+apic_asm.o head.o klib.o mpx.o: sconst.h
+

diff --git a/kernel/arch/arm/arch_clock.c b/kernel/arch/earm/arch_clock.c
similarity index 96%
rename from kernel/arch/arm/arch_clock.c
rename to kernel/arch/earm/arch_clock.c
index 03759638de16906e368f051afd3b9924a0b78057..5a514414037fe1723e7d9b4834bcf69fc69f882e 100644 (file)
--- a/kernel/arch/arm/arch_clock.c
+++ b/kernel/arch/earm/arch_clock.c
@@ -7,11 +7,11 @@
 #include "kernel/proc.h"
 #include "kernel/interrupt.h"
 #include <minix/u64.h>
-#include "glo.h"
-#include "profile.h"
+#include "kernel/glo.h"
+#include "kernel/profile.h"
 
 
-#include "spinlock.h"
+#include "kernel/spinlock.h"
 
 #ifdef CONFIG_SMP
 #include "kernel/smp.h"

diff --git a/kernel/arch/arm/arch_do_vmctl.c b/kernel/arch/earm/arch_do_vmctl.c
similarity index 100%
rename from kernel/arch/arm/arch_do_vmctl.c
rename to kernel/arch/earm/arch_do_vmctl.c

diff --git a/kernel/arch/arm/arch_reset.c b/kernel/arch/earm/arch_reset.c
similarity index 100%
rename from kernel/arch/arm/arch_reset.c
rename to kernel/arch/earm/arch_reset.c

diff --git a/kernel/arch/arm/arch_system.c b/kernel/arch/earm/arch_system.c
similarity index 98%
rename from kernel/arch/arm/arch_system.c
rename to kernel/arch/earm/arch_system.c
index c8af6cc09157a9ef881ba30edaade0a1e1643d8e..4db5fdbe3ffff36b3752b95a9b204c171c1f3ce0 100644 (file)
--- a/kernel/arch/arm/arch_system.c
+++ b/kernel/arch/earm/arch_system.c
@@ -77,6 +77,7 @@ void cpu_identify(void)
        cpu_info[cpu].arch = (midr >> 16) & 0xF;
        cpu_info[cpu].part = (midr >> 4) & 0xFFF;
        cpu_info[cpu].revision = midr & 0xF;
+       cpu_info[cpu].freq = 660; /* 660 Mhz hardcoded */
 }
 
 void arch_init(void)

diff --git a/kernel/arch/arm/direct_tty_utils.c b/kernel/arch/earm/direct_tty_utils.c
similarity index 100%
rename from kernel/arch/arm/direct_tty_utils.c
rename to kernel/arch/earm/direct_tty_utils.c

diff --git a/kernel/arch/arm/exc.S b/kernel/arch/earm/exc.S
similarity index 100%
rename from kernel/arch/arm/exc.S
rename to kernel/arch/earm/exc.S

diff --git a/kernel/arch/arm/exception.c b/kernel/arch/earm/exception.c
similarity index 100%
rename from kernel/arch/arm/exception.c
rename to kernel/arch/earm/exception.c

diff --git a/kernel/arch/arm/glo.h b/kernel/arch/earm/glo.h
similarity index 100%
rename from kernel/arch/arm/glo.h
rename to kernel/arch/earm/glo.h

diff --git a/kernel/arch/arm/head.S b/kernel/arch/earm/head.S
similarity index 95%
rename from kernel/arch/arm/head.S
rename to kernel/arch/earm/head.S
index 5f8bd04f020e9f8a5546435a3835ee3298800603..99fdd09db515019c1bb5fd4ddddf157bc372230b 100644 (file)
--- a/kernel/arch/arm/head.S
+++ b/kernel/arch/earm/head.S
@@ -3,7 +3,7 @@
 /* sections */
 
 #include <machine/vm.h>
-#include "../../kernel.h"
+#include "kernel/kernel.h"
 #include <minix/config.h>
 #include <minix/const.h>
 #include <minix/com.h>
@@ -41,7 +41,8 @@ multiboot_init:
        mov     r1, #0
        push    {r1}    /* Terminate stack */
        /* r0 holds kinfo_t ptr */
-       bl      _C_LABEL(kmain)
+       ldr     r2, =_C_LABEL(kmain)
+       bx      r2
 
        /* not reached */
 hang:

diff --git a/kernel/arch/arm/include/arch_clock.h b/kernel/arch/earm/include/arch_clock.h
similarity index 100%
rename from kernel/arch/arm/include/arch_clock.h
rename to kernel/arch/earm/include/arch_clock.h

diff --git a/kernel/arch/arm/include/arch_proto.h b/kernel/arch/earm/include/arch_proto.h
similarity index 100%
rename from kernel/arch/arm/include/arch_proto.h
rename to kernel/arch/earm/include/arch_proto.h

diff --git a/kernel/arch/arm/include/arch_watchdog.h b/kernel/arch/earm/include/arch_watchdog.h
similarity index 100%
rename from kernel/arch/arm/include/arch_watchdog.h
rename to kernel/arch/earm/include/arch_watchdog.h

diff --git a/kernel/arch/arm/include/archconst.h b/kernel/arch/earm/include/archconst.h
similarity index 100%
rename from kernel/arch/arm/include/archconst.h
rename to kernel/arch/earm/include/archconst.h

diff --git a/kernel/arch/arm/include/cpufunc.h b/kernel/arch/earm/include/cpufunc.h
similarity index 100%
rename from kernel/arch/arm/include/cpufunc.h
rename to kernel/arch/earm/include/cpufunc.h

diff --git a/kernel/arch/arm/include/direct_utils.h b/kernel/arch/earm/include/direct_utils.h
similarity index 100%
rename from kernel/arch/arm/include/direct_utils.h
rename to kernel/arch/earm/include/direct_utils.h

diff --git a/kernel/arch/arm/include/hw_intr.h b/kernel/arch/earm/include/hw_intr.h
similarity index 100%
rename from kernel/arch/arm/include/hw_intr.h
rename to kernel/arch/earm/include/hw_intr.h

diff --git a/kernel/arch/arm/include/io.h b/kernel/arch/earm/include/io.h
similarity index 100%
rename from kernel/arch/arm/include/io.h
rename to kernel/arch/earm/include/io.h

diff --git a/kernel/arch/arm/io_intr.S b/kernel/arch/earm/io_intr.S
similarity index 100%
rename from kernel/arch/arm/io_intr.S
rename to kernel/arch/earm/io_intr.S

diff --git a/kernel/arch/arm/kernel.lds b/kernel/arch/earm/kernel.lds
similarity index 100%
rename from kernel/arch/arm/kernel.lds
rename to kernel/arch/earm/kernel.lds

diff --git a/kernel/arch/arm/klib.S b/kernel/arch/earm/klib.S
similarity index 100%
rename from kernel/arch/arm/klib.S
rename to kernel/arch/earm/klib.S

diff --git a/kernel/arch/arm/memory.c b/kernel/arch/earm/memory.c
similarity index 100%
rename from kernel/arch/arm/memory.c
rename to kernel/arch/earm/memory.c

diff --git a/kernel/arch/arm/mpx.S b/kernel/arch/earm/mpx.S
similarity index 100%
rename from kernel/arch/arm/mpx.S
rename to kernel/arch/earm/mpx.S

diff --git a/kernel/arch/arm/omap_ccnt.h b/kernel/arch/earm/omap_ccnt.h
similarity index 100%
rename from kernel/arch/arm/omap_ccnt.h
rename to kernel/arch/earm/omap_ccnt.h

diff --git a/kernel/arch/arm/omap_intr.c b/kernel/arch/earm/omap_intr.c
similarity index 100%
rename from kernel/arch/arm/omap_intr.c
rename to kernel/arch/earm/omap_intr.c

diff --git a/kernel/arch/arm/omap_intr.h b/kernel/arch/earm/omap_intr.h
similarity index 100%
rename from kernel/arch/arm/omap_intr.h
rename to kernel/arch/earm/omap_intr.h

diff --git a/kernel/arch/arm/omap_serial.c b/kernel/arch/earm/omap_serial.c
similarity index 100%
rename from kernel/arch/arm/omap_serial.c
rename to kernel/arch/earm/omap_serial.c

diff --git a/kernel/arch/arm/omap_serial.h b/kernel/arch/earm/omap_serial.h
similarity index 100%
rename from kernel/arch/arm/omap_serial.h
rename to kernel/arch/earm/omap_serial.h

diff --git a/kernel/arch/arm/omap_timer.c b/kernel/arch/earm/omap_timer.c
similarity index 100%
rename from kernel/arch/arm/omap_timer.c
rename to kernel/arch/earm/omap_timer.c

diff --git a/kernel/arch/arm/omap_timer.h b/kernel/arch/earm/omap_timer.h
similarity index 100%
rename from kernel/arch/arm/omap_timer.h
rename to kernel/arch/earm/omap_timer.h

diff --git a/kernel/arch/arm/pg_utils.c b/kernel/arch/earm/pg_utils.c
similarity index 100%
rename from kernel/arch/arm/pg_utils.c
rename to kernel/arch/earm/pg_utils.c

diff --git a/kernel/arch/arm/phys_copy.S b/kernel/arch/earm/phys_copy.S
similarity index 100%
rename from kernel/arch/arm/phys_copy.S
rename to kernel/arch/earm/phys_copy.S

diff --git a/kernel/arch/arm/phys_memset.S b/kernel/arch/earm/phys_memset.S
similarity index 100%
rename from kernel/arch/arm/phys_memset.S
rename to kernel/arch/earm/phys_memset.S

diff --git a/kernel/arch/arm/pre_init.c b/kernel/arch/earm/pre_init.c
similarity index 86%
rename from kernel/arch/arm/pre_init.c
rename to kernel/arch/earm/pre_init.c
index 602cc0678ea8245b907cb4ea51b45a2bad0eb693..cab4979df62d33fdeee7ce4c6fc1f7d8d71808d0 100644 (file)
--- a/kernel/arch/arm/pre_init.c
+++ b/kernel/arch/earm/pre_init.c
@@ -47,7 +47,7 @@ static int mb_set_param(char *bigbuf, char *name, char *value, kinfo_t *cbi)
        /* Some variables we recognize */
        if(!strcmp(name, SERVARNAME)) { cbi->do_serial_debug = 1; }
        if(!strcmp(name, SERBAUDVARNAME)) { cbi->serial_debug_baud = atoi(value); }
-       
+
        /* Delete the item if already exists */
        while (*p) {
                if (strncmp(p, name, namelen) == 0 && p[namelen] == '=') {
@@ -95,6 +95,39 @@ int overlaps(multiboot_module_t *mod, int n, int cmp_mod)
        return 0;
 }
 
+/* XXX: hard-coded stuff for modules */
+#define MB_MODS_NR 12
+#define MB_MODS_BASE  0x90000000
+#define MB_MODS_ALIGN 0x00800000 /*  8 MB */
+#define MB_MODS_SIZE  0x00004000 /* 16 KB */
+#define MB_MMAP_START MB_MODS_BASE
+#define MB_MMAP_SIZE  0x10000000 /* 256 MB */
+
+multiboot_module_t mb_modlist[MB_MODS_NR];
+multiboot_memory_map_t mb_memmap;
+
+void setup_mbi(multiboot_info_t *mbi)
+{
+       memset(mbi, 0, sizeof(*mbi));
+       mbi->flags = MULTIBOOT_INFO_MODS | MULTIBOOT_INFO_MEM_MAP;
+       mbi->mods_count = MB_MODS_NR;
+       mbi->mods_addr = (u32_t)&mb_modlist;
+
+       int i;
+       for (i = 0; i < MB_MODS_NR; ++i) {
+           mb_modlist[i].mod_start = MB_MODS_BASE + i * MB_MODS_ALIGN;
+           mb_modlist[i].mod_end = mb_modlist[i].mod_start + MB_MODS_ALIGN - 1;            mb_modlist[i].cmdline = 0;
+       }
+
+       mbi->mmap_addr = (void*)&mb_memmap;
+       mbi->mmap_length = sizeof(mb_memmap);
+
+       mb_memmap.size = sizeof(multiboot_memory_map_t);
+       mb_memmap.addr = MB_MMAP_START;
+       mb_memmap.len  = MB_MMAP_SIZE;
+       mb_memmap.type = MULTIBOOT_MEMORY_AVAILABLE;
+}
+
 void get_parameters(u32_t ebx, kinfo_t *cbi) 
 {
        multiboot_memory_map_t *mmap;
@@ -109,7 +142,8 @@ void get_parameters(u32_t ebx, kinfo_t *cbi)
        static char cmdline[BUF];
 
        /* get our own copy of the multiboot info struct and module list */
-       memcpy((void *) mbi, (void *) ebx, sizeof(*mbi));
+       //memcpy((void *) mbi, (void *) ebx, sizeof(*mbi));
+       setup_mbi(mbi);
 
        /* Set various bits of info for the higher-level kernel. */
        cbi->mem_high_phys = 0;
@@ -237,4 +271,3 @@ kinfo_t *pre_init(u32_t magic, u32_t ebx)
 int send_sig(endpoint_t proc_nr, int sig_nr) { return 0; }
 void minix_shutdown(timer_t *t) { arch_shutdown(RBT_PANIC); }
 void busy_delay_ms(int x) { }
-

diff --git a/kernel/arch/arm/procoffsets.cf b/kernel/arch/earm/procoffsets.cf
similarity index 100%
rename from kernel/arch/arm/procoffsets.cf
rename to kernel/arch/earm/procoffsets.cf

diff --git a/kernel/arch/arm/protect.c b/kernel/arch/earm/protect.c
similarity index 100%
rename from kernel/arch/arm/protect.c
rename to kernel/arch/earm/protect.c

diff --git a/kernel/arch/arm/sconst.h b/kernel/arch/earm/sconst.h
similarity index 100%
rename from kernel/arch/arm/sconst.h
rename to kernel/arch/earm/sconst.h

diff --git a/kernel/arch/arm/serial.h b/kernel/arch/earm/serial.h
similarity index 100%
rename from kernel/arch/arm/serial.h
rename to kernel/arch/earm/serial.h

diff --git a/kernel/arch/arm/timer.h b/kernel/arch/earm/timer.h
similarity index 100%
rename from kernel/arch/arm/timer.h
rename to kernel/arch/earm/timer.h

diff --git a/kernel/arch/i386/Makefile.inc b/kernel/arch/i386/Makefile.inc
index 98909456d2d3f58675939e4f083bfc0895f6f9fe..9e276c0e8a97c81b13c73d2b712d58194a0b9feb 100644 (file)
--- a/kernel/arch/i386/Makefile.inc
+++ b/kernel/arch/i386/Makefile.inc
@@ -49,13 +49,13 @@ CPPFLAGS.findfp.c+= -I ${NETBSDSRCDIR}/lib/libc/include
 # some object files we give a symbol prefix (or namespace) of __k_unpaged_
 # that must live in their own unique namespace.
 #
-.for UNPAGED_OBJ in head.o pre_init.o direct_tty_utils.o io_outb.o \
+.for unpaged_obj in head.o pre_init.o direct_tty_utils.o io_outb.o \
        io_inb.o pg_utils.o klib.o utility.o arch_reset.o \
        ${MINLIB_OBJS_UNPAGED} ${MINC_OBJS_UNPAGED} ${SYS_OBJS_UNPAGED}
-unpaged_${UNPAGED_OBJ}: ${UNPAGED_OBJ}
-       ${OBJCOPY} --prefix-symbols=__k_unpaged_ ${.OBJDIR}/${UNPAGED_OBJ} $@
-UNPAGED_OBJS += unpaged_${UNPAGED_OBJ}
-ORIG_UNPAGED_OBJS += ${UNPAGED_OBJ}
+unpaged_${unpaged_obj}: ${unpaged_obj}
+       ${OBJCOPY} --prefix-symbols=__k_unpaged_ ${.OBJDIR}/${unpaged_obj} $@
+UNPAGED_OBJS += unpaged_${unpaged_obj}
+ORIG_UNPAGED_OBJS += ${unpaged_obj}
 .endfor
 
 CLEANFILES+= ${ORIG_UNPAGED_OBJS}
@@ -104,5 +104,5 @@ procoffsets.h: ${PROCOFFSETSCF} kernel.h proc.h stackframe.h archtypes.h
          mv -f $@.tmp $@ 
 
 sconst.h: procoffsets.h
-apic_asm.S head.S klib16.S klib.S mpx.S: sconst.h
+apic_asm.o head.o klib.o mpx.o: sconst.h
 

diff --git a/lib/Makefile b/lib/Makefile
index cc4880d9489898bd783ff9c3552f38432869e6b1..777c4d121acdf33a908dcffe0de8778e8b943923 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -42,8 +42,12 @@ SUBDIR+= libcompat_minix libblockdriver libchardriver     \
        libz libfetch libvtreefs libaudiodriver libmthread   \
        libexec libdevman libusb libasyn librmt \
        libddekit libminixfs libbdev libelf libminc libcrypt libterminfo \
-       libvassert libutil libbz2 libprop \
-       libnetsock libpuffs libsffs libhgfs libvboxfs 
+       libutil libbz2 libprop \
+       libnetsock libpuffs libsffs
+
+.if (${MACHINE} == "i386")
+SUBDIR += libvassert libhgfs libvboxfs 
+.endif
 
 .if (${MKRUMP} != "no")
 SUBDIR+=       librumpclient

diff --git a/lib/libc/arch/arm/Makefile.inc b/lib/libc/arch/arm/Makefile.inc
index 50509c6836335e7f5e69721e52789799793323b8..0d5c191c8c4f8955cbdf010f6d0001fcb32bb60f 100644 (file)
--- a/lib/libc/arch/arm/Makefile.inc
+++ b/lib/libc/arch/arm/Makefile.inc
@@ -9,7 +9,7 @@ SRCS+=  __aeabi_read_tp.S __sigaction14_sigtramp.c __sigtramp2.S
 CPPFLAGS += -I.
 CPPFLAGS += -DSOFTFLOAT
 
-.if ${MACHINE_ARCH} == "earm" || ${MACHINE_ARCH} == "earmeb"
+.if ${MACHINE_ARCH} == "earm" || ${MACHINE_ARCH} == "earmeb" || defined(__MINIX)
 SRCS+= __aeabi_ldivmod.S __aeabi_uldivmod.S
 SRCS+= __aeabi_lcmp.c __aeabi_ulcmp.c
 SRCS+= fixunsgen_ieee754.c fixunssfsi_ieee754.c

diff --git a/lib/libc/arch/arm/genassym.cf b/lib/libc/arch/arm/genassym.cf
deleted file mode 100644 (file)
index 75cb98e..0000000
--- a/lib/libc/arch/arm/genassym.cf
+++ /dev/null
@@ -1,36 +0,0 @@
-#      $NetBSD: genassym.cf,v 1.1 2012/09/27 11:20:20 skrll Exp $
-
-#
-# Copyright (c) 2012 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# This code is derived from software contributed to The NetBSD Foundation
-# by Nick Hudson
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-include <sys/types.h>
-include <ucontext.h>
-
-define _UC_REGS_SP     offsetof(ucontext_t, uc_mcontext.__gregs[_REG_SP])
-define _UC_REGS_PC     offsetof(ucontext_t, uc_mcontext.__gregs[_REG_PC])

diff --git a/lib/libc/arch/arm/sys-minix/Makefile.inc b/lib/libc/arch/arm/sys-minix/Makefile.inc
index 0259a31b1a91bb36b4ddd5b5a1110de1db52568a..00d4e8e25042302a2f01aa383dfb445ce3bfefef 100644 (file)
--- a/lib/libc/arch/arm/sys-minix/Makefile.inc
+++ b/lib/libc/arch/arm/sys-minix/Makefile.inc
@@ -1,14 +1,13 @@
 # rts sources
-HERE=${.CURDIR}/arch/${MACHINE_ARCH}/sys-minix
+HERE=${ARCHDIR}/sys-minix
 .PATH: ${HERE}
 
-ARCHINCLS=${NETBSDSRCDIR}/include/arch/${MACHINE_ARCH}/include/
 TMP=ucontextoffsets.h.tmp
-CF=ucontextoffsets.cf
+CF=${HERE}/ucontextoffsets.cf
 
 INCS+=ucontextoffsets.h
 
-ucontext.d: ucontextoffsets.h
+ucontext.o: ucontextoffsets.h
 
 SRCS+=   \
        __sigreturn.S \
@@ -17,9 +16,12 @@ SRCS+=   \
        brksize.S \
        ucontext.S
 
-ucontextoffsets.h: ${CF} ${ARCHINCLS}/stackframe.h ${NETBSDSRCDIR}/sys/sys/ucontext.h
+ucontextoffsets.h: ${CF} 
+ucontextoffsets.h: ${NETBSDSRCDIR}/sys/sys/ucontext.h
+ucontextoffsets.h: ${NETBSDSRCDIR}/include/arch/${MACHINE_ARCH}/include/stackframe.h
+ucontextoffsets.h: 
        ${_MKTARGET_CREATE}
-       cat ${HERE}/$(CF) | \
+       cat ${CF} | \
                ${TOOL_GENASSYM} -- ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} >$TMP && \
        mv -f $TMP $@
 

diff --git a/lib/libc/arch/i386/sys-minix/Makefile.inc b/lib/libc/arch/i386/sys-minix/Makefile.inc
index 0259a31b1a91bb36b4ddd5b5a1110de1db52568a..00d4e8e25042302a2f01aa383dfb445ce3bfefef 100644 (file)
--- a/lib/libc/arch/i386/sys-minix/Makefile.inc
+++ b/lib/libc/arch/i386/sys-minix/Makefile.inc
@@ -1,14 +1,13 @@
 # rts sources
-HERE=${.CURDIR}/arch/${MACHINE_ARCH}/sys-minix
+HERE=${ARCHDIR}/sys-minix
 .PATH: ${HERE}
 
-ARCHINCLS=${NETBSDSRCDIR}/include/arch/${MACHINE_ARCH}/include/
 TMP=ucontextoffsets.h.tmp
-CF=ucontextoffsets.cf
+CF=${HERE}/ucontextoffsets.cf
 
 INCS+=ucontextoffsets.h
 
-ucontext.d: ucontextoffsets.h
+ucontext.o: ucontextoffsets.h
 
 SRCS+=   \
        __sigreturn.S \
@@ -17,9 +16,12 @@ SRCS+=   \
        brksize.S \
        ucontext.S
 
-ucontextoffsets.h: ${CF} ${ARCHINCLS}/stackframe.h ${NETBSDSRCDIR}/sys/sys/ucontext.h
+ucontextoffsets.h: ${CF} 
+ucontextoffsets.h: ${NETBSDSRCDIR}/sys/sys/ucontext.h
+ucontextoffsets.h: ${NETBSDSRCDIR}/include/arch/${MACHINE_ARCH}/include/stackframe.h
+ucontextoffsets.h: 
        ${_MKTARGET_CREATE}
-       cat ${HERE}/$(CF) | \
+       cat ${CF} | \
                ${TOOL_GENASSYM} -- ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} >$TMP && \
        mv -f $TMP $@
 

diff --git a/lib/libc/softfloat/softfloat-specialize b/lib/libc/softfloat/softfloat-specialize
index 172d6f9b99764688e0ccf92a79e2df6819070a04..de1729c1e1f8a7400fe3cad3f41265784539e218 100644 (file)
--- a/lib/libc/softfloat/softfloat-specialize
+++ b/lib/libc/softfloat/softfloat-specialize
@@ -80,7 +80,11 @@ void float_raise( fp_except flags )
            info.si_code = FPE_FLTINV;
        else if (flags & float_flag_inexact)
            info.si_code = FPE_FLTRES;
+#if !defined(__minix)
+/* LSC FIXME: This kind of remove any interest to the function. We should
+               be using the minix equivalent, or do something appropriate. */
        sigqueueinfo(getpid(), &info);
+#endif /* !defined(__minix) */
     }
 }
 #undef float_exception_mask

diff --git a/lib/libcompat_minix/include/Makefile.inc b/lib/libcompat_minix/include/Makefile.inc
index ab3e5c6185a4d637b4a5f2301ce3f0fc96434bce..c62cb3ce4f5cff9ef88d270f187aa200597eb60b 100644 (file)
--- a/lib/libcompat_minix/include/Makefile.inc
+++ b/lib/libcompat_minix/include/Makefile.inc
@@ -5,4 +5,4 @@ INCSDIR= /usr/include
 INCS+= configfile.h
 INCS+=         compat/a.out.h 
 INCS+= net/gen/netdb.h net/gen/resolv.h net/gen/nameser.h
-INCS+= sys/jmp_buf.h ${MACHINE_ARCH}/compat_jmp_buf.h
+INCS+= sys/jmp_buf.h ${MACHINE}/compat_jmp_buf.h

diff --git a/lib/libcompat_minix/include/arm/compat_jmp_buf.h b/lib/libcompat_minix/include/evbarm/compat_jmp_buf.h
similarity index 100%
rename from lib/libcompat_minix/include/arm/compat_jmp_buf.h
rename to lib/libcompat_minix/include/evbarm/compat_jmp_buf.h

diff --git a/lib/libminc/Makefile b/lib/libminc/Makefile
index b04001e9181faabb83a7c2575be1a69746f37a70..e9be11aae90311a4fd3936ad70a9002af83c5afe 100644 (file)
--- a/lib/libminc/Makefile
+++ b/lib/libminc/Makefile
@@ -12,6 +12,7 @@ LIBCSRCDIR=   ${NETBSDSRCDIR}/lib/libc
 CPPFLAGS+=      -I${LIBCSRCDIR}/include -I${LIBCSRCDIR}
 CPPFLAGS+=     -D_LIBMINC
 
+ARCHDIR?=  ${LIBCSRCDIR}/arch/${MACHINE_CPU}
 #
 # Customized versions of libc functions.
 #
@@ -99,7 +100,7 @@ CLEANFILES+= errlist.c
        isfinitef_ieee754.c isfinited_ieee754.c \
        signbitf_ieee754.c signbitd_ieee754.c \
        nanf.c
-.PATH.c .PATH.S: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/gen ${LIBCSRCDIR}/gen/minix \
+.PATH.c .PATH.S: ${ARCHDIR}/gen ${LIBCSRCDIR}/gen/minix \
        ${LIBCSRCDIR}/gen ${LIBCSRCDIR}
 SRCS+= ${i}
 .endfor
@@ -117,7 +118,7 @@ SRCS+= ${i}
 # Import from string
 .for i in strcspn.c strerror.c strerror_r.c strtol.c \
        bcopy.S bzero.S
-.PATH.S: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/string
+.PATH.S: ${ARCHDIR}/string
 .PATH.c: ${LIBCSRCDIR}/string
 SRCS+= ${i}
 CPPFLAGS.${i}+= -D_LIBC
@@ -145,7 +146,7 @@ CPPFLAGS.${i}+= -I${LIBCSRCDIR}/locale
        stime.c syscall.c _ucontext.c umask.c unlink.c waitpid.c \
        brksize.S _ipc.S _senda.S ucontext.S mmap.c init.c
 .PATH.c: ${LIBCSRCDIR}/sys-minix
-.PATH.S: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/sys-minix
+.PATH.S: ${ARCHDIR}/sys-minix
 SRCS+= ${i}
 .endfor
 

diff --git a/lib/libminc/arch/arm/Makefile.libc.inc b/lib/libminc/arch/earm/Makefile.libc.inc
similarity index 91%
rename from lib/libminc/arch/arm/Makefile.libc.inc
rename to lib/libminc/arch/earm/Makefile.libc.inc
index 8c865b6881d3d39cda733c4da9d7f670aa3aa916..3c6a4257af5f74e2a9a31805e1f864f7dc082ea7 100644 (file)
--- a/lib/libminc/arch/arm/Makefile.libc.inc
+++ b/lib/libminc/arch/earm/Makefile.libc.inc
@@ -3,3 +3,4 @@ SRCS+=  memchr.c memcmp.c memcpy.c memmove.c memset.c \
        strcat.c strchr.c strcmp.c strcpy.c strlen.c \
        strncmp.c strrchr.c
 SRCS+= bcmp.c
+SRCS+= divsi3.S

diff --git a/lib/libminlib/arm/Makefile.inc b/lib/libminlib/earm/Makefile.inc
similarity index 100%
rename from lib/libminlib/arm/Makefile.inc
rename to lib/libminlib/earm/Makefile.inc

diff --git a/lib/libminlib/arm/get_bp.S b/lib/libminlib/earm/get_bp.S
similarity index 100%
rename from lib/libminlib/arm/get_bp.S
rename to lib/libminlib/earm/get_bp.S

diff --git a/lib/libminlib/arm/read_tsc.c b/lib/libminlib/earm/read_tsc.c
similarity index 100%
rename from lib/libminlib/arm/read_tsc.c
rename to lib/libminlib/earm/read_tsc.c

diff --git a/lib/libsys/Makefile b/lib/libsys/Makefile
index 5de363a20a30883c8758d1c12d0c051d53bcff61..be79967d4361758cfd6c3c2525cb39008432b224 100644 (file)
--- a/lib/libsys/Makefile
+++ b/lib/libsys/Makefile
@@ -75,6 +75,7 @@ SRCS=  \
        taskcall.c \
        tickdelay.c \
        timers.c \
+       tsc_util.c \
        vm_brk.c \
        vm_exit.c \
        vm_fork.c \
@@ -108,7 +109,6 @@ SRCS+=  \
        sys_voutl.c \
        sys_voutw.c \
        timing.c \
-       tsc_util.c \
        vbox.c
 .endif
 

diff --git a/libexec/ld.elf_so/arch/arm/mdreloc.c b/libexec/ld.elf_so/arch/arm/mdreloc.c
index 533826d4266252410a8d2614398648796f62778d..f053785b97d3c6f7a6b78fac0de4e81b700ed63a 100644 (file)
--- a/libexec/ld.elf_so/arch/arm/mdreloc.c
+++ b/libexec/ld.elf_so/arch/arm/mdreloc.c
@@ -179,6 +179,7 @@ _rtld_relocate_nonplt_objects(Obj_Entry *obj)
                        rdbg(("COPY (avoid in main)"));
                        break;
 
+#if defined(__HAVE_TLS_VARIANT_I) || defined(__HAVE_TLS_VARIANT_II)
                case R_TYPE(TLS_DTPOFF32):
                        def = _rtld_find_symdef(symnum, obj, &defobj, false);
                        if (def == NULL)
@@ -231,6 +232,7 @@ _rtld_relocate_nonplt_objects(Obj_Entry *obj)
                            obj->strtab + obj->symtab[symnum].st_name,
                            obj->path, (void *)tmp));
                        break;
+#endif
 
                default:
                        rdbg(("sym = %lu, type = %lu, offset = %p, "

diff --git a/releasetools/Makefile b/releasetools/Makefile
index 542c9da7409ba6bacac09b77d8586ffc3cde11bd..062e3251a0cf697aea8f7b5cf4d3736cc50c08e7 100644 (file)
--- a/releasetools/Makefile
+++ b/releasetools/Makefile
@@ -18,19 +18,20 @@ PROGROOT:= ${MAKEOBJDIR:S,releasetools,,}
 # Specify the programs that are part of the system image.
 KERNEL= ${PROGROOT}/kernel/kernel
 # PROGRAMS are in the order they should be loaded by boot
-PROGRAMS= \
-       ${PROGROOT}/servers/ds/ds \
-       ${PROGROOT}/servers/rs/rs \
-       ${PROGROOT}/servers/pm/pm \
-       ${PROGROOT}/servers/sched/sched \
-       ${PROGROOT}/servers/vfs/vfs \
-       ${PROGROOT}/drivers/memory/memory \
-       ${PROGROOT}/drivers/log/log \
-       ${PROGROOT}/drivers/tty/tty \
-       ${PROGROOT}/servers/mfs/mfs \
-       ${PROGROOT}/servers/vm/vm \
-       ${PROGROOT}/servers/pfs/pfs \
-       ${PROGROOT}/servers/init/init
+PROGRAMS+= ${PROGROOT}/servers/ds/ds
+PROGRAMS+= ${PROGROOT}/servers/rs/rs
+PROGRAMS+= ${PROGROOT}/servers/pm/pm
+PROGRAMS+= ${PROGROOT}/servers/sched/sched
+PROGRAMS+= ${PROGROOT}/servers/vfs/vfs
+PROGRAMS+= ${PROGROOT}/drivers/memory/memory
+.if ${MACHINE_ARCH} == "i386"
+PROGRAMS+= ${PROGROOT}/drivers/log/log
+.endif
+PROGRAMS+= ${PROGROOT}/drivers/tty/tty
+PROGRAMS+= ${PROGROOT}/servers/mfs/mfs
+PROGRAMS+= ${PROGROOT}/servers/vm/vm
+PROGRAMS+= ${PROGROOT}/servers/pfs/pfs
+PROGRAMS+= ${PROGROOT}/servers/init/init
 
 usage: 
        @echo " " >&2

diff --git a/servers/Makefile b/servers/Makefile
index 2590023e2669a3ad982163545329596e0176359f..6297edc652b45f8bf630a978758c3e7c9f5000b0 100644 (file)
--- a/servers/Makefile
+++ b/servers/Makefile
@@ -9,8 +9,12 @@ SUBDIR=        ds init mfs pfs pm rs sched vfs vm
 
 .else
 
-SUBDIR=        ds ext2 hgfs inet init ipc is iso9660fs \
-       mfs pfs pm procfs rs sched vbfs vfs vm devman
+SUBDIR=        ds ext2 inet init ipc is iso9660fs \
+       mfs pfs pm procfs rs sched vfs vm devman
+
+.if ${MACHINE_ARCH} == "i386"
+SUBDIR+= hgfs vbfs
+.endif
 
 .endif
 

diff --git a/servers/ipc/inc.h b/servers/ipc/inc.h
index 5163a318ce523711e9986ea30d55ff9f97efe157..e3e1dc88885a0d24a63a9ee3dc34f242a05bdc92 100644 (file)
--- a/servers/ipc/inc.h
+++ b/servers/ipc/inc.h
@@ -18,6 +18,7 @@
 #include <sys/sem.h>
 #include <sys/mman.h>
 #include <machine/vm.h>
+#include <machine/vmparam.h>
 #include <sys/vm.h>
 
 #include <time.h>

diff --git a/servers/ipc/shm.c b/servers/ipc/shm.c
index 7229bd26afea18842e1dd5863b0343fc9c6c4357..caa99aa2fd67ced68bb9fd7fae66f67564b63f99 100644 (file)
--- a/servers/ipc/shm.c
+++ b/servers/ipc/shm.c
@@ -60,8 +60,8 @@ int do_shmget(message *m)
                if (size <= 0)
                        return EINVAL;
                /* round up to a multiple of PAGE_SIZE */
-               if (size % I386_PAGE_SIZE)
-                       size += I386_PAGE_SIZE - size % I386_PAGE_SIZE;
+               if (size % PAGE_SIZE)
+                       size += PAGE_SIZE - size % PAGE_SIZE;
                if (size <= 0)
                        return EINVAL;
 
@@ -115,9 +115,9 @@ int do_shmat(message *m)
        addr = (vir_bytes) m->SHMAT_ADDR;
        flag = m->SHMAT_FLAG;
 
-       if (addr && (addr % I386_PAGE_SIZE)) {
+       if (addr && (addr % PAGE_SIZE)) {
                if (flag & SHM_RND)
-                       addr -= (addr % I386_PAGE_SIZE);
+                       addr -= (addr % PAGE_SIZE);
                else
                        return EINVAL;
        }
@@ -169,8 +169,8 @@ void update_refcount_and_destroy(void)
                        j++;
                } else {
                        int size = shm_list[i].shmid_ds.shm_segsz;
-                       if (size % I386_PAGE_SIZE)
-                               size += I386_PAGE_SIZE - size % I386_PAGE_SIZE;
+                       if (size % PAGE_SIZE)
+                               size += PAGE_SIZE - size % PAGE_SIZE;
                        minix_munmap((void *)shm_list[i].page, size);
                }
        }
@@ -297,7 +297,7 @@ int do_shmctl(message *m)
                s_info.shm_tot = 0;
                for (i = 0; i < shm_list_nr; i++)
                        s_info.shm_tot +=
-                               shm_list[i].shmid_ds.shm_segsz/I386_PAGE_SIZE;
+                               shm_list[i].shmid_ds.shm_segsz/PAGE_SIZE;
                s_info.shm_rss = s_info.shm_tot;
                s_info.shm_swp = 0;
                s_info.swap_attempts = 0;

diff --git a/servers/is/dmp_kernel.c b/servers/is/dmp_kernel.c
index abda65d8f7c299890ddacbd43d980f1201a0efb1..34f477e1ff7de1800a6227583c7ca2a42bf821b4 100644 (file)
--- a/servers/is/dmp_kernel.c
+++ b/servers/is/dmp_kernel.c
@@ -312,7 +312,7 @@ static char *p_rts_flags_str(int flags)
  *                             proctab_dmp                                  *
  *===========================================================================*/
 #if defined(__i386__)
-void proctab_dmp()
+void proctab_dmp(void)
 {
 /* Proc table dump */
 
@@ -341,6 +341,13 @@ void proctab_dmp()
 }
 #endif                         /* defined(__i386__) */
 
+#if defined(__arm__)
+void proctab_dmp(void)
+{
+    /* LSC FIXME: Not implemented for arm */
+}
+#endif                         /* defined(__arm__) */
+
 /*===========================================================================*
  *                             procstack_dmp                                *
  *===========================================================================*/

diff --git a/servers/procfs/cpuinfo.c b/servers/procfs/cpuinfo.c
index ca47a8196796a50b7274f2cdf69e288bdf62cc5c..cdf28ac9d01b5cfc6aa13e9fff81d6e20f708956 100644 (file)
--- a/servers/procfs/cpuinfo.c
+++ b/servers/procfs/cpuinfo.c
@@ -90,6 +90,7 @@ static void print_cpu(struct cpu_info * cpu_info, unsigned id)
 {
        buf_printf("%-16s: %d\n", "processor", id);
 
+#if defined(__i386__)
        switch (cpu_info->vendor) {
                case CPU_VENDOR_INTEL:
                        buf_printf("%-16s: %s\n", "vendor_id", "GenuineIntel");
@@ -109,8 +110,8 @@ static void print_cpu(struct cpu_info * cpu_info, unsigned id)
        buf_printf("%-16s: %d\n", "cpu MHz", cpu_info->freq);
        buf_printf("%-16s: ", "flags");
        print_cpu_flags(cpu_info->flags);
-
        buf_printf("\n");
+#endif
 }
 
 void root_cpuinfo(void)

diff --git a/servers/procfs/root.c b/servers/procfs/root.c
index dfd5b20e9353f9de6242007bf96b1f11ea9218d7..653d8c32fcb6673cde9e1164236705bfd833a6aa 100644 (file)
--- a/servers/procfs/root.c
+++ b/servers/procfs/root.c
@@ -1,7 +1,10 @@
 /* ProcFS - root.c - by Alen Stojanov and David van Moolenbroek */
 
 #include "inc.h"
+
+#if defined (__i386__)
 #include <machine/pci.h>
+#endif
 #include <minix/dmap.h>
 #include "cpuinfo.h"
 #include "mounts.h"
@@ -11,7 +14,9 @@ static void root_uptime(void);
 static void root_loadavg(void);
 static void root_kinfo(void);
 static void root_meminfo(void);
+#if defined(__i386__)
 static void root_pci(void);
+#endif
 static void root_dmap(void);
 static void root_ipcvecs(void);
 
@@ -21,9 +26,13 @@ struct file root_files[] = {
        { "loadavg",    REG_ALL_MODE,   (data_t) root_loadavg   },
        { "kinfo",      REG_ALL_MODE,   (data_t) root_kinfo     },
        { "meminfo",    REG_ALL_MODE,   (data_t) root_meminfo   },
+#if defined(__i386__)
        { "pci",        REG_ALL_MODE,   (data_t) root_pci       },
+#endif
        { "dmap",       REG_ALL_MODE,   (data_t) root_dmap      },
+#if defined(__i386__)
        { "cpuinfo",    REG_ALL_MODE,   (data_t) root_cpuinfo   },
+#endif
        { "ipcvecs",    REG_ALL_MODE,   (data_t) root_ipcvecs   },
        { "mounts",     REG_ALL_MODE,   (data_t) root_mounts    },
        { NULL,         0,              NULL                    }
@@ -113,6 +122,7 @@ static void root_meminfo(void)
 /*===========================================================================*
  *                             root_pci                                     *
  *===========================================================================*/
+#if defined(__i386__)
 static void root_pci(void)
 {
        /* Print information about PCI devices present in the system.
@@ -147,6 +157,7 @@ static void root_pci(void)
                r = pci_next_dev(&devind, &vid, &did);
        }
 }
+#endif /* defined(__i386__) */
 
 /*===========================================================================*
  *                             root_dmap                                    *

diff --git a/servers/vm/arch/arm/Makefile.inc b/servers/vm/arch/earm/Makefile.inc
similarity index 100%
rename from servers/vm/arch/arm/Makefile.inc
rename to servers/vm/arch/earm/Makefile.inc

diff --git a/servers/vm/arch/arm/pagetable.h b/servers/vm/arch/earm/pagetable.h
similarity index 100%
rename from servers/vm/arch/arm/pagetable.h
rename to servers/vm/arch/earm/pagetable.h

diff --git a/share/mk/bsd.gcc.mk b/share/mk/bsd.gcc.mk
index 8bff5939682585adacdc36543c727a44c6a22c58..a491ab8b48c2ada54065a40a70ecb3699d17daa0 100644 (file)
--- a/share/mk/bsd.gcc.mk
+++ b/share/mk/bsd.gcc.mk
@@ -27,10 +27,9 @@ _GCC_LIBGCCDIR?=     ${DESTDIR}/usr/lib
 AFLAGS+=-D__ASSEMBLY__
 CPPFLAGS+= -fno-builtin -Wall -Wno-sign-compare
 
+#LSC FIXME: Needed by clang for now
 .if ${MACHINE_ARCH} == "i386"
 CPUFLAGS+= -march=i586
-.elif ${MACHINE_ARCH} == "arm"
-CPUFLAGS+= -march=armv7-a -mfloat-abi=softfp
 .endif
 
 # LSC In the current state there is too much to be done

diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index e72604160b6fabfda908c9ff5e9c00bc61ccf172..1d37c9cf23232ce574b4ce63ab79525ecf81df02 100644 (file)
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -25,8 +25,6 @@ MANGRP?=      operator
 INFOGRP?=      operator
 DOCGRP?=       operator
 
-MACHINE_GNU_PLATFORM?=${MACHINE_ARCH}-elf32-minix
-
 MKBINUTILS:=   no
 MKGDB:=                no
 MKGCC?=                no
@@ -747,6 +745,11 @@ MACHINE_GNU_PLATFORM?=${MACHINE_GNU_ARCH}--netbsdelf
 MACHINE_GNU_PLATFORM?=${MACHINE_GNU_ARCH}--netbsd
 .endif
 
+.if defined(__MINIX)
+# We have a simpler toolchain naming scheme
+MACHINE_GNU_PLATFORM:=${MACHINE_GNU_ARCH}-elf32-minix
+.endif # defined(__MINIX)
+
 #
 # Determine if arch uses native kernel modules with rump
 #
@@ -960,7 +963,7 @@ _MKVARS.no= \
 #MINIX-specific vars
 _MKVARS.no+= \
        MKIMAGEONLY MKSMALL
-.if (${MACHINE_ARCH} == "arm")
+.if (${MACHINE_ARCH} == "earm")
 _MKVARS.no+= \
        MKWATCHDOG MKACPI MKAPIC MKDEBUGREG MKINSTALLBOOT MKPCI
 .endif

diff --git a/sys/arch/arm/Makefile b/sys/arch/arm/Makefile
index 251bae6938582245ed542babec0bc7a101e2046c..b92c71b9b71237956c82ace351ce14a4b41db7d0 100644 (file)
--- a/sys/arch/arm/Makefile
+++ b/sys/arch/arm/Makefile
@@ -2,7 +2,9 @@
 
 SUBDIR=        include .WAIT include/arm26 include/arm32
 
+.ifndef __MINIX
 # install footbridge headers.
 SUBDIR+= footbridge
+.endif
 
 .include <bsd.kinc.mk>

diff --git a/sys/arch/arm/include/Makefile b/sys/arch/arm/include/Makefile
index 538c2b5ffb73d3e376fd897ad78d616d4e933fcc..bbbde22fc5b37c1f113fba7b19717e0b490c11e4 100644 (file)
--- a/sys/arch/arm/include/Makefile
+++ b/sys/arch/arm/include/Makefile
@@ -2,7 +2,7 @@
 
 INCSDIR= /usr/include/arm
 
-INCS=  ansi.h asm.h \
+INCS=  aeabi.h ansi.h asm.h \
        bswap.h byte_swap.h \
        cdefs.h cpu.h \
        disklabel.h \
@@ -13,9 +13,9 @@ INCS= ansi.h asm.h \
        \
        limits.h lock.h \
        math.h mcontext.h mutex.h \
-       param.h profile.h \
-       \
+       param.h profile.h rwlock.h \
        \
+       rwlock.h \
        setjmp.h signal.h \
        types.h \
        \

diff --git a/sys/arch/arm/include/aeabi.h b/sys/arch/arm/include/aeabi.h
new file mode 100644 (file)
index 0000000..9508384
--- /dev/null
+++ b/sys/arch/arm/include/aeabi.h
@@ -0,0 +1,200 @@
+/*     $NetBSD: aeabi.h,v 1.2 2012/08/11 16:21:26 matt Exp $   */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matt Thomas of 3am Software Foundry.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef _ARM_AEABI_H_
+#define        _ARM_AEABI_H_
+
+#include <stddef.h>
+
+#define        __value_in_regs         /* nothing */
+
+/*
+ * Standard double precision floating-point arithmetic helper functions
+ */
+double __aeabi_dadd(double, double);   // double-precision addition
+double __aeabi_ddiv(double n, double d);       // double-precision division, n / d
+double __aeabi_dmul(double, double);   // double-precision multiplication
+double __aeabi_drsub(double x, double y);      // double-precision reverse subtraction, y - x
+double __aeabi_dsub(double x, double y);       // double-precision subtraction, x - y
+double __aeabi_dneg(double);   // double-precision negation (obsolete, to be removed in r2.09)
+
+/*
+ * Double precision floating-point comparison helper functions
+ */
+void __aeabi_cdcmpeq(double, double); // non-excepting equality comparison [1], result in PSR ZC flags
+void __aeabi_cdcmple(double, double); // 3-way (<, =, >) compare [1], result in PSR ZC flags
+void __aeabi_cdrcmple(double, double); // reversed 3-way (<, =, >) compare [1], result in PSR ZC flags
+int __aeabi_dcmpeq(double, double); // result (1, 0) denotes (=, <>) [2], use for C == and !=
+int __aeabi_dcmplt(double, double); // result (1, 0) denotes (<, >=) [2], use for C <
+int __aeabi_dcmple(double, double); // result (1, 0) denotes (<=, >) [2], use for C <=
+int __aeabi_dcmpge(double, double); // result (1, 0) denotes (>=, <) [2], use for C >=
+int __aeabi_dcmpgt(double, double); // result (1, 0) denotes (>, <=) [2], use for C >
+int __aeabi_dcmpun(double, double); // result (1, 0) denotes (?, <=>) [2], use for C99 isunordered()
+
+/*
+ * Standard single precision floating-point arithmetic helper functions
+ */
+float __aeabi_fadd(float, float); // single-precision addition
+float __aeabi_fdiv(float n, float d); // single-precision division, n / d
+float __aeabi_fmul(float, float); // single-precision multiplication
+float __aeabi_frsub(float x, float y); // single-precision reverse subtraction, y - x
+float __aeabi_fsub(float x, float y); // single-precision subtraction, x - y
+float __aeabi_fneg(float); // single-precision negation (obsolete, to be removed in r2.09)
+
+/*
+ * Standard single precision floating-point comparison helper functions
+ */
+void __aeabi_cfcmpeq(float, float); // non-excepting equality comparison [1], result in PSR ZC flags
+void __aeabi_cfcmple(float, float); // 3-way (<, =, ?>) compare [1], result in PSR ZC flags
+void __aeabi_cfrcmple(float, float); // reversed 3-way (<, =, ?>) compare [1], result in PSR ZC flags
+int __aeabi_fcmpeq(float, float); // result (1, 0) denotes (=, <>) [2], use for C == and !=
+int __aeabi_fcmplt(float, float); // result (1, 0) denotes (<, >=) [2], use for C <
+int __aeabi_fcmple(float, float); // result (1, 0) denotes (<=, >) [2], use for C <=
+int __aeabi_fcmpge(float, float); // result (1, 0) denotes (>=, <) [2], use for C >=
+int __aeabi_fcmpgt(float, float); // result (1, 0) denotes (>, <=) [2], use for C >
+int __aeabi_fcmpun(float, float); // result (1, 0) denotes (?, <=>) [2], use for C99 isunordered()
+
+/*
+ * Standard conversions between floating types
+ */
+float __aeabi_d2f(double);     // double to float (single precision) conversion
+double __aeabi_f2d(float);     // float (single precision) to double conversion
+float __aeabi_h2f(short hf);   // IEEE 754 binary16 storage format (VFP half precision) to binary32 (float) conversion [4, 5]
+short __aeabi_f2h(float f);    // IEEE 754 binary32 (float) to binary16 storage format (VFP half precision) conversion [4, 6]
+float __aeabi_h2f_alt(short hf);       // __aeabi_h2f_alt converts from VFP alternative format [7].
+short __aeabi_f2h_alt(float f);        // __aeabi_f2h_alt converts to VFP alternative format [8].
+
+/*
+ * Standard floating-point to integer conversions
+ */
+int __aeabi_d2iz(double);      // double to integer C-style conversion [3]
+unsigned __aeabi_d2uiz(double);        // double to unsigned C-style conversion [3]
+long long __aeabi_d2lz(double);        // double to long long C-style conversion [3]
+unsigned long long __aeabi_d2ulz(double);      // double to unsigned long long C-style conversion [3]
+int __aeabi_f2iz(float);       // float (single precision) to integer C-style conversion [3]
+unsigned __aeabi_f2uiz(float); // float (single precision) to unsigned C-style conversion [3]
+long long __aeabi_f2lz(float); // float (single precision) to long long C-style conversion [3]
+unsigned long long __aeabi_f2ulz(float);       // float to unsigned long long C-style conversion [3]
+
+/*
+ * Standard integer to floating-point conversions
+ */
+double __aeabi_i2d(int);               // integer to double conversion
+double __aeabi_ui2d(unsigned); // unsigned to double conversion
+double __aeabi_l2d(long long); // long long to double conversion
+double __aeabi_ul2d(unsigned long long);       // unsigned long long to double conversion
+float __aeabi_i2f(int);        // integer to float (single precision) conversion
+float __aeabi_ui2f(unsigned);  // unsigned to float (single precision) conversion
+float __aeabi_l2f(long long);  // long long to float (single precision) conversion
+float __aeabi_ul2f(unsigned long long);        // unsigned long long to float (single precision) conversion
+
+/*
+ * Long long functions
+ */
+long long __aeabi_lmul(long long, long long); // multiplication
+
+/*
+ * A pair of (unsigned) long longs is returned in {{r0, r1}, {r2, r3}},
+ * the quotient in {r0, r1}, and the remainder in {r2, r3}. 
+ */
+typedef struct { long long quot; long long rem; } lldiv_t;
+__value_in_regs lldiv_t __aeabi_ldivmod(long long n, long long d); // signed long long division and remainder, {q, r} = n / d [2]
+
+typedef struct { unsigned long long quot; unsigned long long rem; } ulldiv_t;
+__value_in_regs ulldiv_t __aeabi_uldivmod(unsigned long long n, unsigned long long d); // unsigned signed ll division, remainder, {q, r} = n / d [2]
+
+/*
+ * Because of 2's complement number representation, these functions work
+ * identically with long long replaced uniformly by unsigned long long.
+ * Each returns its result in {r0, r1}, as specified by the [AAPCS].
+ */
+long long __aeabi_llsl(long long, int); // logical shift left [1]
+long long __aeabi_llsr(long long, int); // logical shift right [1]
+long long __aeabi_lasr(long long, int); // arithmetic shift right [1]
+
+/*
+ * The comparison functions return negative, zero, or a positive integer
+ * according to whether the comparison result is <, ==, or >, respectively
+ * (like strcmp).
+ */
+int __aeabi_lcmp(long long, long long); // signed long long comparison
+int __aeabi_ulcmp(unsigned long long, unsigned long long); // unsigned long long comparison
+
+int __aeabi_idiv(int numerator, int denominator);
+unsigned __aeabi_uidiv(unsigned numerator, unsigned denominator);
+typedef struct { int quot, rem; } idiv_return;
+typedef struct { unsigned int quot, rem; } uidiv_return;
+__value_in_regs idiv_return __aeabi_idivmod(int, int);
+__value_in_regs uidiv_return __aeabi_uidivmod(unsigned int, unsigned int);
+
+/*
+ * Division by zero
+ *
+ * If an integer or long long division helper function is called upon to
+ * divide by 0, it should return as quotient the value returned by a call
+ * to __aeabi_idiv0 or __aeabi_ldiv0, respectively. A *divmod helper should
+ * return as remainder either 0 or the original numerator.
+ */
+int __aeabi_idiv0(int);
+long long __aeabi_ldiv0(long long);
+
+/*
+ * These functions read and write 4-byte and 8-byte values at arbitrarily
+ * aligned addresses.  Write functions return the value written,
+ * read functions the value read.
+ */
+int __aeabi_uread4(void *);
+int __aeabi_uwrite4(int, void *);
+long long __aeabi_uread8(void *);
+long long __aeabi_uwrite8(long long, void *);
+
+/*
+ * Memory copying, clearing, and setting
+ */
+void __aeabi_memcpy8(void *, const void *, size_t);
+void __aeabi_memcpy4(void *, const void *, size_t);
+void __aeabi_memcpy(void *, const void *, size_t);
+void __aeabi_memmove8(void *, const void *, size_t);
+void __aeabi_memmove4(void *, const void *, size_t);
+void __aeabi_memmove(void *, const void *, size_t);
+
+/*
+ * Memory clearing and setting
+ */
+void __aeabi_memset8(void *, size_t, int);
+void __aeabi_memset4(void *, size_t, int);
+void __aeabi_memset(void *, size_t, int);
+void __aeabi_memclr8(void *, size_t);
+void __aeabi_memclr4(void *, size_t);
+void __aeabi_memclr(void *, size_t);
+
+void *__aeabi_read_tp(void); // return the value of $tp
+
+#endif /* _ARM_AEABI_H_ */

diff --git a/sys/arch/arm/include/ansi.h b/sys/arch/arm/include/ansi.h
index 8686b29ef945342f0cede84daa7b45fa1c6a756a..3aae6ae64c0bf17bf09f8d1a899a3022f3804b3f 100644 (file)
--- a/sys/arch/arm/include/ansi.h
+++ b/sys/arch/arm/include/ansi.h
@@ -31,6 +31,8 @@
  *     from: @(#)ansi.h        8.2 (Berkeley) 1/4/94
  */
 
+/* These types are Minix specific. */
+
 #ifndef        _ANSI_H_
 #define        _ANSI_H_
 
@@ -47,15 +49,15 @@
  *     #undef  _BSD_SIZE_T_
  *     #endif
  */
-#define        _BSD_CLOCK_T_           long    /* clock() */
-#define        _BSD_PTRDIFF_T_         int     /* ptr1 - ptr2 */
-#define        _BSD_SIZE_T_            unsigned int /* sizeof() */
-#define        _BSD_SSIZE_T_           int     /* byte count or error */
-#define        _BSD_TIME_T_            long    /* time() */
+#define        _BSD_CLOCK_T_           int             /* clock() */
+#define _BSD_PTRDIFF_T_                int             /* ptr1 - ptr2 */
+#define _BSD_SIZE_T_           unsigned int    /* sizeof() */
+#define        _BSD_SSIZE_T_           int             /* byte count or error */
+#define        _BSD_TIME_T_            int             /* time() */
 #define        _BSD_CLOCKID_T_         int             /* clockid_t */
 #define        _BSD_TIMER_T_           int             /* timer_t */
-#define        _BSD_SUSECONDS_T_       long            /* suseconds_t */
-#define        _BSD_USECONDS_T_        long            /* useconds_t */
+#define        _BSD_SUSECONDS_T_       int             /* suseconds_t */
+#define        _BSD_USECONDS_T_        int             /* useconds_t */
 #define        _BSD_WCHAR_T_           int             /* wchar_t */
 #define        _BSD_WINT_T_            int             /* wint_t */
 

diff --git a/sys/arch/arm/include/arm26/Makefile b/sys/arch/arm/include/arm26/Makefile
new file mode 100644 (file)
index 0000000..f3e923f
--- /dev/null
+++ b/sys/arch/arm/include/arm26/Makefile
@@ -0,0 +1,7 @@
+#      $NetBSD: Makefile,v 1.2 2002/11/26 23:30:12 lukem Exp $
+
+INCSDIR= /usr/include/arm/arm26
+
+INCS=  types.h
+
+.include <bsd.kinc.mk>

diff --git a/sys/arch/arm/include/arm26/types.h b/sys/arch/arm/include/arm26/types.h
new file mode 100644 (file)
index 0000000..9d1d6a2
--- /dev/null
+++ b/sys/arch/arm/include/arm26/types.h
@@ -0,0 +1,47 @@
+/*     $NetBSD: types.h,v 1.1 2001/11/22 17:59:57 thorpej Exp $        */
+
+/*
+ * Copyright (c) 2001 Wasabi Systems, Inc.
+ * All rights reserved.
+ *
+ * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed for the NetBSD Project by
+ *     Wasabi Systems, Inc.
+ * 4. The name of Wasabi Systems, Inc. may not be used to endorse
+ *    or promote products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _ARM_ARM26_TYPES_H_
+#define        _ARM_ARM26_TYPES_H_
+
+#ifdef _KERNEL
+#define        __PROG26                /* indicate 26-bit mode */
+#endif
+
+#include <arm/types.h>         /* pull in generic ARM definitions */
+
+#endif /* _ARM_ARM26_TYPES_H_ */

diff --git a/sys/arch/arm/include/arm32/Makefile b/sys/arch/arm/include/arm32/Makefile
index e7666be3f866c7ba7c67e0e5b70510775791f4cc..bfc56950f8bd0ef5c670ea914d8b1bfb540d6bb9 100644 (file)
--- a/sys/arch/arm/include/arm32/Makefile
+++ b/sys/arch/arm/include/arm32/Makefile
@@ -2,6 +2,6 @@
 
 INCSDIR= /usr/include/arm/arm32
 
-INCS=  types.h vmparam.h
+INCS=  param.h types.h vmparam.h
 
 .include <bsd.kinc.mk>

diff --git a/sys/arch/arm/include/arm32/param.h b/sys/arch/arm/include/arm32/param.h
new file mode 100644 (file)
index 0000000..e93314d
--- /dev/null
+++ b/sys/arch/arm/include/arm32/param.h
@@ -0,0 +1,110 @@
+/*     $NetBSD: param.h,v 1.17 2012/02/04 17:56:16 para Exp $  */
+
+/*
+ * Copyright (c) 1994,1995 Mark Brinicombe.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the RiscBSD team.
+ * 4. The name "RiscBSD" nor the name of the author may be used to
+ *    endorse or promote products derived from this software without specific
+ *    prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY RISCBSD ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL RISCBSD OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef        _ARM_ARM32_PARAM_H_
+#define        _ARM_ARM32_PARAM_H_
+
+#ifdef _KERNEL
+#  include <machine/cpu.h>
+#endif
+
+/*
+ * Machine dependent constants for ARM6+ processors
+ */
+/* These are defined in the Port File before it includes
+ * this file. */
+
+#define        PGSHIFT         12              /* LOG2(NBPG) */
+#define        NBPG            (1 << PGSHIFT)  /* bytes/page */
+#define        PGOFSET         (NBPG-1)        /* byte offset into page */
+#define        NPTEPG          (NBPG/(sizeof (pt_entry_t)))
+
+
+#define SSIZE           1               /* initial stack size/NBPG */
+#define SINCR           1               /* increment of stack/NBPG */
+#define UPAGES          2               /* pages of u-area */
+#define USPACE          (UPAGES * NBPG) /* total size of u-area */
+
+#ifndef MSGBUFSIZE
+#define MSGBUFSIZE     NBPG            /* default message buffer size */
+#endif
+
+/*
+ * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized
+ * logical pages.
+ */
+#define        NKMEMPAGES_MIN_DEFAULT  ((8 * 1024 * 1024) >> PAGE_SHIFT)
+#define        NKMEMPAGES_MAX_DEFAULT  ((128 * 1024 * 1024) >> PAGE_SHIFT)
+
+/* Constants used to divide the USPACE area */
+
+/*
+ * The USPACE area contains :
+ * 1. the pcb structure for the process
+ * 2. the fp context for FP emulation
+ * 3. the kernel (svc) stack
+ *
+ * The layout of the area looks like this
+ *
+ * | uarea | FP context | kernel stack |
+ *
+ * The size of the uarea is known.
+ * The size of the FP context is variable depending of the FP emulator
+ * in use and whether there is hardware FP support. However we can put
+ * an upper limit on it.
+ * The kernel stack should be at least 4K is size.
+ *
+ * The stack top addresses are used to set the stack pointers. The stack bottom
+ * addresses at the addresses monitored by the diagnostic code for stack overflows
+ *
+ */
+
+#define FPCONTEXTSIZE                  (0x100)
+#define USPACE_SVC_STACK_TOP           (USPACE)
+#define USPACE_SVC_STACK_BOTTOM                (sizeof(struct pcb) + FPCONTEXTSIZE + 10)
+
+#define arm_btop(x)                    ((x) >> PGSHIFT)
+#define arm_ptob(x)                    ((x) << PGSHIFT)
+#define arm_trunc_page(x)              ((unsigned)(x) & ~PGOFSET)
+    
+#ifdef _KERNEL
+#ifndef _LOCORE
+void   delay(unsigned);
+#define DELAY(x)       delay(x)
+#endif
+#endif
+
+#include <arm/param.h>
+
+#endif /* _ARM_ARM32_PARAM_H_ */

diff --git a/sys/arch/arm/include/asm.h b/sys/arch/arm/include/asm.h
index 9c777c37bed2fa8dac339ae46e3763d17164fd6c..dcec53c43518c07d3ea6f9120483a1f0ea8e577a 100644 (file)
--- a/sys/arch/arm/include/asm.h
+++ b/sys/arch/arm/include/asm.h
@@ -88,6 +88,12 @@
 #define        ASENTRY_NP(y)   _ENTRY(_ASM_LABEL(y))
 #define        ASEND(y)        _END(_ASM_LABEL(y))
 
+#if defined(__minix)
+#define _LABEL(x) \
+       .globl x; x:
+#define        LABEL(y)        _LABEL(_C_LABEL(y))
+
+#endif /* defined(__minix) */
 #define        ASMSTR          .asciz
 
 #if defined(PIC)

diff --git a/sys/arch/arm/include/int_types.h b/sys/arch/arm/include/int_types.h
index 89b0b1d39e36610ef3e48c9c741c3c9941da1a52..f32c0d8536c019dce7118a6cc0c2129d3b32fc56 100644 (file)
--- a/sys/arch/arm/include/int_types.h
+++ b/sys/arch/arm/include/int_types.h
@@ -62,7 +62,7 @@ typedef       unsigned long long int __uint64_t;
 
 /* 7.18.1.4 Integer types capable of holding object pointers */
 
-typedef long int              __intptr_t;
-typedef unsigned long int     __uintptr_t;
+typedef        int                    __intptr_t;
+typedef        unsigned int          __uintptr_t;
 
 #endif /* !_ARM32_INT_TYPES_H_ */

diff --git a/sys/arch/arm/include/rwlock.h b/sys/arch/arm/include/rwlock.h
new file mode 100644 (file)
index 0000000..0912456
--- /dev/null
+++ b/sys/arch/arm/include/rwlock.h
@@ -0,0 +1,54 @@
+/*     $NetBSD: rwlock.h,v 1.5 2008/04/28 20:23:14 martin Exp $        */
+
+/*-
+ * Copyright (c) 2002, 2006 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe and Andrew Doran.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _ARM_RWLOCK_H_
+#define        _ARM_RWLOCK_H_
+
+struct krwlock {
+       volatile uintptr_t      rw_owner;
+};
+
+#ifdef __RWLOCK_PRIVATE
+
+#define        __HAVE_SIMPLE_RW_LOCKS          1
+
+#define        RW_RECEIVE(rw)                  /* nothing */
+#define        RW_GIVE(rw)                     /* nothing */
+
+unsigned long  _lock_cas(volatile unsigned long *,
+    unsigned long, unsigned long);
+
+#define        RW_CAS(p, o, n)                 \
+    (_lock_cas((volatile unsigned long *)(p), (o), (n)) == (o))
+
+#endif /* __RWLOCK_PRIVATE */
+
+#endif /* _ARM_RWLOCK_H_ */

diff --git a/sys/arch/arm/include/signal.h b/sys/arch/arm/include/signal.h
index ac58ee3b8c8e8b45353c155ef640547297ee0c33..f4d6d4f632e6f33d0925c6344dabc989e2544e8d 100644 (file)
--- a/sys/arch/arm/include/signal.h
+++ b/sys/arch/arm/include/signal.h
@@ -24,6 +24,7 @@ struct sigframe {             /* stack frame created for signalled process */
 };
 
 struct sigcontext {
+  int trap_style;              /* how should context be restored? KTS_* */
   int sc_flags;                        /* sigstack state to restore (including
                                 * MF_FPU_INITIALIZED)
                                 */

diff --git a/sys/arch/arm/include/types.h b/sys/arch/arm/include/types.h
index 391dd04cd1155ef7d2cd7dc29453473a859b2b6c..fa8955fd7e8f3b48a214fc484163572db345a851 100644 (file)
--- a/sys/arch/arm/include/types.h
+++ b/sys/arch/arm/include/types.h
@@ -87,7 +87,9 @@ typedef       volatile int            __cpu_simple_lock_t;
 #define __HAVE_CPU_DATA_FIRST
 #define        __HAVE___LWP_GETPRIVATE_FAST
 #define        __HAVE_COMMON___TLS_GET_ADDR
+#if !defined(__minix)
 #define        __HAVE_TLS_VARIANT_I
+#endif /* !defined(__minix) */
 
 #if defined(_KERNEL) || defined(_KMEMUSER)
 #define        PCU_FPU                 0

diff --git a/sys/arch/evbarm/Makefile b/sys/arch/evbarm/Makefile
new file mode 100644 (file)
index 0000000..f538c1f
--- /dev/null
+++ b/sys/arch/evbarm/Makefile
@@ -0,0 +1,93 @@
+#      $NetBSD: Makefile,v 1.9 2012/07/26 06:21:57 skrll Exp $
+
+# Makefile for evbarm tags file and boot blocks
+
+# Find where ARM source files are for inclusion in tags
+.include <../arm/Makefile.inc>
+
+TEVBARM=       ${SYSDIR}/arch/evbarm/tags
+SEVBARM=       ${SYSDIR}/arch/evbarm/adi_brh/*.[ch]
+SEVBARM+=      ${SYSDIR}/arch/evbarm/armadillo/*.[ch]
+SEVBARM+=      ${SYSDIR}/arch/evbarm/beagle/*.[ch]
+SEVBARM+=      ${SYSDIR}/arch/evbarm/cp3100/*.[ch]
+SEVBARM+=      ${SYSDIR}/arch/evbarm/dev/*.[ch]
+SEVBARM+=      ${SYSDIR}/arch/evbarm/devkit8000/*.[ch]
+SEVBARM+=      ${SYSDIR}/arch/evbarm/evbarm/*.[ch]
+SEVBARM+=      ${SYSDIR}/arch/evbarm/g42xxeb/*.[ch]
+SEVBARM+=      ${SYSDIR}/arch/evbarm/gemini/*.[ch]
+SEVBARM+=      ${SYSDIR}/arch/evbarm/gumstix/*.[ch]
+SEVBARM+=      ${SYSDIR}/arch/evbarm/hdl_g/*.[ch]
+SEVBARM+=      ${SYSDIR}/arch/evbarm/ifpga/*.[ch]
+SEVBARM+=      ${SYSDIR}/arch/evbarm/imx31/*.[ch]
+SEVBARM+=      ${SYSDIR}/arch/evbarm/include/*.h
+SEVBARM+=      ${SYSDIR}/arch/evbarm/integrator/*.[ch]
+SEVBARM+=      ${SYSDIR}/arch/evbarm/iq31244/*.[ch]
+SEVBARM+=      ${SYSDIR}/arch/evbarm/iq80310/*.[ch]
+SEVBARM+=      ${SYSDIR}/arch/evbarm/iq80321/*.[ch]
+SEVBARM+=      ${SYSDIR}/arch/evbarm/ixdp425/*.[ch]
+SEVBARM+=      ${SYSDIR}/arch/evbarm/ixm1200/*.[ch]
+SEVBARM+=      ${SYSDIR}/arch/evbarm/lubbock/*.[ch]
+SEVBARM+=      ${SYSDIR}/arch/evbarm/marvell/*.[ch]
+SEVBARM+=      ${SYSDIR}/arch/evbarm/mini2440/*.[ch]
+SEVBARM+=      ${SYSDIR}/arch/evbarm/mpcsa/*.[ch]
+SEVBARM+=      ${SYSDIR}/arch/evbarm/netwalker/*.[ch]
+SEVBARM+=      ${SYSDIR}/arch/evbarm/npwr_fc/*.[ch]
+SEVBARM+=      ${SYSDIR}/arch/evbarm/nslu2/*.[ch]
+SEVBARM+=      ${SYSDIR}/arch/evbarm/rpi/*.[ch]
+SEVBARM+=      ${SYSDIR}/arch/evbarm/osk5912/*.[ch]
+SEVBARM+=      ${SYSDIR}/arch/evbarm/smdk2xx0/*.[ch]
+SEVBARM+=      ${SYSDIR}/arch/evbarm/tisdp24xx/*.[ch]
+SEVBARM+=      ${SYSDIR}/arch/evbarm/tsarm/*.[ch]
+SEVBARM+=      ${SYSDIR}/arch/evbarm/viper/*.[ch]
+SEVBARM+=      ${SYSDIR}/arch/arm/xscale/*.[ch]
+
+AEVBARM=       ${SYSDIR}/arch/evbarm/adi_brh/*.S
+AEVBARM+=      ${SYSDIR}/arch/evbarm/armadillo/*.S
+AEVBARM+=      ${SYSDIR}/arch/evbarm/beagle/*.S
+AEVBARM+=      ${SYSDIR}/arch/evbarm/g42xxeb/*.S
+AEVBARM+=      ${SYSDIR}/arch/evbarm/gemini/*.S
+AEVBARM+=      ${SYSDIR}/arch/evbarm/gumstix/*.S
+AEVBARM+=      ${SYSDIR}/arch/evbarm/hdl_g/*.S
+AEVBARM+=      ${SYSDIR}/arch/evbarm/imx31/*.S
+AEVBARM+=      ${SYSDIR}/arch/evbarm/ixdp425/*.S
+AEVBARM+=      ${SYSDIR}/arch/evbarm/ixm1200/*.S
+AEVBARM+=      ${SYSDIR}/arch/evbarm/lubbock/*.S
+AEVBARM+=      ${SYSDIR}/arch/evbarm/marvell/*.S
+AEVBARM+=      ${SYSDIR}/arch/evbarm/mini2440/*.S
+AEVBARM+=      ${SYSDIR}/arch/evbarm/mpcsa/*.S
+AEVBARM+=      ${SYSDIR}/arch/evbarm/netwalker/*.S
+AEVBARM+=      ${SYSDIR}/arch/evbarm/nslu2/*.S
+AEVBARM+=      ${SYSDIR}/arch/evbarm/rpi/*.S
+AEVBARM+=      ${SYSDIR}/arch/evbarm/smdk2xx0/*.S
+AEVBARM+=      ${SYSDIR}/arch/evbarm/tisdp24xx/*.S
+AEVBARM+=      ${SYSDIR}/arch/evbarm/tsarm/*.S
+AEVBARM+=      ${SYSDIR}/arch/evbarm/viper/*.S
+AEVBARM+=      ${SYSDIR}/arch/arm/xscale/*.S
+AEVBARM+=      ${SYSDIR}/arch/evbarm/integrator/*.S
+AEVBARM+=      ${SYSDIR}/arch/evbarm/iq80310/*.S
+AEVBARM+=      ${SYSDIR}/arch/evbarm/iq80321/*.S
+
+# Directories in which to place tags links
+DEVBARM=       include
+
+.if !defined(__MINIX)
+.include "../../kern/Make.tags.inc"
+
+tags:
+       -rm -f ${TEVBARM}
+       -echo ${SEVBARM} ${SARM} | xargs ctags -wadtf ${TEVBARM}
+       -${FINDCOMM} | xargs ctags -wadtf ${TEVBARM}
+       egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AEVBARM} ${AARM} | \
+           ${TOOL_SED} -e \
+               "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3     \1      /^\2(\3\4$$/;" \
+           >> ${TEVBARM}
+       sort -o ${TEVBARM} ${TEVBARM}
+
+links:
+       -for i in ${DEVBARM}; do \
+           cd $$i && rm -f tags; ln -s ../tags tags; done
+.endif # !defined(__MINIX)
+
+
+SUBDIR=        include
+.include <bsd.subdir.mk>

diff --git a/sys/arch/evbarm/include/Makefile b/sys/arch/evbarm/include/Makefile
new file mode 100644 (file)
index 0000000..b2dea9f
--- /dev/null
+++ b/sys/arch/evbarm/include/Makefile
@@ -0,0 +1,27 @@
+#      $NetBSD: Makefile,v 1.17 2011/07/17 23:46:49 dyoung Exp $
+
+INCSDIR= /usr/include/evbarm
+
+INCS=  ansi.h asm.h \
+       bswap.h \
+       cdefs.h cpu.h \
+       disklabel.h \
+       elf_machdep.h endian.h endian_machdep.h \
+       float.h \
+       ieee.h ieeefp.h \
+       int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \
+       \
+       limits.h lock.h \
+       math.h mcontext.h mutex.h \
+       param.h profile.h \
+       rwlock.h \
+       setjmp.h signal.h \
+       types.h \
+       vmparam.h \
+       wchar_limits.h
+
+.if !defined(__MINIX)
+INCS+= joystick.h
+.endif
+
+.include <bsd.kinc.mk>

diff --git a/sys/arch/evbarm/include/ansi.h b/sys/arch/evbarm/include/ansi.h
new file mode 100644 (file)
index 0000000..7b997a3
--- /dev/null
+++ b/sys/arch/evbarm/include/ansi.h
@@ -0,0 +1,3 @@
+/*     $NetBSD: ansi.h,v 1.1 2001/11/25 15:56:03 thorpej Exp $ */
+
+#include <arm/ansi.h>

diff --git a/sys/arch/evbarm/include/asm.h b/sys/arch/evbarm/include/asm.h
new file mode 100644 (file)
index 0000000..4756667
--- /dev/null
+++ b/sys/arch/evbarm/include/asm.h
@@ -0,0 +1,3 @@
+/*     $NetBSD: asm.h,v 1.1 2001/11/25 15:56:03 thorpej Exp $  */
+
+#include <arm/asm.h>

diff --git a/sys/arch/evbarm/include/bswap.h b/sys/arch/evbarm/include/bswap.h
new file mode 100644 (file)
index 0000000..f7999af
--- /dev/null
+++ b/sys/arch/evbarm/include/bswap.h
@@ -0,0 +1,3 @@
+/*     $NetBSD: bswap.h,v 1.1 2001/11/25 15:56:03 thorpej Exp $        */
+
+#include <arm/bswap.h>

diff --git a/sys/arch/evbarm/include/cdefs.h b/sys/arch/evbarm/include/cdefs.h
new file mode 100644 (file)
index 0000000..a355743
--- /dev/null
+++ b/sys/arch/evbarm/include/cdefs.h
@@ -0,0 +1,3 @@
+/*     $NetBSD: cdefs.h,v 1.1 2001/11/25 15:56:03 thorpej Exp $        */
+
+#include <arm/cdefs.h>

diff --git a/sys/arch/evbarm/include/cpu.h b/sys/arch/evbarm/include/cpu.h
new file mode 100644 (file)
index 0000000..2830af8
--- /dev/null
+++ b/sys/arch/evbarm/include/cpu.h
@@ -0,0 +1,3 @@
+/*     $NetBSD: cpu.h,v 1.5 2003/01/02 23:38:03 thorpej Exp $  */
+
+#include <arm/cpu.h>

diff --git a/sys/arch/evbarm/include/disklabel.h b/sys/arch/evbarm/include/disklabel.h
new file mode 100644 (file)
index 0000000..349ea09
--- /dev/null
+++ b/sys/arch/evbarm/include/disklabel.h
@@ -0,0 +1,8 @@
+/*     $NetBSD: disklabel.h,v 1.4 2011/08/30 12:39:54 bouyer Exp $     */
+
+#define LABELUSESMBR   1
+#if HAVE_NBTOOL_CONFIG_H
+#include <nbinclude/arm/disklabel.h>
+#else
+#include <arm/disklabel.h>
+#endif /* HAVE_NBTOOL_CONFIG_H */

diff --git a/sys/arch/evbarm/include/elf_machdep.h b/sys/arch/evbarm/include/elf_machdep.h
new file mode 100644 (file)
index 0000000..d661dbd
--- /dev/null
+++ b/sys/arch/evbarm/include/elf_machdep.h
@@ -0,0 +1,3 @@
+/*     $NetBSD: elf_machdep.h,v 1.1 2001/11/25 15:56:04 thorpej Exp $  */
+
+#include <arm/elf_machdep.h>

diff --git a/sys/arch/evbarm/include/endian.h b/sys/arch/evbarm/include/endian.h
new file mode 100644 (file)
index 0000000..e57caa0
--- /dev/null
+++ b/sys/arch/evbarm/include/endian.h
@@ -0,0 +1,3 @@
+/*     $NetBSD: endian.h,v 1.1 2001/11/25 15:56:04 thorpej Exp $       */
+
+#include <sys/endian.h>

diff --git a/sys/arch/evbarm/include/endian_machdep.h b/sys/arch/evbarm/include/endian_machdep.h
new file mode 100644 (file)
index 0000000..86779f6
--- /dev/null
+++ b/sys/arch/evbarm/include/endian_machdep.h
@@ -0,0 +1,3 @@
+/*     $NetBSD: endian_machdep.h,v 1.1 2001/11/25 15:56:04 thorpej Exp $       */
+
+#include <arm/endian_machdep.h>

diff --git a/sys/arch/evbarm/include/float.h b/sys/arch/evbarm/include/float.h
new file mode 100644 (file)
index 0000000..598984d
--- /dev/null
+++ b/sys/arch/evbarm/include/float.h
@@ -0,0 +1,3 @@
+/*     $NetBSD: float.h,v 1.1 2001/11/25 15:56:04 thorpej Exp $        */
+
+#include <arm/float.h>

diff --git a/sys/arch/evbarm/include/ieee.h b/sys/arch/evbarm/include/ieee.h
new file mode 100644 (file)
index 0000000..4456f7f
--- /dev/null
+++ b/sys/arch/evbarm/include/ieee.h
@@ -0,0 +1,3 @@
+/*     $NetBSD: ieee.h,v 1.1 2001/11/25 15:56:04 thorpej Exp $ */
+
+#include <arm/ieee.h>

diff --git a/sys/arch/evbarm/include/ieeefp.h b/sys/arch/evbarm/include/ieeefp.h
new file mode 100644 (file)
index 0000000..f80ff2c
--- /dev/null
+++ b/sys/arch/evbarm/include/ieeefp.h
@@ -0,0 +1,3 @@
+/*     $NetBSD: ieeefp.h,v 1.1 2001/11/25 15:56:04 thorpej Exp $       */
+
+#include <arm/ieeefp.h>

diff --git a/sys/arch/evbarm/include/int_const.h b/sys/arch/evbarm/include/int_const.h
new file mode 100644 (file)
index 0000000..4d34c2e
--- /dev/null
+++ b/sys/arch/evbarm/include/int_const.h
@@ -0,0 +1,3 @@
+/*     $NetBSD: int_const.h,v 1.1 2001/11/25 15:56:04 thorpej Exp $    */
+
+#include <arm/int_const.h>

diff --git a/sys/arch/evbarm/include/int_fmtio.h b/sys/arch/evbarm/include/int_fmtio.h
new file mode 100644 (file)
index 0000000..c034664
--- /dev/null
+++ b/sys/arch/evbarm/include/int_fmtio.h
@@ -0,0 +1,3 @@
+/*     $NetBSD: int_fmtio.h,v 1.1 2001/11/25 15:56:04 thorpej Exp $    */
+
+#include <arm/int_fmtio.h>

diff --git a/sys/arch/evbarm/include/int_limits.h b/sys/arch/evbarm/include/int_limits.h
new file mode 100644 (file)
index 0000000..fd1c61f
--- /dev/null
+++ b/sys/arch/evbarm/include/int_limits.h
@@ -0,0 +1,3 @@
+/*     $NetBSD: int_limits.h,v 1.1 2001/11/25 15:56:04 thorpej Exp $   */
+
+#include <arm/int_limits.h>

diff --git a/sys/arch/evbarm/include/int_mwgwtypes.h b/sys/arch/evbarm/include/int_mwgwtypes.h
new file mode 100644 (file)
index 0000000..384e599
--- /dev/null
+++ b/sys/arch/evbarm/include/int_mwgwtypes.h
@@ -0,0 +1,3 @@
+/*     $NetBSD: int_mwgwtypes.h,v 1.1 2001/11/25 15:56:04 thorpej Exp $        */
+
+#include <arm/int_mwgwtypes.h>

diff --git a/sys/arch/evbarm/include/int_types.h b/sys/arch/evbarm/include/int_types.h
new file mode 100644 (file)
index 0000000..325e6f7
--- /dev/null
+++ b/sys/arch/evbarm/include/int_types.h
@@ -0,0 +1,3 @@
+/*     $NetBSD: int_types.h,v 1.1 2001/11/25 15:56:04 thorpej Exp $    */
+
+#include <arm/int_types.h>

diff --git a/sys/arch/evbarm/include/limits.h b/sys/arch/evbarm/include/limits.h
new file mode 100644 (file)
index 0000000..07f5de8
--- /dev/null
+++ b/sys/arch/evbarm/include/limits.h
@@ -0,0 +1,3 @@
+/*     $NetBSD: limits.h,v 1.1 2001/11/25 15:56:05 thorpej Exp $       */
+
+#include <arm/limits.h>

diff --git a/sys/arch/evbarm/include/lock.h b/sys/arch/evbarm/include/lock.h
new file mode 100644 (file)
index 0000000..93512d9
--- /dev/null
+++ b/sys/arch/evbarm/include/lock.h
@@ -0,0 +1,3 @@
+/*     $NetBSD: lock.h,v 1.1 2001/11/25 15:56:05 thorpej Exp $ */
+
+#include <arm/lock.h>

diff --git a/sys/arch/evbarm/include/math.h b/sys/arch/evbarm/include/math.h
new file mode 100644 (file)
index 0000000..2c7db5e
--- /dev/null
+++ b/sys/arch/evbarm/include/math.h
@@ -0,0 +1,3 @@
+/*     $NetBSD: math.h,v 1.1 2001/11/25 15:56:05 thorpej Exp $ */
+
+#include <arm/math.h>

diff --git a/sys/arch/evbarm/include/mcontext.h b/sys/arch/evbarm/include/mcontext.h
new file mode 100644 (file)
index 0000000..294734e
--- /dev/null
+++ b/sys/arch/evbarm/include/mcontext.h
@@ -0,0 +1,3 @@
+/*     $NetBSD: mcontext.h,v 1.2 2003/01/17 22:45:39 thorpej Exp $     */
+
+#include <arm/mcontext.h>

diff --git a/sys/arch/evbarm/include/mutex.h b/sys/arch/evbarm/include/mutex.h
new file mode 100644 (file)
index 0000000..46b293e
--- /dev/null
+++ b/sys/arch/evbarm/include/mutex.h
@@ -0,0 +1,3 @@
+/*     $NetBSD: mutex.h,v 1.2 2007/02/09 21:55:03 ad Exp $     */
+
+#include <arm/mutex.h>

diff --git a/sys/arch/evbarm/include/param.h b/sys/arch/evbarm/include/param.h
new file mode 100644 (file)
index 0000000..d6da399
--- /dev/null
+++ b/sys/arch/evbarm/include/param.h
@@ -0,0 +1,47 @@
+/*     $NetBSD: param.h,v 1.2 2002/02/12 06:58:19 thorpej Exp $        */
+
+/*
+ * Copyright (c) 1994,1995 Mark Brinicombe.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the RiscBSD team.
+ * 4. The name "RiscBSD" nor the name of the author may be used to
+ *    endorse or promote products derived from this software without specific
+ *    prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY RISCBSD ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL RISCBSD OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef        _EVBARM_PARAM_H_
+#define        _EVBARM_PARAM_H_
+
+/*
+ * Machine dependent constants
+ */
+
+#define        _MACHINE        evbarm
+#define        MACHINE         "evbarm"
+
+#include <arm/arm32/param.h>
+
+#endif /* _EVBARM_PARAM_H_ */

diff --git a/sys/arch/evbarm/include/profile.h b/sys/arch/evbarm/include/profile.h
new file mode 100644 (file)
index 0000000..95cdb64
--- /dev/null
+++ b/sys/arch/evbarm/include/profile.h
@@ -0,0 +1,3 @@
+/*     $NetBSD: profile.h,v 1.1 2001/11/25 15:56:05 thorpej Exp $      */
+
+#include <arm/profile.h>

diff --git a/sys/arch/evbarm/include/rwlock.h b/sys/arch/evbarm/include/rwlock.h
new file mode 100644 (file)
index 0000000..7f22fd0
--- /dev/null
+++ b/sys/arch/evbarm/include/rwlock.h
@@ -0,0 +1,3 @@
+/*     $NetBSD: rwlock.h,v 1.2 2007/02/09 21:55:03 ad Exp $    */
+
+#include <arm/rwlock.h>

diff --git a/sys/arch/evbarm/include/setjmp.h b/sys/arch/evbarm/include/setjmp.h
new file mode 100644 (file)
index 0000000..80b6c4c
--- /dev/null
+++ b/sys/arch/evbarm/include/setjmp.h
@@ -0,0 +1,3 @@
+/*     $NetBSD: setjmp.h,v 1.1 2001/11/25 15:56:05 thorpej Exp $       */
+
+#include <arm/setjmp.h>

diff --git a/sys/arch/evbarm/include/signal.h b/sys/arch/evbarm/include/signal.h
new file mode 100644 (file)
index 0000000..1fa3dad
--- /dev/null
+++ b/sys/arch/evbarm/include/signal.h
@@ -0,0 +1,3 @@
+/*     $NetBSD: signal.h,v 1.1 2001/11/25 15:56:05 thorpej Exp $       */
+
+#include <arm/signal.h>

diff --git a/sys/arch/evbarm/include/types.h b/sys/arch/evbarm/include/types.h
new file mode 100644 (file)
index 0000000..e62a072
--- /dev/null
+++ b/sys/arch/evbarm/include/types.h
@@ -0,0 +1,10 @@
+/*     $NetBSD: types.h,v 1.12 2011/11/26 16:31:40 skrll Exp $ */
+
+#ifndef _EVBARM_TYPES_H_
+#define        _EVBARM_TYPES_H_
+
+#include <arm/arm32/types.h>
+
+#define        __HAVE_NEW_STYLE_BUS_H
+
+#endif

diff --git a/sys/arch/evbarm/include/vmparam.h b/sys/arch/evbarm/include/vmparam.h
new file mode 100644 (file)
index 0000000..3c256a7
--- /dev/null
+++ b/sys/arch/evbarm/include/vmparam.h
@@ -0,0 +1,99 @@
+/*     $NetBSD: vmparam.h,v 1.28 2012/02/18 16:29:37 christos Exp $    */
+
+/*
+ * Copyright (c) 1988 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef        _EVBARM_VMPARAM_H_
+#define        _EVBARM_VMPARAM_H_
+
+#if defined(__minix)
+#include <arm/arm32/vmparam.h>
+#endif /* defined(__minix) */
+
+#if defined(_KERNEL) || defined(_KMEMUSER)
+
+#include <arm/arm32/vmparam.h>
+
+/*
+ * Address space constants
+ */
+
+/*
+ * The line between user space and kernel space
+ * Mappings >= KERNEL_BASE are constant across all processes
+ */
+#ifdef KERNEL_BASE_EXT
+#define        KERNEL_BASE             KERNEL_BASE_EXT
+#else
+#define        KERNEL_BASE             0x80000000
+#endif
+
+/*
+ * Override the default pager_map size, there's not enough KVA.
+ */
+#define PAGER_MAP_DEFAULT_SIZE         (4 * 1024 * 1024)
+
+/*
+ * Size of User Raw I/O map
+ */
+
+#define USRIOSIZE       300
+
+/* virtual sizes (bytes) for various kernel submaps */
+
+#define VM_PHYS_SIZE           (USRIOSIZE*PAGE_SIZE)
+
+/*
+ * max number of non-contig chunks of physical RAM you can have
+ */
+
+#define        VM_PHYSSEG_MAX          32
+
+/*
+ * when converting a physical address to a vm_page structure, we
+ * want to use a binary search on the chunks of physical memory
+ * to find our RAM
+ */
+
+#define        VM_PHYSSEG_STRAT        VM_PSTRAT_BSEARCH
+
+/*
+ * we support 2 free lists:
+ *
+ *     - DEFAULT for all systems
+ *     - ISADMA for the ISA DMA range on Sharks only
+ */
+
+#define        VM_NFREELIST            2
+#define        VM_FREELIST_DEFAULT     0
+#define        VM_FREELIST_ISADMA      1
+
+#endif /* _KERNEL || _KMEMUSER */
+
+#endif /* _EVBARM_VMPARAM_H_ */

diff --git a/sys/arch/evbarm/include/wchar_limits.h b/sys/arch/evbarm/include/wchar_limits.h
new file mode 100644 (file)
index 0000000..4170e81
--- /dev/null
+++ b/sys/arch/evbarm/include/wchar_limits.h
@@ -0,0 +1,3 @@
+/*     $NetBSD: wchar_limits.h,v 1.2 2005/12/11 12:17:09 christos Exp $        */
+
+#include <arm/wchar_limits.h>

diff --git a/sys/arch/i386/include/param.h b/sys/arch/i386/include/param.h
index fa6114c51d03fc1c8145f485b79c459c277ec364..7fc1226dfafaab981c1e56bd8fe5f521c258d1c9 100644 (file)
--- a/sys/arch/i386/include/param.h
+++ b/sys/arch/i386/include/param.h
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.72 2010/02/08 19:02:29 joerg Exp $ */
+/*     $NetBSD: param.h,v 1.77 2012/04/20 22:23:24 rmind Exp $ */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -41,20 +41,16 @@
  * Machine dependent constants for Intel 386.
  */
 
-/*
- * Round p (pointer or byte index) up to a correctly-aligned value
- * for all data types (int, long, ...).   The result is u_int and
- * must be cast to any desired pointer type.
- *
- * ALIGNED_POINTER is a boolean macro that checks whether an address
- * is valid to fetch data elements of type t from on this architecture.
- * This does not reflect the optimal alignment, just the possibility
- * (within reasonable limits). 
- *
- */
-#define ALIGNBYTES             (sizeof(int) - 1)
-#define ALIGN(p)               (((u_int)(u_long)(p) + ALIGNBYTES) &~ \
-    ALIGNBYTES)
+#ifdef _KERNEL
+#include <machine/cpu.h>
+#endif
+
+#define        _MACHINE        i386
+#define        MACHINE         "i386"
+#define        _MACHINE_ARCH   i386
+#define        MACHINE_ARCH    "i386"
+#define        MID_MACHINE     MID_I386
+
 #define ALIGNED_POINTER(p,t)   1
 
 #define        PGSHIFT         12              /* LOG2(NBPG) */
@@ -63,7 +59,15 @@
 #define        NPTEPG          (NBPG/(sizeof (pt_entry_t)))
 
 #ifndef MAXPHYS
-#define MAXPHYS                (64 * 1024)     /* max raw I/O transfer size */
+#define MAXPHYS                (64 * 1024)     /* max raw I/O transfer size */
+#endif
+
+#if defined(_KERNEL_OPT)
+#include "opt_kernbase.h"
+#endif /* defined(_KERNEL_OPT) */
+
+#ifdef KERNBASE_LOCORE
+#error "You should only re-define KERNBASE"
 #endif
 
 #define DEV_BSHIFT      9               /* log2(DEV_BSIZE) */

diff --git a/sys/sys/Makefile b/sys/sys/Makefile
index 962ec0dfbf7e9efaa50bfa80b486982025472c0c..e40a68df352949ed129f84c53be3839e661311fa 100644 (file)
--- a/sys/sys/Makefile
+++ b/sys/sys/Makefile
@@ -11,7 +11,7 @@ INCS= ansi.h atomic.h \
        ctype_bits.h ctype_inline.h \
        \
        dirent.h \
-       disk.h disklabel.h disklabel_gpt.h \
+       disk.h disklabel.h disklabel_acorn.h disklabel_gpt.h \
        dkbad.h dkio.h \
        endian.h errno.h exec.h \
        exec_elf.h extattr.h \

diff --git a/sys/sys/disklabel_acorn.h b/sys/sys/disklabel_acorn.h
new file mode 100644 (file)
index 0000000..a7bf464
--- /dev/null
+++ b/sys/sys/disklabel_acorn.h
@@ -0,0 +1,109 @@
+/*     $NetBSD: disklabel_acorn.h,v 1.6 2005/12/11 12:25:20 christos Exp $     */
+
+/*
+ * Copyright (c) 1994 Mark Brinicombe.
+ * Copyright (c) 1994 Brini.
+ * All rights reserved.
+ *
+ * This code is derived from software written for Brini by Mark Brinicombe
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by Brini.
+ * 4. The name of the company nor the name of the author may be used to
+ *    endorse or promote products derived from this software without specific
+ *    prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY BRINI ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL BRINI OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _SYS_DISKLABEL_ACORN_H_
+#define _SYS_DISKLABEL_ACORN_H_
+
+#define PARTITION_TYPE_UNUSED  0
+#define PARTITION_TYPE_ADFS    1
+#define PARTITION_TYPE_RISCIX  2
+
+#define PARTITION_FORMAT_RISCIX  2
+#define PARTITION_FORMAT_RISCBSD 0x42
+
+#define FILECORE_BOOT_SECTOR 6
+
+/* Stuff to deal with RISCiX partitions */
+
+#define NRISCIX_PARTITIONS 8
+#define RISCIX_PARTITION_OFFSET 8
+
+struct riscix_partition {
+       uint32_t        rp_start;
+       uint32_t        rp_length;
+       uint32_t        rp_type;
+       int8_t          rp_name[16];
+};
+
+struct riscix_partition_table {
+       uint32_t        pad0;
+       uint32_t        pad1;
+       struct riscix_partition partitions[NRISCIX_PARTITIONS];
+};
+
+struct filecore_bootblock {
+       uint8_t         padding0[0x1c0];
+       uint8_t         log2secsize;
+       uint8_t         secspertrack;
+       uint8_t         heads;
+       uint8_t         density;
+       uint8_t         idlen;
+       uint8_t         log2bpmb;
+       uint8_t         skew;
+       uint8_t         bootoption;
+       uint8_t         lowsector;
+       uint8_t         nzones;
+       uint16_t        zone_spare;
+       uint32_t        root;
+       uint32_t        disc_size;
+       uint16_t        disc_id;
+       uint8_t         disc_name[10];
+       uint32_t        disc_type;
+
+       uint8_t         padding1[24];
+
+       uint8_t         partition_type;
+       uint8_t         partition_cyl_low;
+       uint8_t         partition_cyl_high;
+       uint8_t         checksum;
+};
+
+#if defined(_KERNEL) && !defined(__ASSEMBLER__)
+struct buf;
+struct cpu_disklabel;
+struct disklabel;
+
+/* for readdisklabel.  rv != 0 -> matches, msg == NULL -> success */
+int filecore_label_read(dev_t, void (*)(struct buf *),
+       struct disklabel *, struct cpu_disklabel *, const char **, int *,
+       int *);
+
+/* for writedisklabel.  rv == 0 -> dosen't match, rv > 0 -> success */
+int filecore_label_locate(dev_t, void (*)(struct buf *),
+       struct disklabel *, struct cpu_disklabel *, int *, int *);
+#endif
+#endif /* _SYS_DISKLABEL_ACORN_H_ */

diff --git a/sys/sys/param.h b/sys/sys/param.h
index 8815b9c6adfd223172f802e005e9ef3c3cce5fe1..d3f50c824e174ebd1266f8ca86e53ead14662f3e 100644 (file)
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -166,6 +166,25 @@
 #define        MAX_LWP_PER_PROC        8000
 #endif
 
+/*
+ * Round p (pointer or byte index) up to a correctly-aligned value for all
+ * data types (int, long, ...).   The result is u_int and must be cast to
+ * any desired pointer type.
+ *
+ * ALIGNED_POINTER is a boolean macro that checks whether an address
+ * is valid to fetch data elements of type t from on this architecture.
+ * This does not reflect the optimal alignment, just the possibility
+ * (within reasonable limits).
+ *
+ */
+#define ALIGNBYTES     __ALIGNBYTES
+#ifndef ALIGN
+#define        ALIGN(p)                (((uintptr_t)(p) + ALIGNBYTES) & ~ALIGNBYTES)
+#endif
+#ifndef ALIGNED_POINTER
+#define        ALIGNED_POINTER(p,t)    ((((uintptr_t)(p)) & (sizeof(t) - 1)) == 0)
+#endif
+
 /*
  * Miscellaneous.
  */