Accepting request 1313084 from devel:languages:haxe

- Relax the mbedtls dependency since upstream supports building with version 3 boo#1252435

OBS-URL: https://build.opensuse.org/request/show/1313084
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hashlink?expand=0&rev=11

0001-Disable-the-JIT-tests-on-arm-architectures.patch

@@ -1,127 +0,0 @@
-From 4cfdad9d9b8344d9f871dba7a0201d54d1565833 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jaime=20Marqui=CC=81nez=20Ferra=CC=81ndiz?=
- <jaime.marquinez.ferrandiz@fastmail.net>
-Date: Fri, 25 Feb 2022 17:42:27 +0100
-Subject: [PATCH] Disable the JIT tests on arm architectures
-Upstream: submitted
-References: gh#HaxeFoundation/hashlink#521
-
----
- CMakeLists.txt | 25 ++++++++++++++++---------
- 1 file changed, 16 insertions(+), 9 deletions(-)
-
-Index: hashlink-1.14/CMakeLists.txt
-===================================================================
---- hashlink-1.14.orig/CMakeLists.txt
-+++ hashlink-1.14/CMakeLists.txt
-@@ -194,41 +194,48 @@ if(BUILD_TESTING)
-         haxe
-     )
- 
--    #####################
--    # hello.hl
--
--    add_custom_command(OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/hello.hl
--        COMMAND ${HAXE_COMPILER}
--            -hl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/hello.hl
--            -cp ${CMAKE_SOURCE_DIR}/other/tests -main HelloWorld
--    )
--    add_custom_target(hello.hl ALL
--        DEPENDS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/hello.hl
--    )
--
--    #####################
--    # threads.hl
--
--    add_custom_command(OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/threads.hl
--        COMMAND ${HAXE_COMPILER}
--            -hl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/threads.hl
--            -cp ${CMAKE_SOURCE_DIR}/other/tests -main Threads
--    )
--    add_custom_target(threads.hl ALL
--        DEPENDS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/threads.hl
--    )
--
--    #####################
--    # uvsample.hl
--
--    add_custom_command(OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/uvsample.hl
--        COMMAND ${HAXE_COMPILER}
--            -hl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/uvsample.hl
--            -cp ${CMAKE_SOURCE_DIR}/other/uvsample -main UVSample
--    )
--    add_custom_target(uvsample.hl ALL
--        DEPENDS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/uvsample.hl
--    )
-+    set(JIT_TEST_ENABLED TRUE)
-+    if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm|aarch64")
-+        set(JIT_TEST_ENABLED FALSE)
-+    endif()
-+
-+    if(JIT_TEST_ENABLED)
-+        #####################
-+        # hello.hl
-+
-+        add_custom_command(OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/hello.hl
-+            COMMAND ${HAXE_COMPILER}
-+                -hl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/hello.hl
-+                -cp ${CMAKE_SOURCE_DIR}/other/tests -main HelloWorld
-+        )
-+        add_custom_target(hello.hl ALL
-+            DEPENDS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/hello.hl
-+        )
-+
-+        #####################
-+        # threads.hl
-+
-+        add_custom_command(OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/threads.hl
-+            COMMAND ${HAXE_COMPILER}
-+                -hl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/threads.hl
-+                -cp ${CMAKE_SOURCE_DIR}/other/tests -main Threads
-+        )
-+        add_custom_target(threads.hl ALL
-+            DEPENDS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/threads.hl
-+        )
-+
-+        #####################
-+        # uvsample.hl
-+
-+        add_custom_command(OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/uvsample.hl
-+            COMMAND ${HAXE_COMPILER}
-+                -hl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/uvsample.hl
-+                -cp ${CMAKE_SOURCE_DIR}/other/uvsample -main UVSample
-+        )
-+        add_custom_target(uvsample.hl ALL
-+            DEPENDS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/uvsample.hl
-+        )
-+    ENDIF(JIT_TEST_ENABLED)
- 
-     #####################
-     # hello.c
-@@ -300,15 +307,17 @@ if(BUILD_TESTING)
-     #####################
-     # Tests
- 
--    add_test(NAME hello.hl
--        COMMAND hl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/hello.hl
--    )
--    add_test(NAME threads.hl
--        COMMAND hl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/threads.hl
--    )
--    add_test(NAME uvsample.hl
--        COMMAND hl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/uvsample.hl 6001
--    )
-+    IF(JIT_TEST_ENABLED)
-+        add_test(NAME hello.hl
-+            COMMAND hl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/hello.hl
-+        )
-+        add_test(NAME threads.hl
-+            COMMAND hl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/threads.hl
-+        )
-+        add_test(NAME uvsample.hl
-+            COMMAND hl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/uvsample.hl 6001
-+        )
-+    ENDIF(JIT_TEST_ENABLED)
-     add_test(NAME hello
-         COMMAND hello
-     )

