michaelh/zephyr
1
0
Fork 0
Code Releases Activity

arch: x86: set output format/arch per arch

Browse source 
Instead of doing this per platform, set the output format and arch on
architecture level.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2018-07-31 07:32:10 -05:00
commit 9426a3cbf9
4 changed files with 10 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

13
arch/x86/CMakeLists.txt
View file

@ -7,6 +7,16 @@ else()
zephyr_compile_definitions(PERF_OPT)
endif()
if(CONFIG_X86_IAMCU)
set_property(GLOBAL APPEND PROPERTY PROPERTY_LINKER_SCRIPT_DEFINES -D__IAMCU)
set_property(GLOBAL PROPERTY PROPERTY_OUTPUT_FORMAT "elf32-iamcu")
set_property(GLOBAL PROPERTY PROPERTY_OUTPUT_ARCH "iamcu:intel")
else()
set_property(GLOBAL PROPERTY PROPERTY_OUTPUT_ARCH "i386")
set_property(GLOBAL PROPERTY PROPERTY_OUTPUT_FORMAT "elf32-i386")
endif()
if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
if(CONFIG_X86_IAMCU)
@ -33,9 +43,6 @@ endif()
set(GENIDT ${ZEPHYR_BASE}/scripts/gen_idt.py)
define_property(GLOBAL PROPERTY PROPERTY_OUTPUT_ARCH BRIEF_DOCS " " FULL_DOCS " ")
set_property(GLOBAL PROPERTY PROPERTY_OUTPUT_ARCH "i386")
set_property(GLOBAL PROPERTY PROPERTY_OUTPUT_FORMAT "elf32-i386")
# Use gen_idt.py and objcopy to generate irq_int_vector_map.o and
# staticIdt.o from the elf file zephyr_prebuilt

3
arch/x86/soc/ia32/CMakeLists.txt
View file

@ -4,9 +4,6 @@ zephyr_library_include_directories(${ZEPHYR_BASE}/drivers)
zephyr_cc_option(-march=pentium)
if(CONFIG_X86_IAMCU)
set_property(GLOBAL APPEND PROPERTY PROPERTY_LINKER_SCRIPT_DEFINES -D__IAMCU)
set_property(GLOBAL PROPERTY PROPERTY_OUTPUT_FORMAT "elf32-iamcu")
set_property(GLOBAL PROPERTY PROPERTY_OUTPUT_ARCH "iamcu:intel")
zephyr_cc_option(-msoft-float)
endif()

6
arch/x86/soc/intel_quark/quark_d2000/CMakeLists.txt
View file

@ -7,9 +7,3 @@ zephyr_compile_definitions_ifdef(
)
zephyr_cc_option(-march=lakemont -mtune=lakemont -msoft-float)
if(CONFIG_X86_IAMCU)
set_property(GLOBAL APPEND PROPERTY PROPERTY_LINKER_SCRIPT_DEFINES -D__IAMCU)
set_property(GLOBAL PROPERTY PROPERTY_OUTPUT_FORMAT "elf32-iamcu")
set_property(GLOBAL PROPERTY PROPERTY_OUTPUT_ARCH "iamcu:intel")
endif()

6
arch/x86/soc/intel_quark/quark_se/CMakeLists.txt
View file

@ -8,12 +8,6 @@ zephyr_compile_definitions_ifdef(
zephyr_cc_option(-march=lakemont -mtune=lakemont -msoft-float)
if(CONFIG_X86_IAMCU)
set_property(GLOBAL APPEND PROPERTY PROPERTY_LINKER_SCRIPT_DEFINES -D__IAMCU)
set_property(GLOBAL PROPERTY PROPERTY_OUTPUT_FORMAT "elf32-iamcu")
set_property(GLOBAL PROPERTY PROPERTY_OUTPUT_ARCH "iamcu:intel")
endif()
zephyr_sources(
soc.c
soc_config.c