From 94e4b3a60765c26895c17d8c12c5790b16384602 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Fri, 5 Feb 2016 22:23:15 +0100 Subject: [PATCH] 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 Acked-by: Konstantin Ananyev --- config/common_bsdapp | 1 + config/common_linuxapp | 1 + config/defconfig_i686-native-linuxapp-gcc | 1 + config/defconfig_i686-native-linuxapp-icc | 1 + config/defconfig_x86_64-native-bsdapp-clang | 1 + config/defconfig_x86_64-native-bsdapp-gcc | 1 + config/defconfig_x86_64-native-linuxapp-clang | 1 + config/defconfig_x86_64-native-linuxapp-gcc | 1 + config/defconfig_x86_64-native-linuxapp-icc | 1 + config/defconfig_x86_x32-native-linuxapp-gcc | 1 + 10 files changed, 10 insertions(+) diff --git a/config/common_bsdapp b/config/common_bsdapp index 50b9829a57..be09b48794 100644 --- 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 4866b96cc7..bf1bb6e8bf 100644 --- 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 a90de9b49f..290183abdf 100644 --- 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 c021321cfd..96725f365f 100644 --- 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 3305cbd8af..d2baf2c4f7 100644 --- 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 aad7add1e1..5a6a4e8c98 100644 --- 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 5f3074ed12..7b1102fded 100644 --- 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 60baf5be2b..e69a37e0ef 100644 --- 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 71d1e285b5..bfa8a3da6c 100644 --- 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 fb0afc4d16..0c26857c04 100644 --- 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 -- 2.20.1