Changeset ec3e2ed0 in mainline for uspace

Timestamp:

2011-03-23T23:10:36Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1d465bf

Parents:

143932e3

Message:

Build shared C library. Add config options for building and using all libraries
as shared instead of just C library (not working yet). Move libtest under
lib/test.

Location:

uspace

Files:

• Makefile (modified) (2 diffs)
• Makefile.common (modified) (1 diff)
• lib/c/Makefile (modified) (1 diff)
• lib/c/libc.so (added)
• lib/c/libc.so.0 (added)
• lib/test/Makefile (moved) (moved from uspace/lib/libtest/Makefile )
• lib/test/arch/ia32/_link.ld.in (moved) (moved from uspace/lib/libtest/arch/ia32/_link.ld.in )
• lib/test/arch/mips32/_link.ld.in (moved) (moved from uspace/lib/libtest/arch/mips32/_link.ld.in )
• lib/test/arch/ppc32/_link.ld.in (moved) (moved from uspace/lib/libtest/arch/ppc32/_link.ld.in )
• lib/test/libtest.c (moved) (moved from uspace/lib/libtest/libtest.c )
• lib/test/libtest.h (moved) (moved from uspace/lib/libtest/libtest.h )
• lib/test/libtest.so (moved) (moved from uspace/lib/libtest/libtest.so )
• lib/test/libtest.so.0 (moved) (moved from uspace/lib/libtest/libtest.so.0 )

uspace/Makefile

@@ -94 +94 @@
         drv/test2
 
-## Shared C library
-ifeq ($(CONFIG_BUILD_SHARED_LIBC), y)
+## Shared libraries
+ifeq ($(CONFIG_BUILD_SHARED_LIBS), y)
         DIRS += \
-                lib/c/shared \
                 app/dltest
 endif
@@ -155 +154 @@
         lib/softint \
         lib/softfloat \
-        lib/libtest \
+        lib/test \
         lib/drv \
         lib/packet \

uspace/Makefile.common

@@ -236 +236 @@
 endif
 
+%.lo: %.S
+        $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@
+
+%.lo: %.s
+        $(AS) $(AFLAGS) $< -o $@
+
 %.lo: %.c $(DEPEND)
         $(CC) $(DEFS) $(LIB_CFLAGS) -c $< -o $@

uspace/lib/c/Makefile

@@ -46 +46 @@
 EXTRA_CLEAN = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(INCLUDE_RTLDARCH) $(COMMON_HEADER_ARCH) $(LINKER_SCRIPT)
 LIBRARY = libc
+SLIBRARY = libc.so.0.0
+LSONAME = libc.so.0
+
 
 -include $(COMMON_MAKEFILE)