Update numpy 1.26.4 patch

Author: msimacek

graalpython/lib-graalpython/patches/numpy/numpy-1.26.4.patch

@@ -1,15 +1,5 @@
 diff --git a/numpy/core/include/numpy/ndarrayobject.h b/numpy/core/include/numpy/ndarrayobject.h
 index d4b73eb..af90a68 100644
---- a/vendored-meson/meson/mesonbuild/utils/universal.py
-+++ b/vendored-meson/meson/mesonbuild/utils/universal.py
-@@ -727,6 +727,7 @@ def windows_detect_native_arch() -> str:
-     """
-     if sys.platform != 'win32':
-         return ''
-+    return 'amd64'  # Workaround for GraalPy bug on Windows with kernel32.GetCurrentProcess()
-     try:
-         import ctypes
-         process_arch = ctypes.c_ushort()
 --- a/numpy/core/include/numpy/ndarrayobject.h
 +++ b/numpy/core/include/numpy/ndarrayobject.h
 @@ -225,7 +225,7 @@ NPY_TITLE_KEY_check(PyObject *key, PyObject *value)
@@ -71,46 +61,46 @@ index 2890406..353a657 100644
  #include <feature_detection_misc.h>
 
 diff --git a/numpy/core/src/npymath/ieee754.c.src b/numpy/core/src/npymath/ieee754.c.src
-index 8fccc9a..e7f79e1 100644
+index 8fccc9a..3bb9cf0 100644
 --- a/numpy/core/src/npymath/ieee754.c.src
 +++ b/numpy/core/src/npymath/ieee754.c.src
-@@ -362,6 +362,17 @@ int npy_get_floatstatus_barrier(char* param)
+@@ -362,6 +362,11 @@ int npy_get_floatstatus_barrier(char* param)
       * By using a volatile, the compiler cannot reorder this call
       */
      if (param != NULL) {
 +        // GraalPy change: the pointer needs to be dereferenced to establish
 +        // a data dependency to to ensure the compiler won't reorder the call
-+#define HANDLE_BASE 0x8000000000000000ULL
-+#define points_to_py_handle_space(PTR) ((((uintptr_t) (PTR)) & HANDLE_BASE) != 0)
-+#define pointer_to_stub(PTR) ((PyObject *)(((uintptr_t) (PTR)) & ~HANDLE_BASE))
 +        if (points_to_py_handle_space(param)) {
-+            param = pointer_to_stub(param);
++            param = (char*)pointer_to_stub(param);
 +        }
-+#undef points_to_py_handle_space
-+#undef pointer_to_stub
-+#undef HANDLE_BASE
          volatile char NPY_UNUSED(c) = *(char*)param;
      }
 
 diff --git a/numpy/core/src/npymath/ieee754.cpp b/numpy/core/src/npymath/ieee754.cpp
-index 1c59bf3..131985e 100644
+index 1c59bf3..519fabc 100644
 --- a/numpy/core/src/npymath/ieee754.cpp
 +++ b/numpy/core/src/npymath/ieee754.cpp
-@@ -428,6 +428,17 @@ npy_get_floatstatus_barrier(char *param)
+@@ -428,6 +428,11 @@ npy_get_floatstatus_barrier(char *param)
       * By using a volatile, the compiler cannot reorder this call
       */
      if (param != NULL) {
 +        // GraalPy change: the pointer needs to be dereferenced to establish
 +        // a data dependency to to ensure the compiler won't reorder the call
-+#define HANDLE_BASE 0x8000000000000000ULL
-+#define points_to_py_handle_space(PTR) ((((uintptr_t) (PTR)) & HANDLE_BASE) != 0)
-+#define pointer_to_stub(PTR) ((PyObject *)(((uintptr_t) (PTR)) & ~HANDLE_BASE))
 +        if (points_to_py_handle_space(param)) {
-+            param = pointer_to_stub(param);
++            param = (char*)pointer_to_stub(param);
 +        }
-+#undef points_to_py_handle_space
-+#undef pointer_to_stub
-+#undef HANDLE_BASE
          volatile char NPY_UNUSED(c) = *(char *)param;
      }
 
+diff --git a/vendored-meson/meson/mesonbuild/utils/universal.py b/vendored-meson/meson/mesonbuild/utils/universal.py
+index 1694912..a555fe3 100644
+--- a/vendored-meson/meson/mesonbuild/utils/universal.py
++++ b/vendored-meson/meson/mesonbuild/utils/universal.py
+@@ -727,6 +727,7 @@ def windows_detect_native_arch() -> str:
+     """
+     if sys.platform != 'win32':
+         return ''
++    return 'amd64'  # Workaround for GraalPy bug on Windows with kernel32.GetCurrentProcess()
+     try:
+         import ctypes
+         process_arch = ctypes.c_ushort()