From 2852d93af60b4f3731c35451d419f874ba2e5fbd Mon Sep 17 00:00:00 2001
From: Ruben Ayrapetyan <r.ayrapetyan@samsung.com>
Date: Fri, 8 May 2015 20:09:04 +0300
Subject: [PATCH] Fixing toolchain_external.cmake build configuration:
 generalizing it from Nuttx OS.

JerryScript-DCO-1.0-Signed-off-by: Ruben Ayrapetyan r.ayrapetyan@samsung.com
---
 CMakeLists.txt                         |  6 +++---
 Makefile                               |  1 +
 build/configs/toolchain_external.cmake |  3 ++-
 jerry-core/CMakeLists.txt              | 10 +++++++---
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 60f563263..2b31bbd2a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,8 +76,8 @@ project (Jerry CXX C ASM)
 
   option(STRIP_RELEASE_BINARY "Strip symbols from release binaries" OFF)
   set(MCU_SCRIPT_FILE "tests/blinky.js" CACHE STRING "Script to run on MCU")
- elseif("${PLATFORM}" STREQUAL "NUTTX")
-  set(PLATFORM_EXT "NUTTX")
+ elseif("${PLATFORM}" STREQUAL "EXTERNAL")
+  set(PLATFORM_EXT "${CMAKE_SYSTEM_VERSION}")
   set(EXTERNAL_BUILD TRUE)
 
   set(EXTERNAL_LIBC_INTERFACE "UNDEFINED" CACHE STRING "Path to external libc include directory")
@@ -95,7 +95,7 @@ project (Jerry CXX C ASM)
   set(USE_JERRY_LIBC TRUE)
 
   # Jerry's libc doesn't support Nuttx platform
-   if(${PLATFORM} STREQUAL "NUTTX")
+   if(${PLATFORM_EXT} STREQUAL "NUTTX")
     message(FATAL_ERROR "Nuttx build doesn't support Jerry's libc implementation")
    endif()
  else()
diff --git a/Makefile b/Makefile
index 5c77ad274..1f81c7eb6 100644
--- a/Makefile
+++ b/Makefile
@@ -167,6 +167,7 @@ $(BUILD_DIRS_NUTTX): prerequisites
           cmake \
           -DENABLE_VALGRIND=$(VALGRIND) -DENABLE_LTO=$(LTO) \
           -DCMAKE_TOOLCHAIN_FILE=build/configs/toolchain_external.cmake \
+          -DEXTERNAL_TARGET_NAME=NUTTX \
           -DEXTERNAL_LIBC_INTERFACE="${EXTERNAL_LIBC_INTERFACE}" \
           -DEXTERNAL_LIBS_INTERFACE="${EXTERNAL_LIBS_INTERFACE}" \
           -DEXTERNAL_CMAKE_C_COMPILER="${EXTERNAL_C_COMPILER}" \
diff --git a/build/configs/toolchain_external.cmake b/build/configs/toolchain_external.cmake
index 1bba1a3d7..5ad75cce1 100644
--- a/build/configs/toolchain_external.cmake
+++ b/build/configs/toolchain_external.cmake
@@ -14,7 +14,8 @@
 
 include(CMakeForceCompiler)
 
-set(CMAKE_SYSTEM_NAME NUTTX)
+set(CMAKE_SYSTEM_NAME EXTERNAL)
+set(CMAKE_SYSTEM_VERSION ${EXTERNAL_TARGET_NAME})
 
 CMAKE_FORCE_C_COMPILER(${EXTERNAL_CMAKE_C_COMPILER} GNU)
 CMAKE_FORCE_CXX_COMPILER(${EXTERNAL_CMAKE_CXX_COMPILER} GNU)
diff --git a/jerry-core/CMakeLists.txt b/jerry-core/CMakeLists.txt
index 9caead6d2..d24ac1b10 100644
--- a/jerry-core/CMakeLists.txt
+++ b/jerry-core/CMakeLists.txt
@@ -83,8 +83,12 @@ project (JerryCore CXX C ASM)
    math(EXPR MEM_HEAP_AREA_SIZE_16K "16 * 1024")
    set(DEFINES_JERRY_NUTTX CONFIG_MEM_HEAP_AREA_SIZE=${MEM_HEAP_AREA_SIZE_16K})
   # MCU
-   math(EXPR MEM_HEAP_AREA_SIZE_16K "16 * 1024")
-   set(DEFINES_JERRY_MCU CONFIG_MEM_HEAP_AREA_SIZE=${MEM_HEAP_AREA_SIZE_16K})
+   # stm32f3
+    math(EXPR MEM_HEAP_AREA_SIZE_16K "16 * 1024")
+    set(DEFINES_JERRY_MCU_STM32F3 CONFIG_MEM_HEAP_AREA_SIZE=${MEM_HEAP_AREA_SIZE_16K})
+   # stm32f4
+    math(EXPR MEM_HEAP_AREA_SIZE_16K "16 * 1024")
+    set(DEFINES_JERRY_MCU_STM32F4 CONFIG_MEM_HEAP_AREA_SIZE=${MEM_HEAP_AREA_SIZE_16K})
 
 # Include directories
  set(INCLUDE_CORE
@@ -134,7 +138,7 @@ project (JerryCore CXX C ASM)
  endif()
 
 # Platform-specific configuration
- set(DEFINES_JERRY ${DEFINES_JERRY} ${DEFINES_JERRY_${PLATFORM}})
+ set(DEFINES_JERRY ${DEFINES_JERRY} ${DEFINES_JERRY_${PLATFORM_EXT}})
 
 # Targets declaration
  function(declare_targets_for_build_mode BUILD_MODE)