config: add a common x86 flag

Intel Architecture (IA), also called x86, is declined in
- i686
- x86_x32
- x86_64

The code common to all of these architectures can now be guarded
by a single flag RTE_ARCH_X86.

Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>

diff --git a/config/common_bsdapp b/config/common_bsdapp
index 50b9829a57d669377022902afa39eaedbdfa0832..be09b48794ca2defad106f425f6183e5dc13e1a7 100644 (file)
--- a/config/common_bsdapp
+++ b/config/common_bsdapp
@@ -49,6 +49,7 @@ CONFIG_RTE_EXEC_ENV_BSDAPP=y
 ##
 #CONFIG_RTE_ARCH="x86_64"
 #CONFIG_RTE_ARCH_X86_64=y
+#CONFIG_RTE_ARCH_X86=y
 #
 ##
 ## The compiler we use.

diff --git a/config/common_linuxapp b/config/common_linuxapp
index 4866b96cc7f48a9a9ad9c62b1773ffc591591923..bf1bb6e8bf5dba5dbf8a07e6c766fecff46bc7e4 100644 (file)
--- a/config/common_linuxapp
+++ b/config/common_linuxapp
@@ -49,6 +49,7 @@ CONFIG_RTE_EXEC_ENV_LINUXAPP=y
 ##
 #CONFIG_RTE_ARCH="x86_64"
 #CONFIG_RTE_ARCH_X86_64=y
+#CONFIG_RTE_ARCH_X86=y
 #
 ##
 ## The compiler we use.

diff --git a/config/defconfig_i686-native-linuxapp-gcc b/config/defconfig_i686-native-linuxapp-gcc
index a90de9b49f2a9d65b7ce69683b9e255806d22908..290183abdfe25076cc3809e3a566a8372f23eb8b 100644 (file)
--- a/config/defconfig_i686-native-linuxapp-gcc
+++ b/config/defconfig_i686-native-linuxapp-gcc
@@ -36,6 +36,7 @@ CONFIG_RTE_MACHINE="native"
 
 CONFIG_RTE_ARCH="i686"
 CONFIG_RTE_ARCH_I686=y
+CONFIG_RTE_ARCH_X86=y
 
 CONFIG_RTE_TOOLCHAIN="gcc"
 CONFIG_RTE_TOOLCHAIN_GCC=y

diff --git a/config/defconfig_i686-native-linuxapp-icc b/config/defconfig_i686-native-linuxapp-icc
index c021321cfd4fffe3a37ba9c2d8854d1ee77c689b..96725f365f35902b4cd054008414156df4b48b1d 100644 (file)
--- a/config/defconfig_i686-native-linuxapp-icc
+++ b/config/defconfig_i686-native-linuxapp-icc
@@ -36,6 +36,7 @@ CONFIG_RTE_MACHINE="native"
 
 CONFIG_RTE_ARCH="i686"
 CONFIG_RTE_ARCH_I686=y
+CONFIG_RTE_ARCH_X86=y
 
 CONFIG_RTE_TOOLCHAIN="icc"
 CONFIG_RTE_TOOLCHAIN_ICC=y

diff --git a/config/defconfig_x86_64-native-bsdapp-clang b/config/defconfig_x86_64-native-bsdapp-clang
index 3305cbd8af27a0562f92ea38c3f2ba4a40545517..d2baf2c4f7ae05c277c44700f47b67d497c3a5c8 100644 (file)
--- a/config/defconfig_x86_64-native-bsdapp-clang
+++ b/config/defconfig_x86_64-native-bsdapp-clang
@@ -36,6 +36,7 @@ CONFIG_RTE_MACHINE="native"
 
 CONFIG_RTE_ARCH="x86_64"
 CONFIG_RTE_ARCH_X86_64=y
+CONFIG_RTE_ARCH_X86=y
 
 CONFIG_RTE_TOOLCHAIN="clang"
 CONFIG_RTE_TOOLCHAIN_CLANG=y

