Changeset ec3e2ed in mainline


Ignore:
Timestamp:
2011-03-23T23:10:36Z (13 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
1d465bf
Parents:
143932e
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.

Files:
2 added
13 edited
8 moved

Legend:

Unmodified
Added
Removed

  • HelenOS.config

    r143932e rec3e2ed  
    525525! [PLATFORM=sparc64&MACHINE=generic] CONFIG_AOUT_ISOFS_B (y)
    526526
    527 % Build shared C library
    528 ! CONFIG_BUILD_SHARED_LIBC (y/n)
    529 
    530 % Link against shared C library
    531 ! [CONFIG_BUILD_SHARED_LIBC=y] CONFIG_USE_SHARED_LIBC (n/y)
    532 ! [CONFIG_BUILD_SHARED_LIBC=n] CONFIG_USE_SHARED_LIBC (n)
     527% Build shared libraries
     528! CONFIG_BUILD_SHARED_LIBS (y/n)
     529
     530% Link against shared libraries
     531! [CONFIG_BUILD_SHARED_LIBS=y] CONFIG_USE_SHARED_LIBS (n/y)
     532! [CONFIG_BUILD_SHARED_LIBS=n] CONFIG_USE_SHARED_LIBS (n)
    533533
    534534% Load disk drivers on startup

  • boot/Makefile.common

    r143932e rec3e2ed  
    119119
    120120RD_LIBS = \
    121         $(USPACE_PATH)/lib/libtest/libtest.so.0
     121        $(USPACE_PATH)/lib/test/libtest.so.0
    122122
    123 ifeq ($(CONFIG_BUILD_SHARED_LIBC), y)
    124         RD_LIBS += $(USPACE_PATH)/lib/c/shared/libc.so.0
     123ifeq ($(CONFIG_BUILD_SHARED_LIBS), y)
     124        RD_LIBS += $(USPACE_PATH)/lib/c/libc.so.0
    125125        RD_APPS += $(USPACE_PATH)/app/dltest/dltest
    126126endif

  • defaults/amd64/Makefile.config

    r143932e rec3e2ed  
    5959CONFIG_VESA_BPP = 16
    6060
    61 # Use shared C library
    62 CONFIG_SHARED_LIBC = n
     61# Build shared libraries
     62CONFIG_BUILD_SHARED_LIBS = n
    6363
    6464# Load disk drivers on startup

  • defaults/arm32/Makefile.config

    r143932e rec3e2ed  
    3535CONFIG_HID_OUT = generic
    3636
    37 # Use shared C library
    38 CONFIG_SHARED_LIBC = n
     37# Build shared libraries
     38CONFIG_BUILD_SHARED_LIBS = n
    3939
    4040# Load disk drivers on startup

  • defaults/ia32/Makefile.config

    r143932e rec3e2ed  
    6565CONFIG_VESA_BPP = 16
    6666
    67 # Use shared C library
    68 CONFIG_SHARED_LIBC = n
     67# Build shared libraries
     68CONFIG_BUILD_SHARED_LIBS = y
     69
     70# Link against shared libraries
     71CONFIG_USE_SHARED_LIBS = y
    6972
    7073# Load disk drivers on startup

  • defaults/ia64/Makefile.config

    r143932e rec3e2ed  
    4747CONFIG_HID_OUT = generic
    4848
    49 # Use shared C library
    50 CONFIG_SHARED_LIBC = n
     49# Build shared libraries
     50CONFIG_BUILD_SHARED_LIBS = n
    5151
    5252# Load disk drivers on startup

  • defaults/mips32/Makefile.config

    r143932e rec3e2ed  
    4141CONFIG_HID_OUT = generic
    4242
    43 # Use shared C library
    44 CONFIG_SHARED_LIBC = n
     43# Build shared libraries
     44CONFIG_BUILD_SHARED_LIBS = n
    4545
    4646# Load disk drivers on startup

  • defaults/ppc32/Makefile.config

    r143932e rec3e2ed  
    4141CONFIG_BAT = y
    4242
    43 # Use shared C library
    44 CONFIG_SHARED_LIBC = n
     43# Build shared libraries
     44CONFIG_BUILD_SHARED_LIBS = n
    4545
    4646# Load disk drivers on startup

  • defaults/sparc64/Makefile.config

    r143932e rec3e2ed  
    5656CONFIG_AOUT_ISOFS_B = y
    5757
     58# Build shared libraries
     59CONFIG_BUILD_SHARED_LIBS = n
     60
    5861# Load disk drivers on startup
    5962CONFIG_START_BD = n

  • defaults/special/Makefile.config

    r143932e rec3e2ed  
    2929CONFIG_TEST = y
    3030
     31# Build shared libraries
     32CONFIG_BUILD_SHARED_LIBS = n
     33
    3134# Load disk drivers on startup
    3235CONFIG_START_BD = n

  • uspace/Makefile

    r143932e rec3e2ed  
    9494        drv/test2
    9595
    96 ## Shared C library
    97 ifeq ($(CONFIG_BUILD_SHARED_LIBC), y)
     96## Shared libraries
     97ifeq ($(CONFIG_BUILD_SHARED_LIBS), y)
    9898        DIRS += \
    99                 lib/c/shared \
    10099                app/dltest
    101100endif
    … …  
    155154        lib/softint \
    156155        lib/softfloat \
    157         lib/libtest \
     156        lib/test \
    158157        lib/drv \
    159158        lib/packet \

  • uspace/Makefile.common

    r143932e rec3e2ed  
    236236endif
    237237
     238%.lo: %.S
     239        $(CC) $(DEFS) $(AFLAGS) $(CFLAGS) -D__ASM__ -c $< -o $@
     240
     241%.lo: %.s
     242        $(AS) $(AFLAGS) $< -o $@
     243
    238244%.lo: %.c $(DEPEND)
    239245        $(CC) $(DEFS) $(LIB_CFLAGS) -c $< -o $@

  • uspace/lib/c/Makefile

    r143932e rec3e2ed  
    4646EXTRA_CLEAN = $(INCLUDE_KERNEL) $(INCLUDE_ARCH) $(INCLUDE_LIBARCH) $(INCLUDE_RTLDARCH) $(COMMON_HEADER_ARCH) $(LINKER_SCRIPT)
    4747LIBRARY = libc
     48SLIBRARY = libc.so.0.0
     49LSONAME = libc.so.0
     50
    4851
    4952-include $(COMMON_MAKEFILE)
Note: See TracChangeset for help on using the changeset viewer.