Changeset 61c0402 in mainline for kernel/arch/arm32/Makefile.inc

Timestamp:

2010-01-15T19:36:53Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

92bee46

Parents:

50f9c3a (diff), 963462af (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:

• kernel/arch/arm32/Makefile.inc (modified) (2 diffs)

kernel/arch/arm32/Makefile.inc

@@ -38 +38 @@
 ATSIGN = %
 
-GCC_CFLAGS += -fno-zero-initialized-in-bss
+GCC_CFLAGS += -fno-zero-initialized-in-bss -mapcs-frame
 
 BITS = 32
@@ -57 +57 @@
         arch/$(KARCH)/src/exception.c \
         arch/$(KARCH)/src/userspace.c \
+        arch/$(KARCH)/src/debug/stacktrace.c \
+        arch/$(KARCH)/src/debug/stacktrace_asm.S \
         arch/$(KARCH)/src/mm/as.c \
         arch/$(KARCH)/src/mm/frame.c \
         arch/$(KARCH)/src/mm/page.c \
         arch/$(KARCH)/src/mm/tlb.c \
-        arch/$(KARCH)/src/mm/page_fault.c
+        arch/$(KARCH)/src/mm/page_fault.c \
+        arch/$(KARCH)/src/ras.c
 
 ifeq ($(MACHINE),testarm)