Changeset aebcd42 in mainline for uspace/lib/c

Timestamp:

2012-10-24T21:58:08Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

6c5fc8e

Parents:

6ecf5b8

Message:

Prevent compile-time symlinks in userspace

Continuation of the previous commit (see details there).

Only abi/ remains to be done.

Location:

uspace/lib/c

Files:

• Makefile (modified) (4 diffs)
• arch/abs32le/include/barrier.h (deleted)
• arch/abs32le/include/context_offset.h (deleted)
• arch/abs32le/include/elf.h (deleted)
• arch/abs32le/include/istate.h (deleted)
• arch/abs32le/include/libarch/atomic.h (moved) (moved from uspace/lib/c/arch/abs32le/include/atomic.h )
• arch/abs32le/include/libarch/barrier.h (added)
• arch/abs32le/include/libarch/config.h (moved) (moved from uspace/lib/c/arch/abs32le/include/config.h )
• arch/abs32le/include/libarch/context_offset.h (added)
• arch/abs32le/include/libarch/ddi.h (moved) (moved from uspace/lib/c/arch/abs32le/include/ddi.h )
• arch/abs32le/include/libarch/elf.h (added)
• arch/abs32le/include/libarch/elf_linux.h (moved) (moved from uspace/lib/c/arch/abs32le/include/elf_linux.h )
• arch/abs32le/include/libarch/entry.h (moved) (moved from uspace/lib/c/arch/abs32le/include/entry.h )
• arch/abs32le/include/libarch/faddr.h (moved) (moved from uspace/lib/c/arch/abs32le/include/faddr.h )
• arch/abs32le/include/libarch/fibril.h (moved) (moved from uspace/lib/c/arch/abs32le/include/fibril.h )
• arch/abs32le/include/libarch/inttypes.h (moved) (moved from uspace/lib/c/arch/abs32le/include/inttypes.h )
• arch/abs32le/include/libarch/istate.h (added)
• arch/abs32le/include/libarch/syscall.h (moved) (moved from uspace/lib/c/arch/abs32le/include/syscall.h )
• arch/abs32le/include/libarch/thread.h (moved) (moved from uspace/lib/c/arch/abs32le/include/thread.h )
• arch/abs32le/include/libarch/tls.h (moved) (moved from uspace/lib/c/arch/abs32le/include/tls.h )
• arch/abs32le/include/libarch/types.h (moved) (moved from uspace/lib/c/arch/abs32le/include/types.h )
• arch/amd64/include/barrier.h (deleted)
• arch/amd64/include/context_offset.h (deleted)
• arch/amd64/include/ddi.h (deleted)
• arch/amd64/include/elf.h (deleted)
• arch/amd64/include/istate.h (deleted)
• arch/amd64/include/libarch/atomic.h (moved) (moved from uspace/lib/c/arch/amd64/include/atomic.h )
• arch/amd64/include/libarch/barrier.h (added)
• arch/amd64/include/libarch/config.h (moved) (moved from uspace/lib/c/arch/amd64/include/config.h )
• arch/amd64/include/libarch/context_offset.h (added)
• arch/amd64/include/libarch/ddi.h (added)
• arch/amd64/include/libarch/elf.h (added)
• arch/amd64/include/libarch/elf_linux.h (moved) (moved from uspace/lib/c/arch/amd64/include/elf_linux.h )
• arch/amd64/include/libarch/faddr.h (moved) (moved from uspace/lib/c/arch/amd64/include/faddr.h )
• arch/amd64/include/libarch/fibril.h (moved) (moved from uspace/lib/c/arch/amd64/include/fibril.h )
• arch/amd64/include/libarch/inttypes.h (moved) (moved from uspace/lib/c/arch/amd64/include/inttypes.h )
• arch/amd64/include/libarch/istate.h (added)
• arch/amd64/include/libarch/stackarg.h (moved) (moved from uspace/lib/c/arch/amd64/include/stackarg.h )
• arch/amd64/include/libarch/syscall.h (moved) (moved from uspace/lib/c/arch/amd64/include/syscall.h )
• arch/amd64/include/libarch/thread.h (moved) (moved from uspace/lib/c/arch/amd64/include/thread.h )
• arch/amd64/include/libarch/tls.h (moved) (moved from uspace/lib/c/arch/amd64/include/tls.h )
• arch/amd64/include/libarch/types.h (moved) (moved from uspace/lib/c/arch/amd64/include/types.h )
• arch/arm32/include/barrier.h (deleted)
• arch/arm32/include/elf.h (deleted)
• arch/arm32/include/istate.h (deleted)
• arch/arm32/include/libarch/atomic.h (moved) (moved from uspace/lib/c/arch/arm32/include/atomic.h )
• arch/arm32/include/libarch/barrier.h (added)
• arch/arm32/include/libarch/config.h (moved) (moved from uspace/lib/c/arch/arm32/include/config.h )
• arch/arm32/include/libarch/ddi.h (moved) (moved from uspace/lib/c/arch/arm32/include/ddi.h )
• arch/arm32/include/libarch/elf.h (added)
• arch/arm32/include/libarch/elf_linux.h (moved) (moved from uspace/lib/c/arch/arm32/include/elf_linux.h )
• arch/arm32/include/libarch/faddr.h (moved) (moved from uspace/lib/c/arch/arm32/include/faddr.h )
• arch/arm32/include/libarch/fibril.h (moved) (moved from uspace/lib/c/arch/arm32/include/fibril.h )
• arch/arm32/include/libarch/inttypes.h (moved) (moved from uspace/lib/c/arch/arm32/include/inttypes.h )
• arch/arm32/include/libarch/istate.h (added)
• arch/arm32/include/libarch/regutils.h (added)
• arch/arm32/include/libarch/stackarg.h (moved) (moved from uspace/lib/c/arch/arm32/include/stackarg.h )
• arch/arm32/include/libarch/syscall.h (moved) (moved from uspace/lib/c/arch/arm32/include/syscall.h )
• arch/arm32/include/libarch/thread.h (moved) (moved from uspace/lib/c/arch/arm32/include/thread.h )
• arch/arm32/include/libarch/tls.h (moved) (moved from uspace/lib/c/arch/arm32/include/tls.h )
• arch/arm32/include/libarch/types.h (moved) (moved from uspace/lib/c/arch/arm32/include/types.h )
• arch/arm32/include/regutils.h (deleted)
• arch/ia32/include/barrier.h (deleted)
• arch/ia32/include/context_offset.h (deleted)
• arch/ia32/include/elf.h (deleted)
• arch/ia32/include/istate.h (deleted)
• arch/ia32/include/libarch/atomic.h (moved) (moved from uspace/lib/c/arch/ia32/include/atomic.h )
• arch/ia32/include/libarch/barrier.h (added)
• arch/ia32/include/libarch/config.h (moved) (moved from uspace/lib/c/arch/ia32/include/config.h )
• arch/ia32/include/libarch/context_offset.h (added)
• arch/ia32/include/libarch/ddi.h (moved) (moved from uspace/lib/c/arch/ia32/include/ddi.h )
• arch/ia32/include/libarch/elf.h (added)
• arch/ia32/include/libarch/elf_linux.h (moved) (moved from uspace/lib/c/arch/ia32/include/elf_linux.h )
• arch/ia32/include/libarch/faddr.h (moved) (moved from uspace/lib/c/arch/ia32/include/faddr.h )
• arch/ia32/include/libarch/fibril.h (moved) (moved from uspace/lib/c/arch/ia32/include/fibril.h )
• arch/ia32/include/libarch/inttypes.h (moved) (moved from uspace/lib/c/arch/ia32/include/inttypes.h )
• arch/ia32/include/libarch/istate.h (added)
• arch/ia32/include/libarch/rtld/dynamic.h (moved) (moved from uspace/lib/c/arch/ia32/include/rtld/dynamic.h )
• arch/ia32/include/libarch/rtld/elf_dyn.h (moved) (moved from uspace/lib/c/arch/ia32/include/rtld/elf_dyn.h )
• arch/ia32/include/libarch/syscall.h (moved) (moved from uspace/lib/c/arch/ia32/include/syscall.h )
• arch/ia32/include/libarch/thread.h (moved) (moved from uspace/lib/c/arch/ia32/include/thread.h )
• arch/ia32/include/libarch/tls.h (moved) (moved from uspace/lib/c/arch/ia32/include/tls.h )
• arch/ia32/include/libarch/types.h (moved) (moved from uspace/lib/c/arch/ia32/include/types.h )
• arch/ia64/include/barrier.h (deleted)
• arch/ia64/include/elf.h (deleted)
• arch/ia64/include/istate.h (deleted)
• arch/ia64/include/libarch/atomic.h (moved) (moved from uspace/lib/c/arch/ia64/include/atomic.h )
• arch/ia64/include/libarch/barrier.h (added)
• arch/ia64/include/libarch/config.h (moved) (moved from uspace/lib/c/arch/ia64/include/config.h )
• arch/ia64/include/libarch/ddi.h (moved) (moved from uspace/lib/c/arch/ia64/include/ddi.h )
• arch/ia64/include/libarch/elf.h (added)
• arch/ia64/include/libarch/elf_linux.h (moved) (moved from uspace/lib/c/arch/ia64/include/elf_linux.h )
• arch/ia64/include/libarch/faddr.h (moved) (moved from uspace/lib/c/arch/ia64/include/faddr.h )
• arch/ia64/include/libarch/fibril.h (moved) (moved from uspace/lib/c/arch/ia64/include/fibril.h )
• arch/ia64/include/libarch/inttypes.h (moved) (moved from uspace/lib/c/arch/ia64/include/inttypes.h )
• arch/ia64/include/libarch/istate.h (added)
• arch/ia64/include/libarch/register.h (added)
• arch/ia64/include/libarch/stack.h (moved) (moved from uspace/lib/c/arch/ia64/include/stack.h )
• arch/ia64/include/libarch/stackarg.h (moved) (moved from uspace/lib/c/arch/ia64/include/stackarg.h )
• arch/ia64/include/libarch/syscall.h (moved) (moved from uspace/lib/c/arch/ia64/include/syscall.h )
• arch/ia64/include/libarch/thread.h (moved) (moved from uspace/lib/c/arch/ia64/include/thread.h )
• arch/ia64/include/libarch/tls.h (moved) (moved from uspace/lib/c/arch/ia64/include/tls.h )
• arch/ia64/include/libarch/types.h (moved) (moved from uspace/lib/c/arch/ia64/include/types.h )
• arch/ia64/include/register.h (deleted)
• arch/mips32/include/barrier.h (deleted)
• arch/mips32/include/context_offset.h (deleted)
• arch/mips32/include/cp0.h (deleted)
• arch/mips32/include/elf.h (deleted)
• arch/mips32/include/istate.h (deleted)
• arch/mips32/include/libarch/atomic.h (moved) (moved from uspace/lib/c/arch/mips32/include/atomic.h )
• arch/mips32/include/libarch/barrier.h (added)
• arch/mips32/include/libarch/config.h (moved) (moved from uspace/lib/c/arch/mips32/include/config.h )
• arch/mips32/include/libarch/context_offset.h (added)
• arch/mips32/include/libarch/cp0.h (added)
• arch/mips32/include/libarch/ddi.h (moved) (moved from uspace/lib/c/arch/mips32/include/ddi.h )
• arch/mips32/include/libarch/elf.h (added)
• arch/mips32/include/libarch/elf_linux.h (moved) (moved from uspace/lib/c/arch/mips32/include/elf_linux.h )
• arch/mips32/include/libarch/faddr.h (moved) (moved from uspace/lib/c/arch/mips32/include/faddr.h )
• arch/mips32/include/libarch/fibril.h (moved) (moved from uspace/lib/c/arch/mips32/include/fibril.h )
• arch/mips32/include/libarch/inttypes.h (moved) (moved from uspace/lib/c/arch/mips32/include/inttypes.h )
• arch/mips32/include/libarch/istate.h (added)
• arch/mips32/include/libarch/regname.h (added)
• arch/mips32/include/libarch/stack.h (added)
• arch/mips32/include/libarch/syscall.h (moved) (moved from uspace/lib/c/arch/mips32/include/syscall.h )
• arch/mips32/include/libarch/thread.h (moved) (moved from uspace/lib/c/arch/mips32/include/thread.h )
• arch/mips32/include/libarch/tls.h (moved) (moved from uspace/lib/c/arch/mips32/include/tls.h )
• arch/mips32/include/libarch/types.h (moved) (moved from uspace/lib/c/arch/mips32/include/types.h )
• arch/mips32/include/regname.h (deleted)
• arch/mips32/include/stack.h (deleted)
• arch/mips32eb/include/atomic.h (deleted)
• arch/mips32eb/include/barrier.h (deleted)
• arch/mips32eb/include/config.h (deleted)
• arch/mips32eb/include/context_offset.h (deleted)
• arch/mips32eb/include/cp0.h (deleted)
• arch/mips32eb/include/ddi.h (deleted)
• arch/mips32eb/include/elf.h (deleted)
• arch/mips32eb/include/elf_linux.h (deleted)
• arch/mips32eb/include/faddr.h (deleted)
• arch/mips32eb/include/fibril.h (deleted)
• arch/mips32eb/include/inttypes.h (deleted)
• arch/mips32eb/include/istate.h (deleted)
• arch/mips32eb/include/libarch/atomic.h (added)
• arch/mips32eb/include/libarch/barrier.h (added)
• arch/mips32eb/include/libarch/config.h (added)
• arch/mips32eb/include/libarch/context_offset.h (added)
• arch/mips32eb/include/libarch/cp0.h (added)
• arch/mips32eb/include/libarch/ddi.h (added)
• arch/mips32eb/include/libarch/elf.h (added)
• arch/mips32eb/include/libarch/elf_linux.h (added)
• arch/mips32eb/include/libarch/faddr.h (added)
• arch/mips32eb/include/libarch/fibril.h (added)
• arch/mips32eb/include/libarch/inttypes.h (added)
• arch/mips32eb/include/libarch/istate.h (added)
• arch/mips32eb/include/libarch/regname.h (added)
• arch/mips32eb/include/libarch/stack.h (added)
• arch/mips32eb/include/libarch/syscall.h (added)
• arch/mips32eb/include/libarch/thread.h (added)
• arch/mips32eb/include/libarch/tls.h (added)
• arch/mips32eb/include/libarch/types.h (added)
• arch/mips32eb/include/regname.h (deleted)
• arch/mips32eb/include/stack.h (deleted)
• arch/mips32eb/include/syscall.h (deleted)
• arch/mips32eb/include/thread.h (deleted)
• arch/mips32eb/include/tls.h (deleted)
• arch/mips32eb/include/types.h (deleted)
• arch/mips64/include/barrier.h (deleted)
• arch/mips64/include/context_offset.h (deleted)
• arch/mips64/include/cp0.h (deleted)
• arch/mips64/include/elf.h (deleted)
• arch/mips64/include/istate.h (deleted)
• arch/mips64/include/libarch/atomic.h (moved) (moved from uspace/lib/c/arch/mips64/include/atomic.h )
• arch/mips64/include/libarch/barrier.h (added)
• arch/mips64/include/libarch/config.h (moved) (moved from uspace/lib/c/arch/mips64/include/config.h )
• arch/mips64/include/libarch/context_offset.h (added)
• arch/mips64/include/libarch/cp0.h (added)
• arch/mips64/include/libarch/ddi.h (moved) (moved from uspace/lib/c/arch/mips64/include/ddi.h )
• arch/mips64/include/libarch/elf.h (added)
• arch/mips64/include/libarch/elf_linux.h (moved) (moved from uspace/lib/c/arch/mips64/include/elf_linux.h )
• arch/mips64/include/libarch/faddr.h (moved) (moved from uspace/lib/c/arch/mips64/include/faddr.h )
• arch/mips64/include/libarch/fibril.h (moved) (moved from uspace/lib/c/arch/mips64/include/fibril.h )
• arch/mips64/include/libarch/inttypes.h (moved) (moved from uspace/lib/c/arch/mips64/include/inttypes.h )
• arch/mips64/include/libarch/istate.h (added)
• arch/mips64/include/libarch/regname.h (added)
• arch/mips64/include/libarch/stack.h (added)
• arch/mips64/include/libarch/syscall.h (moved) (moved from uspace/lib/c/arch/mips64/include/syscall.h )
• arch/mips64/include/libarch/thread.h (moved) (moved from uspace/lib/c/arch/mips64/include/thread.h )
• arch/mips64/include/libarch/tls.h (moved) (moved from uspace/lib/c/arch/mips64/include/tls.h )
• arch/mips64/include/libarch/types.h (moved) (moved from uspace/lib/c/arch/mips64/include/types.h )
• arch/mips64/include/regname.h (deleted)
• arch/mips64/include/stack.h (deleted)
• arch/ppc32/include/barrier.h (deleted)
• arch/ppc32/include/context_offset.h (deleted)
• arch/ppc32/include/elf.h (deleted)
• arch/ppc32/include/istate.h (deleted)
• arch/ppc32/include/libarch/atomic.h (moved) (moved from uspace/lib/c/arch/ppc32/include/atomic.h )
• arch/ppc32/include/libarch/barrier.h (added)
• arch/ppc32/include/libarch/config.h (moved) (moved from uspace/lib/c/arch/ppc32/include/config.h )
• arch/ppc32/include/libarch/context_offset.h (added)
• arch/ppc32/include/libarch/ddi.h (moved) (moved from uspace/lib/c/arch/ppc32/include/ddi.h )
• arch/ppc32/include/libarch/elf.h (added)
• arch/ppc32/include/libarch/elf_linux.h (moved) (moved from uspace/lib/c/arch/ppc32/include/elf_linux.h )
• arch/ppc32/include/libarch/faddr.h (moved) (moved from uspace/lib/c/arch/ppc32/include/faddr.h )
• arch/ppc32/include/libarch/fibril.h (moved) (moved from uspace/lib/c/arch/ppc32/include/fibril.h )
• arch/ppc32/include/libarch/inttypes.h (moved) (moved from uspace/lib/c/arch/ppc32/include/inttypes.h )
• arch/ppc32/include/libarch/istate.h (added)
• arch/ppc32/include/libarch/msr.h (added)
• arch/ppc32/include/libarch/regname.h (moved) (moved from uspace/lib/c/arch/ppc32/include/regname.h )
• arch/ppc32/include/libarch/stackarg.h (moved) (moved from uspace/lib/c/arch/ppc32/include/stackarg.h )
• arch/ppc32/include/libarch/syscall.h (moved) (moved from uspace/lib/c/arch/ppc32/include/syscall.h )
• arch/ppc32/include/libarch/thread.h (moved) (moved from uspace/lib/c/arch/ppc32/include/thread.h )
• arch/ppc32/include/libarch/tls.h (moved) (moved from uspace/lib/c/arch/ppc32/include/tls.h )
• arch/ppc32/include/libarch/types.h (moved) (moved from uspace/lib/c/arch/ppc32/include/types.h )
• arch/ppc32/include/msr.h (deleted)
• arch/sparc64/include/barrier.h (deleted)
• arch/sparc64/include/context_offset.h (deleted)
• arch/sparc64/include/elf.h (deleted)
• arch/sparc64/include/istate.h (deleted)
• arch/sparc64/include/libarch/atomic.h (moved) (moved from uspace/lib/c/arch/sparc64/include/atomic.h )
• arch/sparc64/include/libarch/barrier.h (added)
• arch/sparc64/include/libarch/config.h (moved) (moved from uspace/lib/c/arch/sparc64/include/config.h )
• arch/sparc64/include/libarch/context_offset.h (added)
• arch/sparc64/include/libarch/ddi.h (moved) (moved from uspace/lib/c/arch/sparc64/include/ddi.h )
• arch/sparc64/include/libarch/elf.h (added)
• arch/sparc64/include/libarch/elf_linux.h (moved) (moved from uspace/lib/c/arch/sparc64/include/elf_linux.h )
• arch/sparc64/include/libarch/faddr.h (moved) (moved from uspace/lib/c/arch/sparc64/include/faddr.h )
• arch/sparc64/include/libarch/fibril.h (moved) (moved from uspace/lib/c/arch/sparc64/include/fibril.h )
• arch/sparc64/include/libarch/inttypes.h (moved) (moved from uspace/lib/c/arch/sparc64/include/inttypes.h )
• arch/sparc64/include/libarch/istate.h (added)
• arch/sparc64/include/libarch/regdef.h (added)
• arch/sparc64/include/libarch/stack.h (moved) (moved from uspace/lib/c/arch/sparc64/include/stack.h )
• arch/sparc64/include/libarch/stackarg.h (moved) (moved from uspace/lib/c/arch/sparc64/include/stackarg.h )
• arch/sparc64/include/libarch/syscall.h (moved) (moved from uspace/lib/c/arch/sparc64/include/syscall.h )
• arch/sparc64/include/libarch/thread.h (moved) (moved from uspace/lib/c/arch/sparc64/include/thread.h )
• arch/sparc64/include/libarch/tls.h (moved) (moved from uspace/lib/c/arch/sparc64/include/tls.h )
• arch/sparc64/include/libarch/types.h (moved) (moved from uspace/lib/c/arch/sparc64/include/types.h )
• arch/sparc64/include/regdef.h (deleted)

