Changeset 694ca93f in mainline

Timestamp:

2011-05-01T19:34:26Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0e26444

Parents:

1ff896e (diff), 042fbe0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

Files:

• HelenOS.config (modified) (view diffs)
• boot/Makefile (modified) (view diffs)
• boot/Makefile.build (modified) (view diffs)
• boot/Makefile.common (modified) (view diffs)
• boot/arch/ia64/_link.ld.in (modified) (view diffs)
• boot/arch/ia64/src/boot.S (modified) (view diffs)
• defaults/arm32/gta02/Makefile.config (modified) (view diffs)
• kernel/Makefile (modified) (view diffs)
• kernel/arch/abs32le/include/types.h (modified) (view diffs)
• kernel/arch/amd64/Makefile.inc (modified) (view diffs)
• kernel/arch/amd64/_link.ld.in (modified) (view diffs)
• kernel/arch/amd64/include/types.h (modified) (view diffs)
• kernel/arch/amd64/src/asm.S (modified) (view diffs)
• kernel/arch/arm32/include/types.h (modified) (view diffs)
• kernel/arch/arm32/src/asm.S (modified) (view diffs)
• kernel/arch/arm32/src/exception.c (modified) (view diffs)
• kernel/arch/arm32/src/mach/integratorcp/integratorcp.c (modified) (view diffs)
• kernel/arch/ia32/_link.ld.in (modified) (view diffs)
• kernel/arch/ia32/include/barrier.h (modified) (view diffs)
• kernel/arch/ia32/include/types.h (modified) (view diffs)
• kernel/arch/ia32/src/asm.S (modified) (view diffs)
• kernel/arch/ia32/src/cpu/cpu.c (modified) (view diffs)
• kernel/arch/ia64/_link.ld.in (modified) (view diffs)
• kernel/arch/ia64/include/types.h (modified) (view diffs)
• kernel/arch/ia64/src/asm.S (modified) (view diffs)
• kernel/arch/ia64/src/ivt.S (modified) (view diffs)
• kernel/arch/ia64/src/mm/tlb.c (modified) (view diffs)
• kernel/arch/ia64/src/start.S (modified) (view diffs)
• kernel/arch/mips32/include/atomic.h (modified) (view diffs)
• kernel/arch/mips32/include/cp0.h (modified) (view diffs)
• kernel/arch/mips32/include/memstr.h (deleted)
• kernel/arch/mips32/include/types.h (modified) (view diffs)
• kernel/arch/mips32/src/asm.S (modified) (view diffs)
• kernel/arch/mips32/src/mm/frame.c (modified) (view diffs)
• kernel/arch/ppc32/_link.ld.in (modified) (view diffs)
• kernel/arch/ppc32/include/memstr.h (deleted)
• kernel/arch/ppc32/include/types.h (modified) (view diffs)
• kernel/arch/ppc32/src/asm.S (modified) (view diffs)
• kernel/arch/sparc64/_link.ld.in (modified) (view diffs)
• kernel/arch/sparc64/include/cpu.h (modified) (view diffs)
• kernel/arch/sparc64/include/memstr.h (deleted)
• kernel/arch/sparc64/include/sun4u/cpu.h (modified) (view diffs)
• kernel/arch/sparc64/include/types.h (modified) (view diffs)
• kernel/arch/sparc64/src/asm.S (modified) (view diffs)
• kernel/arch/sparc64/src/mm/sun4u/as.c (modified) (view diffs)
• kernel/arch/sparc64/src/mm/sun4v/as.c (modified) (view diffs)
• kernel/arch/sparc64/src/smp/sun4v/smp.c (modified) (view diffs)
• kernel/arch/sparc64/src/sun4v/start.S (modified) (view diffs)
• kernel/arch/sparc64/src/trap/sun4v/interrupt.c (modified) (view diffs)
• kernel/genarch/Makefile.inc (modified) (view diffs)
• kernel/genarch/src/drivers/via-cuda/cuda.c (modified) (view diffs)
• kernel/genarch/src/kbrd/kbrd_pl050.c (deleted)
• kernel/genarch/src/kbrd/scanc_pl050.c (deleted)
• kernel/genarch/src/ofw/ebus.c (modified) (view diffs)
• kernel/genarch/src/ofw/fhc.c (modified) (view diffs)
• kernel/genarch/src/ofw/ofw_tree.c (modified) (view diffs)
• kernel/genarch/src/ofw/pci.c (modified) (view diffs)
• kernel/genarch/src/ofw/upa.c (modified) (view diffs)
• kernel/generic/include/ipc/ipc.h (modified) (view diffs)
• kernel/generic/include/lib/memfnc.h (moved) (moved from kernel/arch/ia32/include/memstr.h ) (view diffs)
• kernel/generic/include/macros.h (modified) (view diffs)
• kernel/generic/include/memstr.h (modified) (view diffs)
• kernel/generic/include/mm/as.h (modified) (view diffs)
• kernel/generic/include/mm/frame.h (modified) (view diffs)
• kernel/generic/include/mm/reserve.h (added)
• kernel/generic/include/str.h (modified) (view diffs)
• kernel/generic/src/ipc/sysipc.c (modified) (view diffs)
• kernel/generic/src/lib/memfnc.c (added)
• kernel/generic/src/lib/memstr.c (modified) (view diffs)
• kernel/generic/src/lib/str.c (modified) (view diffs)
• kernel/generic/src/main/main.c (modified) (view diffs)
• kernel/generic/src/mm/as.c (modified) (view diffs)
• kernel/generic/src/mm/backend_anon.c (modified) (view diffs)
• kernel/generic/src/mm/backend_elf.c (modified) (view diffs)
• kernel/generic/src/mm/backend_phys.c (modified) (view diffs)
• kernel/generic/src/mm/frame.c (modified) (view diffs)
• kernel/generic/src/mm/reserve.c (added)
• kernel/generic/src/proc/scheduler.c (modified) (view diffs)
• tools/autotool.py (modified) (view diffs)
• tools/mkfat.py (modified) (view diffs)
• tools/toolchain.sh (modified) (view diffs)
• uspace/Makefile.common (modified) (view diffs)
• uspace/app/bdsh/cmds/modules/cat/cat.c (modified) (view diffs)
• uspace/app/bdsh/cmds/modules/cp/cp.c (modified) (view diffs)
• uspace/app/bdsh/cmds/modules/ls/ls.c (modified) (view diffs)
• uspace/app/bdsh/cmds/modules/ls/ls.h (deleted)
• uspace/app/bdsh/cmds/modules/rm/rm.c (modified) (view diffs)
• uspace/app/init/Makefile (modified) (view diffs)
• uspace/app/init/init.c (modified) (view diffs)
• uspace/app/klog/klog.c (modified) (view diffs)
• uspace/app/sbi/src/run_expr.c (modified) (view diffs)
• uspace/app/stats/stats.c (modified) (view diffs)
• uspace/app/tester/Makefile (modified) (view diffs)
• uspace/app/tester/devs/devman1.c (added)
• uspace/app/tester/devs/devman1.def (added)
• uspace/app/tester/fault/fault2.c (modified) (view diffs)
• uspace/app/tester/mm/malloc2.c (added)
• uspace/app/tester/mm/malloc2.def (added)
• uspace/app/tester/tester.c (modified) (view diffs)
• uspace/app/tester/tester.h (modified) (view diffs)
• uspace/app/top/screen.c (modified) (view diffs)
• uspace/app/trace/trace.c (modified) (view diffs)
• uspace/drv/isa/isa.c (modified) (view diffs)
• uspace/drv/ns8250/ns8250.c (modified) (view diffs)
• uspace/drv/pciintel/pci.c (modified) (view diffs)
• uspace/drv/root/root.c (modified) (view diffs)
• uspace/drv/rootpc/rootpc.c (modified) (view diffs)
• uspace/drv/rootvirt/rootvirt.c (modified) (view diffs)
• uspace/drv/test1/test1.c (modified) (view diffs)
• uspace/drv/test2/test2.c (modified) (view diffs)
• uspace/lib/block/libblock.c (modified) (view diffs)
• uspace/lib/c/Makefile (modified) (view diffs)
• uspace/lib/c/arch/abs32le/Makefile.inc (modified) (view diffs)
• uspace/lib/c/arch/abs32le/_link.ld.in (modified) (view diffs)
• uspace/lib/c/arch/abs32le/src/entryjmp.c (moved) (moved from uspace/srv/loader/arch/abs32le/abs32le.c ) (view diffs)
• uspace/lib/c/arch/amd64/Makefile.inc (modified) (view diffs)
• uspace/lib/c/arch/amd64/_link.ld.in (modified) (view diffs)
• uspace/lib/c/arch/amd64/src/entryjmp.s (moved) (moved from uspace/srv/loader/arch/amd64/amd64.s ) (view diffs)
• uspace/lib/c/arch/arm32/Makefile.inc (modified) (view diffs)
• uspace/lib/c/arch/arm32/_link.ld.in (modified) (view diffs)
• uspace/lib/c/arch/arm32/src/entryjmp.s (moved) (moved from uspace/srv/loader/arch/arm32/arm32.s ) (view diffs)
• uspace/lib/c/arch/ia32/Makefile.inc (modified) (view diffs)
• uspace/lib/c/arch/ia32/_link.ld.in (modified) (view diffs)
• uspace/lib/c/arch/ia32/include/config.h (modified) (view diffs)
• uspace/lib/c/arch/ia32/include/ddi.h (modified) (view diffs)
• uspace/lib/c/arch/ia32/include/faddr.h (modified) (view diffs)
• uspace/lib/c/arch/ia32/include/fibril.h (modified) (view diffs)
• uspace/lib/c/arch/ia32/include/rtld/dynamic.h (moved) (moved from uspace/srv/loader/include/arch.h ) (view diffs)
• uspace/lib/c/arch/ia32/include/rtld/elf_dyn.h (moved) (moved from kernel/arch/arm32/include/memstr.h ) (view diffs)
• uspace/lib/c/arch/ia32/src/entryjmp.s (moved) (moved from uspace/srv/loader/arch/ia32/ia32.s ) (view diffs)
• uspace/lib/c/arch/ia32/src/rtld/dynamic.c (moved) (moved from kernel/arch/ia64/include/memstr.h ) (view diffs)
• uspace/lib/c/arch/ia32/src/rtld/reloc.c (added)
• uspace/lib/c/arch/ia32/src/stacktrace.c (modified) (view diffs)
• uspace/lib/c/arch/ia32/src/syscall.S (modified) (view diffs)
• uspace/lib/c/arch/ia32/src/tls.c (modified) (view diffs)
• uspace/lib/c/arch/ia64/Makefile.inc (modified) (view diffs)
• uspace/lib/c/arch/ia64/_link.ld.in (modified) (view diffs)
• uspace/lib/c/arch/ia64/src/entry.s (modified) (view diffs)
• uspace/lib/c/arch/ia64/src/entryjmp.s (moved) (moved from uspace/srv/loader/arch/ia64/ia64.s ) (view diffs)
• uspace/lib/c/arch/ia64/src/thread_entry.s (modified) (view diffs)
• uspace/lib/c/arch/mips32/Makefile.inc (modified) (view diffs)
• uspace/lib/c/arch/mips32/_link.ld.in (modified) (view diffs)
• uspace/lib/c/arch/mips32/include/atomic.h (modified) (view diffs)
• uspace/lib/c/arch/mips32/src/entryjmp.s (moved) (moved from uspace/srv/loader/arch/mips32/mips32.s ) (view diffs)
• uspace/lib/c/arch/mips32eb/Makefile.inc (modified) (view diffs)
• uspace/lib/c/arch/ppc32/Makefile.inc (modified) (view diffs)
• uspace/lib/c/arch/ppc32/_link.ld.in (modified) (view diffs)
• uspace/lib/c/arch/ppc32/src/entryjmp.s (moved) (moved from uspace/srv/loader/arch/ppc32/ppc32.s ) (view diffs)
• uspace/lib/c/arch/sparc64/Makefile.inc (modified) (view diffs)
• uspace/lib/c/arch/sparc64/_link.ld.in (modified) (view diffs)
• uspace/lib/c/arch/sparc64/src/entryjmp.s (moved) (moved from uspace/srv/loader/arch/sparc64/sparc64.s ) (view diffs)
• uspace/lib/c/generic/adt/measured_strings.c (modified) (view diffs)
• uspace/lib/c/generic/assert.c (moved) (moved from kernel/arch/abs32le/include/memstr.h ) (view diffs)
• uspace/lib/c/generic/async.c (modified) (view diffs)
• uspace/lib/c/generic/async_sess.c (modified) (view diffs)
• uspace/lib/c/generic/devman.c (modified) (view diffs)
• uspace/lib/c/generic/dlfcn.c (added)
• uspace/lib/c/generic/errno.c (modified) (view diffs)
• uspace/lib/c/generic/fibril_synch.c (modified) (view diffs)
• uspace/lib/c/generic/io/io.c (modified) (view diffs)
• uspace/lib/c/generic/io/log.c (added)
• uspace/lib/c/generic/libc.c (modified) (view diffs)
• uspace/lib/c/generic/malloc.c (modified) (view diffs)
• uspace/lib/c/generic/net/packet.c (modified) (view diffs)
• uspace/lib/c/generic/net/socket_client.c (modified) (view diffs)
• uspace/lib/c/generic/rtld/dynamic.c (added)
• uspace/lib/c/generic/rtld/elf_load.c (added)
• uspace/lib/c/generic/rtld/module.c (added)
• uspace/lib/c/generic/rtld/rtld.c (added)
• uspace/lib/c/generic/rtld/symbol.c (added)
• uspace/lib/c/generic/stacktrace.c (modified) (view diffs)
• uspace/lib/c/generic/str.c (modified) (view diffs)
• uspace/lib/c/generic/vfs/vfs.c (modified) (view diffs)
• uspace/lib/c/include/adt/generic_char_map.h (modified) (view diffs)
• uspace/lib/c/include/adt/generic_field.h (modified) (view diffs)
• uspace/lib/c/include/adt/int_map.h (modified) (view diffs)
• uspace/lib/c/include/assert.h (modified) (view diffs)
• uspace/lib/c/include/async.h (modified) (view diffs)
• uspace/lib/c/include/devman.h (modified) (view diffs)
• uspace/lib/c/include/dlfcn.h (added)
• uspace/lib/c/include/entry_point.h (moved) (moved from kernel/arch/sparc64/include/mm/cache.h ) (view diffs)
• uspace/lib/c/include/errno.h (modified) (view diffs)
• uspace/lib/c/include/fibril_synch.h (modified) (view diffs)
• uspace/lib/c/include/io/log.h (added)
• uspace/lib/c/include/ipc/devman.h (modified) (view diffs)
• uspace/lib/c/include/ipc/services.h (modified) (view diffs)
• uspace/lib/c/include/loader/pcb.h (modified) (view diffs)
• uspace/lib/c/include/macros.h (modified) (view diffs)
• uspace/lib/c/include/rtld/dynamic.h (added)
• uspace/lib/c/include/rtld/elf_dyn.h (added)
• uspace/lib/c/include/rtld/module.h (moved) (moved from kernel/generic/include/proc/tasklet.h ) (view diffs)
• uspace/lib/c/include/rtld/rtld.h (added)
• uspace/lib/c/include/rtld/rtld_arch.h (added)
• uspace/lib/c/include/rtld/rtld_debug.h (moved) (moved from kernel/arch/amd64/include/memstr.h ) (view diffs)
• uspace/lib/c/include/rtld/symbol.h (added)
• uspace/lib/c/include/str.h (modified) (view diffs)
• uspace/lib/drv/Makefile (modified) (view diffs)
• uspace/lib/drv/generic/driver.c (modified) (view diffs)
• uspace/lib/drv/generic/log.c (moved) (moved from kernel/generic/src/proc/tasklet.c ) (view diffs)
• uspace/lib/drv/include/ddf/log.h (added)
• uspace/lib/fs/libfs.c (modified) (view diffs)
• uspace/lib/net/generic/generic.c (modified) (view diffs)
• uspace/lib/net/generic/net_checksum.c (modified) (view diffs)
• uspace/lib/net/generic/packet_client.c (modified) (view diffs)
• uspace/lib/net/il/ip_client.c (modified) (view diffs)
• uspace/lib/net/tl/icmp_client.c (modified) (view diffs)
• uspace/lib/net/tl/socket_core.c (modified) (view diffs)
• uspace/lib/net/tl/tl_common.c (modified) (view diffs)
• uspace/lib/packet/generic/packet_server.c (modified) (view diffs)
• uspace/lib/softint/Makefile (modified) (view diffs)
• uspace/lib/softint/generic/multiplication.c (modified) (view diffs)
• uspace/srv/bd/ata_bd/ata_bd.c (modified) (view diffs)
• uspace/srv/bd/ata_bd/ata_hw.h (modified) (view diffs)
• uspace/srv/bd/rd/Makefile (modified) (view diffs)
• uspace/srv/devman/Makefile (modified) (view diffs)
• uspace/srv/devman/devman.c (modified) (view diffs)
• uspace/srv/devman/devman.h (modified) (view diffs)
• uspace/srv/devman/main.c (modified) (view diffs)
• uspace/srv/devman/util.c (modified) (view diffs)
• uspace/srv/devman/util.h (modified) (view diffs)
• uspace/srv/devmap/Makefile (modified) (view diffs)
• uspace/srv/devmap/devmap.c (modified) (view diffs)
• uspace/srv/fs/devfs/Makefile (modified) (view diffs)
• uspace/srv/fs/fat/Makefile (modified) (view diffs)
• uspace/srv/fs/fat/fat_fat.c (modified) (view diffs)
• uspace/srv/fs/fat/fat_idx.c (modified) (view diffs)
• uspace/srv/fs/fat/fat_ops.c (modified) (view diffs)
• uspace/srv/fs/tmpfs/Makefile (modified) (view diffs)
• uspace/srv/hid/kbd/Makefile (modified) (view diffs)
• uspace/srv/hid/kbd/ctl/pl050.c (deleted)
• uspace/srv/hid/kbd/generic/kbd.c (modified) (view diffs)
• uspace/srv/hid/kbd/include/kbd.h (modified) (view diffs)
• uspace/srv/hid/kbd/port/ns16550.c (modified) (view diffs)
• uspace/srv/hid/kbd/port/z8530.c (modified) (view diffs)
• uspace/srv/hw/bus/cuda_adb/cuda_adb.c (modified) (view diffs)
• uspace/srv/hw/irc/apic/apic.c (modified) (view diffs)
• uspace/srv/hw/irc/fhc/fhc.c (modified) (view diffs)
• uspace/srv/hw/irc/i8259/i8259.c (modified) (view diffs)
• uspace/srv/hw/irc/obio/obio.c (modified) (view diffs)
• uspace/srv/hw/netif/ne2000/dp8390.c (modified) (view diffs)
• uspace/srv/hw/netif/ne2000/ne2000.c (modified) (view diffs)
• uspace/srv/loader/Makefile (modified) (view diffs)
• uspace/srv/loader/arch/abs32le/Makefile.inc (deleted)
• uspace/srv/loader/arch/abs32le/_link.ld.in (deleted)
• uspace/srv/loader/arch/amd64/Makefile.inc (deleted)
• uspace/srv/loader/arch/amd64/_link.ld.in (deleted)
• uspace/srv/loader/arch/arm32/Makefile.inc (deleted)
• uspace/srv/loader/arch/arm32/_link.ld.in (deleted)
• uspace/srv/loader/arch/ia32/Makefile.inc (deleted)
• uspace/srv/loader/arch/ia32/_link.ld.in (deleted)
• uspace/srv/loader/arch/ia64/Makefile.inc (deleted)
• uspace/srv/loader/arch/ia64/_link.ld.in (deleted)
• uspace/srv/loader/arch/mips32/Makefile.inc (deleted)
• uspace/srv/loader/arch/mips32/_link.ld.in (deleted)
• uspace/srv/loader/arch/mips32eb (deleted)
• uspace/srv/loader/arch/ppc32/Makefile.inc (deleted)
• uspace/srv/loader/arch/ppc32/_link.ld.in (deleted)
• uspace/srv/loader/arch/sparc64/Makefile.inc (deleted)
• uspace/srv/loader/arch/sparc64/_link.ld.in (deleted)
• uspace/srv/loader/elf_load.c (modified) (view diffs)
• uspace/srv/loader/include/elf_load.h (modified) (view diffs)
• uspace/srv/loader/main.c (modified) (view diffs)
• uspace/srv/net/il/arp/arp.c (modified) (view diffs)
• uspace/srv/net/il/ip/ip.c (modified) (view diffs)
• uspace/srv/net/net/net.c (modified) (view diffs)
• uspace/srv/net/nil/eth/eth.c (modified) (view diffs)
• uspace/srv/net/tl/icmp/Makefile (modified) (view diffs)
• uspace/srv/net/tl/tcp/tcp.c (modified) (view diffs)
• uspace/srv/net/tl/tcp/tcp.h (modified) (view diffs)
• uspace/srv/net/tl/udp/udp.c (modified) (view diffs)
• uspace/srv/ns/Makefile (modified) (view diffs)
• uspace/srv/ns/clonable.c (modified) (view diffs)
• uspace/srv/ns/service.c (modified) (view diffs)
• uspace/srv/ns/task.c (modified) (view diffs)
• uspace/srv/vfs/Makefile (modified) (view diffs)
• uspace/srv/vfs/vfs_file.c (modified) (view diffs)
• uspace/srv/vfs/vfs_ops.c (modified) (view diffs)
• version (modified) (view diffs)