Changeset 4c53333 in mainline for kernel/arch/amd64/Makefile.inc

Timestamp:

2013-07-11T08:21:10Z (11 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

64e63ce1

Parents:

80445cf (diff), c8bb1633 (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) (3 diffs)

kernel/arch/amd64/Makefile.inc

@@ -30 +30 @@
 BFD_ARCH = i386:x86-64
 BFD = binary
-CLANG_ARCH = x86_64
 
 FPU_NO_CFLAGS = -mno-sse -mno-sse2
-
-#
-# FIXME:
-#
-# The -fno-optimize-sibling-calls should be removed as soon as a bug
-# in GCC concerning the "large" memory model and tail call optimization
-# is fixed.
-#
-# When GCC generates a code for tail call, instead of generating ..
-#
-#   jmp *fnc
-#
-# it generates an assembly code with an illegal immediate prefix:
-#
-#   jmp *$fnc
-#
-# See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=48385 for reference.
-#
-
-CMN1 = -m64 -mcmodel=large -mno-red-zone -fno-unwind-tables -fno-omit-frame-pointer -fno-optimize-sibling-calls
+CMN1 = -m64 -mcmodel=large -mno-red-zone -fno-unwind-tables -fno-omit-frame-pointer
 GCC_CFLAGS += $(CMN1)
 ICC_CFLAGS += $(CMN1)
-SUNCC_CFLAGS += -m64 -xmodel=kernel
+CLANG_CFLAGS += $(CMN1)
 
 BITS = 64
@@ -67 +47 @@
         GCC_CFLAGS += $(CMN2)
         ICC_CFLAGS += $(CMN2)
-        SUNCC_CFLAGS += -xtarget=opteron
 endif
 
@@ -97 +76 @@
         arch/$(KARCH)/src/proc/thread.c \
         arch/$(KARCH)/src/userspace.c \
-        arch/$(KARCH)/src/syscall.c \
-        arch/$(KARCH)/src/debugger.c
+        arch/$(KARCH)/src/syscall.c
 
 ifeq ($(CONFIG_SMP),y)