uspace/lib/c/Makefile

@@ -32 +32 @@
 
 INCLUDE_ABI = include/abi
-INCLUDE_LIBARCH = include/libarch
 
 COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common
 COMMON_HEADER = $(ROOT_PATH)/common.h
-COMMON_HEADER_ARCH = arch/$(UARCH)/include/common.h
+COMMON_HEADER_ARCH = arch/$(UARCH)/include/libarch/common.h
 
 CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
@@ -46 +45 @@
         $(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld
 
-PRE_DEPEND = $(INCLUDE_ABI) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH)
+PRE_DEPEND = $(INCLUDE_ABI) $(COMMON_HEADER_ARCH)
 EXTRA_OUTPUT = $(LINKER_SCRIPTS)
-EXTRA_CLEAN = $(INCLUDE_ABI) $(INCLUDE_LIBARCH) $(COMMON_HEADER_ARCH) $(LINKER_SCRIPTS)
+EXTRA_CLEAN = $(INCLUDE_ABI) $(COMMON_HEADER_ARCH) $(LINKER_SCRIPTS)
 LIBRARY = libc
 SLIBRARY = libc.so.0.0
@@ -157 +156 @@
 include $(USPACE_PREFIX)/Makefile.common
 
-$(INCLUDE_LIBARCH): arch/$(UARCH)/include
-        ln -sfn ../$< $@
-
 $(INCLUDE_ABI): ../../../abi/include/
         ln -sfn ../$< $@
@@ -176 +172 @@
 
 $(COMMON_HEADER_ARCH): $(COMMON_HEADER)
-        ln -sfn ../../../$< $@
+        ln -sfn ../../../../$< $@