Changeset 6843a9c in mainline for kernel/arch/arm32/Makefile.inc


Ignore:
Timestamp:
2012-06-29T13:02:14Z (13 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
722912e
Parents:
ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/arm32/Makefile.inc

    rba72f2b r6843a9c  
    3333ATSIGN = %
    3434
    35 GCC_CFLAGS += -fno-zero-initialized-in-bss -mapcs-frame
     35GCC_CFLAGS += -march=armv4
    3636
    3737BITS = 32
    … …  
    4141        arch/$(KARCH)/src/start.S \
    4242        arch/$(KARCH)/src/asm.S \
     43        arch/$(KARCH)/src/eabi.S \
    4344        arch/$(KARCH)/src/exc_handler.S \
    4445        arch/$(KARCH)/src/arm32.c \
    … …  
    5354        arch/$(KARCH)/src/debug/stacktrace.c \
    5455        arch/$(KARCH)/src/debug/stacktrace_asm.S \
     56        arch/$(KARCH)/src/mm/km.c \
    5557        arch/$(KARCH)/src/mm/as.c \
    5658        arch/$(KARCH)/src/mm/frame.c \
Note: See TracChangeset for help on using the changeset viewer.