Changeset 03362fbd in mainline for uspace/lib/c

Timestamp:

2013-02-09T23:14:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

Location:

uspace/lib/c

Files:

• Makefile (modified) (view diffs)
• arch/abs32le/_link.ld.in (modified) (view diffs)
• arch/abs32le/include/atomic.h (modified) (view diffs)
• arch/abs32le/include/ddi.h (modified) (view diffs)
• arch/abs32le/include/types.h (modified) (view diffs)
• arch/abs32le/src/entryjmp.c (modified) (view diffs)
• arch/abs32le/src/fibril.c (modified) (view diffs)
• arch/abs32le/src/stacktrace.c (modified) (view diffs)
• arch/amd64/_link.ld.in (modified) (view diffs)
• arch/amd64/include/elf_linux.h (modified) (view diffs)
• arch/amd64/include/types.h (modified) (view diffs)
• arch/amd64/src/stacktrace.c (modified) (view diffs)
• arch/arm32/Makefile.common (modified) (view diffs)
• arch/arm32/_link.ld.in (modified) (view diffs)
• arch/arm32/include/atomic.h (modified) (view diffs)
• arch/arm32/include/cp15.h (added)
• arch/arm32/include/ddi.h (modified) (view diffs)
• arch/arm32/include/types.h (modified) (view diffs)
• arch/arm32/src/fibril.S (modified) (view diffs)
• arch/arm32/src/stacktrace.c (modified) (view diffs)
• arch/arm32/src/stacktrace_asm.S (modified) (view diffs)
• arch/arm32/src/thread_entry.s (modified) (view diffs)
• arch/ia32/_link.ld.in (modified) (view diffs)
• arch/ia32/include/ddi.h (modified) (view diffs)
• arch/ia32/include/types.h (modified) (view diffs)
• arch/ia32/src/stacktrace.c (modified) (view diffs)
• arch/ia64/Makefile.common (modified) (view diffs)
• arch/ia64/_link.ld.in (modified) (view diffs)
• arch/ia64/include/ddi.h (modified) (view diffs)
• arch/ia64/include/types.h (modified) (view diffs)
• arch/ia64/src/ddi.c (modified) (view diffs)
• arch/ia64/src/stacktrace.c (modified) (view diffs)
• arch/mips32/Makefile.common (modified) (view diffs)
• arch/mips32/_link.ld.in (modified) (view diffs)
• arch/mips32/include/ddi.h (modified) (view diffs)
• arch/mips32/include/types.h (modified) (view diffs)
• arch/mips32/src/stacktrace.c (modified) (view diffs)
• arch/mips32eb/Makefile.common (modified) (view diffs)
• arch/mips64/Makefile.common (modified) (view diffs)
• arch/mips64/_link.ld.in (modified) (view diffs)
• arch/mips64/include/ddi.h (modified) (view diffs)
• arch/mips64/include/types.h (modified) (view diffs)
• arch/mips64/src/stacktrace.c (modified) (view diffs)
• arch/ppc32/Makefile.common (modified) (view diffs)
• arch/ppc32/_link.ld.in (modified) (view diffs)
• arch/ppc32/include/ddi.h (modified) (view diffs)
• arch/ppc32/include/types.h (modified) (view diffs)
• arch/ppc32/src/stacktrace.c (modified) (view diffs)
• arch/sparc64/_link.ld.in (modified) (view diffs)
• arch/sparc64/include/ddi.h (modified) (view diffs)
• arch/sparc64/include/types.h (modified) (view diffs)
• arch/sparc64/src/stacktrace.c (modified) (view diffs)
• generic/adt/hash_set.c (deleted)
• generic/adt/hash_table.c (modified) (view diffs)
• generic/adt/list.c (modified) (view diffs)
• generic/async.c (modified) (view diffs)
• generic/bd.c (added)
• generic/bd_srv.c (added)
• generic/ddi.c (modified) (view diffs)
• generic/device/battery_dev.c (added)
• generic/device/clock_dev.c (moved) (moved from kernel/arch/arm32/include/mach/testarm/testarm.h ) (view diffs)
• generic/device/graph_dev.c (added)
• generic/devman.c (modified) (view diffs)
• generic/dlfcn.c (modified) (view diffs)
• generic/double_to_str.c (added)
• generic/fibril.c (modified) (view diffs)
• generic/fibril_synch.c (modified) (view diffs)
• generic/ieee_double.c (added)
• generic/io/chargrid.c (moved) (moved from uspace/lib/fb/screenbuffer.c ) (view diffs)
• generic/io/con_srv.c (added)
• generic/io/console.c (modified) (view diffs)
• generic/io/input.c (added)
• generic/io/io.c (modified) (view diffs)
• generic/io/klog.c (modified) (view diffs)
• generic/io/log.c (modified) (view diffs)
• generic/io/logctl.c (added)
• generic/io/output.c (added)
• generic/io/printf_core.c (modified) (view diffs)
• generic/io/visualizer.c (added)
• generic/io/window.c (added)
• generic/ipc.c (modified) (view diffs)
• generic/iplink_srv.c (modified) (view diffs)
• generic/loc.c (modified) (view diffs)
• generic/malloc.c (modified) (view diffs)
• generic/pio_trace.c (added)
• generic/power_of_ten.c (added)
• generic/private/async.h (modified) (view diffs)
• generic/private/power_of_ten.h (added)
• generic/stack.c (added)
• generic/stdlib.c (modified) (view diffs)
• generic/str.c (modified) (view diffs)
• generic/sysinfo.c (modified) (view diffs)
• generic/task.c (modified) (view diffs)
• generic/thread.c (modified) (view diffs)
• generic/time.c (modified) (view diffs)
• generic/tls.c (modified) (view diffs)
• include/adt/hash.h (added)
• include/adt/hash_table.h (modified) (view diffs)
• include/adt/list.h (modified) (view diffs)
• include/async.h (modified) (view diffs)
• include/atomicdflt.h (modified) (view diffs)
• include/bd.h (added)
• include/bd_srv.h (added)
• include/cfg.h (modified) (view diffs)
• include/ddi.h (modified) (view diffs)
• include/device/battery_dev.h (added)
• include/device/clock_dev.h (added)
• include/device/graph_dev.h (added)
• include/device/hw_res.h (modified) (view diffs)
• include/devman.h (modified) (view diffs)
• include/double_to_str.h (added)
• include/fibril_synch.h (modified) (view diffs)
• include/ieee_double.h (added)
• include/inet/iplink_srv.h (modified) (view diffs)
• include/io/charfield.h (moved) (moved from uspace/lib/fb/screenbuffer.h ) (view diffs)
• include/io/chargrid.h (added)
• include/io/con_srv.h (added)
• include/io/concaps.h (added)
• include/io/console.h (modified) (view diffs)
• include/io/input.h (added)
• include/io/kbd_event.h (added)
• include/io/klog.h (modified) (view diffs)
• include/io/log.h (modified) (view diffs)
• include/io/logctl.h (added)
• include/io/mode.h (added)
• include/io/output.h (added)
• include/io/pixel.h (added)
• include/io/pixelmap.h (added)
• include/io/verify.h (added)
• include/io/visualizer.h (added)
• include/io/window.h (added)
• include/ipc/console.h (modified) (view diffs)
• include/ipc/dev_iface.h (modified) (view diffs)
• include/ipc/graph.h (added)
• include/ipc/input.h (modified) (view diffs)
• include/ipc/ipc.h (modified) (view diffs)
• include/ipc/logger.h (added)
• include/ipc/mouseev.h (modified) (view diffs)
• include/ipc/output.h (added)
• include/ipc/services.h (modified) (view diffs)
• include/ipc/vfs.h (modified) (view diffs)
• include/ipc/window.h (added)
• include/loc.h (modified) (view diffs)
• include/macros.h (modified) (view diffs)
• include/nic/nic.h (modified) (view diffs)
• include/rtld/dynamic.h (modified) (view diffs)
• include/sort.h (modified) (view diffs)
• include/stack.h (moved) (moved from uspace/lib/c/include/bool.h ) (view diffs)
• include/stacktrace.h (modified) (view diffs)
• include/stats.h (modified) (view diffs)
• include/stdbool.h (moved) (moved from uspace/lib/posix/stdbool.h ) (view diffs)
• include/stdio.h (modified) (view diffs)
• include/str.h (modified) (view diffs)
• include/sys/stat.h (modified) (view diffs)
• include/sys/time.h (modified) (view diffs)
• include/sysinfo.h (modified) (view diffs)
• include/task.h (modified) (view diffs)