Changeset 2b3dd78 in mainline for kernel/Makefile

Timestamp:

2018-01-31T12:02:00Z (8 years ago)

Author:

Jenda <jenda.jzqk73@…>

Branches:

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

Children:

5595841

Parents:

a0a9cc2 (diff), 14d789c (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 remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

File:

• kernel/Makefile (modified) (2 diffs)

kernel/Makefile

@@ -90 +90 @@
 
 COMMON_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
-        -ffreestanding -fno-builtin -nostdlib -nostdinc \
+        -ffreestanding -nostdlib -nostdinc \
         -fexec-charset=UTF-8 -finput-charset=UTF-8 -fno-common \
         -fdebug-prefix-map=$(realpath $(ROOT_PATH))=.
@@ -208 +208 @@
         generic/src/mm/backend_user.c \
         generic/src/mm/slab.c \
-        generic/src/lib/func.c \
+        generic/src/lib/halt.c \
         generic/src/lib/mem.c \
         generic/src/lib/memfnc.c \