Commit b0b1ff65 authored by Lasse Collin's avatar Lasse Collin Committed by Andi Kleen
Browse files

[PATCH] i386: Fix usage of -mtune when X86_GENERIC=y or CONFIG_MCORE2=y 

Hi!

I sent this simple patch to lkml about two weeks ago and also cc'ed
to Linus, but seems that the patch got ignored. I decided to write to
you, because you have modified the relevant file most recently.

Below is a copy of the mail that is also available at
<http://lkml.org/lkml/2007/2/28/230

>.

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
parent 973efae2

arch/i386/Makefile.cpu

+4 −4
Original line number Diff line number Diff line
@@ -4,9 +4,9 @@ 
#-mtune exists since gcc 3.4

HAS_MTUNE	:= $(call cc-option-yn, -mtune=i386)

ifeq ($(HAS_MTUNE),y)

tune		= $(call cc-option,-mtune=$(1),)

tune		= $(call cc-option,-mtune=$(1),$(2))

else

tune		= $(call cc-option,-mcpu=$(1),)

tune		= $(call cc-option,-mcpu=$(1),$(2))

endif



align := $(cc-option-align)
@@ -33,7 +33,7 @@ cflags-$(CONFIG_MWINCHIP3D) += $(call cc-option,-march=winchip2,-march=i586) 
cflags-$(CONFIG_MCYRIXIII)	+= $(call cc-option,-march=c3,-march=i486) $(align)-functions=0 $(align)-jumps=0 $(align)-loops=0

cflags-$(CONFIG_MVIAC3_2)	+= $(call cc-option,-march=c3-2,-march=i686)

cflags-$(CONFIG_MVIAC7)		+= -march=i686

cflags-$(CONFIG_MCORE2)		+= -march=i686 $(call cc-option,-mtune=core2,$(call cc-option,-mtune=generic,-mtune=i686))

cflags-$(CONFIG_MCORE2)		+= -march=i686 $(call tune,core2)



# AMD Elan support

cflags-$(CONFIG_X86_ELAN)	+= -march=i486
@@ -43,5 +43,5 @@ cflags-$(CONFIG_MGEODEGX1) += -march=pentium-mmx 


# add at the end to overwrite eventual tuning options from earlier

# cpu entries

cflags-$(CONFIG_X86_GENERIC) 	+= $(call tune,generic)

cflags-$(CONFIG_X86_GENERIC) 	+= $(call tune,generic,$(call tune,i686))

CRA Git | Maintained and supported by SUSTech CRA and CCSE