Skip to content
Permalink
Browse files

arch/x86/Kconfig: remove CONFIG_ISA_IA32

This option is set iff CONFIG_X86 is set, thus it provides no useful
information. Remove the option and replace references with CONFIG_X86.

Signed-off-by: Charles E. Youse <charles.youse@intel.com>
  • Loading branch information...
Charles E. Youse authored and nashif committed Jun 11, 2019
1 parent 15223dd commit c2c85a2a48bd1472bd32dbab06e738c0197dd488
@@ -265,14 +265,6 @@ config REBOOT_RST_CNT

endchoice


config ISA_IA32
bool
default y
help
This option signifies the use of a CPU based on the Intel IA-32
instruction set architecture.

config CMOV
bool
help
@@ -29,7 +29,7 @@
* _store_all_float_registers()
*/

#if defined(CONFIG_ISA_IA32)
#if defined(CONFIG_X86)

#define FP_OPTION 0

@@ -95,7 +95,7 @@ struct fp_non_volatile_register_set {
"\t'struct fp_non_volatile_registers'\n"
"\t'SIZEOF_FP_VOLATILE_REGISTER_SET'\n"
"\t'SIZEOF_FP_NON_VOLATILE_REGISTER_SET'\n"
#endif /* CONFIG_ISA_IA32 */
#endif /* CONFIG_X86 */

/* the set of ALL floating point registers */

@@ -12,7 +12,7 @@
#ifndef _FLOAT_REGS_X86_GCC_H
#define _FLOAT_REGS_X86_GCC_H

#if !defined(__GNUC__) || !defined(CONFIG_ISA_IA32)
#if !defined(__GNUC__) || !defined(CONFIG_X86)
#error __FILE__ goes only with x86 GCC
#endif

@@ -43,15 +43,15 @@
#error Rebuild with the FP_SHARING config option enabled
#endif

#if defined(CONFIG_ISA_IA32)
#if defined(CONFIG_X86)
#ifndef CONFIG_SSE
#error Rebuild with the SSE config option enabled
#endif
#endif /* CONFIG_ISA_IA32 */
#endif /* CONFIG_X86 */

#include <zephyr.h>

#if defined(CONFIG_ISA_IA32)
#if defined(CONFIG_X86)
#if defined(__GNUC__)
#include "float_regs_x86_gcc.h"
#else
@@ -226,7 +226,7 @@ void load_store_low(void)
* After every 1000 iterations (arbitrarily chosen), explicitly
* disable floating point operations for the task.
*/
#if (defined(CONFIG_ISA_IA32) && defined(CONFIG_LAZY_FP_SHARING)) || \
#if (defined(CONFIG_X86) && defined(CONFIG_LAZY_FP_SHARING)) || \
defined(CONFIG_ARMV7_M_ARMV8_M_FP)
/*
* In x86:
@@ -345,7 +345,7 @@ void load_store_high(void)
}
}

#if defined(CONFIG_ISA_IA32)
#if defined(CONFIG_X86)
#define THREAD_FP_FLAGS (K_FP_REGS | K_SSE_REGS)
#else
#define THREAD_FP_FLAGS (K_FP_REGS)
@@ -12,9 +12,7 @@ This module implements assembler exception and interrupt stubs for regression
testing.
*/

#ifdef CONFIG_ISA_IA32

/* IA-32 specific */
#ifdef CONFIG_X86

#include <arch/cpu.h>
#include <kernel_structs.h>
@@ -36,4 +34,4 @@ SECTION_FUNC(TEXT, int_stub)

#error Arch not supported

#endif /* CONFIG_ISA_IA32 */
#endif /* CONFIG_X86 */

0 comments on commit c2c85a2

Please sign in to comment.
You can’t perform that action at this time.