From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 26 Sep 2013 17:53:24 +0000 (+0000)
Subject: build: unify x86 target cflags
X-Git-Tag: fast2504n-3.10.28-merged~1234
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=7d2ec0b8d3a3a079f18c44106f6a00606d1e2dc9;p=openwrt.git

build: unify x86 target cflags

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38212 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/include/target.mk b/include/target.mk
index 8c427c0c4f..c27e9d3354 100644
--- a/include/target.mk
+++ b/include/target.mk
@@ -214,6 +214,7 @@ ifeq ($(DUMP),1)
   ifeq ($(ARCH),i386)
     CPU_TYPE ?= i486
     CPU_CFLAGS_i486 = -march=i486
+    CPU_CFLAGS_geode = -march=geode -mmmx -m3dnow
   endif
   ifneq ($(findstring arm,$(ARCH)),)
     CPU_TYPE ?= xscale
diff --git a/target/linux/x86/alix2/target.mk b/target/linux/x86/alix2/target.mk
index 561aba6bcf..fce9c90972 100644
--- a/target/linux/x86/alix2/target.mk
+++ b/target/linux/x86/alix2/target.mk
@@ -22,8 +22,7 @@ DEFAULT_PACKAGES += \
 LINUX_VERSION:=3.10.12
 CS5535_MASK:=0x0b000042
 
-CFLAGS += -march=geode -Os -mmmx -m3dnow -fno-align-jumps -fno-align-functions \
-	-fno-align-labels -fno-align-loops -pipe -fomit-frame-pointer
+CPU_TYPE := geode
 
 define Target/Description
 	Build firmware images for PCEngines alix2 board
diff --git a/target/linux/x86/geos/target.mk b/target/linux/x86/geos/target.mk
index 5e057b3254..7e4670212a 100644
--- a/target/linux/x86/geos/target.mk
+++ b/target/linux/x86/geos/target.mk
@@ -24,8 +24,7 @@ DEFAULT_PACKAGES += \
 LINUX_VERSION:=3.8.13
 CS5535_MASK:=0x0E000048
 
-CFLAGS += -march=geode -Os -mmmx -m3dnow -fno-align-jumps -fno-align-functions \
-        -fno-align-labels -fno-align-loops -pipe -fomit-frame-pointer
+CPU_TYPE := geode
 
 define Target/Description
     Build firmware images for Traverse Geos board
diff --git a/target/linux/x86/net5501/target.mk b/target/linux/x86/net5501/target.mk
index 13948d87b3..e8a2bd81c8 100644
--- a/target/linux/x86/net5501/target.mk
+++ b/target/linux/x86/net5501/target.mk
@@ -22,8 +22,7 @@ DEFAULT_PACKAGES += kmod-crypto-hw-geode kmod-crypto-ocf \
 
 CS5535_MASK:=0x01000040
 
-CFLAGS += -march=geode -Os -mmmx -m3dnow -fno-align-jumps -fno-align-functions \
-	  -fno-align-labels -fno-align-loops -pipe -fomit-frame-pointer
+CPU_TYPE := geode
 
 define Target/Description
 	Build firmware images for Soekris net5501 board
diff --git a/target/linux/x86/rdc/target.mk b/target/linux/x86/rdc/target.mk
index e38f5e2006..7475103e5d 100644
--- a/target/linux/x86/rdc/target.mk
+++ b/target/linux/x86/rdc/target.mk
@@ -1,6 +1,5 @@
 BOARDNAME:=RDC R-321x
 FEATURES:=squashfs pci usb gpio pcmcia
-CFLAGS:=-Os -pipe -march=i486 -mtune=i486
 MAINTAINER:=Florian Fainelli <florian@openwrt.org>
 
 DEFAULT_PACKAGES += kmod-llc kmod-stp kmod-bridge kmod-8021q \
diff --git a/target/linux/x86/thincan/target.mk b/target/linux/x86/thincan/target.mk
index cd127a4823..6fc2f97007 100644
--- a/target/linux/x86/thincan/target.mk
+++ b/target/linux/x86/thincan/target.mk
@@ -1,7 +1,7 @@
 DEVICE_TYPE:=terminal
 BOARDNAME:=Artec ThinCan
 
-CFLAGS := -O2 -pipe -march=geode -mtune=geode -funit-at-a-time
+CPU_TYPE := geode
 
 DEFAULT_PACKAGES:=\
 	base-files \