diff --git a/build/configs/toolchain_afl_i686.cmake b/build/configs/toolchain_afl_i686.cmake
index 1ca633b87..582a2d1ff 100644
--- a/build/configs/toolchain_afl_i686.cmake
+++ b/build/configs/toolchain_afl_i686.cmake
@@ -15,7 +15,7 @@
 include(CMakeForceCompiler)
 
 set(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_SYSTEM_PROCESSOR x86)
+set(CMAKE_SYSTEM_PROCESSOR i686)
 
 CMAKE_FORCE_C_COMPILER(afl-gcc GNU)
 CMAKE_FORCE_CXX_COMPILER(afl-g++ GNU)
diff --git a/build/configs/toolchain_linux_i686.cmake b/build/configs/toolchain_linux_i686.cmake
index 053bc7771..030c47991 100644
--- a/build/configs/toolchain_linux_i686.cmake
+++ b/build/configs/toolchain_linux_i686.cmake
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 set(CMAKE_SYSTEM_NAME Linux)
-set(CMAKE_SYSTEM_PROCESSOR x86)
+set(CMAKE_SYSTEM_PROCESSOR i686)
 
 find_program(CMAKE_C_COMPILER NAMES i686-linux-gnu-gcc i686-unknown-linux-gnu-gcc)
 find_program(CMAKE_CXX_COMPILER NAMES i686-linux-gnu-g++ i686-unknown-linux-gnu-g++)
diff --git a/jerry-libc/CMakeLists.txt b/jerry-libc/CMakeLists.txt
index adbc746af..bc1720e05 100644
--- a/jerry-libc/CMakeLists.txt
+++ b/jerry-libc/CMakeLists.txt
@@ -107,16 +107,16 @@ set(COMPILE_FLAGS_LIBC "${COMPILE_FLAGS_JERRY} ${C_FLAGS_JERRY}")
   set(DEFINES_LIBC ${DEFINES_LIBC} ${DEFINES_LIBC_ARMV7_HF})
  elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l-el")
   set(DEFINES_LIBC ${DEFINES_LIBC} ${DEFINES_LIBC_ARMV7_EL})
- elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86")
+ elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i686")
   set(DEFINES_LIBC ${DEFINES_LIBC} ${DEFINES_LIBC_X86})
  else()
   message(FATAL_ERROR "Unsupported machine architecture")
  endif()
- 
+
 # Platform-specific configuration
  set(DEFINES_LIBC ${DEFINES_LIBC} ${DEFINES_LIBC_${PLATFORM}})
 
-# Targets declaration 
+# Targets declaration
  add_custom_target (jerry-libc-all)
 
  string(TOLOWER ${PLATFORM_EXT} PLATFORM_L)