diff --git a/config/defconfig_x86_64-native-bsdapp-gcc b/config/defconfig_x86_64-native-bsdapp-gcc
index aad7add1e11a2010c4edf78b463fd20220046a9f..5a6a4e8c98f2424be41c4f5829c0092791738f20 100644 (file)
--- a/config/defconfig_x86_64-native-bsdapp-gcc
+++ b/config/defconfig_x86_64-native-bsdapp-gcc
@@ -36,6 +36,7 @@ CONFIG_RTE_MACHINE="native"
 
 CONFIG_RTE_ARCH="x86_64"
 CONFIG_RTE_ARCH_X86_64=y
+CONFIG_RTE_ARCH_X86=y
 
 CONFIG_RTE_TOOLCHAIN="gcc"
 CONFIG_RTE_TOOLCHAIN_GCC=y

diff --git a/config/defconfig_x86_64-native-linuxapp-clang b/config/defconfig_x86_64-native-linuxapp-clang
index 5f3074ed12b55decaa8d71cde3e06df0a51856ac..7b1102fdeda2ac8a6e33526f34fecb32a739c27d 100644 (file)
--- a/config/defconfig_x86_64-native-linuxapp-clang
+++ b/config/defconfig_x86_64-native-linuxapp-clang
@@ -36,6 +36,7 @@ CONFIG_RTE_MACHINE="native"
 
 CONFIG_RTE_ARCH="x86_64"
 CONFIG_RTE_ARCH_X86_64=y
+CONFIG_RTE_ARCH_X86=y
 CONFIG_RTE_ARCH_64=y
 
 CONFIG_RTE_TOOLCHAIN="clang"

diff --git a/config/defconfig_x86_64-native-linuxapp-gcc b/config/defconfig_x86_64-native-linuxapp-gcc
index 60baf5be2b446d0f6d2230eaada8b368770879d6..e69a37e0efd862fb880bbee04e3eaff1d3eb13a7 100644 (file)
--- a/config/defconfig_x86_64-native-linuxapp-gcc
+++ b/config/defconfig_x86_64-native-linuxapp-gcc
@@ -36,6 +36,7 @@ CONFIG_RTE_MACHINE="native"
 
 CONFIG_RTE_ARCH="x86_64"
 CONFIG_RTE_ARCH_X86_64=y
+CONFIG_RTE_ARCH_X86=y
 CONFIG_RTE_ARCH_64=y
 
 CONFIG_RTE_TOOLCHAIN="gcc"

diff --git a/config/defconfig_x86_64-native-linuxapp-icc b/config/defconfig_x86_64-native-linuxapp-icc
index 71d1e285b54736175788a025c6b5b24cd41e591a..bfa8a3da6c372cd5aa517b2133a8191c9aab3a08 100644 (file)
--- a/config/defconfig_x86_64-native-linuxapp-icc
+++ b/config/defconfig_x86_64-native-linuxapp-icc
@@ -36,6 +36,7 @@ CONFIG_RTE_MACHINE="native"
 
 CONFIG_RTE_ARCH="x86_64"
 CONFIG_RTE_ARCH_X86_64=y
+CONFIG_RTE_ARCH_X86=y
 CONFIG_RTE_ARCH_64=y
 
 CONFIG_RTE_TOOLCHAIN="icc"

diff --git a/config/defconfig_x86_x32-native-linuxapp-gcc b/config/defconfig_x86_x32-native-linuxapp-gcc
index fb0afc4d16e106d69b94f6269343ef49bb3cd891..0c26857c045258b3dd2753f159cccbf787057fca 100644 (file)
--- a/config/defconfig_x86_x32-native-linuxapp-gcc
+++ b/config/defconfig_x86_x32-native-linuxapp-gcc
@@ -36,6 +36,7 @@ CONFIG_RTE_MACHINE="native"
 
 CONFIG_RTE_ARCH="x86_x32"
 CONFIG_RTE_ARCH_X86_X32=y
+CONFIG_RTE_ARCH_X86=y
 
 CONFIG_RTE_TOOLCHAIN="gcc"
 CONFIG_RTE_TOOLCHAIN_GCC=y