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

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:

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

kernel/arch/sparc64/Makefile.inc

@@ -32 +32 @@
 
 GCC_CFLAGS += -m64 -mcpu=ultrasparc -mcmodel=medlow -mno-fpu
-SUNCC_CFLAGS += -m64 -xarch=sparc -xregs=appl,no%float
 
 LFLAGS += -no-check-sections
@@ -68 +67 @@
         arch/$(KARCH)/src/fpu_context.c \
         arch/$(KARCH)/src/dummy.s \
+        arch/$(KARCH)/src/mm/$(USARCH)/km.c \
         arch/$(KARCH)/src/mm/$(USARCH)/as.c \
         arch/$(KARCH)/src/mm/$(USARCH)/frame.c \