Changeset 0773396 in mainline for kernel/Makefile


Ignore:
Timestamp:
2013-12-25T13:05:25Z (10 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
bc54126c
Parents:
f4a47e52 (diff), 6946f23 (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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/Makefile

    rf4a47e52 r0773396  
    167167
    168168ifeq ($(COMPILER),gcc_cross)
     169        CFLAGS = $(GCC_CFLAGS)
     170        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
     171        INSTRUMENTATION = -finstrument-functions
     172endif
     173
     174ifeq ($(COMPILER),gcc_helenos)
    169175        CFLAGS = $(GCC_CFLAGS)
    170176        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
    … …  
    220226        generic/src/mm/km.c \
    221227        generic/src/mm/reserve.c \
    222         generic/src/mm/buddy.c \
    223228        generic/src/mm/frame.c \
    224229        generic/src/mm/page.c \
Note: See TracChangeset for help on using the changeset viewer.