Changeset eb522e8 in mainline for uspace/Makefile.common


Ignore:
Timestamp:
2011-06-01T08:43:42Z (14 years ago)
Author:
Lubos Slovak <lubos.slovak@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
8d6c1f1
Parents:
9e2e715 (diff), e51a514 (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:

Huuuuuge merge from development - all the work actually :)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile.common

    r9e2e715 reb522e8  
    4040#   BINARY         (/) binary output name (like appname)
    4141#   LIBRARY        (/) library output name (like libname)
     42#
    4243#   EXTRA_OUTPUT       additional output targets
    4344#   EXTRA_CLEAN        additional cleanup targets
     45#
     46# Optionally, for a binary:
     47#   STATIC_NEEDED      set to 'y' for init binaries, will build statically
     48#                      linked version
     49#   STATIC_ONLY        set to 'y' if binary cannot be linked dynamically
     50#                      (e.g. uses thread-local variables)
     51#
     52# Optionally, for a libary:
     53#   SLIBRARY           Name with full version, e.g. libfoo.so.0.0
     54#   LSONAME            Soname / name with short version, e.g. libfoo.so.0
    4455#
    4556# (x) required variables
    … …  
    7384endif
    7485
     86ifeq ($(CONFIG_BUILD_SHARED_LIBS), y)
     87        ifneq ($(SLIBRARY),)
     88                LARCHIVE = $(LIBRARY).la
     89                LOUTPUT = $(SLIBRARY)
     90                EXTRA_OUTPUT += $(LOUTPUT).disasm $(LIBRARY).so $(LSONAME)
     91                EXTRA_CLEAN += $(LOUTPUT).map $(LOUTPUT).ldisasm \
     92                    $(LIBC_PREFIX)/shared/arch/$(UARCH)/_lib.ld \
     93                    $(LIBRARY).so $(LSONAME)
     94        endif
     95endif
     96
    7597DEPEND = Makefile.depend
    7698DEPEND_PREV = $(DEPEND).prev
    … …  
    86108LIBCLUI_PREFIX = $(LIB_PREFIX)/clui
    87109
     110
     111LIBUSB_PREFIX = $(LIB_PREFIX)/usb
     112LIBUSBHOST_PREFIX = $(LIB_PREFIX)/usbhost
     113LIBUSBDEV_PREFIX = $(LIB_PREFIX)/usbdev
     114LIBUSBHID_PREFIX = $(LIB_PREFIX)/usbhid
     115LIBUSBVIRT_PREFIX = $(LIB_PREFIX)/usbvirt
    88116LIBDRV_PREFIX = $(LIB_PREFIX)/drv
    89117LIBPACKET_PREFIX = $(LIB_PREFIX)/packet
    90118LIBNET_PREFIX = $(LIB_PREFIX)/net
    91119
     120ifeq ($(STATIC_NEEDED),y)
     121        STATIC_BUILD = y
     122else
     123        ifeq ($(STATIC_ONLY),y)
     124                STATIC_BUILD = y
     125        else
     126                ifeq ($(CONFIG_USE_SHARED_LIBS), y)
     127                        STATIC_BUILD = n
     128                else
     129                        STATIC_BUILD = y
     130                endif
     131        endif
     132endif
     133# Build static whenever we use libusb because that library uses
     134# thread local variables
     135ifneq ($(findstring usb, $(LIBS)),)
     136        STATIC_BUILD = y
     137endif
     138
     139ifeq ($(STATIC_BUILD), y)
    92140BASE_LIBS = $(LIBC_PREFIX)/libc.a $(LIBSOFTINT_PREFIX)/libsoftint.a
    93 
    94141LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld
     142else
     143BASE_LIBS = $(LIBC_PREFIX)/libc.so0 $(LIBSOFTINT_PREFIX)/libsofti.so0
     144LFLAGS = -Bdynamic
     145LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld
     146endif
    95147
    96148ifeq ($(CONFIG_OPTIMIZE_FOR_SIZE),y)
    … …  
    102154.PHONY: all clean
    103155
    104 all: $(VERSION_DEF) $(COMMON_MAKEFILE) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) $(LIBS) $(OUTPUT) $(EXTRA_OUTPUT)
     156all: $(VERSION_DEF) $(COMMON_MAKEFILE) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) $(LIBS) $(OUTPUT) $(LOUTPUT) $(EXTRA_OUTPUT)
    105157        -[ -f $(DEPEND) ] && cp -a $(DEPEND) $(DEPEND_PREV)
    106158
    107159clean:
    108         rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(EXTRA_OUTPUT) $(EXTRA_CLEAN)
     160        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(LARCHIVE) $(LOUTPUT) $(EXTRA_OUTPUT) $(EXTRA_CLEAN)
    109161        find . -name '*.o' -follow -exec rm \{\} \;
     162        find . -name '*.lo' -follow -exec rm \{\} \;
    110163
    111164GCC_CFLAGS = -I$(LIBC_PREFIX)/include -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
    … …  
    113166        -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
    114167        -Wall -Wextra -Wno-clobbered -Wno-unused-parameter -Wmissing-prototypes \
    115         -Werror-implicit-function-declaration -Wwrite-strings \
     168        -std=gnu99 -Werror-implicit-function-declaration -Wwrite-strings \
    116169        -pipe -g -D__$(ENDIANESS)__
    117170
    … …  
    130183        -pipe -g -arch $(CLANG_ARCH) -D__$(ENDIANESS)__
    131184
     185LIB_CFLAGS = $(CFLAGS) -fPIC -D__IN_SHARED_LIBC__
     186LIB_LFLAGS = $(LFLAGS) -shared -soname $(LSONAME) --whole-archive
     187
    132188ifeq ($(CONFIG_DEBUG),y)
    133189        GCC_CFLAGS += -Werror
    … …  
    135191endif
    136192
     193ifeq ($(CONFIG_LINE_DEBUG),y)
     194        GCC_CFLAGS += -g
     195        ICC_CFLAGS += -g
     196        SUNCC_CFLAGS += -g
     197        CLANG_CFLAGS += -g
     198endif
     199
    137200## Setup platform configuration
    138201#
    … …  
    168231
    169232OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
     233LOBJECTS := $(addsuffix .lo,$(basename $(SOURCES)))
    170234
    171235ifneq ($(BINARY),)
    … …  
    178242
    179243$(BINARY): $(LINKER_SCRIPT) $(OBJECTS) $(LIBS) $(BASE_LIBS)
    180         $(LD) -N $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(BINARY).map -o $(BINARY) $(OBJECTS) $(LIBS) $(BASE_LIBS)
     244        $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(BINARY).map -o $(BINARY) $(OBJECTS) $(LIBS) $(BASE_LIBS)
    181245ifeq ($(CONFIG_STRIP_BINARIES),y)
    182246        $(STRIP) $(BINARY)
    183247endif
     248endif
     249
     250ifneq ($(SLIBRARY),)
     251%.disasm: $(LOUTPUT)
     252ifeq ($(CONFIG_LINE_DEBUG),y)
     253        $(OBJDUMP) -d -S $< > $@
     254else
     255        $(OBJDUMP) -d $< > $@
     256endif
     257
     258$(LOUTPUT): $(LARCHIVE) $(LIBC_PREFIX)/arch/$(UARCH)/_link-shlib.ld
     259        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link-shlib.ld $(LIB_LFLAGS) $(LARCHIVE) -o $@ -Map $(LOUTPUT).map
     260
     261$(LIBRARY).so:
     262        ln -s $(SLIBRARY) $@
     263
     264$(LSONAME):
     265        ln -s $(SLIBRARY) $@
    184266endif
    185267
    … …  
    189271endif
    190272
     273ifneq ($(SLIBRARY),)
     274%.la: $(LOBJECTS)
     275        $(AR) rc $@ $(LOBJECTS)
     276endif
     277
    191278%.o: %.S $(DEPEND)
    192279        $(CC) $(DEFS) $(CFLAGS) -D__ASM__ -c $< -o $@
    … …  
    203290%.o: %.c $(DEPEND)
    204291        $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
     292ifeq ($(PRECHECK),y)
     293        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
     294endif
     295
     296%.lo: %.S $(DEPEND)
     297        $(CC) $(DEFS) $(LIB_CFLAGS) -D__ASM__ -c $< -o $@
     298ifeq ($(PRECHECK),y)
     299        $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS) -D__ASM__
     300endif
     301
     302%.lo: %.s $(DEPEND)
     303        $(AS) $(AFLAGS) -o $@ $<
     304ifeq ($(PRECHECK),y)
     305        $(JOBFILE) $(JOB) $< $@ as asm
     306endif
     307
     308%.lo: %.c $(DEPEND)
     309        $(CC) $(DEFS) $(LIB_CFLAGS) -c $< -o $@
    205310ifeq ($(PRECHECK),y)
    206311        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
    … …  
    210315        makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null
    211316        -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@
     317
     318##
     319# This explicit dependecy of the output binary on the object files seems to be
     320# necessary to prevent parallel build failures (GNU make bug #26893 ???).
     321$(OUTPUT): $(OBJECTS)
     322
     323$(LARCHIVE): $(LOBJECTS)
Note: See TracChangeset for help on using the changeset viewer.