0001-cmake-Don-t-build-the-interpreter-on-ARM.patch

@@ -1,130 +0,0 @@
-From 5f294de79b17e9131f9c5fac583ba6c0273f072c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jaime=20Marqui=CC=81nez=20Ferra=CC=81ndiz?=
- <jaime.marquinez.ferrandiz@fastmail.net>
-Date: Fri, 20 May 2022 18:28:05 +0200
-Subject: [PATCH] cmake: Don't build the interpreter on ARM
-Upstream: submitted
-References: gh#HaxeFoundation/hashlink#521
-
----
- CMakeLists.txt | 51 ++++++++++++++++++++++++++++++--------------------
- 1 file changed, 31 insertions(+), 20 deletions(-)
-
-Index: hashlink-1.14/CMakeLists.txt
-===================================================================
---- hashlink-1.14.orig/CMakeLists.txt
-+++ hashlink-1.14/CMakeLists.txt
-@@ -34,6 +34,11 @@ else()
-     set(CMAKE_C_STANDARD_REQUIRED ON)
- endif()
- 
-+set(INTERPRETER_ENABLED TRUE)
-+if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm|aarch64")
-+    set(INTERPRETER_ENABLED FALSE)
-+endif()
-+
- # put output in "bin"
- 
- set(OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR}/bin)
-@@ -165,24 +170,28 @@ set_target_properties(libhl
-     COMPILE_DEFINITIONS "_USRDLL;LIBHL_EXPORTS;HAVE_CONFIG_H;PCRE2_CODE_UNIT_WIDTH=16"
- )
- 
--add_executable(hl
--    src/code.c
--    src/jit.c
--    src/main.c
--    src/module.c
--    src/debugger.c
--    src/profile.c
--)
-+if(INTERPRETER_ENABLED)
-+    add_executable(hl
-+        src/code.c
-+        src/jit.c
-+        src/main.c
-+        src/module.c
-+        src/debugger.c
-+        src/profile.c
-+    )
- 
--if (UNIX AND NOT APPLE)
--    set_target_properties(hl PROPERTIES INSTALL_RPATH "$ORIGIN;${CMAKE_INSTALL_PREFIX}/lib")
--endif()
-+    if (UNIX AND NOT APPLE)
-+        set_target_properties(hl PROPERTIES INSTALL_RPATH "$ORIGIN;${CMAKE_INSTALL_PREFIX}/lib")
-+    endif()
- 
--target_link_libraries(hl libhl)
-+    target_link_libraries(hl libhl)
-+endif()
- 
- if(WIN32)
-     target_link_libraries(libhl ws2_32 user32)
--    target_link_libraries(hl user32)
-+    if(INTERPRETER_ENABLED)
-+        target_link_libraries(hl user32)
-+    endif()
- else()
-     target_link_libraries(libhl m dl pthread)
- endif()
-@@ -194,12 +203,7 @@ if(BUILD_TESTING)
-         haxe
-     )
- 
--    set(JIT_TEST_ENABLED TRUE)
--    if(CMAKE_SYSTEM_PROCESSOR MATCHES "arm|aarch64")
--        set(JIT_TEST_ENABLED FALSE)
--    endif()
--
--    if(JIT_TEST_ENABLED)
-+    if(INTERPRETER_ENABLED)
-         #####################
-         # hello.hl
- 
-@@ -235,7 +239,7 @@ if(BUILD_TESTING)
-         add_custom_target(uvsample.hl ALL
-             DEPENDS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/uvsample.hl
-         )
--    ENDIF(JIT_TEST_ENABLED)
-+    ENDIF(INTERPRETER_ENABLED)
- 
-     #####################
-     # hello.c
-@@ -307,7 +311,7 @@ if(BUILD_TESTING)
-     #####################
-     # Tests
- 
--    IF(JIT_TEST_ENABLED)
-+    IF(INTERPRETER_ENABLED)
-         add_test(NAME hello.hl
-             COMMAND hl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/hello.hl
-         )
-@@ -317,7 +321,7 @@ if(BUILD_TESTING)
-         add_test(NAME uvsample.hl
-             COMMAND hl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/uvsample.hl 6001
-         )
--    ENDIF(JIT_TEST_ENABLED)
-+    ENDIF(INTERPRETER_ENABLED)
-     add_test(NAME hello
-         COMMAND hello
-     )
-@@ -360,10 +364,15 @@ set(HDLL_DESTINATION
-     ${CMAKE_INSTALL_LIBDIR}
- )
- 
-+
-+if(INTERPRETER_ENABLED)
-+    set(INSTALL_TARGETS hl libhl)
-+else()
-+    set(INSTALL_TARGETS libhl)
-+endif()
-+
- install(
--    TARGETS
--        hl
--        libhl
-+    TARGETS ${INSTALL_TARGETS}
-     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
-     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}

