Changeset 6843a9c in mainline for kernel/arch/ia32/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/ia32/Makefile.inc (modified) (4 diffs)

kernel/arch/ia32/Makefile.inc

@@ -38 +38 @@
 GCC_CFLAGS += $(CMN1)
 ICC_CFLAGS += $(CMN1)
-SUNCC_CFLAGS += $(CMN1)
 CLANG_CFLAGS += $(CMN1)
 
@@ -50 +49 @@
 ifeq ($(PROCESSOR),athlon_xp)
         CMN2 = -march=athlon-xp
-        SUNCC_CFLAGS += -xarch=ssea
 endif
 
 ifeq ($(PROCESSOR),athlon_mp)
         CMN2 = -march=athlon-mp
-        SUNCC_CFLAGS += xarch=ssea
 endif
 
 ifeq ($(PROCESSOR),pentium3)
         CMN2 = -march=pentium3
-        SUNCC_CFLAGS += -xarch=sse
 endif
 
 ifeq ($(PROCESSOR),pentium4)
         CMN2 = -march=pentium4
-        SUNCC_CFLAGS += -xarch=sse2
 endif
 
 ifeq ($(PROCESSOR),core)
         CMN2 = -march=prescott
-        SUNCC_CFLAGS += -xarch=sse3
 endif
 
@@ -99 +93 @@
         arch/$(KARCH)/src/userspace.c \
         arch/$(KARCH)/src/cpu/cpu.c \
+        arch/$(KARCH)/src/mm/km.c \
         arch/$(KARCH)/src/mm/as.c \
         arch/$(KARCH)/src/mm/frame.c \
@@ -106 +101 @@
         arch/$(KARCH)/src/drivers/i8254.c \
         arch/$(KARCH)/src/drivers/i8259.c \
-        arch/$(KARCH)/src/drivers/vesa.c \
-        arch/$(KARCH)/src/boot/boot.S \
+        arch/$(KARCH)/src/boot/multiboot.S \
+        arch/$(KARCH)/src/boot/multiboot2.S \
         arch/$(KARCH)/src/boot/memmap.c \
         arch/$(KARCH)/src/fpu_context.c \