81a82934e7
Refresh patches for new version. Remove patch that is no longer needed. Add patch to avoid error for invalid conversion of pointer types. Avoid issue with circular dependency between OpenCASCADE and VTK. The Tk and Tcl packages don't install static libraries.
45 lines
2.0 KiB
Diff
45 lines
2.0 KiB
Diff
From c1e0fcab5f19ca26e2f7fa72644f437cd86fdcf8 Mon Sep 17 00:00:00 2001
|
|
From: Hernan Martinez <hernan.c.martinez@gmail.com>
|
|
Date: Tue, 21 Feb 2023 15:22:29 -0700
|
|
Subject: [PATCH] aarch64 mm_alloc
|
|
Support aarch64 builds
|
|
|
|
---
|
|
src/Standard/Standard.cxx | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/Standard/Standard.cxx b/src/Standard/Standard.cxx
|
|
index 8467bc3bd1..250d7c0e6a 100644
|
|
--- a/src/Standard/Standard.cxx
|
|
+++ b/src/Standard/Standard.cxx
|
|
@@ -25,7 +25,7 @@
|
|
|
|
#if defined(_MSC_VER) || defined(__ANDROID__) || defined(__QNX__)
|
|
#include <malloc.h>
|
|
-#elif (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)) && (defined(__i386) || defined(__x86_64)))
|
|
+#elif (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)) && (defined(__i386) || defined(__x86_64) || defined(__aarch64__)))
|
|
#include <mm_malloc.h>
|
|
#else
|
|
extern "C" int posix_memalign(void** thePtr, size_t theAlign, size_t theSize);
|
|
@@ -508,7 +508,7 @@ Standard_Address Standard::AllocateAligned(const Standard_Size theSize,
|
|
return _aligned_malloc(theSize, theAlign);
|
|
#elif defined(__ANDROID__) || defined(__QNX__)
|
|
return memalign(theAlign, theSize);
|
|
-#elif (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)) && (defined(__i386) || defined(__x86_64)))
|
|
+#elif (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)) && (defined(__i386) || defined(__x86_64) || defined(__aarch64__)))
|
|
return _mm_malloc(theSize, theAlign);
|
|
#else
|
|
void* aPtr;
|
|
@@ -536,7 +536,7 @@ return je_free(thePtrAligned);
|
|
_aligned_free(thePtrAligned);
|
|
#elif defined(__ANDROID__) || defined(__QNX__)
|
|
free(thePtrAligned);
|
|
-#elif (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)) && (defined(__i386) || defined(__x86_64)))
|
|
+#elif (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 1)) && (defined(__i386) || defined(__x86_64) || defined(__aarch64__)))
|
|
_mm_free(thePtrAligned);
|
|
#else
|
|
free(thePtrAligned);
|
|
--
|
|
2.44.0.windows.1
|
|
|