Skip to content
Snippets Groups Projects
Commit bd202202 authored by Kitware Robot's avatar Kitware Robot Committed by Brad King
Browse files

KWIML 2020-04-20 (4abfeaa7)

Code extracted from:

    https://gitlab.kitware.com/utils/kwiml.git

at commit 4abfeaa780c5107013f264c0517107b48b43bba4 (master).

Upstream Shortlog
-----------------

Ben Boeckel (1):
      a079afc6 cmake: don't set the minimum version

Hernan Martinez (1):
      4abfeaa7 abi.h: Add pointer size and endianess for Windows on ARM64
parent 6e921648
Branches
No related tags found
No related merge requests found
......@@ -17,7 +17,6 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
endif()
set(KWIML_INCLUDE_PREFIX kwiml)
else()
cmake_minimum_required(VERSION 2.8.2 FATAL_ERROR)
set(kwiml_standalone 0)
if(KWIML_INSTALL_INCLUDE_DIR AND NOT DEFINED KWIML_INCLUDE_PREFIX)
message(FATAL_ERROR "Host project must set KWIML_INCLUDE_PREFIX")
......
......@@ -136,6 +136,8 @@ suppression macro KWIML_ABI_NO_VERIFY was defined.
# define KWIML_ABI_SIZEOF_DATA_PTR 8
# elif defined(__i386) || defined(__i386__)
# define KWIML_ABI_SIZEOF_DATA_PTR 4
# elif defined(_M_ARM64)
# define KWIML_ABI_SIZEOF_DATA_PTR 8
# endif
#endif
#if !defined(KWIML_ABI_SIZEOF_DATA_PTR)
......@@ -461,6 +463,10 @@ suppression macro KWIML_ABI_NO_VERIFY was defined.
# define KWIML_ABI_ENDIAN_ID KWIML_ABI_ENDIAN_ID_BIG
# endif
/* Aarch64 (Windows) */
#elif defined(_M_ARM64)
# define KWIML_ABI_ENDIAN_ID KWIML_ABI_ENDIAN_ID_LITTLE
/* Xtensa */
#elif defined(__XTENSA_EB__)
# define KWIML_ABI_ENDIAN_ID KWIML_ABI_ENDIAN_ID_BIG
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment