Changeset 9b0a6b4 in mainline

Timestamp:

2012-04-13T06:36:25Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

90f067d9

Parents:

e61aa80 (diff), d11a181 (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:

• boot/Makefile.build (modified) (view diffs)
• boot/arch/arm32/Makefile.inc (modified) (view diffs)
• boot/arch/arm32/src/asm.S (modified) (view diffs)
• boot/arch/arm32/src/eabi.S (added)
• boot/genarch/include/division.h (modified) (view diffs)
• boot/genarch/src/division.c (modified) (view diffs)
• boot/generic/src/str.c (modified) (view diffs)
• boot/generic/src/version.c (modified) (view diffs)
• kernel/Makefile (modified) (view diffs)
• kernel/arch/arm32/Makefile.inc (modified) (view diffs)
• kernel/arch/arm32/src/eabi.S (added)
• kernel/arch/arm32/src/mach/testarm/testarm.c (modified) (view diffs)
• kernel/genarch/include/softint/division.h (modified) (view diffs)
• kernel/genarch/include/softint/multiplication.h (modified) (view diffs)
• kernel/genarch/src/softint/division.c (modified) (view diffs)
• kernel/genarch/src/softint/multiplication.c (modified) (view diffs)
• kernel/generic/src/console/console.c (modified) (view diffs)
• kernel/generic/src/lib/str.c (modified) (view diffs)
• kernel/generic/src/main/version.c (modified) (view diffs)
• tools/autotool.py (modified) (view diffs)
• tools/check.sh (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/cat/cat.h (modified) (view diffs)
• uspace/app/binutils/Makefile (modified) (view diffs)
• uspace/app/getterm/Makefile (modified) (view diffs)
• uspace/app/getterm/version.c (modified) (view diffs)
• uspace/app/sbi/src/run_texpr.c (modified) (view diffs)
• uspace/app/sportdmp/sportdmp.c (modified) (view diffs)
• uspace/app/tester/fault/fault2.c (modified) (view diffs)
• uspace/app/tester/hw/serial/serial1.c (modified) (view diffs)
• uspace/app/websrv/websrv.c (modified) (view diffs)
• uspace/dist/data/web/bar.html (moved) (moved from uspace/dist/data/web/bar.htm ) (view diffs)
• uspace/dist/data/web/foo.html (moved) (moved from uspace/dist/data/web/foo.htm ) (view diffs)
• uspace/dist/data/web/index.html (moved) (moved from uspace/dist/data/web/index.htm ) (view diffs)
• uspace/drv/bus/isa/isa.c (modified) (view diffs)
• uspace/drv/bus/usb/ehci/Makefile (modified) (view diffs)
• uspace/drv/bus/usb/ehci/main.c (modified) (view diffs)
• uspace/drv/bus/usb/ehci/pci.c (deleted)
• uspace/drv/bus/usb/ehci/res.c (added)
• uspace/drv/bus/usb/ehci/res.h (moved) (moved from uspace/drv/bus/usb/ehci/pci.h ) (view diffs)
• uspace/drv/bus/usb/ohci/Makefile (modified) (view diffs)
• uspace/drv/bus/usb/ohci/hw_struct/hcca.h (modified) (view diffs)
• uspace/drv/bus/usb/ohci/ohci.c (modified) (view diffs)
• uspace/drv/bus/usb/ohci/res.c (moved) (moved from uspace/drv/bus/usb/ohci/pci.c ) (view diffs)
• uspace/drv/bus/usb/ohci/res.h (moved) (moved from uspace/drv/bus/usb/ohci/pci.h ) (view diffs)
• uspace/drv/bus/usb/uhci/Makefile (modified) (view diffs)
• uspace/drv/bus/usb/uhci/res.c (moved) (moved from uspace/drv/bus/usb/uhci/pci.c ) (view diffs)
• uspace/drv/bus/usb/uhci/res.h (moved) (moved from uspace/drv/bus/usb/uhci/pci.h ) (view diffs)
• uspace/drv/bus/usb/uhci/uhci.c (modified) (view diffs)
• uspace/drv/bus/usb/uhcirh/port.c (modified) (view diffs)
• uspace/drv/bus/usb/usbhub/port.c (modified) (view diffs)
• uspace/drv/char/ns8250/ns8250.c (modified) (view diffs)
• uspace/drv/char/ps2mouse/main.c (modified) (view diffs)
• uspace/drv/char/xtkbd/main.c (modified) (view diffs)
• uspace/drv/infrastructure/root/root.c (modified) (view diffs)
• uspace/drv/infrastructure/rootpc/rootpc.c (modified) (view diffs)
• uspace/drv/nic/e1k/e1k.c (modified) (view diffs)
• uspace/lib/c/arch/arm32/Makefile.common (modified) (view diffs)
• uspace/lib/c/arch/arm32/src/eabi.S (modified) (view diffs)
• uspace/lib/c/generic/str.c (modified) (view diffs)
• uspace/lib/net/generic/net_remote.c (modified) (view diffs)
• uspace/lib/softfloat/Makefile (modified) (view diffs)
• uspace/lib/softfloat/arch/abs32le/include/functions.h (deleted)
• uspace/lib/softfloat/arch/amd64/include/functions.h (deleted)
• uspace/lib/softfloat/arch/arm32/include/functions.h (deleted)
• uspace/lib/softfloat/arch/ia32/include/functions.h (deleted)
• uspace/lib/softfloat/arch/ia64/include/functions.h (deleted)
• uspace/lib/softfloat/arch/mips32/include/functions.h (deleted)
• uspace/lib/softfloat/arch/mips32eb/include/functions.h (deleted)
• uspace/lib/softfloat/arch/mips64/include/functions.h (deleted)
• uspace/lib/softfloat/arch/ppc32/include/functions.h (deleted)
• uspace/lib/softfloat/arch/sparc64/include/functions.h (deleted)
• uspace/lib/softfloat/generic/add.c (modified) (view diffs)
• uspace/lib/softfloat/generic/common.c (modified) (view diffs)
• uspace/lib/softfloat/generic/comparison.c (modified) (view diffs)
• uspace/lib/softfloat/generic/conversion.c (modified) (view diffs)
• uspace/lib/softfloat/generic/div.c (modified) (view diffs)
• uspace/lib/softfloat/generic/mul.c (modified) (view diffs)
• uspace/lib/softfloat/generic/softfloat.c (modified) (view diffs)
• uspace/lib/softfloat/generic/sub.c (modified) (view diffs)
• uspace/lib/softfloat/include/add.h (modified) (view diffs)
• uspace/lib/softfloat/include/common.h (modified) (view diffs)
• uspace/lib/softfloat/include/comparison.h (modified) (view diffs)
• uspace/lib/softfloat/include/conversion.h (modified) (view diffs)
• uspace/lib/softfloat/include/div.h (modified) (view diffs)
• uspace/lib/softfloat/include/mul.h (modified) (view diffs)
• uspace/lib/softfloat/include/sftypes.h (modified) (view diffs)
• uspace/lib/softfloat/include/softfloat.h (modified) (view diffs)
• uspace/lib/softfloat/include/sub.h (modified) (view diffs)
• uspace/lib/softint/generic/division.c (modified) (view diffs)
• uspace/lib/softint/include/comparison.h (modified) (view diffs)
• uspace/lib/softint/include/division.h (modified) (view diffs)
• uspace/lib/softint/include/lltype.h (modified) (view diffs)
• uspace/lib/softint/include/multiplication.h (modified) (view diffs)
• uspace/lib/softint/include/shift.h (modified) (view diffs)
• uspace/lib/usb/src/ddfiface.c (modified) (view diffs)
• uspace/lib/usbvirt/src/ipc_dev.c (modified) (view diffs)
• uspace/lib/usbvirt/src/ipc_hc.c (modified) (view diffs)
• uspace/srv/fs/exfat/exfat_fat.c (modified) (view diffs)
• uspace/srv/hid/fb/port/ega.c (modified) (view diffs)
• uspace/srv/hid/fb/port/kchar.c (modified) (view diffs)
• uspace/srv/hid/fb/port/kfb.c (modified) (view diffs)
• uspace/srv/hid/fb/port/niagara.c (modified) (view diffs)
• version (modified) (view diffs)