Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bbd3aff8 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by Linus Torvalds
Browse files

[PATCH] x86_64: fix CONFIG_REORDER 



Fix CONFIG_REORDER.

The value of cflags-y was assined to CFLAGS before cflags-y was assigned
the value used for CONFIG_REORDER.

Use cflags-y for all CFLAGS options in the Makefile to avoid this
happening again.

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 97c2803c

arch/x86_64/Makefile

+12 −12
Original line number Diff line number Diff line
@@ -24,37 +24,37 @@ 
LDFLAGS		:= -m elf_x86_64

OBJCOPYFLAGS	:= -O binary -R .note -R .comment -S

LDFLAGS_vmlinux :=



CHECKFLAGS      += -D__x86_64__ -m64



cflags-y	:=

cflags-$(CONFIG_MK8) += $(call cc-option,-march=k8)

cflags-$(CONFIG_MPSC) += $(call cc-option,-march=nocona)

cflags-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=generic)

CFLAGS += $(cflags-y)



CFLAGS += -m64

CFLAGS += -mno-red-zone

CFLAGS += -mcmodel=kernel

CFLAGS += -pipe

cflags-y += -m64

cflags-y += -mno-red-zone

cflags-y += -mcmodel=kernel

cflags-y += -pipe

cflags-$(CONFIG_REORDER) += -ffunction-sections

# this makes reading assembly source easier, but produces worse code

# actually it makes the kernel smaller too.

CFLAGS += -fno-reorder-blocks	

CFLAGS += -Wno-sign-compare

cflags-y += -fno-reorder-blocks

cflags-y += -Wno-sign-compare

ifneq ($(CONFIG_UNWIND_INFO),y)

CFLAGS += -fno-asynchronous-unwind-tables

cflags-y += -fno-asynchronous-unwind-tables

endif

ifneq ($(CONFIG_DEBUG_INFO),y)

# -fweb shrinks the kernel a bit, but the difference is very small

# it also messes up debugging, so don't use it for now.

#CFLAGS += $(call cc-option,-fweb)

#cflags-y += $(call cc-option,-fweb)

endif

# -funit-at-a-time shrinks the kernel .text considerably

# unfortunately it makes reading oopses harder.

CFLAGS += $(call cc-option,-funit-at-a-time)

cflags-y += $(call cc-option,-funit-at-a-time)

# prevent gcc from generating any FP code by mistake

CFLAGS += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,)

cflags-y += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,)



CFLAGS += $(cflags-y)

AFLAGS += -m64



head-y := arch/x86_64/kernel/head.o arch/x86_64/kernel/head64.o arch/x86_64/kernel/init_task.o

include/asm-x86_64/ia32_unistd.h

+1 −1
Original line number Diff line number Diff line
@@ -317,6 +317,6 @@ 
#define __NR_ia32_ppoll			309

#define __NR_ia32_unshare		310



#define IA32_NR_syscalls 315	/* must be > than biggest syscall! */

#define IA32_NR_syscalls 311	/* must be > than biggest syscall! */



#endif /* _ASM_X86_64_IA32_UNISTD_H_ */