chiark / gitweb /
Merge branch 'master' of gregkh@master.kernel.org:/pub/scm/linux/hotplug/udev
authorGreg Kroah-Hartman <gregkh@suse.de>
Wed, 9 Nov 2005 17:53:53 +0000 (09:53 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 9 Nov 2005 17:53:53 +0000 (09:53 -0800)
604 files changed:
ChangeLog
HOWTO-udev_for_dev [deleted file]
Makefile
README
RELEASE-NOTES
TODO
extras/volume_id/Makefile
extras/volume_id/libvolume_id/Makefile [new file with mode: 0644]
extras/volume_id/libvolume_id/cramfs.c [moved from extras/volume_id/volume_id/cramfs.c with 98% similarity]
extras/volume_id/libvolume_id/ext.c [moved from extras/volume_id/volume_id/ext.c with 99% similarity]
extras/volume_id/libvolume_id/fat.c [moved from extras/volume_id/volume_id/fat.c with 99% similarity]
extras/volume_id/libvolume_id/hfs.c [moved from extras/volume_id/volume_id/hfs.c with 99% similarity]
extras/volume_id/libvolume_id/highpoint.c [moved from extras/volume_id/volume_id/highpoint.c with 98% similarity]
extras/volume_id/libvolume_id/hpfs.c [moved from extras/volume_id/volume_id/hpfs.c with 98% similarity]
extras/volume_id/libvolume_id/iso9660.c [moved from extras/volume_id/volume_id/iso9660.c with 99% similarity]
extras/volume_id/libvolume_id/isw_raid.c [moved from extras/volume_id/volume_id/isw_raid.c with 98% similarity]
extras/volume_id/libvolume_id/jfs.c [moved from extras/volume_id/volume_id/jfs.c with 98% similarity]
extras/volume_id/libvolume_id/linux_raid.c [moved from extras/volume_id/volume_id/linux_raid.c with 98% similarity]
extras/volume_id/libvolume_id/linux_swap.c [moved from extras/volume_id/volume_id/linux_swap.c with 98% similarity]
extras/volume_id/libvolume_id/logging.h [moved from extras/volume_id/volume_id/logging.h with 100% similarity]
extras/volume_id/libvolume_id/lsi_raid.c [moved from extras/volume_id/volume_id/lsi_raid.c with 98% similarity]
extras/volume_id/libvolume_id/luks.c [moved from extras/volume_id/volume_id/luks.c with 99% similarity]
extras/volume_id/libvolume_id/lvm.c [moved from extras/volume_id/volume_id/lvm.c with 99% similarity]
extras/volume_id/libvolume_id/mac.c [moved from extras/volume_id/volume_id/mac.c with 99% similarity]
extras/volume_id/libvolume_id/minix.c [moved from extras/volume_id/volume_id/minix.c with 98% similarity]
extras/volume_id/libvolume_id/msdos.c [moved from extras/volume_id/volume_id/msdos.c with 99% similarity]
extras/volume_id/libvolume_id/ntfs.c [moved from extras/volume_id/volume_id/ntfs.c with 99% similarity]
extras/volume_id/libvolume_id/nvidia_raid.c [moved from extras/volume_id/volume_id/nvidia_raid.c with 98% similarity]
extras/volume_id/libvolume_id/ocfs.c [moved from extras/volume_id/volume_id/ocfs.c with 99% similarity]
extras/volume_id/libvolume_id/promise_raid.c [moved from extras/volume_id/volume_id/promise_raid.c with 98% similarity]
extras/volume_id/libvolume_id/reiserfs.c [moved from extras/volume_id/volume_id/reiserfs.c with 99% similarity]
extras/volume_id/libvolume_id/romfs.c [moved from extras/volume_id/volume_id/romfs.c with 98% similarity]
extras/volume_id/libvolume_id/silicon_raid.c [moved from extras/volume_id/volume_id/silicon_raid.c with 98% similarity]
extras/volume_id/libvolume_id/sysv.c [moved from extras/volume_id/volume_id/sysv.c with 99% similarity]
extras/volume_id/libvolume_id/udf.c [moved from extras/volume_id/volume_id/udf.c with 99% similarity]
extras/volume_id/libvolume_id/ufs.c [moved from extras/volume_id/volume_id/ufs.c with 99% similarity]
extras/volume_id/libvolume_id/util.c [moved from extras/volume_id/volume_id/util.c with 100% similarity]
extras/volume_id/libvolume_id/util.h [moved from extras/volume_id/volume_id/util.h with 100% similarity]
extras/volume_id/libvolume_id/via_raid.c [moved from extras/volume_id/volume_id/via_raid.c with 98% similarity]
extras/volume_id/libvolume_id/volume_id.c [moved from extras/volume_id/volume_id/volume_id.c with 78% similarity]
extras/volume_id/libvolume_id/volume_id.h [new file with mode: 0644]
extras/volume_id/libvolume_id/vxfs.c [moved from extras/volume_id/volume_id/vxfs.c with 98% similarity]
extras/volume_id/libvolume_id/xfs.c [moved from extras/volume_id/volume_id/xfs.c with 98% similarity]
extras/volume_id/vol_id.c
extras/volume_id/volume_id/Makefile.inc [deleted file]
extras/volume_id/volume_id/cramfs.h [deleted file]
extras/volume_id/volume_id/ext.h [deleted file]
extras/volume_id/volume_id/fat.h [deleted file]
extras/volume_id/volume_id/hfs.h [deleted file]
extras/volume_id/volume_id/highpoint.h [deleted file]
extras/volume_id/volume_id/hpfs.h [deleted file]
extras/volume_id/volume_id/iso9660.h [deleted file]
extras/volume_id/volume_id/isw_raid.h [deleted file]
extras/volume_id/volume_id/jfs.h [deleted file]
extras/volume_id/volume_id/linux_raid.h [deleted file]
extras/volume_id/volume_id/linux_swap.h [deleted file]
extras/volume_id/volume_id/lsi_raid.h [deleted file]
extras/volume_id/volume_id/luks.h [deleted file]
extras/volume_id/volume_id/lvm.h [deleted file]
extras/volume_id/volume_id/mac.h [deleted file]
extras/volume_id/volume_id/minix.h [deleted file]
extras/volume_id/volume_id/msdos.h [deleted file]
extras/volume_id/volume_id/ntfs.h [deleted file]
extras/volume_id/volume_id/nvidia_raid.h [deleted file]
extras/volume_id/volume_id/ocfs.h [deleted file]
extras/volume_id/volume_id/promise_raid.h [deleted file]
extras/volume_id/volume_id/reiserfs.h [deleted file]
extras/volume_id/volume_id/romfs.h [deleted file]
extras/volume_id/volume_id/silicon_raid.h [deleted file]
extras/volume_id/volume_id/sysv.h [deleted file]
extras/volume_id/volume_id/udf.h [deleted file]
extras/volume_id/volume_id/ufs.h [deleted file]
extras/volume_id/volume_id/via_raid.h [deleted file]
extras/volume_id/volume_id/volume_id.h [deleted file]
extras/volume_id/volume_id/vxfs.h [deleted file]
extras/volume_id/volume_id/xfs.h [deleted file]
klibc/MCONFIG [deleted file]
klibc/MRULES [deleted file]
klibc/Makefile [deleted file]
klibc/README [deleted file]
klibc/include/alloca.h [deleted file]
klibc/include/arch/alpha/klibc/archsetjmp.h [deleted file]
klibc/include/arch/alpha/klibc/archsignal.h [deleted file]
klibc/include/arch/alpha/klibc/archstat.h [deleted file]
klibc/include/arch/alpha/klibc/archsys.h [deleted file]
klibc/include/arch/alpha/machine/asm.h [deleted file]
klibc/include/arch/arm/klibc/archsetjmp.h [deleted file]
klibc/include/arch/arm/klibc/archsignal.h [deleted file]
klibc/include/arch/arm/klibc/archstat.h [deleted file]
klibc/include/arch/arm/klibc/archsys.h [deleted file]
klibc/include/arch/cris/klibc/archsetjmp.h [deleted file]
klibc/include/arch/cris/klibc/archsignal.h [deleted file]
klibc/include/arch/cris/klibc/archstat.h [deleted file]
klibc/include/arch/cris/klibc/archsys.h [deleted file]
klibc/include/arch/i386/klibc/archsetjmp.h [deleted file]
klibc/include/arch/i386/klibc/archsignal.h [deleted file]
klibc/include/arch/i386/klibc/archstat.h [deleted file]
klibc/include/arch/i386/klibc/archsys.h [deleted file]
klibc/include/arch/i386/klibc/diverr.h [deleted file]
klibc/include/arch/i386/sys/io.h [deleted file]
klibc/include/arch/i386/sys/vm86.h [deleted file]
klibc/include/arch/ia64/klibc/archsetjmp.h [deleted file]
klibc/include/arch/ia64/klibc/archsignal.h [deleted file]
klibc/include/arch/ia64/klibc/archstat.h [deleted file]
klibc/include/arch/ia64/klibc/archsys.h [deleted file]
klibc/include/arch/m32r/klibc/archsetjmp.h [deleted file]
klibc/include/arch/m32r/klibc/archsignal.h [deleted file]
klibc/include/arch/m32r/klibc/archstat.h [deleted file]
klibc/include/arch/m32r/klibc/archsys.h [deleted file]
klibc/include/arch/m68k/klibc/archsignal.h [deleted file]
klibc/include/arch/m68k/klibc/archstat.h [deleted file]
klibc/include/arch/m68k/klibc/archsys.h [deleted file]
klibc/include/arch/mips/klibc/archfcntl.h [deleted file]
klibc/include/arch/mips/klibc/archsetjmp.h [deleted file]
klibc/include/arch/mips/klibc/archsignal.h [deleted file]
klibc/include/arch/mips/klibc/archstat.h [deleted file]
klibc/include/arch/mips/klibc/archsys.h [deleted file]
klibc/include/arch/mips/machine/asm.h [deleted file]
klibc/include/arch/mips/sgidefs.h [deleted file]
klibc/include/arch/mips/spaces.h [deleted file]
klibc/include/arch/mips64/klibc/archsignal.h [deleted file]
klibc/include/arch/mips64/klibc/archstat.h [deleted file]
klibc/include/arch/mips64/klibc/archsys.h [deleted file]
klibc/include/arch/parisc/klibc/archsetjmp.h [deleted file]
klibc/include/arch/parisc/klibc/archsignal.h [deleted file]
klibc/include/arch/parisc/klibc/archstat.h [deleted file]
klibc/include/arch/parisc/klibc/archsys.h [deleted file]
klibc/include/arch/ppc/klibc/archsetjmp.h [deleted file]
klibc/include/arch/ppc/klibc/archsignal.h [deleted file]
klibc/include/arch/ppc/klibc/archstat.h [deleted file]
klibc/include/arch/ppc/klibc/archsys.h [deleted file]
klibc/include/arch/ppc64/klibc/archsetjmp.h [deleted file]
klibc/include/arch/ppc64/klibc/archsignal.h [deleted file]
klibc/include/arch/ppc64/klibc/archstat.h [deleted file]
klibc/include/arch/ppc64/klibc/archsys.h [deleted file]
klibc/include/arch/s390/klibc/archsetjmp.h [deleted file]
klibc/include/arch/s390/klibc/archsignal.h [deleted file]
klibc/include/arch/s390/klibc/archstat.h [deleted file]
klibc/include/arch/s390/klibc/archsys.h [deleted file]
klibc/include/arch/s390x/klibc/archsetjmp.h [deleted file]
klibc/include/arch/s390x/klibc/archsignal.h [deleted file]
klibc/include/arch/s390x/klibc/archstat.h [deleted file]
klibc/include/arch/s390x/klibc/archsys.h [deleted file]
klibc/include/arch/sh/klibc/archsetjmp.h [deleted file]
klibc/include/arch/sh/klibc/archsignal.h [deleted file]
klibc/include/arch/sh/klibc/archstat.h [deleted file]
klibc/include/arch/sh/klibc/archsys.h [deleted file]
klibc/include/arch/sparc/klibc/archsetjmp.h [deleted file]
klibc/include/arch/sparc/klibc/archsignal.h [deleted file]
klibc/include/arch/sparc/klibc/archstat.h [deleted file]
klibc/include/arch/sparc/klibc/archsys.h [deleted file]
klibc/include/arch/sparc/machine/asm.h [deleted file]
klibc/include/arch/sparc/machine/frame.h [deleted file]
klibc/include/arch/sparc/machine/trap.h [deleted file]
klibc/include/arch/sparc64/klibc/archsetjmp.h [deleted file]
klibc/include/arch/sparc64/klibc/archsignal.h [deleted file]
klibc/include/arch/sparc64/klibc/archstat.h [deleted file]
klibc/include/arch/sparc64/klibc/archsys.h [deleted file]
klibc/include/arch/x86_64/klibc/archsetjmp.h [deleted file]
klibc/include/arch/x86_64/klibc/archsignal.h [deleted file]
klibc/include/arch/x86_64/klibc/archstat.h [deleted file]
klibc/include/arch/x86_64/klibc/archsys.h [deleted file]
klibc/include/arch/x86_64/sys/io.h [deleted file]
klibc/include/arpa/inet.h [deleted file]
klibc/include/assert.h [deleted file]
klibc/include/bits32/bitsize.h [deleted file]
klibc/include/bits32/bitsize/limits.h [deleted file]
klibc/include/bits32/bitsize/stddef.h [deleted file]
klibc/include/bits32/bitsize/stdint.h [deleted file]
klibc/include/bits32/bitsize/stdintconst.h [deleted file]
klibc/include/bits32/bitsize/stdintlimits.h [deleted file]
klibc/include/bits64/bitsize.h [deleted file]
klibc/include/bits64/bitsize/limits.h [deleted file]
klibc/include/bits64/bitsize/stddef.h [deleted file]
klibc/include/bits64/bitsize/stdint.h [deleted file]
klibc/include/bits64/bitsize/stdintconst.h [deleted file]
klibc/include/bits64/bitsize/stdintlimits.h [deleted file]
klibc/include/ctype.h [deleted file]
klibc/include/dirent.h [deleted file]
klibc/include/elf.h [deleted file]
klibc/include/endian.h [deleted file]
klibc/include/errno.h [deleted file]
klibc/include/fcntl.h [deleted file]
klibc/include/grp.h [deleted file]
klibc/include/inttypes.h [deleted file]
klibc/include/klibc/compiler.h [deleted file]
klibc/include/klibc/diverr.h [deleted file]
klibc/include/klibc/extern.h [deleted file]
klibc/include/klibc/sysconfig.h [deleted file]
klibc/include/limits.h [deleted file]
klibc/include/malloc.h [deleted file]
klibc/include/net/if.h [deleted file]
klibc/include/net/if_arp.h [deleted file]
klibc/include/net/if_packet.h [deleted file]
klibc/include/net/route.h [deleted file]
klibc/include/netinet/if_ether.h [deleted file]
klibc/include/netinet/in.h [deleted file]
klibc/include/netinet/in6.h [deleted file]
klibc/include/netinet/ip.h [deleted file]
klibc/include/netinet/tcp.h [deleted file]
klibc/include/netinet/udp.h [deleted file]
klibc/include/netpacket/packet.h [deleted file]
klibc/include/paths.h [deleted file]
klibc/include/poll.h [deleted file]
klibc/include/sched.h [deleted file]
klibc/include/setjmp.h [deleted file]
klibc/include/signal.h [deleted file]
klibc/include/stdarg.h [deleted file]
klibc/include/stddef.h [deleted file]
klibc/include/stdint.h [deleted file]
klibc/include/stdio.h [deleted file]
klibc/include/stdlib.h [deleted file]
klibc/include/string.h [deleted file]
klibc/include/sys/dirent.h [deleted file]
klibc/include/sys/elf32.h [deleted file]
klibc/include/sys/elf64.h [deleted file]
klibc/include/sys/elfcommon.h [deleted file]
klibc/include/sys/fsuid.h [deleted file]
klibc/include/sys/inotify.h [deleted file]
klibc/include/sys/ioctl.h [deleted file]
klibc/include/sys/klog.h [deleted file]
klibc/include/sys/mman.h [deleted file]
klibc/include/sys/mount.h [deleted file]
klibc/include/sys/param.h [deleted file]
klibc/include/sys/reboot.h [deleted file]
klibc/include/sys/resource.h [deleted file]
klibc/include/sys/select.h [deleted file]
klibc/include/sys/socket.h [deleted file]
klibc/include/sys/socketcalls.h [deleted file]
klibc/include/sys/stat.h [deleted file]
klibc/include/sys/statfs.h [deleted file]
klibc/include/sys/syscall.h [deleted file]
klibc/include/sys/sysinfo.h [deleted file]
klibc/include/sys/sysmacros.h [deleted file]
klibc/include/sys/time.h [deleted file]
klibc/include/sys/times.h [deleted file]
klibc/include/sys/types.h [deleted file]
klibc/include/sys/uio.h [deleted file]
klibc/include/sys/un.h [deleted file]
klibc/include/sys/utime.h [deleted file]
klibc/include/sys/utsname.h [deleted file]
klibc/include/sys/vfs.h [deleted file]
klibc/include/sys/wait.h [deleted file]
klibc/include/syslog.h [deleted file]
klibc/include/termios.h [deleted file]
klibc/include/time.h [deleted file]
klibc/include/unistd.h [deleted file]
klibc/include/utime.h [deleted file]
klibc/klcc.1 [deleted file]
klibc/klcc.in [deleted file]
klibc/klibc.spec.in [deleted file]
klibc/klibc/CAVEATS [deleted file]
klibc/klibc/Kbuild [deleted file]
klibc/klibc/LICENSE [deleted file]
klibc/klibc/MCONFIG [deleted file]
klibc/klibc/Makefile [deleted file]
klibc/klibc/README [deleted file]
klibc/klibc/SOCKETCALLS.def [deleted file]
klibc/klibc/SYSCALLS.def [deleted file]
klibc/klibc/__put_env.c [deleted file]
klibc/klibc/__shared_init.c [deleted file]
klibc/klibc/__signal.c [deleted file]
klibc/klibc/__static_init.c [deleted file]
klibc/klibc/abort.c [deleted file]
klibc/klibc/alarm.c [deleted file]
klibc/klibc/arch/README [deleted file]
klibc/klibc/arch/alpha/MCONFIG [deleted file]
klibc/klibc/arch/alpha/Makefile.inc [deleted file]
klibc/klibc/arch/alpha/README-gcc [deleted file]
klibc/klibc/arch/alpha/crt0.S [deleted file]
klibc/klibc/arch/alpha/divide.c [deleted file]
klibc/klibc/arch/alpha/pipe.c [deleted file]
klibc/klibc/arch/alpha/setjmp.S [deleted file]
klibc/klibc/arch/alpha/syscall.S [deleted file]
klibc/klibc/arch/alpha/sysdual.S [deleted file]
klibc/klibc/arch/alpha/sysstub.ph [deleted file]
klibc/klibc/arch/arm/MCONFIG [deleted file]
klibc/klibc/arch/arm/Makefile.inc [deleted file]
klibc/klibc/arch/arm/crt0.S [deleted file]
klibc/klibc/arch/arm/setjmp-arm.S [deleted file]
klibc/klibc/arch/arm/setjmp-thumb.S [deleted file]
klibc/klibc/arch/arm/syscall.S [deleted file]
klibc/klibc/arch/arm/sysstub.ph [deleted file]
klibc/klibc/arch/cris/MCONFIG [deleted file]
klibc/klibc/arch/cris/Makefile.inc [deleted file]
klibc/klibc/arch/cris/__negdi2.S [deleted file]
klibc/klibc/arch/cris/crt0.S [deleted file]
klibc/klibc/arch/cris/divide.c [deleted file]
klibc/klibc/arch/cris/setjmp.S [deleted file]
klibc/klibc/arch/cris/syscall.S [deleted file]
klibc/klibc/arch/cris/sysstub.ph [deleted file]
klibc/klibc/arch/i386/MCONFIG [deleted file]
klibc/klibc/arch/i386/Makefile.inc [deleted file]
klibc/klibc/arch/i386/crt0.S [deleted file]
klibc/klibc/arch/i386/exits.S [deleted file]
klibc/klibc/arch/i386/libgcc/__ashldi3.S [deleted file]
klibc/klibc/arch/i386/libgcc/__ashrdi3.S [deleted file]
klibc/klibc/arch/i386/libgcc/__lshrdi3.S [deleted file]
klibc/klibc/arch/i386/libgcc/__muldi3.S [deleted file]
klibc/klibc/arch/i386/libgcc/__negdi2.S [deleted file]
klibc/klibc/arch/i386/open.S [deleted file]
klibc/klibc/arch/i386/setjmp.S [deleted file]
klibc/klibc/arch/i386/sigreturn.S [deleted file]
klibc/klibc/arch/i386/socketcall.S [deleted file]
klibc/klibc/arch/i386/syscall.S [deleted file]
klibc/klibc/arch/i386/sysstub.ph [deleted file]
klibc/klibc/arch/ia64/MCONFIG [deleted file]
klibc/klibc/arch/ia64/Makefile.inc [deleted file]
klibc/klibc/arch/ia64/crt0.S [deleted file]
klibc/klibc/arch/ia64/pipe.c [deleted file]
klibc/klibc/arch/ia64/setjmp.S [deleted file]
klibc/klibc/arch/ia64/syscall.S [deleted file]
klibc/klibc/arch/ia64/sysstub.ph [deleted file]
klibc/klibc/arch/ia64/vfork.S [deleted file]
klibc/klibc/arch/m32r/MCONFIG [deleted file]
klibc/klibc/arch/m32r/Makefile.inc [deleted file]
klibc/klibc/arch/m32r/crt0.S [deleted file]
klibc/klibc/arch/m32r/setjmp.S [deleted file]
klibc/klibc/arch/m32r/syscall.S [deleted file]
klibc/klibc/arch/m32r/sysstub.ph [deleted file]
klibc/klibc/arch/m68k/MCONFIG [deleted file]
klibc/klibc/arch/m68k/Makefile.inc [deleted file]
klibc/klibc/arch/mips/MCONFIG [deleted file]
klibc/klibc/arch/mips/Makefile.inc [deleted file]
klibc/klibc/arch/mips/crt0.S [deleted file]
klibc/klibc/arch/mips/klibc.ld [deleted file]
klibc/klibc/arch/mips/pipe.S [deleted file]
klibc/klibc/arch/mips/setjmp.S [deleted file]
klibc/klibc/arch/mips/syscall.S [deleted file]
klibc/klibc/arch/mips/sysstub.ph [deleted file]
klibc/klibc/arch/mips/vfork.S [deleted file]
klibc/klibc/arch/mips64/MCONFIG [deleted file]
klibc/klibc/arch/mips64/Makefile.inc [deleted file]
klibc/klibc/arch/parisc/MCONFIG [deleted file]
klibc/klibc/arch/parisc/Makefile.inc [deleted file]
klibc/klibc/arch/parisc/crt0.S [deleted file]
klibc/klibc/arch/parisc/setjmp.S [deleted file]
klibc/klibc/arch/parisc/syscall.c [deleted file]
klibc/klibc/arch/parisc/sysstub.ph [deleted file]
klibc/klibc/arch/ppc/MCONFIG [deleted file]
klibc/klibc/arch/ppc/Makefile.inc [deleted file]
klibc/klibc/arch/ppc/crt0.S [deleted file]
klibc/klibc/arch/ppc/setjmp.S [deleted file]
klibc/klibc/arch/ppc/syscall.S [deleted file]
klibc/klibc/arch/ppc/sysstub.ph [deleted file]
klibc/klibc/arch/ppc64/MCONFIG [deleted file]
klibc/klibc/arch/ppc64/Makefile.inc [deleted file]
klibc/klibc/arch/ppc64/crt0.S [deleted file]
klibc/klibc/arch/ppc64/setjmp.S [deleted file]
klibc/klibc/arch/ppc64/syscall.c [deleted file]
klibc/klibc/arch/ppc64/sysstub.ph [deleted file]
klibc/klibc/arch/s390/MCONFIG [deleted file]
klibc/klibc/arch/s390/Makefile.inc [deleted file]
klibc/klibc/arch/s390/crt0.S [deleted file]
klibc/klibc/arch/s390/mmap.c [deleted file]
klibc/klibc/arch/s390/setjmp.S [deleted file]
klibc/klibc/arch/s390/syscall.c [deleted file]
klibc/klibc/arch/s390/sysstub.ph [deleted file]
klibc/klibc/arch/s390x/MCONFIG [deleted file]
klibc/klibc/arch/s390x/Makefile.inc [deleted file]
klibc/klibc/arch/s390x/crt0.S [deleted file]
klibc/klibc/arch/s390x/mmap.c [deleted file]
klibc/klibc/arch/s390x/setjmp.S [deleted file]
klibc/klibc/arch/s390x/syscall.c [deleted file]
klibc/klibc/arch/s390x/sysstub.ph [deleted file]
klibc/klibc/arch/sh/MCONFIG [deleted file]
klibc/klibc/arch/sh/Makefile.inc [deleted file]
klibc/klibc/arch/sh/crt0.S [deleted file]
klibc/klibc/arch/sh/setjmp.S [deleted file]
klibc/klibc/arch/sh/syscall.S [deleted file]
klibc/klibc/arch/sh/sysstub.ph [deleted file]
klibc/klibc/arch/sparc/MCONFIG [deleted file]
klibc/klibc/arch/sparc/Makefile.inc [deleted file]
klibc/klibc/arch/sparc/crt0.S [deleted file]
klibc/klibc/arch/sparc/crt0i.S [deleted file]
klibc/klibc/arch/sparc/divrem.m4 [deleted file]
klibc/klibc/arch/sparc/setjmp.S [deleted file]
klibc/klibc/arch/sparc/smul.S [deleted file]
klibc/klibc/arch/sparc/syscall.S [deleted file]
klibc/klibc/arch/sparc/sysfork.S [deleted file]
klibc/klibc/arch/sparc/sysstub.ph [deleted file]
klibc/klibc/arch/sparc/umul.S [deleted file]
klibc/klibc/arch/sparc64/MCONFIG [deleted file]
klibc/klibc/arch/sparc64/Makefile.inc [deleted file]
klibc/klibc/arch/sparc64/crt0.S [deleted file]
klibc/klibc/arch/sparc64/setjmp.S [deleted file]
klibc/klibc/arch/sparc64/syscall.S [deleted file]
klibc/klibc/arch/sparc64/sysfork.S [deleted file]
klibc/klibc/arch/sparc64/sysstub.ph [deleted file]
klibc/klibc/arch/x86_64/MCONFIG [deleted file]
klibc/klibc/arch/x86_64/Makefile.inc [deleted file]
klibc/klibc/arch/x86_64/crt0.S [deleted file]
klibc/klibc/arch/x86_64/exits.S [deleted file]
klibc/klibc/arch/x86_64/setjmp.S [deleted file]
klibc/klibc/arch/x86_64/sigreturn.S [deleted file]
klibc/klibc/arch/x86_64/syscall.S [deleted file]
klibc/klibc/arch/x86_64/sysstub.ph [deleted file]
klibc/klibc/asprintf.c [deleted file]
klibc/klibc/assert.c [deleted file]
klibc/klibc/atexit.c [deleted file]
klibc/klibc/atexit.h [deleted file]
klibc/klibc/atoi.c [deleted file]
klibc/klibc/atol.c [deleted file]
klibc/klibc/atoll.c [deleted file]
klibc/klibc/atox.c [deleted file]
klibc/klibc/brk.c [deleted file]
klibc/klibc/bsd_signal.c [deleted file]
klibc/klibc/calloc.c [deleted file]
klibc/klibc/closelog.c [deleted file]
klibc/klibc/creat.c [deleted file]
klibc/klibc/ctypes.c [deleted file]
klibc/klibc/daemon.c [deleted file]
klibc/klibc/exec_l.c [deleted file]
klibc/klibc/execl.c [deleted file]
klibc/klibc/execle.c [deleted file]
klibc/klibc/execlp.c [deleted file]
klibc/klibc/execlpe.c [deleted file]
klibc/klibc/execv.c [deleted file]
klibc/klibc/execvp.c [deleted file]
klibc/klibc/execvpe.c [deleted file]
klibc/klibc/exitc.c [deleted file]
klibc/klibc/fgetc.c [deleted file]
klibc/klibc/fgets.c [deleted file]
klibc/klibc/fopen.c [deleted file]
klibc/klibc/fork.c [deleted file]
klibc/klibc/fprintf.c [deleted file]
klibc/klibc/fputc.c [deleted file]
klibc/klibc/fputs.c [deleted file]
klibc/klibc/fread.c [deleted file]
klibc/klibc/fread2.c [deleted file]
klibc/klibc/fstatfs.c [deleted file]
klibc/klibc/fwrite.c [deleted file]
klibc/klibc/fwrite2.c [deleted file]
klibc/klibc/getcwd.c [deleted file]
klibc/klibc/getdomainname.c [deleted file]
klibc/klibc/getenv.c [deleted file]
klibc/klibc/gethostname.c [deleted file]
klibc/klibc/getopt.c [deleted file]
klibc/klibc/getpgrp.c [deleted file]
klibc/klibc/getpriority.c [deleted file]
klibc/klibc/getpt.c [deleted file]
klibc/klibc/globals.c [deleted file]
klibc/klibc/inet/bindresvport.c [deleted file]
klibc/klibc/inet/inet_addr.c [deleted file]
klibc/klibc/inet/inet_aton.c [deleted file]
klibc/klibc/inet/inet_ntoa.c [deleted file]
klibc/klibc/inet/inet_ntop.c [deleted file]
klibc/klibc/inet/inet_pton.c [deleted file]
klibc/klibc/interp.S [deleted file]
klibc/klibc/isatty.c [deleted file]
klibc/klibc/jrand48.c [deleted file]
klibc/klibc/libc_init.c [deleted file]
klibc/klibc/libgcc/__divdi3.c [deleted file]
klibc/klibc/libgcc/__divsi3.c [deleted file]
klibc/klibc/libgcc/__moddi3.c [deleted file]
klibc/klibc/libgcc/__modsi3.c [deleted file]
klibc/klibc/libgcc/__udivdi3.c [deleted file]
klibc/klibc/libgcc/__udivmoddi4.c [deleted file]
klibc/klibc/libgcc/__udivmodsi4.c [deleted file]
klibc/klibc/libgcc/__udivsi3.c [deleted file]
klibc/klibc/libgcc/__umoddi3.c [deleted file]
klibc/klibc/libgcc/__umodsi3.c [deleted file]
klibc/klibc/llseek.c [deleted file]
klibc/klibc/lrand48.c [deleted file]
klibc/klibc/makeerrlist.pl [deleted file]
klibc/klibc/malloc.c [deleted file]
klibc/klibc/malloc.h [deleted file]
klibc/klibc/memccpy.c [deleted file]
klibc/klibc/memchr.c [deleted file]
klibc/klibc/memcmp.c [deleted file]
klibc/klibc/memcpy.c [deleted file]
klibc/klibc/memmem.c [deleted file]
klibc/klibc/memmove.c [deleted file]
klibc/klibc/memrchr.c [deleted file]
klibc/klibc/memset.c [deleted file]
klibc/klibc/memswap.c [deleted file]
klibc/klibc/mmap.c [deleted file]
klibc/klibc/mrand48.c [deleted file]
klibc/klibc/nice.c [deleted file]
klibc/klibc/nrand48.c [deleted file]
klibc/klibc/onexit.c [deleted file]
klibc/klibc/open.c [deleted file]
klibc/klibc/pause.c [deleted file]
klibc/klibc/perror.c [deleted file]
klibc/klibc/printf.c [deleted file]
klibc/klibc/pty.c [deleted file]
klibc/klibc/putchar.c [deleted file]
klibc/klibc/putenv.c [deleted file]
klibc/klibc/puts.c [deleted file]
klibc/klibc/qsort.c [deleted file]
klibc/klibc/raise.c [deleted file]
klibc/klibc/readdir.c [deleted file]
klibc/klibc/realloc.c [deleted file]
klibc/klibc/reboot.c [deleted file]
klibc/klibc/recv.c [deleted file]
klibc/klibc/sbrk.c [deleted file]
klibc/klibc/seed48.c [deleted file]
klibc/klibc/send.c [deleted file]
klibc/klibc/setegid.c [deleted file]
klibc/klibc/setenv.c [deleted file]
klibc/klibc/seteuid.c [deleted file]
klibc/klibc/setpgrp.c [deleted file]
klibc/klibc/sha1hash.c [deleted file]
klibc/klibc/sigaction.c [deleted file]
klibc/klibc/siglist.c [deleted file]
klibc/klibc/siglongjmp.c [deleted file]
klibc/klibc/sigpending.c [deleted file]
klibc/klibc/sigprocmask.c [deleted file]
klibc/klibc/sigsuspend.c [deleted file]
klibc/klibc/sleep.c [deleted file]
klibc/klibc/snprintf.c [deleted file]
klibc/klibc/socketcalls.pl [deleted file]
klibc/klibc/socketcommon.h [deleted file]
klibc/klibc/sprintf.c [deleted file]
klibc/klibc/srand48.c [deleted file]
klibc/klibc/sscanf.c [deleted file]
klibc/klibc/statfs.c [deleted file]
klibc/klibc/strcasecmp.c [deleted file]
klibc/klibc/strcat.c [deleted file]
klibc/klibc/strchr.c [deleted file]
klibc/klibc/strcmp.c [deleted file]
klibc/klibc/strcpy.c [deleted file]
klibc/klibc/strcspn.c [deleted file]
klibc/klibc/strdup.c [deleted file]
klibc/klibc/strerror.c [deleted file]
klibc/klibc/strlcat.c [deleted file]
klibc/klibc/strlcpy.c [deleted file]
klibc/klibc/strlen.c [deleted file]
klibc/klibc/strncasecmp.c [deleted file]
klibc/klibc/strncat.c [deleted file]
klibc/klibc/strncmp.c [deleted file]
klibc/klibc/strncpy.c [deleted file]
klibc/klibc/strndup.c [deleted file]
klibc/klibc/strnlen.c [deleted file]
klibc/klibc/strntoimax.c [deleted file]
klibc/klibc/strntoumax.c [deleted file]
klibc/klibc/strpbrk.c [deleted file]
klibc/klibc/strrchr.c [deleted file]
klibc/klibc/strsep.c [deleted file]
klibc/klibc/strspn.c [deleted file]
klibc/klibc/strstr.c [deleted file]
klibc/klibc/strtoimax.c [deleted file]
klibc/klibc/strtok.c [deleted file]
klibc/klibc/strtol.c [deleted file]
klibc/klibc/strtoll.c [deleted file]
klibc/klibc/strtotimespec.c [deleted file]
klibc/klibc/strtotimeval.c [deleted file]
klibc/klibc/strtotimex.c [deleted file]
klibc/klibc/strtoul.c [deleted file]
klibc/klibc/strtoull.c [deleted file]
klibc/klibc/strtoumax.c [deleted file]
klibc/klibc/strtox.c [deleted file]
klibc/klibc/strxspn.c [deleted file]
klibc/klibc/strxspn.h [deleted file]
klibc/klibc/syscalls.pl [deleted file]
klibc/klibc/syscommon.h [deleted file]
klibc/klibc/syslog.c [deleted file]
klibc/klibc/system.c [deleted file]
klibc/klibc/sysv_signal.c [deleted file]
klibc/klibc/time.c [deleted file]
klibc/klibc/umount.c [deleted file]
klibc/klibc/unsetenv.c [deleted file]
klibc/klibc/usleep.c [deleted file]
klibc/klibc/utime.c [deleted file]
klibc/klibc/vasprintf.c [deleted file]
klibc/klibc/vfprintf.c [deleted file]
klibc/klibc/vprintf.c [deleted file]
klibc/klibc/vsnprintf.c [deleted file]
klibc/klibc/vsprintf.c [deleted file]
klibc/klibc/vsscanf.c [deleted file]
klibc/klibc/wait.c [deleted file]
klibc/klibc/wait3.c [deleted file]
klibc/klibc/waitpid.c [deleted file]
klibc/klibc/zlib/FAQ [deleted file]
klibc/klibc/zlib/INDEX [deleted file]
klibc/klibc/zlib/README [deleted file]
klibc/klibc/zlib/adler32.c [deleted file]
klibc/klibc/zlib/algorithm.txt [deleted file]
klibc/klibc/zlib/compress.c [deleted file]
klibc/klibc/zlib/crc32.c [deleted file]
klibc/klibc/zlib/crc32.h [deleted file]
klibc/klibc/zlib/deflate.c [deleted file]
klibc/klibc/zlib/deflate.h [deleted file]
klibc/klibc/zlib/gzio.c [deleted file]
klibc/klibc/zlib/infback.c [deleted file]
klibc/klibc/zlib/inffast.c [deleted file]
klibc/klibc/zlib/inffast.h [deleted file]
klibc/klibc/zlib/inffixed.h [deleted file]
klibc/klibc/zlib/inflate.c [deleted file]
klibc/klibc/zlib/inflate.h [deleted file]
klibc/klibc/zlib/inftrees.c [deleted file]
klibc/klibc/zlib/inftrees.h [deleted file]
klibc/klibc/zlib/trees.c [deleted file]
klibc/klibc/zlib/trees.h [deleted file]
klibc/klibc/zlib/uncompr.c [deleted file]
klibc/klibc/zlib/zconf.h [deleted file]
klibc/klibc/zlib/zconf.in.h [deleted file]
klibc/klibc/zlib/zlib.3 [deleted file]
klibc/klibc/zlib/zlib.h [deleted file]
klibc/klibc/zlib/zutil.c [deleted file]
klibc/klibc/zlib/zutil.h [deleted file]
klibc/makeklcc.pl [deleted file]
klibc/version [deleted file]
test/simple-build-check.sh

index e6fd84f..3ef3c4b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Summary of changes from v74 to v075
+============================================
+
 Summary of changes from v73 to v074
 ============================================
 
diff --git a/HOWTO-udev_for_dev b/HOWTO-udev_for_dev
deleted file mode 100644 (file)
index 9833dd1..0000000
+++ /dev/null
@@ -1,79 +0,0 @@
-HOWTO use udev to manage /dev
-
-  This document describes one way to get udev working on a Fedora-development
-  machine to manage /dev.  This procedure may be used to get udev to manage
-  /dev on other distros, if you modify some of the steps.
-  
-  This will only work if you use a 2.6 based kernel, preferably the most
-  recent one.  This does not prevent your machine from using a 2.4
-  kernel, if you boot into one, udev will not run and your old /dev will
-  be present with no changes needed.
-
-
-NOTE NOTE NOTE NOTE NOTE NOTE NOTE
-  This is completely unsupported.  Attempting to do this may cause your
-  machine to be unable to boot properly.  USE AT YOUR OWN RISK.  Always
-  have a rescue disk or CD handy to allow you to fix up any errors that
-  may occur.
-NOTE NOTE NOTE NOTE NOTE NOTE NOTE
-
-
- - Build and install udev as specified in the README that comes with
-   udev.  I recommend using the following build options to get the
-   smallest possible binaries:
-       make USE_KLIBC=true USE_LOG=false DEBUG=false
-
- - disable udev from the boot process by running:
-       chkconfig udev off
-   or
-       chkconfig --del udev
-   as root.
-
- - place the start_udev script somewhere that is accessible by your
-   initscripts.  I placed it into /etc/rc.d with the following command:
-       copy extras/start_udev /etc/rc.d/
-       
- - modify the rc.sysinit script to call the start_udev script as one of
-   the first things that it does, but after /proc and /sys are mounted.
-   I did this with the latest Fedora startup scripts with the patch at
-   the end of this file.
-
- - make sure the /etc/udev/udev.conf file lists the udev_root as "/dev/"
-   and the udev_db as "/dev/.udevdb". It should contain the
-   following lines in order to work properly.
-       udev_root="/dev/"
-       udev_db="/dev/.udevdb"
-
- - reboot into a 2.6 kernel and watch udev create all of the initial
-   device nodes in /dev
-
-
-If anyone has any problems with this, please let me, and the
-linux-hotplug-devel@lists.sourceforge.net mailing list know.
-
-A big thanks go out to the Gentoo developers for showing me that this is
-possible to do.
-
-Greg Kroah-Hartman
-<greg@kroah.com>
-
-
-----------------------------------
-Patch to modify rc.sysinit to call udev at the beginning of the boot
-process:
-
-
---- /etc/rc.sysinit.orig       2004-02-17 11:45:17.000000000 -0800
-+++ /etc/rc.sysinit    2004-02-17 13:28:33.000000000 -0800
-@@ -32,6 +32,9 @@
- . /etc/init.d/functions
-+# start udev to populate /dev
-+/etc/rc.d/start_udev
-+
- if [ "$HOSTTYPE" != "s390" -a "$HOSTTYPE" != "s390x" ]; then
-   last=0
-   for i in `LC_ALL=C grep '^[0-9].*respawn:/sbin/mingetty' /etc/inittab | sed 's/^.* tty\([0-9][0-9]*\).*/\1/g'`; do
-
index bc97388..c105dab 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -122,7 +122,6 @@ configdir = ${etcdir}/udev
 udevdir =      /dev
 udevdb =       ${udevdir}/.udevdb
 LOCAL_CFG_DIR =        etc/udev
-KERNEL_DIR =   /lib/modules/${shell uname -r}/build
 DESTDIR =
 
 INSTALL = /usr/bin/install -c
@@ -177,8 +176,7 @@ endif
 
 # if our own version of klibc is used, we need to build it
 ifeq ($(strip $(USE_KLIBC)),true)
-       KLIBC_INSTALL   = $(PWD)/klibc/.install
-       KLCC            = $(KLIBC_INSTALL)/bin/$(CROSS)klcc
+       KLCC            = /usr/bin/$(CROSS)klcc
        CC              = $(KLCC)
        LD              = $(KLCC)
        V = true
@@ -203,7 +201,7 @@ else
        HOST_PROGS=
 endif
 
-all: $(KLCC) $(PROGRAMS) $(MAN_PAGES)
+all: $(PROGRAMS) $(MAN_PAGES)
        @extras="$(EXTRAS)"; for target in $$extras; do \
                echo $$target; \
                $(MAKE) CC="$(CC)" \
@@ -214,7 +212,6 @@ all: $(KLCC) $(PROGRAMS) $(MAN_PAGES)
                        LIB_OBJS="$(LIB_OBJS)" \
                        LIBUDEV="$(PWD)/$(LIBUDEV)" \
                        LIBSYSFS="$(PWD)/$(LIBSYSFS)" \
-                       KERNEL_DIR="$(KERNEL_DIR)" \
                        QUIET="$(QUIET)" \
                        -C $$target $@; \
        done;
@@ -229,28 +226,19 @@ all: $(KLCC) $(PROGRAMS) $(MAN_PAGES)
        $(QUIET) $(CC) -c $(CFLAGS) $< -o $@
 
 # "Static Pattern Rule" to build all programs
-$(PROGRAMS): %: $(HOST_PROGS) $(KLCC) $(HEADERS) $(GEN_HEADERS) $(LIBSYSFS) $(LIBUDEV) %.o
+$(PROGRAMS): %: $(HOST_PROGS) $(HEADERS) $(GEN_HEADERS) $(LIBSYSFS) $(LIBUDEV) %.o
        $(QUIET) $(LD) $(LDFLAGS) $@.o -o $@ $(LIBUDEV) $(LIBSYSFS) $(LIB_OBJS)
 ifneq ($(STRIPCMD),)
        $(QUIET) $(STRIPCMD) $@
 endif
 
-# our own copy of klibc, it is not used if KLCC is given
-$(KLCC):
-       $(MAKE) -C klibc KRNLSRC=$(KERNEL_DIR) SUBDIRS=klibc TESTS= \
-                        SHLIBDIR=$(KLIBC_INSTALL)/lib \
-                        INSTALLDIR=$(KLIBC_INSTALL) \
-                        bindir=$(KLIBC_INSTALL)/bin \
-                        mandir=$(KLIBC_INSTALL)/man all install
-.NOTPARALLEL: $(KLCC)
-
-$(UDEV_OBJS): $(KLCC)
+$(UDEV_OBJS):
 $(LIBUDEV): $(HOST_PROGS) $(HEADERS) $(GEN_HEADERS) $(UDEV_OBJS)
        @rm -f $@
        $(QUIET) $(AR) cq $@ $(UDEV_OBJS)
        $(QUIET) $(RANLIB) $@
 
-$(SYSFS_OBJS): $(KLCC)
+$(SYSFS_OBJS):
 $(LIBSYSFS): $(HOST_PROGS) $(SYSFS_OBJS)
        @rm -f $@
        $(QUIET) $(AR) cq $@ $(SYSFS_OBJS)
@@ -288,13 +276,10 @@ clean:
        - rm -f udev_gcov.txt
        - rm -f core $(PROGRAMS) $(GEN_HEADERS) $(GEN_CONFIGS)
        - rm -f udev-$(VERSION).tar.gz
-       $(MAKE) -C klibc SUBDIRS=klibc clean
        @extras="$(EXTRAS)"; for target in $$extras; do \
                echo $$target; \
                $(MAKE) -C $$target $@; \
        done;
-       $(MAKE) -C klibc SUBDIRS=klibc spotless
-       rm -rf klibc/.install
 .PHONY: clean
 
 release:
diff --git a/README b/README
index 19ed446..3f4f947 100644 (file)
--- a/README
+++ b/README
@@ -45,9 +45,7 @@ Setting which are used for building udev:
   USE_LOG
        if set to 'true', udev will emit messages to the syslog when
        it creates or removes device nodes.  This is helpful to see
-       what udev is doing.  This is enabled by default.  Note, if you
-       are building udev against klibc it is recommended that you
-       disable this option (due to klibc's syslog implementation.)
+       what udev is doing.  This is enabled by default.
   DEBUG
        if set to 'true', verbose debugging messages will be compiled into
        the udev binaries.  Default value is 'false'.
@@ -55,20 +53,13 @@ Setting which are used for building udev:
        if set to 'true', udev will be built with SELinux support
        enabled.  This is disabled by default.
   USE_KLIBC
-       if set to 'true', udev is built and linked against the
-       included version of klibc.  Default value is 'false'.
-  KERNEL_DIR
-       If this is not set it will default to /lib/modules/`uname -r`/build
-       This is used if USE_KLIBC=true to find the kernel include
-       directory that klibc needs to build against.  This must be set
-       if you are not building udev while running a 2.6 kernel.
+       if set to 'true', udev is built and linked against klibc.
+       Default value is 'false'. KLCC specifies the klibc compiler
+       wrapper, usually in /usr/bin/klcc
   EXTRAS
        if set, will build the "extra" helper programs as specified
        as listed (see below for an example.)
 
-if you want to build udev using klibc with debugging messages:
-  make USE_KLIBC=true DEBUG=true
-
 if you want to build the udev helper program cdrom_id and scsi_id:
   make EXTRAS="extras/cdrom_id extras/scsi_id"
 
index 8a1bde8..d89aeaa 100644 (file)
@@ -1,3 +1,8 @@
+udev 075
+========
+The copy of klibc is removed. A systemwide installed version of klibc
+can be used to buil a klibc udev.
+
 udev 074
 ========
 NAME="" will not create any nodes, but execute RUN keys. To completely
diff --git a/TODO b/TODO
index 0bf22dd..41ea98f 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-This is a short list of things that needs to be done.  They are in no specific
+This is a list of things that needs to be done. They are in no specific
 order.  We will gladly accept patches for any of these items:
 
 - Completely replace the built-in wait_for_sysfs stuff in udev_sysfs.c
@@ -8,5 +8,3 @@ order.  We will gladly accept patches for any of these items:
   to syslog, so any error logged from the kernel can be associated with
   any of the links at that time.
 
-- remove klibc tree and make it an external dependency
-
index 23de2ba..30c0abb 100644 (file)
@@ -5,12 +5,8 @@
 # Released under the GNU General Public License, version 2.
 #
 
-VOLUME_ID_BASE=volume_id
-include $(VOLUME_ID_BASE)/Makefile.inc
-
 PROG = vol_id
-OBJS = $(VOLUME_ID_OBJS)
-HEADERS = $(VOLUME_ID_HEADERS)
+LIBVOLUME_ID = libvolume_id/libvolume_id.a
 GEN_HEADERS =
 MAN_PAGES =
 
@@ -36,8 +32,11 @@ all: $(PROG) $(MAN_PAGES)
 %.o: %.c $(GEN_HEADERS)
        $(QUIET) $(CC) -c $(CFLAGS) $< -o $@
 
-$(PROG): %: $(HEADERS) %.o $(OBJS)
-       $(QUIET) $(LD) $(LDFLAGS) $@.o $(OBJS) -o $@ $(LIBUDEV) $(LIBSYSFS) $(LIB_OBJS)
+$(LIBVOLUME_ID):
+       $(MAKE) -C libvolume_id
+
+$(PROG): %: $(HEADERS) %.o $(LIBVOLUME_ID)
+       $(QUIET) $(LD) $(LDFLAGS) $@.o $(LIBVOLUME_ID) -o $@ $(LIBUDEV) $(LIBSYSFS) $(LIB_OBJS)
 ifneq ($(strip $(STRIPCMD)),)
        $(QUIET) $(STRIPCMD) $@
 endif
@@ -49,6 +48,7 @@ endif
 
 clean:
        rm -f $(PROG) $(OBJS) $(GEN_HEADERS)
+       $(MAKE) -C libvolume_id clean
 .PHONY: clean
 
 install-bin: all
diff --git a/extras/volume_id/libvolume_id/Makefile b/extras/volume_id/libvolume_id/Makefile
new file mode 100644 (file)
index 0000000..02c24ea
--- /dev/null
@@ -0,0 +1,66 @@
+# Makefile for udev extra invoked from the udev main Makefile
+#
+# Copyright (C) 2004-2005 Kay Sievers <kay.sievers@vrfy.org>
+#
+# Released under the GNU General Public License, version 2.
+#
+
+LIBVOLUME_ID = libvolume_id.a
+
+OBJS=                          \
+       ext.o                   \
+       fat.o                   \
+       hfs.o                   \
+       highpoint.o             \
+       isw_raid.o              \
+       lsi_raid.o              \
+       via_raid.o              \
+       silicon_raid.o          \
+       nvidia_raid.o           \
+       promise_raid.o          \
+       iso9660.o               \
+       jfs.o                   \
+       linux_raid.o            \
+       linux_swap.o            \
+       lvm.o                   \
+       mac.o                   \
+       msdos.o                 \
+       ntfs.o                  \
+       reiserfs.o              \
+       udf.o                   \
+       ufs.o                   \
+       xfs.o                   \
+       cramfs.o                \
+       hpfs.o                  \
+       romfs.o                 \
+       sysv.o                  \
+       minix.o                 \
+       luks.o                  \
+       ocfs.o                  \
+       vxfs.o                  \
+       volume_id.o             \
+       util.o
+
+HEADERS=                       \
+       volume_id.h             \
+       util.h
+
+AR = $(CROSS)ar
+RANLIB = $(CROSS)ranlib
+
+all: $(LIBVOLUME_ID)
+.PHONY: all
+.DEFAULT: all
+
+%.o: %.c
+       $(QUIET) $(CC) -c $(CFLAGS) $< -o $@
+
+$(LIBVOLUME_ID): $(HEADERS) $(OBJS)
+       @rm -f $@
+       $(QUIET) $(AR) cq $@ $(OBJS)
+       $(QUIET) $(RANLIB) $@
+
+clean:
+       rm -f $(LIBVOLUME_ID) $(OBJS)
+.PHONY: clean
+
similarity index 98%
rename from extras/volume_id/volume_id/cramfs.c
rename to extras/volume_id/libvolume_id/cramfs.c
index 85a1bc8..0ad5886 100644 (file)
@@ -26,7 +26,6 @@
 #include "volume_id.h"
 #include "logging.h"
 #include "util.h"
-#include "cramfs.h"
 
 struct cramfs_super {
        uint8_t         magic[4];
similarity index 99%
rename from extras/volume_id/volume_id/ext.c
rename to extras/volume_id/libvolume_id/ext.c
index a3e20d3..d1f62df 100644 (file)
@@ -26,7 +26,6 @@
 #include "volume_id.h"
 #include "util.h"
 #include "logging.h"
-#include "ext.h"
 
 struct ext2_super_block {
        uint32_t        s_inodes_count;
similarity index 99%
rename from extras/volume_id/volume_id/fat.c
rename to extras/volume_id/libvolume_id/fat.c
index 74f2bb9..26d0fe7 100644 (file)
@@ -26,7 +26,6 @@
 #include "volume_id.h"
 #include "logging.h"
 #include "util.h"
-#include "fat.h"
 
 #define FAT12_MAX                      0xff5
 #define FAT16_MAX                      0xfff5
similarity index 99%
rename from extras/volume_id/volume_id/hfs.c
rename to extras/volume_id/libvolume_id/hfs.c
index 8de8b9a..27a8ac9 100644 (file)
@@ -26,7 +26,6 @@
 #include "volume_id.h"
 #include "logging.h"
 #include "util.h"
-#include "hfs.h"
 
 struct hfs_finder_info{
        uint32_t        boot_folder;
similarity index 98%
rename from extras/volume_id/volume_id/highpoint.c
rename to extras/volume_id/libvolume_id/highpoint.c
index 33c4a8c..721b7ab 100644 (file)
@@ -26,7 +26,6 @@
 #include "volume_id.h"
 #include "logging.h"
 #include "util.h"
-#include "highpoint.h"
 
 struct hpt37x_meta {
        uint8_t         filler1[32];
similarity index 98%
rename from extras/volume_id/volume_id/hpfs.c
rename to extras/volume_id/libvolume_id/hpfs.c
index 3b97d93..52cb47b 100644 (file)
@@ -26,7 +26,6 @@
 #include "volume_id.h"
 #include "logging.h"
 #include "util.h"
-#include "hpfs.h"
 
 struct hpfs_super
 {
similarity index 99%
rename from extras/volume_id/volume_id/iso9660.c
rename to extras/volume_id/libvolume_id/iso9660.c
index 3999a1e..b6654ce 100644 (file)
@@ -26,7 +26,6 @@
 #include "volume_id.h"
 #include "logging.h"
 #include "util.h"
-#include "iso9660.h"
 
 #define ISO_SUPERBLOCK_OFFSET          0x8000
 #define ISO_SECTOR_SIZE                        0x800
similarity index 98%
rename from extras/volume_id/volume_id/isw_raid.c
rename to extras/volume_id/libvolume_id/isw_raid.c
index 745b42f..1f49959 100644 (file)
@@ -26,7 +26,6 @@
 #include "volume_id.h"
 #include "logging.h"
 #include "util.h"
-#include "isw_raid.h"
 
 struct isw_meta {
        uint8_t         sig[32];
similarity index 98%
rename from extras/volume_id/volume_id/jfs.c
rename to extras/volume_id/libvolume_id/jfs.c
index 1b2bfdf..b6ae962 100644 (file)
@@ -26,7 +26,6 @@
 #include "volume_id.h"
 #include "logging.h"
 #include "util.h"
-#include "jfs.h"
 
 struct jfs_super_block {
        uint8_t         magic[4];
similarity index 98%
rename from extras/volume_id/volume_id/linux_raid.c
rename to extras/volume_id/libvolume_id/linux_raid.c
index eb37dba..d90510a 100644 (file)
@@ -26,7 +26,6 @@
 #include "volume_id.h"
 #include "logging.h"
 #include "util.h"
-#include "linux_raid.h"
 
 struct mdp_super_block {
        uint32_t        md_magic;
similarity index 98%
rename from extras/volume_id/volume_id/linux_swap.c
rename to extras/volume_id/libvolume_id/linux_swap.c
index b3e22f6..18928b8 100644 (file)
@@ -26,7 +26,6 @@
 #include "volume_id.h"
 #include "logging.h"
 #include "util.h"
-#include "linux_swap.h"
 
 struct swap_header_v1_2 {
        uint8_t         bootbits[1024];
similarity index 98%
rename from extras/volume_id/volume_id/lsi_raid.c
rename to extras/volume_id/libvolume_id/lsi_raid.c
index e5da281..2720de7 100644 (file)
@@ -26,7 +26,6 @@
 #include "volume_id.h"
 #include "logging.h"
 #include "util.h"
-#include "lsi_raid.h"
 
 struct lsi_meta {
        uint8_t         sig[6];
similarity index 99%
rename from extras/volume_id/volume_id/luks.c
rename to extras/volume_id/libvolume_id/luks.c
index ff90f5d..43f326e 100644 (file)
@@ -26,7 +26,6 @@
 #include "volume_id.h"
 #include "util.h"
 #include "logging.h"
-#include "luks.h"
 
 #define SECTOR_SHIFT                   9
 #define SECTOR_SIZE                    (1 << SECTOR_SHIFT)
similarity index 99%
rename from extras/volume_id/volume_id/lvm.c
rename to extras/volume_id/libvolume_id/lvm.c
index a188402..6509862 100644 (file)
@@ -26,7 +26,6 @@
 #include "volume_id.h"
 #include "logging.h"
 #include "util.h"
-#include "lvm.h"
 
 struct lvm1_super_block {
        uint8_t id[2];
similarity index 99%
rename from extras/volume_id/volume_id/mac.c
rename to extras/volume_id/libvolume_id/mac.c
index 1587f48..99bcbde 100644 (file)
@@ -26,7 +26,6 @@
 #include "volume_id.h"
 #include "logging.h"
 #include "util.h"
-#include "mac.h"
 
 struct mac_driver_desc {
        uint8_t         signature[2];
similarity index 98%
rename from extras/volume_id/volume_id/minix.c
rename to extras/volume_id/libvolume_id/minix.c
index b081afa..ca57745 100644 (file)
@@ -26,7 +26,6 @@
 #include "volume_id.h"
 #include "logging.h"
 #include "util.h"
-#include "minix.h"
 
 struct minix_super_block
 {
similarity index 99%
rename from extras/volume_id/volume_id/msdos.c
rename to extras/volume_id/libvolume_id/msdos.c
index ab18fc3..a660460 100644 (file)
@@ -26,7 +26,6 @@
 #include "volume_id.h"
 #include "logging.h"
 #include "util.h"
-#include "msdos.h"
 
 struct msdos_partition_entry {
        uint8_t         boot_ind;
similarity index 99%
rename from extras/volume_id/volume_id/ntfs.c
rename to extras/volume_id/libvolume_id/ntfs.c
index 39aa2d7..de9ad6d 100644 (file)
@@ -26,7 +26,6 @@
 #include "volume_id.h"
 #include "logging.h"
 #include "util.h"
-#include "ntfs.h"
 
 struct ntfs_super_block {
        uint8_t         jump[3];
similarity index 98%
rename from extras/volume_id/volume_id/nvidia_raid.c
rename to extras/volume_id/libvolume_id/nvidia_raid.c
index 9198f1e..3b967e6 100644 (file)
@@ -26,7 +26,6 @@
 #include "volume_id.h"
 #include "logging.h"
 #include "util.h"
-#include "nvidia_raid.h"
 
 struct nvidia_meta {
        uint8_t         vendor[8];
similarity index 99%
rename from extras/volume_id/volume_id/ocfs.c
rename to extras/volume_id/libvolume_id/ocfs.c
index 88064ed..faf89bd 100644 (file)
@@ -27,7 +27,6 @@
 #include "volume_id.h"
 #include "logging.h"
 #include "util.h"
-#include "ocfs.h"
 
 
 struct ocfs1_super_block_header {
similarity index 98%
rename from extras/volume_id/volume_id/promise_raid.c
rename to extras/volume_id/libvolume_id/promise_raid.c
index 54832a8..6611aea 100644 (file)
@@ -26,7 +26,6 @@
 #include "volume_id.h"
 #include "logging.h"
 #include "util.h"
-#include "promise_raid.h"
 
 struct promise_meta {
        uint8_t sig[24];
similarity index 99%
rename from extras/volume_id/volume_id/reiserfs.c
rename to extras/volume_id/libvolume_id/reiserfs.c
index e64b08a..0eecbda 100644 (file)
@@ -27,7 +27,6 @@
 #include "volume_id.h"
 #include "logging.h"
 #include "util.h"
-#include "reiserfs.h"
 
 struct reiserfs_super_block {
        uint32_t        blocks_count;
similarity index 98%
rename from extras/volume_id/volume_id/romfs.c
rename to extras/volume_id/libvolume_id/romfs.c
index 3373f36..51ef373 100644 (file)
@@ -26,7 +26,6 @@
 #include "volume_id.h"
 #include "logging.h"
 #include "util.h"
-#include "romfs.h"
 
 struct romfs_super {
        uint8_t magic[8];
similarity index 98%
rename from extras/volume_id/volume_id/silicon_raid.c
rename to extras/volume_id/libvolume_id/silicon_raid.c
index 5f68127..a307764 100644 (file)
@@ -26,7 +26,6 @@
 #include "volume_id.h"
 #include "logging.h"
 #include "util.h"
-#include "silicon_raid.h"
 
 struct silicon_meta {
        uint8_t         unknown0[0x2E];
similarity index 99%
rename from extras/volume_id/volume_id/sysv.c
rename to extras/volume_id/libvolume_id/sysv.c
index 610edb8..fc874d5 100644 (file)
@@ -26,7 +26,6 @@
 #include "volume_id.h"
 #include "logging.h"
 #include "util.h"
-#include "sysv.h"
 
 #define SYSV_NICINOD                   100
 #define SYSV_NICFREE                   50
similarity index 99%
rename from extras/volume_id/volume_id/udf.c
rename to extras/volume_id/libvolume_id/udf.c
index f54ca87..fede1ce 100644 (file)
@@ -26,7 +26,6 @@
 #include "volume_id.h"
 #include "logging.h"
 #include "util.h"
-#include "udf.h"
 
 struct volume_descriptor {
        struct descriptor_tag {
similarity index 99%
rename from extras/volume_id/volume_id/ufs.c
rename to extras/volume_id/libvolume_id/ufs.c
index a7bd091..ace61db 100644 (file)
@@ -26,7 +26,6 @@
 #include "volume_id.h"
 #include "logging.h"
 #include "util.h"
-#include "ufs.h"
 
 struct ufs_super_block {
        uint32_t        fs_link;
similarity index 98%
rename from extras/volume_id/volume_id/via_raid.c
rename to extras/volume_id/libvolume_id/via_raid.c
index 2b74123..66962cd 100644 (file)
@@ -26,7 +26,6 @@
 #include "volume_id.h"
 #include "logging.h"
 #include "util.h"
-#include "via_raid.h"
 
 struct via_meta {
        uint16_t        signature;
similarity index 78%
rename from extras/volume_id/volume_id/volume_id.c
rename to extras/volume_id/libvolume_id/volume_id.c
index b922698..09d1e31 100644 (file)
 #include "logging.h"
 #include "util.h"
 
-#include "ext.h"
-#include "reiserfs.h"
-#include "fat.h"
-#include "hfs.h"
-#include "jfs.h"
-#include "xfs.h"
-#include "ufs.h"
-#include "ntfs.h"
-#include "iso9660.h"
-#include "udf.h"
-#include "highpoint.h"
-#include "isw_raid.h"
-#include "lsi_raid.h"
-#include "via_raid.h"
-#include "silicon_raid.h"
-#include "nvidia_raid.h"
-#include "promise_raid.h"
-#include "luks.h"
-#include "linux_swap.h"
-#include "linux_raid.h"
-#include "lvm.h"
-#include "cramfs.h"
-#include "hpfs.h"
-#include "romfs.h"
-#include "sysv.h"
-#include "minix.h"
-#include "mac.h"
-#include "msdos.h"
-#include "ocfs.h"
-#include "vxfs.h"
 
 int volume_id_probe_all(struct volume_id *id, uint64_t off, uint64_t size)
 {
@@ -213,28 +183,6 @@ struct volume_id *volume_id_open_node(const char *path)
        return id;
 }
 
-/* open volume by major/minor */
-struct volume_id *volume_id_open_dev_t(dev_t devt)
-{
-       struct volume_id *id;
-       char tmp_node[VOLUME_ID_PATH_MAX];
-
-       snprintf(tmp_node, VOLUME_ID_PATH_MAX,
-                "/dev/.volume_id-%u-%u-%u", getpid(), major(devt), minor(devt));
-       tmp_node[VOLUME_ID_PATH_MAX-1] = '\0';
-
-       /* create tempory node to open the block device */
-       unlink(tmp_node);
-       if (mknod(tmp_node, (S_IFBLK | 0600), devt) != 0)
-               return NULL;
-
-       id = volume_id_open_node(tmp_node);
-
-       unlink(tmp_node);
-
-       return id;
-}
-
 void volume_id_close(struct volume_id *id)
 {
        if (id == NULL)
diff --git a/extras/volume_id/libvolume_id/volume_id.h b/extras/volume_id/libvolume_id/volume_id.h
new file mode 100644 (file)
index 0000000..f2f3a0d
--- /dev/null
@@ -0,0 +1,116 @@
+/*
+ * volume_id - reads partition label and uuid
+ *
+ * Copyright (C) 2005 Kay Sievers <kay.sievers@vrfy.org>
+ *
+ *     This program is free software; you can redistribute it and/or modify it
+ *     under the terms of the GNU General Public License as published by the
+ *     Free Software Foundation version 2 of the License.
+ */
+
+#ifndef _VOLUME_ID_H_
+#define _VOLUME_ID_H_
+
+#include <stdint.h>
+
+#define VOLUME_ID_VERSION              53
+
+#define VOLUME_ID_LABEL_SIZE           64
+#define VOLUME_ID_UUID_SIZE            36
+#define VOLUME_ID_FORMAT_SIZE          32
+#define VOLUME_ID_PATH_MAX             256
+#define VOLUME_ID_PARTITIONS_MAX       256
+
+enum volume_id_usage {
+       VOLUME_ID_UNUSED,
+       VOLUME_ID_UNPROBED,
+       VOLUME_ID_OTHER,
+       VOLUME_ID_FILESYSTEM,
+       VOLUME_ID_PARTITIONTABLE,
+       VOLUME_ID_RAID,
+       VOLUME_ID_DISKLABEL,
+       VOLUME_ID_CRYPTO,
+};
+
+struct volume_id_partition {
+       enum            volume_id_usage usage_id;
+       char            *usage;
+       char            *type;
+       uint64_t        off;
+       uint64_t        len;
+       uint8_t         partition_type_raw;
+};
+
+struct volume_id {
+       uint8_t         label_raw[VOLUME_ID_LABEL_SIZE];
+       size_t          label_raw_len;
+       char            label[VOLUME_ID_LABEL_SIZE+1];
+       uint8_t         uuid_raw[VOLUME_ID_UUID_SIZE];
+       size_t          uuid_raw_len;
+       char            uuid[VOLUME_ID_UUID_SIZE+1];
+       enum            volume_id_usage usage_id;
+       char            *usage;
+       char            *type;
+       char            type_version[VOLUME_ID_FORMAT_SIZE];
+
+       struct volume_id_partition *partitions;
+       size_t          partition_count;
+
+       int             fd;
+       uint8_t         *sbbuf;
+       size_t          sbbuf_len;
+       uint8_t         *seekbuf;
+       uint64_t        seekbuf_off;
+       size_t          seekbuf_len;
+       int             fd_close:1;
+};
+
+extern struct volume_id *volume_id_open_fd(int fd);
+extern struct volume_id *volume_id_open_node(const char *path);
+extern int volume_id_probe_all(struct volume_id *id, uint64_t off, uint64_t size);
+extern void volume_id_close(struct volume_id *id);
+
+/* filesystems */
+extern int volume_id_probe_cramfs(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_ext(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_vfat(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_hfs_hfsplus(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_hpfs(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_iso9660(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_jfs(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_minix(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_ntfs(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_ocfs1(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_ocfs2(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_reiserfs(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_romfs(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_sysv(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_udf(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_ufs(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_vxfs(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_xfs(struct volume_id *id, uint64_t off);
+
+/* special formats */
+extern int volume_id_probe_linux_swap(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_luks(struct volume_id *id, uint64_t off);
+
+/* raid */
+extern int volume_id_probe_linux_raid(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_lvm1(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_lvm2(struct volume_id *id, uint64_t off);
+
+/* bios raid */
+extern int volume_id_probe_intel_software_raid(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_highpoint_37x_raid(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_highpoint_45x_raid(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_lsi_mega_raid(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_nvidia_raid(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_promise_fasttrack_raid(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_silicon_medley_raid(struct volume_id *id, uint64_t off, uint64_t size);
+extern int volume_id_probe_via_raid(struct volume_id *id, uint64_t off, uint64_t size);
+
+/* partition tables */
+extern int volume_id_probe_msdos_part_table(struct volume_id *id, uint64_t off);
+extern int volume_id_probe_mac_partition_map(struct volume_id *id, uint64_t off);
+
+#endif
similarity index 98%
rename from extras/volume_id/volume_id/vxfs.c
rename to extras/volume_id/libvolume_id/vxfs.c
index c4a9ace..0aef369 100644 (file)
@@ -26,7 +26,6 @@
 #include "volume_id.h"
 #include "logging.h"
 #include "util.h"
-#include "vxfs.h"
 
 #define VXFS_SUPER_MAGIC       0xa501FCF5
 
similarity index 98%
rename from extras/volume_id/volume_id/xfs.c
rename to extras/volume_id/libvolume_id/xfs.c
index 7fd6290..a5f5d84 100644 (file)
@@ -26,7 +26,6 @@
 #include "volume_id.h"
 #include "logging.h"
 #include "util.h"
-#include "xfs.h"
 
 struct xfs_super_block {
        uint8_t magic[4];
index 2b53085..6f99c52 100644 (file)
@@ -31,7 +31,7 @@
 
 #include "../../udev_utils.h"
 #include "../../logging.h"
-#include "volume_id/volume_id.h"
+#include "libvolume_id/volume_id.h"
 
 #define BLKGETSIZE64 _IOR(0x12,114,size_t)
 
diff --git a/extras/volume_id/volume_id/Makefile.inc b/extras/volume_id/volume_id/Makefile.inc
deleted file mode 100644 (file)
index 6f8dcee..0000000
+++ /dev/null
@@ -1,66 +0,0 @@
-VOLUME_ID_OBJS=                                        \
-       $(VOLUME_ID_BASE)/ext.o                 \
-       $(VOLUME_ID_BASE)/fat.o                 \
-       $(VOLUME_ID_BASE)/hfs.o                 \
-       $(VOLUME_ID_BASE)/highpoint.o           \
-       $(VOLUME_ID_BASE)/isw_raid.o            \
-       $(VOLUME_ID_BASE)/lsi_raid.o            \
-       $(VOLUME_ID_BASE)/via_raid.o            \
-       $(VOLUME_ID_BASE)/silicon_raid.o        \
-       $(VOLUME_ID_BASE)/nvidia_raid.o         \
-       $(VOLUME_ID_BASE)/promise_raid.o        \
-       $(VOLUME_ID_BASE)/iso9660.o             \
-       $(VOLUME_ID_BASE)/jfs.o                 \
-       $(VOLUME_ID_BASE)/linux_raid.o          \
-       $(VOLUME_ID_BASE)/linux_swap.o          \
-       $(VOLUME_ID_BASE)/lvm.o                 \
-       $(VOLUME_ID_BASE)/mac.o                 \
-       $(VOLUME_ID_BASE)/msdos.o               \
-       $(VOLUME_ID_BASE)/ntfs.o                \
-       $(VOLUME_ID_BASE)/reiserfs.o            \
-       $(VOLUME_ID_BASE)/udf.o                 \
-       $(VOLUME_ID_BASE)/ufs.o                 \
-       $(VOLUME_ID_BASE)/xfs.o                 \
-       $(VOLUME_ID_BASE)/cramfs.o              \
-       $(VOLUME_ID_BASE)/hpfs.o                \
-       $(VOLUME_ID_BASE)/romfs.o               \
-       $(VOLUME_ID_BASE)/sysv.o                \
-       $(VOLUME_ID_BASE)/minix.o               \
-       $(VOLUME_ID_BASE)/luks.o                \
-       $(VOLUME_ID_BASE)/ocfs.o                \
-       $(VOLUME_ID_BASE)/vxfs.o                \
-       $(VOLUME_ID_BASE)/volume_id.o           \
-       $(VOLUME_ID_BASE)/util.o
-
-VOLUME_ID_HEADERS=                             \
-       $(VOLUME_ID_BASE)/ext.h                 \
-       $(VOLUME_ID_BASE)/fat.h                 \
-       $(VOLUME_ID_BASE)/hfs.h                 \
-       $(VOLUME_ID_BASE)/highpoint.h           \
-       $(VOLUME_ID_BASE)/isw_raid.h            \
-       $(VOLUME_ID_BASE)/lsi_raid.h            \
-       $(VOLUME_ID_BASE)/via_raid.h            \
-       $(VOLUME_ID_BASE)/silicon_raid.h        \
-       $(VOLUME_ID_BASE)/nvidia_raid.h         \
-       $(VOLUME_ID_BASE)/promise_raid.h        \
-       $(VOLUME_ID_BASE)/iso9660.h             \
-       $(VOLUME_ID_BASE)/jfs.h                 \
-       $(VOLUME_ID_BASE)/linux_raid.h          \
-       $(VOLUME_ID_BASE)/linux_swap.h          \
-       $(VOLUME_ID_BASE)/lvm.h                 \
-       $(VOLUME_ID_BASE)/mac.h                 \
-       $(VOLUME_ID_BASE)/msdos.h               \
-       $(VOLUME_ID_BASE)/ntfs.h                \
-       $(VOLUME_ID_BASE)/reiserfs.h            \
-       $(VOLUME_ID_BASE)/udf.h                 \
-       $(VOLUME_ID_BASE)/ufs.h                 \
-       $(VOLUME_ID_BASE)/xfs.h                 \
-       $(VOLUME_ID_BASE)/cramfs.h              \
-       $(VOLUME_ID_BASE)/romfs.h               \
-       $(VOLUME_ID_BASE)/sysv.h                \
-       $(VOLUME_ID_BASE)/minix.h               \
-       $(VOLUME_ID_BASE)/luks.h                \
-       $(VOLUME_ID_BASE)/ocfs.h                \
-       $(VOLUME_ID_BASE)/vxfs.h                \
-       $(VOLUME_ID_BASE)/volume_id.h           \
-       $(VOLUME_ID_BASE)/util.h
diff --git a/extras/volume_id/volume_id/cramfs.h b/extras/volume_id/volume_id/cramfs.h
deleted file mode 100644 (file)
index 0ff19c3..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * volume_id - reads filesystem label and uuid
- *
- * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
- *
- *     This program is free software; you can redistribute it and/or modify it
- *     under the terms of the GNU General Public License as published by the
- *     Free Software Foundation version 2 of the License.
- */
-
-#ifndef _VOLUME_ID_CRAMFS_
-#define _VOLUME_ID_CRAMFS_
-
-extern int volume_id_probe_cramfs(struct volume_id *id, uint64_t off);
-
-#endif
diff --git a/extras/volume_id/volume_id/ext.h b/extras/volume_id/volume_id/ext.h
deleted file mode 100644 (file)
index dfda207..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * volume_id - reads filesystem label and uuid
- *
- * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
- *
- *     This program is free software; you can redistribute it and/or modify it
- *     under the terms of the GNU General Public License as published by the
- *     Free Software Foundation version 2 of the License.
- */
-
-#ifndef _VOLUME_ID_EXT_
-#define _VOLUME_ID_EXT_
-
-extern int volume_id_probe_ext(struct volume_id *id, uint64_t off);
-
-#endif
diff --git a/extras/volume_id/volume_id/fat.h b/extras/volume_id/volume_id/fat.h
deleted file mode 100644 (file)
index 92fa953..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * volume_id - reads filesystem label and uuid
- *
- * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
- *
- *     This program is free software; you can redistribute it and/or modify it
- *     under the terms of the GNU General Public License as published by the
- *     Free Software Foundation version 2 of the License.
- */
-
-#ifndef _VOLUME_ID_FAT_
-#define _VOLUME_ID_FAT_
-
-extern int volume_id_probe_vfat(struct volume_id *id, uint64_t off);
-
-#endif
diff --git a/extras/volume_id/volume_id/hfs.h b/extras/volume_id/volume_id/hfs.h
deleted file mode 100644 (file)
index 4f732b6..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * volume_id - reads filesystem label and uuid
- *
- * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
- *
- *     This program is free software; you can redistribute it and/or modify it
- *     under the terms of the GNU General Public License as published by the
- *     Free Software Foundation version 2 of the License.
- */
-
-#ifndef _VOLUME_ID_HFS_
-#define _VOLUME_ID_HFS_
-
-extern int volume_id_probe_hfs_hfsplus(struct volume_id *id, uint64_t off);
-
-#endif
diff --git a/extras/volume_id/volume_id/highpoint.h b/extras/volume_id/volume_id/highpoint.h
deleted file mode 100644 (file)
index f04d5f1..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * volume_id - reads filesystem label and uuid
- *
- * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
- *
- *     This program is free software; you can redistribute it and/or modify it
- *     under the terms of the GNU General Public License as published by the
- *     Free Software Foundation version 2 of the License.
- */
-
-#ifndef _VOLUME_ID_HIGHPOINT_
-#define _VOLUME_ID_HIGHPOINT_
-
-extern int volume_id_probe_highpoint_37x_raid(struct volume_id *id, uint64_t off);
-extern int volume_id_probe_highpoint_45x_raid(struct volume_id *id, uint64_t off, uint64_t size);
-
-#endif
diff --git a/extras/volume_id/volume_id/hpfs.h b/extras/volume_id/volume_id/hpfs.h
deleted file mode 100644 (file)
index d33e43a..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * volume_id - reads filesystem label and uuid
- *
- * Copyright (C) 2005 Kay Sievers <kay.sievers@vrfy.org>
- *
- *     This program is free software; you can redistribute it and/or modify it
- *     under the terms of the GNU General Public License as published by the
- *     Free Software Foundation version 2 of the License.
- */
-
-#ifndef _VOLUME_ID_HPFS_
-#define _VOLUME_ID_HPFS_
-
-extern int volume_id_probe_hpfs(struct volume_id *id, uint64_t off);
-
-#endif
diff --git a/extras/volume_id/volume_id/iso9660.h b/extras/volume_id/volume_id/iso9660.h
deleted file mode 100644 (file)
index c407d41..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * volume_id - reads filesystem label and uuid
- *
- * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
- *
- *     This program is free software; you can redistribute it and/or modify it
- *     under the terms of the GNU General Public License as published by the
- *     Free Software Foundation version 2 of the License.
- */
-
-#ifndef _VOLUME_ID_ISO9660_
-#define _VOLUME_ID_ISO9660_
-
-extern int volume_id_probe_iso9660(struct volume_id *id, uint64_t off);
-
-#endif
diff --git a/extras/volume_id/volume_id/isw_raid.h b/extras/volume_id/volume_id/isw_raid.h
deleted file mode 100644 (file)
index 55d8c49..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * volume_id - reads filesystem label and uuid
- *
- * Copyright (C) 2005 Kay Sievers <kay.sievers@vrfy.org>
- *
- *     This program is free software; you can redistribute it and/or modify it
- *     under the terms of the GNU General Public License as published by the
- *     Free Software Foundation version 2 of the License.
- */
-
-#ifndef _VOLUME_ID_ISW_RAID_
-#define _VOLUME_ID_ISW_RAID_
-
-extern int volume_id_probe_intel_software_raid(struct volume_id *id, uint64_t off, uint64_t size);
-
-#endif
diff --git a/extras/volume_id/volume_id/jfs.h b/extras/volume_id/volume_id/jfs.h
deleted file mode 100644 (file)
index 4ef0d87..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * volume_id - reads filesystem label and uuid
- *
- * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
- *
- *     This program is free software; you can redistribute it and/or modify it
- *     under the terms of the GNU General Public License as published by the
- *     Free Software Foundation version 2 of the License.
- */
-
-#ifndef _VOLUME_ID_JFS_
-#define _VOLUME_ID_JFS_
-
-extern int volume_id_probe_jfs(struct volume_id *id, uint64_t off);
-
-#endif
diff --git a/extras/volume_id/volume_id/linux_raid.h b/extras/volume_id/volume_id/linux_raid.h
deleted file mode 100644 (file)
index 8fdeebf..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * volume_id - reads filesystem label and uuid
- *
- * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
- *
- *     This program is free software; you can redistribute it and/or modify it
- *     under the terms of the GNU General Public License as published by the
- *     Free Software Foundation version 2 of the License.
- */
-
-#ifndef _VOLUME_ID_LINUX_RAID_
-#define _VOLUME_ID_LINUX_RAID_
-
-extern int volume_id_probe_linux_raid(struct volume_id *id, uint64_t off, uint64_t size);
-
-#endif
diff --git a/extras/volume_id/volume_id/linux_swap.h b/extras/volume_id/volume_id/linux_swap.h
deleted file mode 100644 (file)
index e31ee6e..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * volume_id - reads filesystem label and uuid
- *
- * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
- *
- *     This program is free software; you can redistribute it and/or modify it
- *     under the terms of the GNU General Public License as published by the
- *     Free Software Foundation version 2 of the License.
- */
-
-#ifndef _VOLUME_ID_LINUX_SWAP_
-#define _VOLUME_ID_LINUX_SWAP_
-
-extern int volume_id_probe_linux_swap(struct volume_id *id, uint64_t off);
-
-#endif
diff --git a/extras/volume_id/volume_id/lsi_raid.h b/extras/volume_id/volume_id/lsi_raid.h
deleted file mode 100644 (file)
index 51a0bfb..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * volume_id - reads filesystem label and uuid
- *
- * Copyright (C) 2005 Kay Sievers <kay.sievers@vrfy.org>
- *
- *     This program is free software; you can redistribute it and/or modify it
- *     under the terms of the GNU General Public License as published by the
- *     Free Software Foundation version 2 of the License.
- */
-
-#ifndef _VOLUME_ID_LSI_RAID_
-#define _VOLUME_ID_LSI_RAID_
-
-extern int volume_id_probe_lsi_mega_raid(struct volume_id *id, uint64_t off, uint64_t size);
-
-#endif
diff --git a/extras/volume_id/volume_id/luks.h b/extras/volume_id/volume_id/luks.h
deleted file mode 100644 (file)
index fbf3fcd..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * volume_id - reads filesystem label and uuid
- *
- * Copyright (C) 2005 W. Michael Petullo <mike@flyn.org>
- *
- *     This program is free software; you can redistribute it and/or modify it
- *     under the terms of the GNU General Public License as published by the
- *     Free Software Foundation version 2 of the License.
- */
-
-#ifndef _VOLUME_ID_LUKS_
-#define _VOLUME_ID_LUKS_
-
-extern int volume_id_probe_luks(struct volume_id *id, uint64_t off);
-
-#endif
diff --git a/extras/volume_id/volume_id/lvm.h b/extras/volume_id/volume_id/lvm.h
deleted file mode 100644 (file)
index d07cb53..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * volume_id - reads filesystem label and uuid
- *
- * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
- *
- *     This program is free software; you can redistribute it and/or modify it
- *     under the terms of the GNU General Public License as published by the
- *     Free Software Foundation version 2 of the License.
- */
-
-#ifndef _VOLUME_ID_LVM_
-#define _VOLUME_ID_LVM_
-
-extern int volume_id_probe_lvm1(struct volume_id *id, uint64_t off);
-extern int volume_id_probe_lvm2(struct volume_id *id, uint64_t off);
-
-#endif
diff --git a/extras/volume_id/volume_id/mac.h b/extras/volume_id/volume_id/mac.h
deleted file mode 100644 (file)
index 77b8ccd..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * volume_id - reads filesystem label and uuid
- *
- * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
- *
- *     This program is free software; you can redistribute it and/or modify it
- *     under the terms of the GNU General Public License as published by the
- *     Free Software Foundation version 2 of the License.
- */
-
-#ifndef _VOLUME_ID_MAC_
-#define _VOLUME_ID_MAC_
-
-extern int volume_id_probe_mac_partition_map(struct volume_id *id, uint64_t off);
-
-#endif
diff --git a/extras/volume_id/volume_id/minix.h b/extras/volume_id/volume_id/minix.h
deleted file mode 100644 (file)
index 3020cc0..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * volume_id - reads filesystem label and uuid
- *
- * Copyright (C) 2005 Kay Sievers <kay.sievers@vrfy.org>
- *
- *     This program is free software; you can redistribute it and/or modify it
- *     under the terms of the GNU General Public License as published by the
- *     Free Software Foundation version 2 of the License.
- */
-
-#ifndef _VOLUME_ID_MINIX_
-#define _VOLUME_ID_MINIX_
-
-extern int volume_id_probe_minix(struct volume_id *id, uint64_t off);
-
-#endif
diff --git a/extras/volume_id/volume_id/msdos.h b/extras/volume_id/volume_id/msdos.h
deleted file mode 100644 (file)
index b319f05..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * volume_id - reads filesystem label and uuid
- *
- * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
- *
- *     This program is free software; you can redistribute it and/or modify it
- *     under the terms of the GNU General Public License as published by the
- *     Free Software Foundation version 2 of the License.
- */
-
-#ifndef _VOLUME_ID_MSDOS_
-#define _VOLUME_ID_MSDOS_
-
-extern int volume_id_probe_msdos_part_table(struct volume_id *id, uint64_t off);
-
-#endif
diff --git a/extras/volume_id/volume_id/ntfs.h b/extras/volume_id/volume_id/ntfs.h
deleted file mode 100644 (file)
index 8d59159..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * volume_id - reads filesystem label and uuid
- *
- * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
- *
- *     This program is free software; you can redistribute it and/or modify it
- *     under the terms of the GNU General Public License as published by the
- *     Free Software Foundation version 2 of the License.
- */
-
-#ifndef _VOLUME_ID_NTFS_
-#define _VOLUME_ID_NTFS_
-
-extern int volume_id_probe_ntfs(struct volume_id *id, uint64_t off);
-
-#endif
diff --git a/extras/volume_id/volume_id/nvidia_raid.h b/extras/volume_id/volume_id/nvidia_raid.h
deleted file mode 100644 (file)
index 80c5169..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * volume_id - reads filesystem label and uuid
- *
- * Copyright (C) 2005 Kay Sievers <kay.sievers@vrfy.org>
- *
- *     This program is free software; you can redistribute it and/or modify it
- *     under the terms of the GNU General Public License as published by the
- *     Free Software Foundation version 2 of the License.
- */
-
-#ifndef _VOLUME_ID_NVIDIA_RAID_
-#define _VOLUME_ID_NVIDIA_RAID_
-
-extern int volume_id_probe_nvidia_raid(struct volume_id *id, uint64_t off, uint64_t size);
-
-#endif
diff --git a/extras/volume_id/volume_id/ocfs.h b/extras/volume_id/volume_id/ocfs.h
deleted file mode 100644 (file)
index 9d46b28..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * volume_id - reads filesystem label and uuid
- *
- * Copyright (C) 2004 Andre Masella <andre@masella.no-ip.org>
- * Copyright (C) 2005 Kay Sievers <kay.sievers@vrfy.org>
- *
- *     This program is free software; you can redistribute it and/or modify it
- *     under the terms of the GNU General Public License as published by the
- *     Free Software Foundation version 2 of the License.
- */
-
-#ifndef _VOLUME_ID_OCFS1_
-#define _VOLUME_ID_OCFS1_
-
-extern int volume_id_probe_ocfs1(struct volume_id *id, uint64_t off);
-extern int volume_id_probe_ocfs2(struct volume_id *id, uint64_t off);
-
-#endif
diff --git a/extras/volume_id/volume_id/promise_raid.h b/extras/volume_id/volume_id/promise_raid.h
deleted file mode 100644 (file)
index a46b062..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * volume_id - reads filesystem label and uuid
- *
- * Copyright (C) 2005 Kay Sievers <kay.sievers@vrfy.org>
- *
- *     This program is free software; you can redistribute it and/or modify it
- *     under the terms of the GNU General Public License as published by the
- *     Free Software Foundation version 2 of the License.
- */
-
-#ifndef _VOLUME_ID_PROMISE_RAID_
-#define _VOLUME_ID_PROMISE_RAID_
-
-extern int volume_id_probe_promise_fasttrack_raid(struct volume_id *id, uint64_t off, uint64_t size);
-
-#endif
diff --git a/extras/volume_id/volume_id/reiserfs.h b/extras/volume_id/volume_id/reiserfs.h
deleted file mode 100644 (file)
index 57ee05e..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * volume_id - reads filesystem label and uuid
- *
- * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
- *
- *     This program is free software; you can redistribute it and/or modify it
- *     under the terms of the GNU General Public License as published by the
- *     Free Software Foundation version 2 of the License.
- */
-
-#ifndef _VOLUME_ID_REISERFS_
-#define _VOLUME_ID_REISERFS_
-
-extern int volume_id_probe_reiserfs(struct volume_id *id, uint64_t off);
-
-#endif
diff --git a/extras/volume_id/volume_id/romfs.h b/extras/volume_id/volume_id/romfs.h
deleted file mode 100644 (file)
index 5fe56dc..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * volume_id - reads filesystem label and uuid
- *
- * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
- *
- *     This program is free software; you can redistribute it and/or modify it
- *     under the terms of the GNU General Public License as published by the
- *     Free Software Foundation version 2 of the License.
- */
-
-#ifndef _VOLUME_ID_ROMFS_
-#define _VOLUME_ID_ROMFS_
-
-extern int volume_id_probe_romfs(struct volume_id *id, uint64_t off);
-
-#endif
diff --git a/extras/volume_id/volume_id/silicon_raid.h b/extras/volume_id/volume_id/silicon_raid.h
deleted file mode 100644 (file)
index f80c1a4..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * volume_id - reads filesystem label and uuid
- *
- * Copyright (C) 2005 Kay Sievers <kay.sievers@vrfy.org>
- *
- *     This program is free software; you can redistribute it and/or modify it
- *     under the terms of the GNU General Public License as published by the
- *     Free Software Foundation version 2 of the License.
- */
-
-#ifndef _VOLUME_ID_SILICON_RAID_
-#define _VOLUME_ID_SILICON_RAID_
-
-extern int volume_id_probe_silicon_medley_raid(struct volume_id *id, uint64_t off, uint64_t size);
-
-#endif
diff --git a/extras/volume_id/volume_id/sysv.h b/extras/volume_id/volume_id/sysv.h
deleted file mode 100644 (file)
index b8c369e..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * volume_id - reads filesystem label and uuid
- *
- * Copyright (C) 2005 Kay Sievers <kay.sievers@vrfy.org>
- *
- *     This program is free software; you can redistribute it and/or modify it
- *     under the terms of the GNU General Public License as published by the
- *     Free Software Foundation version 2 of the License.
- */
-
-#ifndef _VOLUME_ID_SYSV_
-#define _VOLUME_ID_SYSV_
-
-extern int volume_id_probe_sysv(struct volume_id *id, uint64_t off);
-
-#endif
diff --git a/extras/volume_id/volume_id/udf.h b/extras/volume_id/volume_id/udf.h
deleted file mode 100644 (file)
index ff95cc1..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * volume_id - reads filesystem label and uuid
- *
- * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
- *
- *     This program is free software; you can redistribute it and/or modify it
- *     under the terms of the GNU General Public License as published by the
- *     Free Software Foundation version 2 of the License.
- */
-
-#ifndef _VOLUME_ID_UDF_
-#define _VOLUME_ID_UDF_
-
-extern int volume_id_probe_udf(struct volume_id *id, uint64_t off);
-
-#endif
diff --git a/extras/volume_id/volume_id/ufs.h b/extras/volume_id/volume_id/ufs.h
deleted file mode 100644 (file)
index ae46a92..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * volume_id - reads filesystem label and uuid
- *
- * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
- *
- *     This program is free software; you can redistribute it and/or modify it
- *     under the terms of the GNU General Public License as published by the
- *     Free Software Foundation version 2 of the License.
- */
-
-#ifndef _VOLUME_ID_UFS_
-#define _VOLUME_ID_UFS_
-
-extern int volume_id_probe_ufs(struct volume_id *id, uint64_t off);
-
-#endif
diff --git a/extras/volume_id/volume_id/via_raid.h b/extras/volume_id/volume_id/via_raid.h
deleted file mode 100644 (file)
index 3eeaa2c..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * volume_id - reads filesystem label and uuid
- *
- * Copyright (C) 2005 Kay Sievers <kay.sievers@vrfy.org>
- *
- *     This program is free software; you can redistribute it and/or modify it
- *     under the terms of the GNU General Public License as published by the
- *     Free Software Foundation version 2 of the License.
- */
-
-#ifndef _VOLUME_ID_VIA_RAID_
-#define _VOLUME_ID_VIA_RAID_
-
-extern int volume_id_probe_via_raid(struct volume_id *id, uint64_t off, uint64_t size);
-
-#endif
diff --git a/extras/volume_id/volume_id/volume_id.h b/extras/volume_id/volume_id/volume_id.h
deleted file mode 100644 (file)
index 9994615..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * volume_id - reads partition label and uuid
- *
- * Copyright (C) 2005 Kay Sievers <kay.sievers@vrfy.org>
- *
- *     This program is free software; you can redistribute it and/or modify it
- *     under the terms of the GNU General Public License as published by the
- *     Free Software Foundation version 2 of the License.
- */
-
-#ifndef _VOLUME_ID_H_
-#define _VOLUME_ID_H_
-
-#include <stdint.h>
-
-#define VOLUME_ID_VERSION              52
-
-#define VOLUME_ID_LABEL_SIZE           64
-#define VOLUME_ID_UUID_SIZE            36
-#define VOLUME_ID_FORMAT_SIZE          32
-#define VOLUME_ID_PATH_MAX             256
-#define VOLUME_ID_PARTITIONS_MAX       256
-
-enum volume_id_usage {
-       VOLUME_ID_UNUSED,
-       VOLUME_ID_UNPROBED,
-       VOLUME_ID_OTHER,
-       VOLUME_ID_FILESYSTEM,
-       VOLUME_ID_PARTITIONTABLE,
-       VOLUME_ID_RAID,
-       VOLUME_ID_DISKLABEL,
-       VOLUME_ID_CRYPTO,
-};
-
-struct volume_id_partition {
-       enum            volume_id_usage usage_id;
-       char            *usage;
-       char            *type;
-       uint64_t        off;
-       uint64_t        len;
-       uint8_t         partition_type_raw;
-};
-
-struct volume_id {
-       uint8_t         label_raw[VOLUME_ID_LABEL_SIZE];
-       size_t          label_raw_len;
-       char            label[VOLUME_ID_LABEL_SIZE+1];
-       uint8_t         uuid_raw[VOLUME_ID_UUID_SIZE];
-       size_t          uuid_raw_len;
-       char            uuid[VOLUME_ID_UUID_SIZE+1];
-       enum            volume_id_usage usage_id;
-       char            *usage;
-       char            *type;
-       char            type_version[VOLUME_ID_FORMAT_SIZE];
-
-       struct volume_id_partition *partitions;
-       size_t          partition_count;
-
-       int             fd;
-       uint8_t         *sbbuf;
-       size_t          sbbuf_len;
-       uint8_t         *seekbuf;
-       uint64_t        seekbuf_off;
-       size_t          seekbuf_len;
-       int             fd_close:1;
-};
-
-extern struct volume_id *volume_id_open_fd(int fd);
-extern struct volume_id *volume_id_open_node(const char *path);
-extern struct volume_id *volume_id_open_dev_t(dev_t devt);
-extern int volume_id_probe_all(struct volume_id *id, uint64_t off, uint64_t size);
-extern void volume_id_close(struct volume_id *id);
-
-#endif
diff --git a/extras/volume_id/volume_id/vxfs.h b/extras/volume_id/volume_id/vxfs.h
deleted file mode 100644 (file)
index 8ca45c3..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * volume_id - reads filesystem label and uuid
- *
- * Copyright (C) 2005 Kay Sievers <kay.sievers@vrfy.org>
- *
- *     This program is free software; you can redistribute it and/or modify it
- *     under the terms of the GNU General Public License as published by the
- *     Free Software Foundation version 2 of the License.
- */
-
-#ifndef _VOLUME_ID_VXFS_
-#define _VOLUME_ID_VXFS_
-
-extern int volume_id_probe_vxfs(struct volume_id *id, uint64_t off);
-
-#endif
diff --git a/extras/volume_id/volume_id/xfs.h b/extras/volume_id/volume_id/xfs.h
deleted file mode 100644 (file)
index f21cc5f..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * volume_id - reads filesystem label and uuid
- *
- * Copyright (C) 2004 Kay Sievers <kay.sievers@vrfy.org>
- *
- *     This program is free software; you can redistribute it and/or modify it
- *     under the terms of the GNU General Public License as published by the
- *     Free Software Foundation version 2 of the License.
- */
-
-#ifndef _VOLUME_ID__
-#define _VOLUME_ID__
-
-extern int volume_id_probe_xfs(struct volume_id *id, uint64_t off);
-
-#endif
diff --git a/klibc/MCONFIG b/klibc/MCONFIG
deleted file mode 100644 (file)
index 450e5c7..0000000
+++ /dev/null
@@ -1,98 +0,0 @@
-# -*- makefile -*-
-#
-# Makefile configuration, without explicit rules
-#
-
-# CROSS is the prefix used for system tools like gcc, ld etc.
-CROSS   = 
-
-# KCROSS is the prefix we use for klibc installations.  This is usually
-# the same as CROSS, but may be different, e.g. to install an i386
-# cross-compilation suite on an x86-64 system, using the same gcc/binutils.
-KCROSS ?= $(CROSS)
-
-# Location for installation
-prefix      = /usr
-bindir      = $(prefix)/bin
-libdir      = $(prefix)/lib
-mandir      = $(prefix)/man
-INSTALLDIR  = $(prefix)/lib/klibc
-INSTALLROOT =
-
-INSTALL_EXEC = install -m 755
-INSTALL_DATA = install -m 644
-
-# Eventually support separate compilation, but we don't have it yet...
-OBJROOT = $(SRCROOT)
-
-# Kernel trees (source and obj) - can potentially be different
-KRNLSRC = $(SRCROOT)/linux
-KRNLOBJ = $(SRCROOT)/linux
-
-# klibc version information
-KLIBCVER = -D__KLIBC__=$(shell cut -d. -f1 < $(SRCROOT)/version) \
-          -D__KLIBC_MINOR__=$(shell cut -d. -f2 < $(SRCROOT)/version)
-
-ARCH    = $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/parisc.*/parisc/)
-CC     = $(CROSS)gcc
-LD      = $(CROSS)ld
-KLIBSRC = $(SRCROOT)/klibc
-KLIBOBJ = $(OBJROOT)/klibc
-INCLUDE = -I$(SRCROOT)/include/arch/$(ARCH) \
-         -I$(SRCROOT)/include/bits$(BITSIZE) \
-         -I$(SRCROOT)/include \
-         -I$(KRNLOBJ)/include -I$(KRNLOBJ)/include2 -I$(KRNLSRC)/include
-REQFLAGS = $(ARCHREQFLAGS) $(KLIBCVER) -nostdlib -nostdinc -iwithprefix include \
-          $(INCLUDE)
-LDFLAGS =
-AR      = $(CROSS)ar
-RANLIB  = $(CROSS)ranlib
-NM     = $(CROSS)nm
-PERL    = perl
-OBJCOPY = $(CROSS)objcopy
-
-STRIP      = $(CROSS)strip
-STRIPFLAGS = --strip-all -R .comment -R .note
-STRIPCMD   = $(STRIP) $(STRIPFLAGS)
-
-HOST_CC      = gcc
-HOST_CFLAGS  = -g -O
-HOST_LDFLAGS = 
-HOST_LIBS    =
-
-# Static library paths
-CRT0      = $(KLIBOBJ)/crt0.o
-KLIBC     = $(KLIBOBJ)/libc.a
-LIBGCC    = $(shell $(CC) $(REQFLAGS) $(OPTFLAGS) --print-libgcc)
-
-# Shared library paths
-CRTSHARED = $(KLIBOBJ)/interp.o
-LIBSHARED = $(KLIBOBJ)/libc.so
-
-#
-# This indicates the location of the final version of the shared library.
-# THIS MUST BE AN ABSOLUTE PATH WITH NO FINAL SLASH.
-# Leave this empty to make it the root.
-#
-SHLIBDIR = /lib
-
-# Enable this to make perror/strerror return real error messages
-# This makes klibc.so and any static binary which uses these functions
-# about 4K bigger.
-ERRLIST = 1
-
-# Include zlib in klibc.  This roughly triples the size of klibc!
-ZLIB = 0
-
-#
-# Include arch-specific rule fragments
-#
-include $(KLIBSRC)/arch/$(ARCH)/MCONFIG
-
-ifeq ($(DEBUG),y)
-STRIP     = /bin/true -Since_we_are_debugging
-OPTFLAGS += -O1 -g
-endif
-
-# How to tell the linker main() is the entrypoint
-EMAIN ?= -e main
diff --git a/klibc/MRULES b/klibc/MRULES
deleted file mode 100644 (file)
index 41fdd07..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*- makefile -*-
-#
-# Standard pattern rules
-#
-
-.SUFFIXES: .c .o .a .so .lo .i .S .s .ls .ss .lss
-
-% : %.c        # Cancel default rule
-
-% : %.S
-
-.c.o:
-       $(CC) $(CFLAGS) -c -o $@ $<
-
-.c.i:
-       $(CC) $(CFLAGS) -E -o $@ $<
-
-.c.s:
-       $(CC) $(CFLAGS) -S -o $@ $<
-
-.S.o:
-       $(CC) $(CFLAGS) -D__ASSEMBLY__ -c -o $@ $<
-
-.S.s:
-       $(CC) $(CFLAGS) -D__ASSEMBLY__ -E -o $@ $<
-
-.S.lo:
-       $(CC) $(CFLAGS) $(SOFLAGS) -D__ASSEMBLY__ -c -o $@ $<
-
-.S.ls:
-       $(CC) $(CFLAGS) $(SOFLAGS) -D__ASSEMBLY__ -E -o $@ $<
-
-.s.o:
-       $(CC) $(CFLAGS) -x assembler -c -o $@ $<
-
-.ls.lo:
-       $(CC) $(CFLAGS) $(SOFLAGS) -x assembler -c -o $@ $<
-
-.c.lo:
-       $(CC) $(CFLAGS) $(SOFLAGS) -c -o $@ $<
-
-.c.ls:
-       $(CC) $(CFLAGS) $(SOFLAGS) -S -o $@ $<
-
-
diff --git a/klibc/Makefile b/klibc/Makefile
deleted file mode 100644 (file)
index e634aac..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-VERSION := $(shell cat version)
-SUBDIRS = klibc ash ipconfig nfsmount utils kinit gzip
-SRCROOT = .
-
-all:
-
-rpmbuild = $(shell which rpmbuild 2>/dev/null || which rpm)
-
-klibc.spec: klibc.spec.in version
-       sed -e 's/@@VERSION@@/$(VERSION)/g' < $< > $@
-
-.PHONY: rpm
-rpm: klibc.spec
-       +$(rpmbuild) -bb klibc.spec --target=$(ARCH)
-
-$(CROSS)klibc.config: Makefile
-       rm -f $@
-       echo 'ARCH=$(ARCH)' >> $@
-       echo 'CROSS=$(CROSS)' >> $@
-       echo 'KCROSS=$(KCROSS)' >> $@
-       echo 'CC=$(CC)' >> $@
-       echo 'LD=$(LD)' >> $@
-       echo 'REQFLAGS=$(filter-out -I%,$(REQFLAGS))' >> $@
-       echo 'OPTFLAGS=$(OPTFLAGS)' >> $@
-       echo 'LDFLAGS=$(LDFLAGS)' >> $@
-       echo 'STRIP=$(STRIP)' >> $@
-       echo 'STRIPFLAGS=$(STRIPFLAGS)' >> $@
-       echo 'EMAIN=$(EMAIN)' >> $@
-       echo 'BITSIZE=$(BITSIZE)' >> $@
-       echo 'prefix=$(INSTALLDIR)' >> $@
-       echo 'bindir=$(INSTALLDIR)/$(KCROSS)bin' >> $@
-       echo 'libdir=$(INSTALLDIR)/$(KCROSS)lib' >> $@
-       echo 'includedir=$(INSTALLDIR)/$(KCROSS)include' >> $@
-
-$(CROSS)klcc: klcc.in $(CROSS)klibc.config makeklcc.pl
-       $(PERL) makeklcc.pl klcc.in $(CROSS)klibc.config \
-               $(shell bash -c 'type -p $(PERL)') > $@ || ( rm -f $@ ; exit 1 )
-       chmod a+x $@
-
-%: local-%
-       @set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
-
-local-all: $(CROSS)klcc
-
-local-clean:
-       rm -f klibc.config klcc
-
-local-spotless: local-clean
-       rm -f klibc.spec *~ tags
-
-local-install: $(CROSS)klcc
-       mkdir -p $(INSTALLROOT)$(bindir)
-       mkdir -p $(INSTALLROOT)$(mandir)/man1
-       mkdir -p $(INSTALLROOT)$(SHLIBDIR)
-       mkdir -p $(INSTALLROOT)$(INSTALLDIR)
-       -rm -rf $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
-       mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
-       mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
-       mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin
-       set -xe ; for d in linux scsi asm-$(ARCH) asm-generic $(ASMARCH); do \
-         mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(CROSS)include/$$d ; \
-         for r in $(KRNLSRC)/include $(KRNLOBJ)/include $(KRNLOBJ)/include2 ; do \
-           [ ! -d $$r/$$d ] || \
-             cp -rfL $$r/$$d/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/$$d/. ; \
-         done ; \
-       done
-       cd $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include && ln -sf asm-$(ARCH) asm
-       cp -rf include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
-       $(INSTALL_DATA) klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1
-       $(INSTALL_EXEC) $(KCROSS)klcc $(INSTALLROOT)$(bindir)
-
-# This does all the prep work needed to turn a freshly exported git repository
-# into a release tarball tree
-release: klibc.spec
-       rm -f maketar.sh
-
--include MCONFIG
diff --git a/klibc/README b/klibc/README
deleted file mode 100644 (file)
index eb72e1c..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-Please see klibc/README for build instructions and for the status of
-various platforms.
-
-
-
-klibc is archived at:
-
-       ftp://ftp.kernel.org/pub/linux/libs/klibc/
-
-There is a mailing list for klibc and early-userspace issues at:
-
-       http://www.zytor.com/mailman/listinfo/klibc/
-
-There is also a cvsweb repository at:
-
-       http://www.zytor.com/cvsweb.cgi/klibc/
-
-There is no direct public CVS access yet, however, the CVS repository
-is available for rsync from:
-
-       rsync://rsync.kernel.org/pub/linux/libs/klibc/cvsroot/
diff --git a/klibc/include/alloca.h b/klibc/include/alloca.h
deleted file mode 100644 (file)
index 41a4d94..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * alloca.h
- *
- * Just call the builtin alloca() function
- */
-
-#ifndef _ALLOCA_H
-#define _ALLOCA_H
-
-#define alloca(size) __builtin_alloca(size)
-
-#endif /* _ALLOCA_H */
-
diff --git a/klibc/include/arch/alpha/klibc/archsetjmp.h b/klibc/include/arch/alpha/klibc/archsetjmp.h
deleted file mode 100644 (file)
index 9dc570a..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * arch/alpha/include/klibc/archsetjmp.h
- */
-
-#ifndef _KLIBC_ARCHSETJMP_H
-#define _KLIBC_ARCHSETJMP_H
-
-struct __jmp_buf {
-  unsigned long __s0;
-  unsigned long __s1;
-  unsigned long __s2;
-  unsigned long __s3;
-  unsigned long __s4;
-  unsigned long __s5;
-  unsigned long __fp;
-  unsigned long __ra;
-  unsigned long __gp;
-  unsigned long __sp;
-  
-  unsigned long __f2;
-  unsigned long __f3;
-  unsigned long __f4;
-  unsigned long __f5;
-  unsigned long __f6;
-  unsigned long __f7;
-  unsigned long __f8;
-  unsigned long __f9;
-};
-
-/* Must be an array so it will decay to a pointer when a function is called */
-typedef struct __jmp_buf jmp_buf[1];
-
-#endif /* _KLIBC_ARCHSETJMP_H */
diff --git a/klibc/include/arch/alpha/klibc/archsignal.h b/klibc/include/arch/alpha/klibc/archsignal.h
deleted file mode 100644 (file)
index b870a05..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * arch/alpha/include/klibc/archsignal.h
- *
- * Architecture-specific signal definitions
- *
- */
-
-#ifndef _KLIBC_ARCHSIGNAL_H
-#define _KLIBC_ARCHSIGNAL_H
-
-/* No special stuff for this architecture */
-
-#endif
diff --git a/klibc/include/arch/alpha/klibc/archstat.h b/klibc/include/arch/alpha/klibc/archstat.h
deleted file mode 100644 (file)
index 23302d7..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef _KLIBC_ARCHSTAT_H
-#define _KLIBC_ARCHSTAT_H
-
-#define _STATBUF_ST_NSEC
-
-struct stat {
-       unsigned long   st_dev;
-       unsigned long   st_ino;
-       unsigned long   st_rdev;
-       long            st_size;
-       unsigned long   st_blocks;
-
-       unsigned int    st_mode;
-       unsigned int    st_uid;
-       unsigned int    st_gid;
-       unsigned int    st_blksize;
-       unsigned int    st_nlink;
-       unsigned int    __pad0;
-
-       struct timespec st_atim;
-       struct timespec st_mtim;
-       struct timespec st_ctim;
-       long            __unused[3];
-};
-
-#endif
diff --git a/klibc/include/arch/alpha/klibc/archsys.h b/klibc/include/arch/alpha/klibc/archsys.h
deleted file mode 100644 (file)
index 16ed658..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * arch/alpha/include/klibc/archsys.h
- *
- * Architecture-specific syscall definitions
- */
-
-#ifndef _KLIBC_ARCHSYS_H
-#define _KLIBC_ARCHSYS_H
-
-/* Alpha has some bizarre Tru64-derived system calls which return two
-   different values in $0 and $20(!), respectively.  The standard
-   macros can't deal with these; even the ones that give the right
-   return value have the wrong clobbers. */
-
-#define _syscall0_dual0(type, name)                                     \
-type name(void)                                                         \
-{                                                                       \
-        long _sc_ret, _sc_err;                                          \
-        {                                                               \
-                register long _sc_0 __asm__("$0");                      \
-                register long _sc_19 __asm__("$19");                    \
-                register long _sc_20 __asm__("$20");                    \
-                                                                        \
-                _sc_0 = __NR_##name;                                    \
-                __asm__("callsys"                                       \
-                        : "=r"(_sc_0), "=r"(_sc_19), "=r" (_sc_20)      \
-                        : "0"(_sc_0)                                    \
-                        : _syscall_clobbers);                           \
-                _sc_ret = _sc_0, _sc_err = _sc_19; (void)(_sc_20);      \
-        }                                                               \
-        _syscall_return(type);                                          \
-}
-
-#define _syscall0_dual1(type, name)                                     \
-type name(void)                                                         \
-{                                                                       \
-        long _sc_ret, _sc_err;                                          \
-        {                                                               \
-                register long _sc_0 __asm__("$0");                      \
-                register long _sc_19 __asm__("$19");                    \
-                register long _sc_20 __asm__("$20");                    \
-                                                                        \
-                _sc_0 = __NR_##name;                                    \
-                __asm__("callsys"                                       \
-                        : "=r"(_sc_0), "=r"(_sc_19), "=r" (_sc_20)      \
-                        : "0"(_sc_0)                                    \
-                        : _syscall_clobbers);                           \
-                _sc_ret = _sc_20, _sc_err = _sc_19; (void)(_sc_0);      \
-        }                                                               \
-        _syscall_return(type);                                          \
-}
-
-#endif /* _KLIBC_ARCHSYS_H */
diff --git a/klibc/include/arch/alpha/machine/asm.h b/klibc/include/arch/alpha/machine/asm.h
deleted file mode 100644 (file)
index e22db90..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * machine/asm.h
- */
-
-#ifndef _MACHINE_ASM_H
-#define _MACHINE_ASM_H
-
-/* Standard aliases for Alpha register names */
-
-#define v0     $0
-#define t0     $1
-#define t1     $2
-#define t2     $3
-#define t3     $4
-#define t4     $5
-#define t5     $6
-#define t6     $7
-#define t7     $8
-#define s0     $9
-#define s1     $10
-#define s2     $11
-#define s3     $12
-#define s4     $13
-#define s5     $14
-#define fp     $15
-#define a0     $16
-#define a1     $17
-#define a2     $18
-#define a3     $19
-#define a4     $20
-#define a5     $21
-#define t8     $22
-#define t9     $23
-#define t10    $24
-#define t11    $25
-#define ra     $26
-#define t12    $27             /* t12 and pv are both used for $27 */
-#define pv     $27             /* t12 and pv are both used for $27 */
-#define at     $28
-#define gp     $29
-#define sp     $30
-#define zero   $31
-
-#endif /* _MACHINE_ASM_H */
diff --git a/klibc/include/arch/arm/klibc/archsetjmp.h b/klibc/include/arch/arm/klibc/archsetjmp.h
deleted file mode 100644 (file)
index c956b50..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * arch/i386/include/klibc/archsetjmp.h
- */
-
-#ifndef _KLIBC_ARCHSETJMP_H
-#define _KLIBC_ARCHSETJMP_H
-
-struct __jmp_buf {
-  unsigned int regs[10];
-};
-
-typedef struct __jmp_buf jmp_buf[1];
-
-#endif /* _SETJMP_H */
diff --git a/klibc/include/arch/arm/klibc/archsignal.h b/klibc/include/arch/arm/klibc/archsignal.h
deleted file mode 100644 (file)
index 77685e6..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * arch/arm/include/klibc/archsignal.h
- *
- * Architecture-specific signal definitions
- *
- */
-
-#ifndef _KLIBC_ARCHSIGNAL_H
-#define _KLIBC_ARCHSIGNAL_H
-
-/* No special stuff for this architecture */
-
-#endif
diff --git a/klibc/include/arch/arm/klibc/archstat.h b/klibc/include/arch/arm/klibc/archstat.h
deleted file mode 100644 (file)
index 42b1409..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-#ifndef _KLIBC_ARCHSTAT_H
-#define _KLIBC_ARCHSTAT_H
-
-#include <endian.h>
-
-#define _STATBUF_ST_NSEC
-
-/* This matches struct stat64 in glibc2.1, hence the absolutely
- * insane amounts of padding around dev_t's.
- * Note: The kernel zero's the padded region because glibc might read them
- * in the hope that the kernel has stretched to using larger sizes.
- */
-struct stat {
-       unsigned long long      st_dev;
-       unsigned char   __pad0[4];
-
-       unsigned long   __st_ino;
-       unsigned int    st_mode;
-       unsigned int    st_nlink;
-
-       unsigned long   st_uid;
-       unsigned long   st_gid;
-
-       unsigned long long      st_rdev;
-       unsigned char   __pad3[4];
-
-       long long       st_size;
-       unsigned long   st_blksize;
-
-#if __BYTE_ORDER == __BIG_ENDIAN
-       unsigned long   __pad4;         /* Future possible st_blocks hi bits */
-       unsigned long   st_blocks;      /* Number 512-byte blocks allocated. */
-#else /* Must be little */
-       unsigned long   st_blocks;      /* Number 512-byte blocks allocated. */
-       unsigned long   __pad4;         /* Future possible st_blocks hi bits */
-#endif
-
-       struct timespec st_atim;
-       struct timespec st_mtim;
-       struct timespec st_ctim;
-
-       unsigned long long      st_ino;
-};
-
-#endif
diff --git a/klibc/include/arch/arm/klibc/archsys.h b/klibc/include/arch/arm/klibc/archsys.h
deleted file mode 100644 (file)
index dfdc70a..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * arch/cris/include/klibc/archsys.h
- *
- * Architecture-specific syscall definitions
- */
-
-#ifndef _KLIBC_ARCHSYS_H
-#define _KLIBC_ARCHSYS_H
-
-/* No special syscall definitions for this architecture */
-
-#endif /* _KLIBC_ARCHSYS_H */
diff --git a/klibc/include/arch/cris/klibc/archsetjmp.h b/klibc/include/arch/cris/klibc/archsetjmp.h
deleted file mode 100644 (file)
index 8d20800..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * arch/cris/include/klibc/archsetjmp.h
- */
-
-#ifndef _KLIBC_ARCHSETJMP_H
-#define _KLIBC_ARCHSETJMP_H
-
-struct __jmp_buf {
-  unsigned long __r0;
-  unsigned long __r1;
-  unsigned long __r2;
-  unsigned long __r3;
-  unsigned long __r4;
-  unsigned long __r5;
-  unsigned long __r6;
-  unsigned long __r7;
-  unsigned long __r8;
-  unsigned long __sp;
-  unsigned long __srp;
-};
-
-typedef struct __jmp_buf jmp_buf[1];
-
-#endif /* _KLIBC_ARCHSETJMP_H */
diff --git a/klibc/include/arch/cris/klibc/archsignal.h b/klibc/include/arch/cris/klibc/archsignal.h
deleted file mode 100644 (file)
index 73b2e19..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * arch/cris/include/klibc/archsignal.h
- *
- * Architecture-specific signal definitions
- *
- */
-
-#ifndef _KLIBC_ARCHSIGNAL_H
-#define _KLIBC_ARCHSIGNAL_H
-
-/* No special stuff for this architecture */
-
-#endif
diff --git a/klibc/include/arch/cris/klibc/archstat.h b/klibc/include/arch/cris/klibc/archstat.h
deleted file mode 100644 (file)
index 1548207..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef _KLIBC_ARCHSTAT_H
-#define _KLIBC_ARCHSTAT_H
-
-#define _STATBUF_ST_NSEC
-
-/* This matches struct stat64 in glibc2.1, hence the absolutely
- * insane amounts of padding around dev_t's.
- */
-struct stat {
-       unsigned long long      st_dev;
-       unsigned char   __pad0[4];
-
-       unsigned long   __st_ino;
-
-       unsigned int    st_mode;
-       unsigned int    st_nlink;
-
-       unsigned long   st_uid;
-       unsigned long   st_gid;
-
-       unsigned long long      st_rdev;
-       unsigned char   __pad3[4];
-
-       long long       st_size;
-       unsigned long   st_blksize;
-
-       unsigned long   st_blocks;      /* Number 512-byte blocks allocated. */
-       unsigned long   __pad4;         /* future possible st_blocks high bits */
-
-       struct timespec st_atim;
-       struct timespec st_mtim;
-       struct timespec st_ctim;
-
-       unsigned long long      st_ino;
-};
-
-#endif
diff --git a/klibc/include/arch/cris/klibc/archsys.h b/klibc/include/arch/cris/klibc/archsys.h
deleted file mode 100644 (file)
index dfdc70a..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * arch/cris/include/klibc/archsys.h
- *
- * Architecture-specific syscall definitions
- */
-
-#ifndef _KLIBC_ARCHSYS_H
-#define _KLIBC_ARCHSYS_H
-
-/* No special syscall definitions for this architecture */
-
-#endif /* _KLIBC_ARCHSYS_H */
diff --git a/klibc/include/arch/i386/klibc/archsetjmp.h b/klibc/include/arch/i386/klibc/archsetjmp.h
deleted file mode 100644 (file)
index db04314..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * arch/i386/include/klibc/archsetjmp.h
- */
-
-#ifndef _KLIBC_ARCHSETJMP_H
-#define _KLIBC_ARCHSETJMP_H
-
-struct __jmp_buf {
-  unsigned int __ebx;
-  unsigned int __esp;
-  unsigned int __ebp;
-  unsigned int __esi;
-  unsigned int __edi;
-  unsigned int __eip;
-};
-
-typedef struct __jmp_buf jmp_buf[1];
-
-#endif /* _SETJMP_H */
diff --git a/klibc/include/arch/i386/klibc/archsignal.h b/klibc/include/arch/i386/klibc/archsignal.h
deleted file mode 100644 (file)
index b092ba6..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * arch/i386/include/klibc/archsignal.h
- *
- * Architecture-specific signal definitions
- *
- */
-
-#ifndef _KLIBC_ARCHSIGNAL_H
-#define _KLIBC_ARCHSIGNAL_H
-
-/* No special stuff for this architecture */
-
-#endif
diff --git a/klibc/include/arch/i386/klibc/archstat.h b/klibc/include/arch/i386/klibc/archstat.h
deleted file mode 100644 (file)
index 1548207..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef _KLIBC_ARCHSTAT_H
-#define _KLIBC_ARCHSTAT_H
-
-#define _STATBUF_ST_NSEC
-
-/* This matches struct stat64 in glibc2.1, hence the absolutely
- * insane amounts of padding around dev_t's.
- */
-struct stat {
-       unsigned long long      st_dev;
-       unsigned char   __pad0[4];
-
-       unsigned long   __st_ino;
-
-       unsigned int    st_mode;
-       unsigned int    st_nlink;
-
-       unsigned long   st_uid;
-       unsigned long   st_gid;
-
-       unsigned long long      st_rdev;
-       unsigned char   __pad3[4];
-
-       long long       st_size;
-       unsigned long   st_blksize;
-
-       unsigned long   st_blocks;      /* Number 512-byte blocks allocated. */
-       unsigned long   __pad4;         /* future possible st_blocks high bits */
-
-       struct timespec st_atim;
-       struct timespec st_mtim;
-       struct timespec st_ctim;
-
-       unsigned long long      st_ino;
-};
-
-#endif
diff --git a/klibc/include/arch/i386/klibc/archsys.h b/klibc/include/arch/i386/klibc/archsys.h
deleted file mode 100644 (file)
index dfdc70a..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * arch/cris/include/klibc/archsys.h
- *
- * Architecture-specific syscall definitions
- */
-
-#ifndef _KLIBC_ARCHSYS_H
-#define _KLIBC_ARCHSYS_H
-
-/* No special syscall definitions for this architecture */
-
-#endif /* _KLIBC_ARCHSYS_H */
diff --git a/klibc/include/arch/i386/klibc/diverr.h b/klibc/include/arch/i386/klibc/diverr.h
deleted file mode 100644 (file)
index 410aba0..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * arch/i386/include/klibc/diverr.h
- */
-
-#ifndef _KLIBC_DIVERR_H
-#define _KLIBC_DIVERR_H
-
-#include <signal.h>
-
-static __inline__ void
-__divide_error(void)
-{
-  asm volatile("divl %0" :: "rm" (0) : "eax", "edx");
-}
-
-#endif /* _KLIBC_DIVERR_H */
diff --git a/klibc/include/arch/i386/sys/io.h b/klibc/include/arch/i386/sys/io.h
deleted file mode 100644 (file)
index b051464..0000000
+++ /dev/null
@@ -1,126 +0,0 @@
-#ident "$Id: io.h,v 1.2 2004/01/25 07:49:39 hpa Exp $"
-/* ----------------------------------------------------------------------- *
- *   
- *   Copyright 2004 H. Peter Anvin - All Rights Reserved
- *
- *   Permission is hereby granted, free of charge, to any person
- *   obtaining a copy of this software and associated documentation
- *   files (the "Software"), to deal in the Software without
- *   restriction, including without limitation the rights to use,
- *   copy, modify, merge, publish, distribute, sublicense, and/or
- *   sell copies of the Software, and to permit persons to whom
- *   the Software is furnished to do so, subject to the following
- *   conditions:
- *   
- *   The above copyright notice and this permission notice shall
- *   be included in all copies or substantial portions of the Software.
- *   
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- *   OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- *   HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- *   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- *   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- *   OTHER DEALINGS IN THE SOFTWARE.
- *
- * ----------------------------------------------------------------------- */
-
-/*
- * sys/io.h for the i386 architecture
- *
- * Basic I/O macros
- */
-
-#ifndef _SYS_IO_H
-#define _SYS_IO_H 1
-
-/* I/O-related system calls */
-
-int iopl(int);
-int ioperm(unsigned long, unsigned long, int);
-
-/* Basic I/O macros */
-
-static __inline__ void
-outb(unsigned char __v, unsigned short __p)
-{
-  asm volatile("outb %0,%1" : : "a" (__v), "dN" (__p));
-}
-
-static __inline__ void
-outw(unsigned short __v, unsigned short __p)
-{
-  asm volatile("outw %0,%1" : : "a" (__v), "dN" (__p));
-}
-
-static __inline__ void
-outl(unsigned int __v, unsigned short __p)
-{
-  asm volatile("outl %0,%1" : : "a" (__v), "dN" (__p));
-}
-
-static __inline__ unsigned char
-inb(unsigned short __p)
-{
-  unsigned char __v;
-  asm volatile("inb %1,%0" : "=a" (__v) : "dN" (__p));
-  return __v;
-}
-
-static __inline__ unsigned short
-inw(unsigned short __p)
-{
-  unsigned short __v;
-  asm volatile("inw %1,%0" : "=a" (__v) : "dN" (__p));
-  return __v;
-}
-
-static __inline__ unsigned int
-inl(unsigned short __p)
-{
-  unsigned int __v;
-  asm volatile("inl %1,%0" : "=a" (__v) : "dN" (__p));
-  return __v;
-}
-
-/* String I/O macros */
-
-static __inline__ void
-outsb (unsigned short __p, const void *__d, unsigned long __n)
-{
-  asm volatile("cld; rep; outsb" : "+S" (__d), "+c" (__n) : "d" (__p));
-}
-
-static __inline__ void
-outsw (unsigned short __p, const void *__d, unsigned long __n)
-{
-  asm volatile("cld; rep; outsw" : "+S" (__d), "+c" (__n) : "d" (__p));
-}
-
-static __inline__ void
-outsl (unsigned short __p, const void *__d, unsigned long __n)
-{
-  asm volatile("cld; rep; outsl" : "+S" (__d), "+c" (__n) : "d" (__p));
-}
-
-
-static __inline__ void
-insb (unsigned short __p, void *__d, unsigned long __n)
-{
-  asm volatile("cld; rep; insb" : "+D" (__d), "+c" (__n) : "d" (__p));
-}
-
-static __inline__ void
-insw (unsigned short __p, void *__d, unsigned long __n)
-{
-  asm volatile("cld; rep; insw" : "+D" (__d), "+c" (__n) : "d" (__p));
-}
-
-static __inline__ void
-insl (unsigned short __p, void *__d, unsigned long __n)
-{
-  asm volatile("cld; rep; insl" : "+D" (__d), "+c" (__n) : "d" (__p));
-}
-
-#endif /* _SYS_IO_H */
diff --git a/klibc/include/arch/i386/sys/vm86.h b/klibc/include/arch/i386/sys/vm86.h
deleted file mode 100644 (file)
index d327239..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-#ident "$Id: vm86.h,v 1.1 2004/01/25 01:34:28 hpa Exp $"
-/* ----------------------------------------------------------------------- *
- *   
- *   Copyright 2004 H. Peter Anvin - All Rights Reserved
- *
- *   Permission is hereby granted, free of charge, to any person
- *   obtaining a copy of this software and associated documentation
- *   files (the "Software"), to deal in the Software without
- *   restriction, including without limitation the rights to use,
- *   copy, modify, merge, publish, distribute, sublicense, and/or
- *   sell copies of the Software, and to permit persons to whom
- *   the Software is furnished to do so, subject to the following
- *   conditions:
- *   
- *   The above copyright notice and this permission notice shall
- *   be included in all copies or substantial portions of the Software.
- *   
- *   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- *   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- *   OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- *   NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- *   HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- *   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- *   FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- *   OTHER DEALINGS IN THE SOFTWARE.
- *
- * ----------------------------------------------------------------------- */
-
-/*
- * sys/vm86.h for i386
- */
-
-#ifndef _SYS_VM86_H
-#define _SYS_VM86_H 1
-
-#include <asm/vm86.h>
-
-/* Actual system call */
-int vm86(struct vm86_struct *);
-
-#endif
diff --git a/klibc/include/arch/ia64/klibc/archsetjmp.h b/klibc/include/arch/ia64/klibc/archsetjmp.h
deleted file mode 100644 (file)
index bd639c0..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * arch/ia64/include/klibc/archsetjmp.h
- *
- * Code borrowed from the FreeBSD kernel.
- *
- */
-
-#ifndef _KLIBC_ARCHSETJMP_H
-#define _KLIBC_ARCHSETJMP_H
-
-/* User code must not depend on the internal representation of jmp_buf. */
-#define _JBLEN 0x200
-
-/* guaranteed 128-bit alignment! */
-typedef char jmp_buf[_JBLEN] __attribute__ ((aligned (16)));
-
-#endif
diff --git a/klibc/include/arch/ia64/klibc/archsignal.h b/klibc/include/arch/ia64/klibc/archsignal.h
deleted file mode 100644 (file)
index 5b01f19..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * arch/ia64/include/klibc/archsignal.h
- * 
- * Architecture-specific signal definitions.
- *
- */
-
-#ifndef _KLIBC_ARCHSIGNAL_H
-#define _KLIBC_ARCHSIGNAL_H
-
-#define _NSIG        64
-#define _NSIG_BPW    64
-#define _NSIG_WORDS (_NSIG / _NSIG_BPW)
-
-typedef struct {
-       unsigned long sig[_NSIG_WORDS];
-} sigset_t;
-
-struct sigaction {
-        union {
-               __sighandler_t        _sa_handler;
-               void (*_sa_sigaction)(int, struct siginfo *, void *);
-        } _u;
-        sigset_t        sa_mask;
-        int             sa_flags;
-};
-
-#define sa_handler      _u._sa_handler
-#define sa_sigaction    _u._sa_sigaction
-
-#endif
diff --git a/klibc/include/arch/ia64/klibc/archstat.h b/klibc/include/arch/ia64/klibc/archstat.h
deleted file mode 100644 (file)
index 9475c0b..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef _KLIBC_ARCHSTAT_H
-#define _KLIBC_ARCHSTAT_H
-
-#define _STATBUF_ST_NSEC
-
-struct stat {
-       unsigned long   st_dev;
-       unsigned long   st_ino;
-       unsigned long   st_nlink;
-       unsigned int    st_mode;
-       unsigned int    st_uid;
-       unsigned int    st_gid;
-       unsigned int    __pad0;
-       unsigned long   st_rdev;
-       unsigned long   st_size;
-       struct timespec st_atim;
-       struct timespec st_mtim;
-       struct timespec st_ctim;
-       unsigned long   st_blksize;
-       long            st_blocks;
-       unsigned long   __unused[3];
-};
-
-#endif
diff --git a/klibc/include/arch/ia64/klibc/archsys.h b/klibc/include/arch/ia64/klibc/archsys.h
deleted file mode 100644 (file)
index 4c795a4..0000000
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * arch/ia64/include/klibc/archsys.h
- *
- * Architecture-specific syscall definitions
- */
-
-#ifndef _KLIBC_ARCHSYS_H
-#define _KLIBC_ARCHSYS_H
-
-#define __IA64_BREAK "break 0x100000;;\n\t"
-
-#define _syscall0(type,name)                                            \
-type                                                                    \
-name (void)                                                             \
-{                                                                       \
-       register long _r8 asm ("r8");                                   \
-       register long _r10 asm ("r10");                                  \
-       register long _r15 asm ("r15") = __NR_##name;                    \
-       long _retval;                                                    \
-       __asm __volatile (__IA64_BREAK                                   \
-                         : "=r" (_r8), "=r" (_r10), "=r" (_r15)         \
-                         : "2" (_r15) ASM_ARGS_0                        \
-                         : "memory" ASM_CLOBBERS_0);                    \
-       _retval = _r8;                                                   \
-       if (_r10 == -1) {                                                \
-               errno = (_retval);                                       \
-               _retval = -1;                                            \
-       }                                                                \
-       return (type)_retval;                                                  \
-}
-
-#define _syscall1(type,name,type1,arg1)                                 \
-type                                                                    \
-name (type1 arg1)                                                       \
-{                                                                       \
-       register long _r8 asm ("r8");                                   \
-       register long _r10 asm ("r10");                                  \
-       register long _r15 asm ("r15") = __NR_##name;                    \
-       long _retval;                                                    \
-       LOAD_ARGS_1(arg1);                                               \
-       __asm __volatile (__IA64_BREAK                                   \
-                         : "=r" (_r8), "=r" (_r10), "=r" (_r15),        \
-                           ASM_OUTARGS_1                                \
-                         : "2" (_r15) ASM_ARGS_1                        \
-                         : "memory" ASM_CLOBBERS_1);                    \
-       _retval = _r8;                                                   \
-       if (_r10 == -1) {                                                \
-               errno = (_retval);                                       \
-               _retval = -1;                                            \
-       }                                                                \
-       return (type)_retval;                                                  \
-}
-
-#define _syscall2(type,name,type1,arg1,type2,arg2)                      \
-type                                                                    \
-name (type1 arg1, type2 arg2)                                           \
-{                                                                       \
-       register long _r8 asm ("r8");                                   \
-       register long _r10 asm ("r10");                                  \
-       register long _r15 asm ("r15") = __NR_##name;                    \
-       long _retval;                                                    \
-       LOAD_ARGS_2(arg1, arg2);                                         \
-       __asm __volatile (__IA64_BREAK                                   \
-                         : "=r" (_r8), "=r" (_r10), "=r" (_r15),        \
-                           ASM_OUTARGS_2                                \
-                         : "2" (_r15) ASM_ARGS_2                        \
-                         : "memory" ASM_CLOBBERS_2);                    \
-       _retval = _r8;                                                   \
-       if (_r10 == -1) {                                                \
-               errno = (_retval);                                       \
-               _retval = -1;                                            \
-       }                                                                \
-       return (type)_retval;                                                  \
-}
-
-#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3)           \
-type                                                                    \
-name (type1 arg1, type2 arg2, type3 arg3)                               \
-{                                                                       \
-       register long _r8 asm ("r8");                                   \
-       register long _r10 asm ("r10");                                  \
-       register long _r15 asm ("r15") = __NR_##name;                    \
-       long _retval;                                                    \
-       LOAD_ARGS_3(arg1, arg2, arg3);                                   \
-       __asm __volatile (__IA64_BREAK                                   \
-                         : "=r" (_r8), "=r" (_r10), "=r" (_r15),        \
-                           ASM_OUTARGS_3                                \
-                         : "2" (_r15) ASM_ARGS_3                        \
-                         : "memory" ASM_CLOBBERS_3);                    \
-       _retval = _r8;                                                   \
-       if (_r10 == -1) {                                                \
-               errno = (_retval);                                       \
-               _retval = -1;                                            \
-       }                                                                \
-       return (type)_retval;                                                  \
-}
-
-#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
-type                                                                    \
-name (type1 arg1, type2 arg2, type3 arg3, type4 arg4)                   \
-{                                                                       \
-       register long _r8 asm ("r8");                                   \
-       register long _r10 asm ("r10");                                  \
-       register long _r15 asm ("r15") = __NR_##name;                    \
-       long _retval;                                                    \
-       LOAD_ARGS_4(arg1, arg2, arg3, arg4);                             \
-       __asm __volatile (__IA64_BREAK                                   \
-                         : "=r" (_r8), "=r" (_r10), "=r" (_r15),        \
-                           ASM_OUTARGS_4                                \
-                         : "2" (_r15) ASM_ARGS_4                        \
-                         : "memory" ASM_CLOBBERS_4);                    \
-       _retval = _r8;                                                   \
-       if (_r10 == -1) {                                                \
-               errno = (_retval);                                       \
-               _retval = -1;                                            \
-       }                                                                \
-       return (type)_retval;                                                  \
-}
-
-#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5) \
-type                                                                    \
-name (type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5)       \
-{                                                                       \
-       register long _r8 asm ("r8");                                   \
-       register long _r10 asm ("r10");                                  \
-       register long _r15 asm ("r15") = __NR_##name;                    \
-       long _retval;                                                    \
-       LOAD_ARGS_5(arg1, arg2, arg3, arg4, arg5);                       \
-       __asm __volatile (__IA64_BREAK                                   \
-                         : "=r" (_r8), "=r" (_r10), "=r" (_r15),        \
-                           ASM_OUTARGS_5                                \
-                         : "2" (_r15) ASM_ARGS_5                        \
-                         : "memory" ASM_CLOBBERS_5);                    \
-       _retval = _r8;                                                   \
-       if (_r10 == -1) {                                                \
-               errno = (_retval);                                       \
-               _retval = -1;                                            \
-       }                                                                \
-       return (type)_retval;                                                  \
-}
-
-#define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5,type6,arg6) \
-type                                                                    \
-name (type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6)       \
-{                                                                       \
-       register long _r8 asm ("r8");                                   \
-       register long _r10 asm ("r10");                                  \
-       register long _r15 asm ("r15") = __NR_##name;                    \
-       long _retval;                                                    \
-       LOAD_ARGS_6(arg1, arg2, arg3, arg4, arg5, arg6);                 \
-       __asm __volatile (__IA64_BREAK                                   \
-                         : "=r" (_r8), "=r" (_r10), "=r" (_r15),        \
-                           ASM_OUTARGS_6                                \
-                         : "2" (_r15) ASM_ARGS_6                        \
-                         : "memory" ASM_CLOBBERS_6);                    \
-       _retval = _r8;                                                   \
-       if (_r10 == -1) {                                                \
-               errno = (_retval);                                       \
-               _retval = -1;                                            \
-       }                                                                \
-       return (type)_retval;                                                  \
-}
-  
-
-#define LOAD_ARGS_0()   do { } while (0)
-#define LOAD_ARGS_1(out0)                              \
-  register long _out0 asm ("out0") = (long) (out0);    \
-  LOAD_ARGS_0 ()
-#define LOAD_ARGS_2(out0, out1)                                \
-  register long _out1 asm ("out1") = (long) (out1);    \
-  LOAD_ARGS_1 (out0)
-#define LOAD_ARGS_3(out0, out1, out2)                  \
-  register long _out2 asm ("out2") = (long) (out2);    \
-  LOAD_ARGS_2 (out0, out1)
-#define LOAD_ARGS_4(out0, out1, out2, out3)            \
-  register long _out3 asm ("out3") = (long) (out3);    \
-  LOAD_ARGS_3 (out0, out1, out2)
-#define LOAD_ARGS_5(out0, out1, out2, out3, out4)      \
-  register long _out4 asm ("out4") = (long) (out4);    \
-  LOAD_ARGS_4 (out0, out1, out2, out3)
-#define LOAD_ARGS_6(out0, out1, out2, out3, out4, out5)        \
-  register long _out5 asm ("out5") = (long) (out5);    \
-  LOAD_ARGS_5 (out0, out1, out2, out3, out4)
-
-#define ASM_OUTARGS_1  "=r" (_out0)
-#define ASM_OUTARGS_2  ASM_OUTARGS_1, "=r" (_out1)
-#define ASM_OUTARGS_3  ASM_OUTARGS_2, "=r" (_out2)
-#define ASM_OUTARGS_4  ASM_OUTARGS_3, "=r" (_out3)
-#define ASM_OUTARGS_5  ASM_OUTARGS_4, "=r" (_out4)
-#define ASM_OUTARGS_6  ASM_OUTARGS_5, "=r" (_out5)
-
-#define ASM_ARGS_0
-#define ASM_ARGS_1     ASM_ARGS_0, "3" (_out0)
-#define ASM_ARGS_2     ASM_ARGS_1, "4" (_out1)
-#define ASM_ARGS_3     ASM_ARGS_2, "5" (_out2)
-#define ASM_ARGS_4     ASM_ARGS_3, "6" (_out3)
-#define ASM_ARGS_5     ASM_ARGS_4, "7" (_out4)
-#define ASM_ARGS_6     ASM_ARGS_5, "8" (_out5)
-
-#define ASM_CLOBBERS_0 ASM_CLOBBERS_1, "out0"
-#define ASM_CLOBBERS_1 ASM_CLOBBERS_2, "out1"
-#define ASM_CLOBBERS_2 ASM_CLOBBERS_3, "out2"
-#define ASM_CLOBBERS_3 ASM_CLOBBERS_4, "out3"
-#define ASM_CLOBBERS_4 ASM_CLOBBERS_5, "out4"
-#define ASM_CLOBBERS_5 ASM_CLOBBERS_6, "out5"
-#define ASM_CLOBBERS_6 , "out6", "out7",                               \
-  /* Non-stacked integer registers, minus r8, r10, r15.  */            \
-  "r2", "r3", "r9", "r11", "r12", "r13", "r14", "r16", "r17", "r18",   \
-  "r19", "r20", "r21", "r22", "r23", "r24", "r25", "r26", "r27",       \
-  "r28", "r29", "r30", "r31",                                          \
-  /* Predicate registers.  */                                          \
-  "p6", "p7", "p8", "p9", "p10", "p11", "p12", "p13", "p14", "p15",    \
-  /* Non-rotating fp registers.  */                                    \
-  "f6", "f7", "f8", "f9", "f10", "f11", "f12", "f13", "f14", "f15",    \
-  /* Branch registers.  */                                             \
-  "b6", "b7"
-
-#endif /* _KLIBC_ARCHSYS_H */
diff --git a/klibc/include/arch/m32r/klibc/archsetjmp.h b/klibc/include/arch/m32r/klibc/archsetjmp.h
deleted file mode 100644 (file)
index e16a835..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * arch/m32r/include/klibc/archsetjmp.h
- */
-
-#ifndef _KLIBC_ARCHSETJMP_H
-#define _KLIBC_ARCHSETJMP_H
-
-struct __jmp_buf {
-  unsigned long __r8;
-  unsigned long __r9;
-  unsigned long __r10;
-  unsigned long __r11;
-  unsigned long __r12;
-  unsigned long __r13;
-  unsigned long __r14;
-  unsigned long __r15;
-};
-
-typedef struct __jmp_buf jmp_buf[1];
-
-#endif /* _KLIBC_ARCHSETJMP_H */
diff --git a/klibc/include/arch/m32r/klibc/archsignal.h b/klibc/include/arch/m32r/klibc/archsignal.h
deleted file mode 100644 (file)
index 02596e9..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * arch/m32r/include/klibc/archsignal.h
- *
- * Architecture-specific signal definitions
- *
- */
-
-#ifndef _KLIBC_ARCHSIGNAL_H
-#define _KLIBC_ARCHSIGNAL_H
-
-/* No special stuff for this architecture */
-
-#endif
diff --git a/klibc/include/arch/m32r/klibc/archstat.h b/klibc/include/arch/m32r/klibc/archstat.h
deleted file mode 100644 (file)
index 1548207..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef _KLIBC_ARCHSTAT_H
-#define _KLIBC_ARCHSTAT_H
-
-#define _STATBUF_ST_NSEC
-
-/* This matches struct stat64 in glibc2.1, hence the absolutely
- * insane amounts of padding around dev_t's.
- */
-struct stat {
-       unsigned long long      st_dev;
-       unsigned char   __pad0[4];
-
-       unsigned long   __st_ino;
-
-       unsigned int    st_mode;
-       unsigned int    st_nlink;
-
-       unsigned long   st_uid;
-       unsigned long   st_gid;
-
-       unsigned long long      st_rdev;
-       unsigned char   __pad3[4];
-
-       long long       st_size;
-       unsigned long   st_blksize;
-
-       unsigned long   st_blocks;      /* Number 512-byte blocks allocated. */
-       unsigned long   __pad4;         /* future possible st_blocks high bits */
-
-       struct timespec st_atim;
-       struct timespec st_mtim;
-       struct timespec st_ctim;
-
-       unsigned long long      st_ino;
-};
-
-#endif
diff --git a/klibc/include/arch/m32r/klibc/archsys.h b/klibc/include/arch/m32r/klibc/archsys.h
deleted file mode 100644 (file)
index 386db8b..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * arch/m32r/include/klibc/archsys.h
- *
- * Architecture-specific syscall definitions
- */
-
-#ifndef _KLIBC_ARCHSYS_H
-#define _KLIBC_ARCHSYS_H
-
-/* No special syscall definitions for this architecture */
-
-#endif /* _KLIBC_ARCHSYS_H */
diff --git a/klibc/include/arch/m68k/klibc/archsignal.h b/klibc/include/arch/m68k/klibc/archsignal.h
deleted file mode 100644 (file)
index 714527f..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * arch/m68k/include/klibc/archsignal.h
- *
- * Architecture-specific signal definitions
- *
- */
-
-#ifndef _KLIBC_ARCHSIGNAL_H
-#define _KLIBC_ARCHSIGNAL_H
-
-/* No special stuff for this architecture */
-
-#endif
diff --git a/klibc/include/arch/m68k/klibc/archstat.h b/klibc/include/arch/m68k/klibc/archstat.h
deleted file mode 100644 (file)
index 9c0a05d..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-#ifndef _KLIBC_ARCHSTAT_H
-#define _KLIBC_ARCHSTAT_H
-
-#define _STATBUF_ST_NSEC
-
-/* This matches struct stat64 in glibc2.1, hence the absolutely
- * insane amounts of padding around dev_t's.
- */
-struct stat {
-       unsigned long long      st_dev;
-       unsigned char   __pad1[2];
-
-       unsigned long   __st_ino;
-
-       unsigned int    st_mode;
-       unsigned int    st_nlink;
-
-       unsigned long   st_uid;
-       unsigned long   st_gid;
-
-       unsigned long long      st_rdev;
-       unsigned char   __pad3[2];
-
-       long long       st_size;
-       unsigned long   st_blksize;
-
-       unsigned long   __pad4;         /* future possible st_blocks high bits */
-       unsigned long   st_blocks;      /* Number 512-byte blocks allocated. */
-
-       struct timespec st_atim;
-       struct timespec st_mtim;
-       struct timespec st_ctim;
-
-       unsigned long long      st_ino;
-};
-
-#endif
diff --git a/klibc/include/arch/m68k/klibc/archsys.h b/klibc/include/arch/m68k/klibc/archsys.h
deleted file mode 100644 (file)
index 8f6bed8..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * arch/m68k/include/klibc/archsys.h
- *
- * Architecture-specific syscall definitions
- */
-
-#ifndef _KLIBC_ARCHSYS_H
-#define _KLIBC_ARCHSYS_H
-
-/* No special syscall definitions for this architecture */
-
-#endif /* _KLIBC_ARCHSYS_H */
diff --git a/klibc/include/arch/mips/klibc/archfcntl.h b/klibc/include/arch/mips/klibc/archfcntl.h
deleted file mode 100644 (file)
index 54462ea..0000000
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * arch/mips/include/klibc/archfcntl.h
- *
- * On MIPS, <asm/fcntl.h> isn't usable (compiling struct stat with
- * the correct definitions doesn't "just work"), so we need to provide
- * our own definitions.
- */
-
-#ifndef _KLIBC_ARCHFCNTL_H
-#define _KLIBC_ARCHFCNTL_H
-
-#ifdef _ASM_FCNTL_H            /* We were too late! */
-# error "<asm/fcntl.h> included before <klibc/archfcntl.h>"
-#endif
-#define _ASM_FCNTL_H           /* Keep <asm/fcntl.h> from getting included */
-
-#define O_ACCMODE      0x0003
-#define O_RDONLY       0x0000
-#define O_WRONLY       0x0001
-#define O_RDWR         0x0002
-#define O_APPEND       0x0008
-#define O_SYNC         0x0010
-#define O_NONBLOCK     0x0080
-#define O_CREAT         0x0100
-#define O_TRUNC                0x0200
-#define O_EXCL         0x0400
-#define O_NOCTTY       0x0800
-#define FASYNC         0x1000
-#define O_LARGEFILE    0x2000
-#define O_DIRECT       0x8000
-#define O_DIRECTORY    0x10000
-#define O_NOFOLLOW     0x20000
-#define O_NOATIME      0x40000
-
-#define O_NDELAY       O_NONBLOCK
-
-#define F_DUPFD                0
-#define F_GETFD                1
-#define F_SETFD                2
-#define F_GETFL                3
-#define F_SETFL                4
-#define F_GETLK                14
-#define F_SETLK                6
-#define F_SETLKW       7
-
-#define F_SETOWN       24
-#define F_GETOWN       23
-#define F_SETSIG       10
-#define F_GETSIG       11
-
-#define F_GETLK64      33
-#define F_SETLK64      34
-#define F_SETLKW64     35
-
-#define FD_CLOEXEC     1
-
-#define F_RDLCK                0
-#define F_WRLCK                1
-#define F_UNLCK                2
-
-#define F_EXLCK                4
-#define F_SHLCK                8
-
-#define F_INPROGRESS   16
-
-#define LOCK_SH                1
-#define LOCK_EX                2
-#define LOCK_NB                4
-#define LOCK_UN                8
-
-#define LOCK_MAND      32
-#define LOCK_READ      64
-#define LOCK_WRITE     128
-#define LOCK_RW                192
-
-typedef struct flock {
-       short   l_type;
-       short   l_whence;
-       loff_t  l_start;
-       loff_t  l_len;
-       pid_t   l_pid;
-} flock_t;
-
-#define F_LINUX_SPECIFIC_BASE  1024
-
-#endif /* _KLIBC_ARCHFCNTL_H */
-
diff --git a/klibc/include/arch/mips/klibc/archsetjmp.h b/klibc/include/arch/mips/klibc/archsetjmp.h
deleted file mode 100644 (file)
index 40e5be2..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * arch/mips/include/klibc/archsetjmp.h
- */
-
-#ifndef _KLIBC_ARCHSETJMP_H
-#define _KLIBC_ARCHSETJMP_H
-
-struct __jmp_buf {
-  unsigned long __s0;
-  unsigned long __s1;
-  unsigned long __s2;
-  unsigned long __s3;
-  unsigned long __s4;
-  unsigned long __s5;
-  unsigned long __s6;
-  unsigned long __s7;
-  unsigned long __gp;
-  unsigned long __sp;
-  unsigned long __s8;
-  unsigned long __ra;
-  unsigned long __f20;
-  unsigned long __f21;
-  unsigned long __f22;
-  unsigned long __f23;
-  unsigned long __f24;
-  unsigned long __f25;
-  unsigned long __f26;
-  unsigned long __f27;
-  unsigned long __f28;
-  unsigned long __f29;
-  unsigned long __f30;
-  unsigned long __f31;
-  unsigned long __fcr31;
-  unsigned long __unused;
-} __attribute__((aligned(8)));
-
-typedef struct __jmp_buf jmp_buf[1];
-
-#endif /* _KLIBC_ARCHSETJMP_H */
diff --git a/klibc/include/arch/mips/klibc/archsignal.h b/klibc/include/arch/mips/klibc/archsignal.h
deleted file mode 100644 (file)
index 3b72908..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * arch/mips/include/klibc/archsignal.h
- *
- * Architecture-specific signal definitions
- *
- */
-
-#ifndef _KLIBC_ARCHSIGNAL_H
-#define _KLIBC_ARCHSIGNAL_H
-
-/* No special stuff for this architecture */
-
-#endif
diff --git a/klibc/include/arch/mips/klibc/archstat.h b/klibc/include/arch/mips/klibc/archstat.h
deleted file mode 100644 (file)
index 612bbfa..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef _KLIBC_ARCHSTAT_H
-#define _KLIBC_ARCHSTAT_H
-
-#define _STATBUF_ST_NSEC
-
-/*
- * This matches struct stat64 in glibc2.1, hence the absolutely insane
- * amounts of padding around dev_t's.  The memory layout is the same as of
- * struct stat of the 64-bit kernel.
- */
-
-struct stat {
-       unsigned long   st_dev;
-       unsigned long   st_pad0[3];     /* Reserved for st_dev expansion  */
-
-       unsigned long long      st_ino;
-
-       mode_t          st_mode;
-       nlink_t         st_nlink;
-
-       uid_t           st_uid;
-       gid_t           st_gid;
-
-       unsigned long   st_rdev;
-       unsigned long   st_pad1[3];     /* Reserved for st_rdev expansion  */
-
-       long long       st_size;
-
-       struct timespec         st_atim;
-       struct timespec         st_mtim;
-       struct timespec         st_ctim;
-
-       unsigned long   st_blksize;
-       unsigned long   st_pad2;
-
-       long long       st_blocks;
-};
-
-#endif
diff --git a/klibc/include/arch/mips/klibc/archsys.h b/klibc/include/arch/mips/klibc/archsys.h
deleted file mode 100644 (file)
index f696cdf..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * arch/mips/include/klibc/archsys.h
- *
- * Architecture-specific syscall definitions
- */
-
-#ifndef _KLIBC_ARCHSYS_H
-#define _KLIBC_ARCHSYS_H
-
-/* No special syscall definitions for this architecture */
-
-#endif /* _KLIBC_ARCHSYS_H */
diff --git a/klibc/include/arch/mips/machine/asm.h b/klibc/include/arch/mips/machine/asm.h
deleted file mode 100644 (file)
index e5239a6..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * arch/mips/include/machine/asm.h
- */
-
-#ifndef _MACHINE_ASM_H
-#define _MACHINE_ASM_H
-
-#include <asm/regdef.h>
-#include <asm/asm.h>
-
-#endif /* _MACHINE_ASM_H */
diff --git a/klibc/include/arch/mips/sgidefs.h b/klibc/include/arch/mips/sgidefs.h
deleted file mode 100644 (file)
index eb103ac..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * arch/mips/include/sgidefs.h
- */
-
-/* Some ABI constants */
-
-#ifndef _SGIDEFS_H
-#define _SGIDEFS_H
-
-#define _MIPS_ISA_MIPS1 1
-#define _MIPS_ISA_MIPS2 2
-#define _MIPS_ISA_MIPS3 3
-#define _MIPS_ISA_MIPS4 4
-#define _MIPS_ISA_MIPS5 5
-
-#define _MIPS_SIM_ABI32         1
-#define _MIPS_SIM_NABI32        2
-#define _MIPS_SIM_ABI64         3
-
-#endif /* _SGIDEFS_H */
diff --git a/klibc/include/arch/mips/spaces.h b/klibc/include/arch/mips/spaces.h
deleted file mode 100644 (file)
index b5f530b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-/* Included by <asm/page.h> but not actually needed */
diff --git a/klibc/include/arch/mips64/klibc/archsignal.h b/klibc/include/arch/mips64/klibc/archsignal.h
deleted file mode 100644 (file)
index 56b0fd3..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * arch/mips64/include/klibc/archsignal.h
- *
- * Architecture-specific signal definitions
- *
- */
-
-#ifndef _KLIBC_ARCHSIGNAL_H
-#define _KLIBC_ARCHSIGNAL_H
-
-/* No special stuff for this architecture */
-
-#endif
diff --git a/klibc/include/arch/mips64/klibc/archstat.h b/klibc/include/arch/mips64/klibc/archstat.h
deleted file mode 100644 (file)
index d237e3a..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-#ifndef _KLIBC_ARCHSTAT_H
-#define _KLIBC_ARCHSTAT_H
-
-#define _STATBUF_ST_NSEC
-
-struct stat {
-       unsigned int            st_dev;
-       unsigned int            st_pad0[3]; /* Reserved for st_dev expansion */
-
-       unsigned long           st_ino;
-
-       mode_t                  st_mode;
-       nlink_t                 st_nlink;
-
-       uid_t                   st_uid;
-       gid_t                   st_gid;
-
-       unsigned int            st_rdev;
-       unsigned int            st_pad1[3]; /* Reserved for st_rdev expansion */
-
-       off_t                   st_size;
-  
-       struct timespec         st_atim;
-       struct timespec         st_mtim;
-       struct timespec         st_ctim;
-
-       unsigned int            st_blksize;
-       unsigned int            st_pad2;
-
-       unsigned long           st_blocks;
-};
-
-#endif
diff --git a/klibc/include/arch/mips64/klibc/archsys.h b/klibc/include/arch/mips64/klibc/archsys.h
deleted file mode 100644 (file)
index 81e5106..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * arch/mips64/include/klibc/archsys.h
- *
- * Architecture-specific syscall definitions
- */
-
-#ifndef _KLIBC_ARCHSYS_H
-#define _KLIBC_ARCHSYS_H
-
-/* No special syscall definitions for this architecture */
-
-#endif /* _KLIBC_ARCHSYS_H */
diff --git a/klibc/include/arch/parisc/klibc/archsetjmp.h b/klibc/include/arch/parisc/klibc/archsetjmp.h
deleted file mode 100644 (file)
index e744498..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * arch/parisc/include/klibc/archsetjmp.h
- */
-
-#ifndef _KLIBC_ARCHSETJMP_H
-#define _KLIBC_ARCHSETJMP_H
-
-struct __jmp_buf {
-  double regs[21];
-};
-
-typedef struct __jmp_buf jmp_buf[1];
-
-#endif /* _SETJMP_H */
diff --git a/klibc/include/arch/parisc/klibc/archsignal.h b/klibc/include/arch/parisc/klibc/archsignal.h
deleted file mode 100644 (file)
index 3190e85..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * arch/parisc/include/klibc/archsignal.h
- *
- * Architecture-specific signal definitions
- *
- */
-
-#ifndef _KLIBC_ARCHSIGNAL_H
-#define _KLIBC_ARCHSIGNAL_H
-
-#define _NSIG    64
-#define _NSIG_SZ (_NSIG / LONG_BIT)
-
-typedef struct {
-        unsigned long sig[_NSIG_SZ];
-} sigset_t;
-
-struct sigaction {
-        __sighandler_t sa_handler;
-        unsigned long sa_flags;
-        sigset_t sa_mask;
-};
-
-#endif
diff --git a/klibc/include/arch/parisc/klibc/archstat.h b/klibc/include/arch/parisc/klibc/archstat.h
deleted file mode 100644 (file)
index 7d28f45..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef _KLIBC_ARCHSTAT_H
-#define _KLIBC_ARCHSTAT_H
-
-#define _STATBUF_ST_NSEC
-
-struct stat {
-       unsigned long long      st_dev;
-       unsigned int            __pad1;
-
-       unsigned int            __st_ino;       /* Not actually filled in */
-       unsigned int            st_mode;
-       unsigned int            st_nlink;
-       unsigned int            st_uid;
-       unsigned int            st_gid;
-       unsigned long long      st_rdev;
-       unsigned int            __pad2;
-       signed long long        st_size;
-       signed int              st_blksize;
-
-       signed long long        st_blocks;
-       struct timespec         st_atim;
-       struct timespec         st_mtim;
-       struct timespec         st_ctim;
-       unsigned long long      st_ino;
-};
-
-#endif
diff --git a/klibc/include/arch/parisc/klibc/archsys.h b/klibc/include/arch/parisc/klibc/archsys.h
deleted file mode 100644 (file)
index 5013ba8..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * arch/parisc/include/klibc/archsys.h
- *
- * Architecture-specific syscall definitions
- */
-
-#ifndef _KLIBC_ARCHSYS_H
-#define _KLIBC_ARCHSYS_H
-
-/* No special syscall definitions for this architecture */
-
-#endif /* _KLIBC_ARCHSYS_H */
diff --git a/klibc/include/arch/ppc/klibc/archsetjmp.h b/klibc/include/arch/ppc/klibc/archsetjmp.h
deleted file mode 100644 (file)
index 53e2fcc..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * arch/ppc/include/klibc/archsetjmp.h
- */
-
-#ifndef _KLIBC_ARCHSETJMP_H
-#define _KLIBC_ARCHSETJMP_H
-
-struct __jmp_buf {
-  unsigned long __r2;
-  unsigned long __sp;
-  unsigned long __lr;
-  unsigned long __cr;
-  unsigned long __r13;
-  unsigned long __r14;
-  unsigned long __r15;
-  unsigned long __r16;
-  unsigned long __r17;
-  unsigned long __r18;
-  unsigned long __r19;
-  unsigned long __r20;
-  unsigned long __r21;
-  unsigned long __r22;
-  unsigned long __r23;
-  unsigned long __r24;
-  unsigned long __r25;
-  unsigned long __r26;
-  unsigned long __r27;
-  unsigned long __r28;
-  unsigned long __r29;
-  unsigned long __r30;
-  unsigned long __r31;
-};
-
-typedef struct __jmp_buf jmp_buf[1];
-
-#endif /* _SETJMP_H */
diff --git a/klibc/include/arch/ppc/klibc/archsignal.h b/klibc/include/arch/ppc/klibc/archsignal.h
deleted file mode 100644 (file)
index 567a547..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * arch/ppc/include/klibc/archsignal.h
- *
- * Architecture-specific signal definitions
- *
- */
-
-#ifndef _KLIBC_ARCHSIGNAL_H
-#define _KLIBC_ARCHSIGNAL_H
-
-/* No special stuff for this architecture */
-
-#endif
diff --git a/klibc/include/arch/ppc/klibc/archstat.h b/klibc/include/arch/ppc/klibc/archstat.h
deleted file mode 100644 (file)
index 1d0487b..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef _KLIBC_ARCHSTAT_H
-#define _KLIBC_ARCHSTAT_H
-
-#define _STATBUF_ST_NSEC
-
-/* This matches struct stat64 in glibc2.1.
- */
-struct stat {
-       unsigned long long st_dev;      /* Device.  */
-       unsigned long long st_ino;      /* File serial number.  */
-       unsigned int st_mode;           /* File mode.  */
-       unsigned int st_nlink;          /* Link count.  */
-       unsigned int st_uid;            /* User ID of the file's owner.  */
-       unsigned int st_gid;            /* Group ID of the file's group. */
-       unsigned long long st_rdev;     /* Device number, if device.  */
-       unsigned short int __pad2;
-       long long st_size;              /* Size of file, in bytes.  */
-       long st_blksize;                /* Optimal block size for I/O.  */
-
-       long long st_blocks;            /* Number 512-byte blocks allocated. */
-       struct timespec st_atim;        /* Time of last access.  */
-       struct timespec st_mtim;        /* Time of last modification.  */
-       struct timespec st_ctim;        /* Time of last status change.  */
-       unsigned long int __unused4;
-       unsigned long int __unused5;
-};
-
-#endif
diff --git a/klibc/include/arch/ppc/klibc/archsys.h b/klibc/include/arch/ppc/klibc/archsys.h
deleted file mode 100644 (file)
index 17a2885..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * arch/ppc/include/klibc/archsys.h
- *
- * Architecture-specific syscall definitions
- */
-
-#ifndef _KLIBC_ARCHSYS_H
-#define _KLIBC_ARCHSYS_H
-
-/* PowerPC seems to lack _syscall6() in its headers */
-/* This seems to work on both 32- and 64-bit ppc */
-
-#ifndef _syscall6
-
-#define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4, \
-          type5,arg5,type6,arg6) \
-type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5,type6 arg6) \
-{ \
-        unsigned long __sc_ret, __sc_err;                               \
-        {                                                               \
-                register unsigned long __sc_0 __asm__ ("r0");           \
-                register unsigned long __sc_3 __asm__ ("r3");           \
-                register unsigned long __sc_4 __asm__ ("r4");           \
-                register unsigned long __sc_5 __asm__ ("r5");           \
-                register unsigned long __sc_6 __asm__ ("r6");           \
-                register unsigned long __sc_7 __asm__ ("r7");           \
-                register unsigned long __sc_8 __asm__ ("r8");           \
-               &nbs