Changeset cefb126 in mainline for kernel/arch/amd64/Makefile.inc

Timestamp:

2010-07-02T14:19:30Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

89c57b6

Parents:

fe7abd0 (diff), e3ee9b9 (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/amd64/Makefile.inc (modified) (2 diffs)

kernel/arch/amd64/Makefile.inc

@@ -33 +33 @@
 
 FPU_NO_CFLAGS = -mno-sse -mno-sse2
-CMN1 = -m64 -mcmodel=kernel -mno-red-zone -fno-unwind-tables -fno-omit-frame-pointer
+CMN1 = -m64 -mcmodel=large -mno-red-zone -fno-unwind-tables -fno-omit-frame-pointer
 GCC_CFLAGS += $(CMN1)
 ICC_CFLAGS += $(CMN1)
@@ -71 +71 @@
         arch/$(KARCH)/src/mm/page.c \
         arch/$(KARCH)/src/mm/tlb.c \
-        arch/$(KARCH)/src/asm_utils.S \
+        arch/$(KARCH)/src/asm.S \
         arch/$(KARCH)/src/cpu/cpu.c \
         arch/$(KARCH)/src/proc/scheduler.c \