0001-cmake-Don-t-run-the-version-test-if-the-interpreter-.patch

@@ -1,45 +0,0 @@
-From 0bcdfac6782485dd8b3ba218e9f5b0e3b1bfe58f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jaime=20Marqui=CC=81nez=20Ferra=CC=81ndiz?=
- <jaime.marquinez.ferrandiz@fastmail.net>
-Date: Sat, 21 May 2022 13:55:11 +0200
-Subject: [PATCH] cmake: Don't run the version test if the interpreter is not
- enabled
-Upstream: submitted
-References: gh#HaxeFoundation/hashlink#521
-
----
- CMakeLists.txt | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-Index: hashlink-1.14/CMakeLists.txt
-===================================================================
---- hashlink-1.14.orig/CMakeLists.txt
-+++ hashlink-1.14/CMakeLists.txt
-@@ -321,6 +321,13 @@ if(BUILD_TESTING)
-         add_test(NAME uvsample.hl
-             COMMAND hl ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test/uvsample.hl 6001
-         )
-+        add_test(NAME version
-+            COMMAND hl --version
-+        )
-+        set_tests_properties(version
-+            PROPERTIES
-+            PASS_REGULAR_EXPRESSION "${HL_VERSION}"
-+        )
-     ENDIF(INTERPRETER_ENABLED)
-     add_test(NAME hello
-         COMMAND hello
-@@ -331,13 +338,6 @@ if(BUILD_TESTING)
-     add_test(NAME uvsample
-         COMMAND uvsample 6002
-     )
--    add_test(NAME version
--        COMMAND hl --version
--    )
--    set_tests_properties(version
--        PROPERTIES
--        PASS_REGULAR_EXPRESSION "${HL_VERSION}"
--    )
- 
- endif()
- 

0001-cmake-Install-hlc_main.c-with-hl.h-and-hlc.h.patch

@@ -1,31 +0,0 @@
-From fe71a9ed1691901a22973386c2f0d7c1513f1433 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jaime=20Marqui=CC=81nez=20Ferra=CC=81ndiz?=
- <jaime.marquinez.ferrandiz@fastmail.net>
-Date: Sat, 19 Feb 2022 21:00:13 +0100
-Subject: [PATCH] cmake: Install hlc_main.c with hl.h and hlc.h
-Upstream: submitted
-References: gh#HaxeFoundation/hashlink#517
-
-This matches the behaviour of the Makefile
----
- CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 01c0014..d66d26a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -327,6 +327,10 @@ install(
-     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-     PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
- )
-+install(
-+    FILES src/hlc_main.c
-+    TYPE INCLUDE
-+)
- 
- # uninstall target
- # https://gitlab.kitware.com/cmake/community/wikis/FAQ#can-i-do-make-uninstall-with-cmake
--- 
-2.35.1
-

0001-fix-rpath.patch

@@ -1,8 +1,8 @@
-Index: hashlink-1.14/CMakeLists.txt
+Index: hashlink-1.15/CMakeLists.txt
 ===================================================================
---- hashlink-1.14.orig/CMakeLists.txt
-+++ hashlink-1.14/CMakeLists.txt
-@@ -181,7 +181,7 @@ if(INTERPRETER_ENABLED)
+--- hashlink-1.15.orig/CMakeLists.txt
++++ hashlink-1.15/CMakeLists.txt
+@@ -188,7 +188,7 @@ if (WITH_VM)
      )
  
      if (UNIX AND NOT APPLE)

fix_incompatible-pointer-types.patch

@@ -1,58 +0,0 @@
-From 1a820f5eacd76a03dada036e94a5457d08aaf501 Mon Sep 17 00:00:00 2001
-From: Apprentice-Alchemist
- <53486764+Apprentice-Alchemist@users.noreply.github.com>
-Date: Tue, 21 May 2024 22:27:45 +0200
-Subject: [PATCH] [mysql] Fix compilation.
-References: gh#HaxeFoundation/hashlink#686
-
----
- libs/mysql/my_api.c  | 1 +
- libs/mysql/socket.c  | 2 +-
- libs/sqlite/sqlite.c | 2 +-
- 3 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/libs/mysql/my_api.c b/libs/mysql/my_api.c
-index d606438bb..cb70e5519 100644
---- a/libs/mysql/my_api.c
-+++ b/libs/mysql/my_api.c
-@@ -20,6 +20,7 @@
-  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-  * DEALINGS IN THE SOFTWARE.
-  */
-+#define _GNU_SOURCE
- #include <stdlib.h>
- #include <memory.h>
- #include <stdio.h>
-diff --git a/libs/mysql/socket.c b/libs/mysql/socket.c
-index 51ab16579..17daa7ac0 100644
---- a/libs/mysql/socket.c
-+++ b/libs/mysql/socket.c
-@@ -19,6 +19,7 @@
-  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-  * DEALINGS IN THE SOFTWARE.
-  */
-+#define _GNU_SOURCE
- #include "socket.h"
- #include <string.h>
- 
-@@ -29,7 +30,6 @@
- #	define HANDLE_EINTR(x)
- 
- #else
--#	define _GNU_SOURCE
- #	include <sys/types.h>
- #	include <sys/socket.h>
- #	include <sys/time.h>
-diff --git a/libs/sqlite/sqlite.c b/libs/sqlite/sqlite.c
-index 587465819..c40f96b4b 100644
---- a/libs/sqlite/sqlite.c
-+++ b/libs/sqlite/sqlite.c
-@@ -117,7 +117,7 @@ HL_PRIM sqlite_result *HL_NAME(request)(sqlite_database *db, vbyte *sql ) {
- 	r->finalize = HL_NAME(finalize_result);
- 	r->db = NULL;
- 
--	if( sqlite3_prepare16_v2(db->db, sql, -1, &r->r, &tl) != SQLITE_OK ) {
-+	if( sqlite3_prepare16_v2(db->db, sql, -1, &r->r, (const void**)&tl) != SQLITE_OK ) {
- 		HL_NAME(error)(db->db, false);
- 	}
- 

hashlink-1.14.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7def473c8fa620011c7359dc36524246c83d0b6a25d495d421750ecb7182cc99
-size 4620084

hashlink-1.15.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3c3e3d47ed05139163310cbe49200de8fb220cd343a979cd1f39afd91e176973
+size 5694738

hashlink.changes

@@ -1,3 +1,38 @@
+-------------------------------------------------------------------
+Wed Oct 22 21:55:28 UTC 2025 - Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@fastmail.net>
+
+- Relax the mbedtls dependency since upstream supports building with version 3 boo#1252435
+
+-------------------------------------------------------------------
+Fri Mar 28 16:07:46 UTC 2025 - Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@fastmail.net>
+
+- Fix build on architectures different to ix86 and x86_64 by disabling the VM
+  and adding implement_hl_debug_break_for_more_architectures.patch
+- Drop fix_arm_compilation.patch
+
+-------------------------------------------------------------------
+Mon Mar 24 21:01:32 UTC 2025 - Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@fastmail.net>
+
+- Update to version 1.15
+  * added more GL functions
+  * added heaps.hdll (contains mikkt, meshtools, convex hull)
+  * added GUID type support (int64 with debugger string representation)
+  * fixes in UI8/F32 handling
+  * GC bug fixes
+  * some other bugfixes and minor improvements
+- Refresh 0001-fix-rpath.patch
+- Add fix_arm_compilation.patch
+- Drop 0001-cmake-Install-hlc_main.c-with-hl.h-and-hlc.h.patch,
+  0001-Disable-the-JIT-tests-on-arm-architectures.patch,
+  0001-cmake-Don-t-build-the-interpreter-on-ARM.patch,
+  0001-cmake-Don-t-run-the-version-test-if-the-interpreter-.patch,
+  fix_incompatible-pointer-types.patch
+
+-------------------------------------------------------------------
+Fri Mar 14 15:26:21 UTC 2025 - Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@fastmail.net>
+
+- Add depenedncy on pkgconfig(glu)
+
 -------------------------------------------------------------------
 Tue Sep  3 18:08:48 UTC 2024 - Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@fastmail.net>
 

hashlink.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package hashlink
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,29 +16,25 @@
 #
 
 
+%ifarch %{ix86} %{x86_64}
+%define with_vm 1
+%endif
 Name:           hashlink
-Version:        1.14
+Version:        1.15
 Release:        0
 Summary:        A virtual machine for Haxe
 License:        MIT
 URL:            https://hashlink.haxe.org/
 Source0:        https://github.com/HaxeFoundation/%{name}/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM
-Patch01:        0001-cmake-Install-hlc_main.c-with-hl.h-and-hlc.h.patch
-# PATCH-FIX-UPSTREAM
-Patch02:        0001-Disable-the-JIT-tests-on-arm-architectures.patch
-# PATCH-FIX-UPSTREAM
-Patch03:        0001-cmake-Don-t-build-the-interpreter-on-ARM.patch
-# PATCH-FIX-UPSTREAM
-Patch04:        0001-cmake-Don-t-run-the-version-test-if-the-interpreter-.patch
 # PATCH-FIX-OPENSUSE
-Patch05:        0001-fix-rpath.patch
-# PATCH-FIX-UPSTREAM https://github.com/HaxeFoundation/hashlink/pull/686
-Patch06:        fix_incompatible-pointer-types.patch
+Patch0:         0001-fix-rpath.patch
+# PATCH-FIX-UPSTREAM https://github.com/HaxeFoundation/hashlink/pull/765
+Patch1:         implement_hl_debug_break_for_more_architectures.patch
 BuildRequires:  cmake
 BuildRequires:  haxe >= 4.0
-BuildRequires:  mbedtls-devel < 3
+BuildRequires:  mbedtls-devel
 BuildRequires:  cmake(sdl2)
+BuildRequires:  pkgconfig(glu)
 BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(libturbojpeg)
 BuildRequires:  pkgconfig(libuv)
@@ -84,7 +80,7 @@ code generated by the haxe compiler.
 # The build process for the tests uses haxe and requires the hashlink library
 haxelib setup ./haxelib
 haxelib dev hashlink other/haxelib
-%cmake
+%cmake -DWITH_VM=%{?with_vm:ON}%{!?with_vm:OFF}
 %cmake_build
 
 %install
@@ -98,7 +94,7 @@ haxelib dev hashlink other/haxelib
 %postun -n libhl1 -p /sbin/ldconfig
 
 %files
-%ifnarch %{arm} %{arm64}
+%if %{defined with_vm}
 %{_bindir}/hl
 %endif
 %license LICENSE

implement_hl_debug_break_for_more_architectures.patch

@@ -0,0 +1,86 @@
+From 737a6629cada6960e2c8c7e73d75117b9baf5726 Mon Sep 17 00:00:00 2001
+From: Apprentice-Alchemist
+ <53486764+Apprentice-Alchemist@users.noreply.github.com>
+Date: Wed, 26 Mar 2025 12:09:51 +0100
+Subject: [PATCH] Implement hl_debug_break for more architectures.
+
+Unify Linux/macOS implementations and enable hl_debug_break for all non-console platforms.
+
+Remove usage of .pushsection embed-breakpoint because it doesn't actually do anything.
+---
+ src/hl.h | 49 +++++++++++++++++++++++++++++++++----------------
+ 1 file changed, 33 insertions(+), 16 deletions(-)
+
+diff --git a/src/hl.h b/src/hl.h
+index 3f57a027b..30635013a 100644
+--- a/src/hl.h
++++ b/src/hl.h
+@@ -283,28 +283,40 @@ C_FUNCTION_END
+ C_FUNCTION_BEGIN
+ HL_API void hl_debug_break( void );
+ C_FUNCTION_END
+-#elif defined(HL_LINUX)
+-#	ifdef HL_64
++#elif !defined(HL_CONSOLE)
++
++// use __builtin_debugtrap when available
++// fall back to breakpoint instructions for certain architectures
++// else raise SIGTRAP
++#	ifdef __has_builtin
++#	if __has_builtin(__builtin_debugtrap)
++#	define USE_BUILTIN_DEBUG_TRAP 1
++#	endif
++#	endif
++
++#	ifdef USE_BUILTIN_DEBUG_TRAP
+ #	define hl_debug_break() \
+ 		if( hl_detect_debugger() ) \
+-			__asm__("0: int3;" \
+-			    ".pushsection embed-breakpoints;" \
+-			    ".quad 0b;" \
+-			    ".popsection")
+-#	else
++			__builtin_debugtrap()
++#	elif defined(__x86_64__) || defined(__i386__)
+ #	define hl_debug_break() \
+ 		if( hl_detect_debugger() ) \
+-			__asm__("0: int3;" \
+-			    ".pushsection embed-breakpoints;" \
+-			    ".long 0b;" \
+-			    ".popsection")
+-#	endif
+-#elif defined(HL_MAC)
+-#include <signal.h>
+-#include <mach/mach.h>
++			__asm__("int3;")
++#	elif defined(__aarch64__)
++#	define hl_debug_break() \
++		if( hl_detect_debugger() ) \
++			__asm__("brk #0xf000;")
++#	elif defined(__riscv)
+ #	define hl_debug_break() \
+ 		if( hl_detect_debugger() ) \
+-			raise(SIGTRAP);//__builtin_trap();
++			__asm__("ebreak;")
++#	else
++#	include <signal.h>
++#	define hl_debug_break() \
++		if( hl_detect_debugger() ) \
++			raise(SIGTRAP)
++#	endif
++#undef USE_BUILTIN_DEBUG_TRAP
+ #else
+ #	define hl_debug_break()
+ #endif
+@@ -913,6 +925,11 @@ struct _hl_trap_ctx {
+ 
+ #define HL_MAX_EXTRA_STACK 64
+ 
++#ifdef HL_MAC
++#include <mach/mach.h>
++#include <signal.h>
++#endif
++
+ typedef struct {
+ 	int thread_id;
+ 	// gc vars