core/i686-unknown-hyperbolabsd-gcc/gcc-hyperbolabsd.patch

diff --git a/config/target-posix b/config/target-posix
index 2fba066..e87a5a9 100644
--- a/config/target-posix
+++ b/config/target-posix
@@ -1,7 +1,7 @@
 case "${target}" in
   *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu)
       ;;
-  *-*-netbsd* | *-*-freebsd* | *-*-openbsd* | *-*-dragonfly*)
+  *-*-netbsd* | *-*-freebsd* | *-*-openbsd* | *-*-dragonfly* | *-*-hyperbolabsd*)
       ;;
   *-*-solaris2* | *-*-hpux11*)
       ;;
diff --git a/config/tcl.m4 b/config/tcl.m4
index 4542a4b..9585b4a 100644
--- a/config/tcl.m4
+++ b/config/tcl.m4
@@ -1489,6 +1489,28 @@ dnl AC_CHECK_TOOL(AR, ar)
 
 	    # FreeBSD doesn't handle version numbers with dots.
 
+	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
+	    TCL_LIB_VERSIONS_OK=nodots
+	    ;;
+	HyperbolaBSD-*)
+	    # POWER[64] needs -fPIC, -fpic will not do.
+	    case `machine` in
+	    arm64|power|power64)
+		SHLIB_CFLAGS="-fPIC";;
+	    *)
+		SHLIB_CFLAGS="-fpic";;
+	    esac
+	    SHLIB_LD="ld -Bshareable -x"
+	    SHLIB_LD_LIBS='${LIBS}'
+	    SHLIB_SUFFIX=".so"
+	    DL_OBJS="tclLoadDl.o"
+	    DL_LIBS=""
+	    LDFLAGS="$LDFLAGS -export-dynamic"
+	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
+	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
+	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
+
+	    # HyperbolaBSD doesn't handle version numbers with dots.
 	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.a'
 	    TCL_LIB_VERSIONS_OK=nodots
 	    ;;
@@ -2097,7 +2119,7 @@ dnl # preprocessing tests use only CPPFLAGS.
 		    ;;
 		IRIX*)
 		    ;;
-		NetBSD-*|FreeBSD-*|OpenBSD-*)
+		NetBSD-*|FreeBSD-*|OpenBSD-*|HyperbolaBSD-*)
 		    ;;
 		Darwin-*)
 		    ;;
diff --git a/config.guess b/config.guess
index 588fe82..c50b78f 100755
--- a/config.guess
+++ b/config.guess
@@ -1,6 +1,9 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
+#
+# Modifications to support HyperbolaBSD:
+# Copyright (C) 2020-2024 Hyperbola Project
 
 timestamp='2018-01-01'
 
@@ -240,6 +243,95 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
 	exit ;;
+    *:HyperbolaBSD:*:*)
+	sysctl_ma="sysctl -n hw.machine"
+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl_ma 2>/dev/null || \
+	    /usr/sbin/$sysctl_ma 2>/dev/null || echo unknown)`
+	sysctl_mo="sysctl -n hw.model"
+	UNAME_MODEL_ARCH=`(/sbin/$sysctl_mo 2>/dev/null || \
+	    /usr/sbin/$sysctl_mo 2>/dev/null || echo unknown)`
+	format=
+	case "${UNAME_MACHINE_ARCH}" in
+	    amd64) machine=x86_64 ;;
+	    arm64)
+		eval $set_cc_for_build
+		if echo BIG_ENDIAN | $CC_FOR_BUILD -E - 2>/dev/null \
+		    | grep -q BIG_ENDIAN
+		then
+		    machine=aarch64_be
+		else
+		    machine=aarch64
+		fi
+		;;
+	    armv7)
+		eval $set_cc_for_build
+		if echo BIG_ENDIAN | $CC_FOR_BUILD -E - 2>/dev/null \
+		    | grep -q BIG_ENDIAN
+		then
+		    machine=armv7b
+		else
+		    machine=armv7l
+		fi
+		if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+		    | grep -q __ARM_EABI__
+		then
+		    format=
+		else
+		    format=eabihf
+		fi
+		;;
+	    i386|ia32|x86_32)
+		case "${UNAME_MODEL_ARCH}" in
+		    *'686'*|*'Pentium Pro'*|*'Pentium ||'*|*'Pentium 2'*| \
+		    *'Pentium 3'*|*'Pentium 4'*|*'Pentium M'*| \
+		    *'Pentium D'*|*'Core'*|*'Xeon'*|*'Tolapai'*| \
+		    *'Celeron'*|*'Atom'*|*'Stealey'*|*'A100'*|*'A110'*| \
+		    *'6x86'*|*'K6'*|*'Athlon'*|*'Duron'*| \
+		    *'Cyrix M'*|*'MediaGX'*|*'Jedi'*|*'Gobi'*|*'Jalapeno'*| \
+		    *'VIA'*|*'C3'*|*'C7'*|*'Eden'*)
+			machine=i686 ;;
+		    *'586'*|*'Pentium'*|*'Quark'*| \
+		    *'5x86'*|*'K5'*|*'Geode'*|*'SC5'*)
+			machine=i586 ;;
+		    *'486'*|*'DX4'*|*'OverDrive'*|*'SC4'*)
+			machine=i486 ;;
+		    *) machine=i386 ;;
+		esac
+		;;
+	    power)
+		eval $set_cc_for_build
+		if echo LITTLE_ENDIAN | $CC_FOR_BUILD -E - 2>/dev/null \
+		    | grep -q LITTLE_ENDIAN
+		then
+		    machine=powerpc
+		else
+		    machine=powerpcle
+		fi
+		;;
+	    power64)
+		eval $set_cc_for_build
+		if echo LITTLE_ENDIAN | $CC_FOR_BUILD -E - 2>/dev/null \
+		    | grep -q LITTLE_ENDIAN
+		then
+		    machine=powerpc64
+		else
+		    machine=powerpc64le
+		fi
+		;;
+	    riscv64)
+		eval $set_cc_for_build
+		if echo BIG_ENDIAN | $CC_FOR_BUILD -E - 2>/dev/null \
+		    | grep -q BIG_ENDIAN
+		then
+		    machine=riscv64be
+		else
+		    machine=riscv64
+		fi
+		;;
+	    *) machine=${UNAME_MACHINE_ARCH} ;;
+	esac
+	echo ${machine}-unknown-hyperbolabsd${format}
+	exit ;;
     *:LibertyBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
diff --git a/config.rpath b/config.rpath
index 4dea759..8c5684d 100755
--- a/config.rpath
+++ b/config.rpath
@@ -6,6 +6,9 @@
 #   Taken from GNU libtool, 2001
 #   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
+#   Modifications to support HyperbolaBSD:
+#   Copyright (C) 2020-2024 Hyperbola Project
+#
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
 #   the Free Software Foundation; either version 2 of the License, or
@@ -159,7 +162,7 @@ if test "$with_gnu_ld" = yes; then
         ld_shlibs=no
       fi
       ;;
-    netbsd*)
+    netbsd* | hyperbolabsd*)
       ;;
     solaris* | sysv5*)
       if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
@@ -358,6 +361,10 @@ else
         esac
       fi
       ;;
+    hyperbolabsd*)
+      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      hardcode_direct=yes
+      ;;
     os2*)
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_minus_L=yes
@@ -489,6 +496,8 @@ case "$host_os" in
     ;;
   openbsd*)
     ;;
+  hyperbolabsd*)
+    ;;
   os2*)
     libname_spec='$name'
     shrext=.dll
diff --git a/config.sub b/config.sub
index f2632cd..0d91b14 100755
--- a/config.sub
+++ b/config.sub
@@ -1,6 +1,9 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright 1992-2018 Free Software Foundation, Inc.
+#
+# Modifications to support HyperbolaBSD:
+# Copyright (C) 2020-2024 Hyperbola Project
 
 timestamp='2018-01-01'
 
@@ -1399,7 +1402,7 @@ case $os in
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
+	      | -bitrig* | -openbsd* | -hyperbolabsd* | -solidbsd* | -libertybsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
diff --git a/configure b/configure
index 0601395..c0863d4 100755
--- a/configure
+++ b/configure
@@ -6,6 +6,9 @@
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
 # Foundation, Inc.
 #
+# Modifications to support HyperbolaBSD:
+# Copyright (C) 2020-2024 Hyperbola Project
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## -------------------- ##
@@ -2959,7 +2962,7 @@ case "${ENABLE_GOLD}" in
     case "${target}" in
       *-*-elf* | *-*-sysv4* | *-*-unixware* | *-*-eabi* | hppa*64*-*-hpux* \
       | *-*-linux* | *-*-gnu* | frv-*-uclinux* | *-*-irix5* | *-*-irix6* \
-      | *-*-netbsd* | *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* \
+      | *-*-netbsd* | *-*-openbsd* |  *-*-hyperbolabsd* | *-*-freebsd* | *-*-dragonfly* \
       | *-*-solaris2* | *-*-nto* | *-*-nacl*)
         case "${target}" in
           *-*-linux*aout* | *-*-linux*oldld*)
@@ -3154,7 +3157,7 @@ if test x$enable_libgomp = x ; then
     case "${target}" in
     *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu)
 	;;
-    *-*-netbsd* | *-*-freebsd* | *-*-openbsd* | *-*-dragonfly*)
+    *-*-netbsd* | *-*-freebsd* | *-*-openbsd* | *-*-dragonfly* | *-*-hyperbolabsd*)
 	;;
     *-*-solaris2* | *-*-hpux11*)
 	;;
@@ -3568,6 +3571,9 @@ case "${target}" in
   *-*-netbsd*)
     noconfigdirs="$noconfigdirs target-newlib target-libgloss"
     ;;
+  *-*-hyperbolabsd*)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
   *-*-netware*)
     noconfigdirs="$noconfigdirs target-newlib target-libgloss"
     ;;
diff --git a/configure.ac b/configure.ac
index c343333..b952544 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,6 +2,9 @@
 #   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012,
 #   2014, 2015, 2016 Free Software Foundation, Inc.
 #
+#   Modifications to support HyperbolaBSD:
+#   Copyright (C) 2020-2024 Hyperbola Project
+#
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
@@ -330,7 +333,7 @@ case "${ENABLE_GOLD}" in
     case "${target}" in
       *-*-elf* | *-*-sysv4* | *-*-unixware* | *-*-eabi* | hppa*64*-*-hpux* \
       | *-*-linux* | *-*-gnu* | frv-*-uclinux* | *-*-irix5* | *-*-irix6* \
-      | *-*-netbsd* | *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* \
+      | *-*-netbsd* | *-*-openbsd* | *-*-hyperbolabsd* | *-*-freebsd* | *-*-dragonfly* \
       | *-*-solaris2* | *-*-nto* | *-*-nacl*)
         case "${target}" in
           *-*-linux*aout* | *-*-linux*oldld*)
@@ -506,7 +509,7 @@ if test x$enable_libgomp = x ; then
     case "${target}" in
     *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu)
 	;;
-    *-*-netbsd* | *-*-freebsd* | *-*-openbsd* | *-*-dragonfly*)
+    *-*-netbsd* | *-*-freebsd* | *-*-openbsd* | *-*-dragonfly* | *-*-hyperbolabsd*)
 	;;
     *-*-solaris2* | *-*-hpux11*)
 	;;
@@ -899,6 +902,9 @@ case "${target}" in
   *-*-netbsd*)
     noconfigdirs="$noconfigdirs target-newlib target-libgloss"
     ;;
+  *-*-hyperbolabsd*)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
   *-*-netware*)
     noconfigdirs="$noconfigdirs target-newlib target-libgloss"
     ;;
diff --git a/contrib/config-list.mk b/contrib/config-list.mk
index fee08b0..27ed619 100644
--- a/contrib/config-list.mk
+++ b/contrib/config-list.mk
@@ -30,12 +30,14 @@ GCC_SRC_DIR=../../gcc
 #
 
 # v850e1-elf is rejected by config.sub
-LIST = aarch64-elf aarch64-linux-gnu aarch64-rtems \
+LIST = aarch64-elf aarch64-linux-gnu aarch64-hyperbolabsd aarch64-rtems \
   alpha-linux-gnu alpha-freebsd6 alpha-netbsd alpha-openbsd \
   alpha64-dec-vms alpha-dec-vms \
   arc-elf32OPT-with-cpu=arc600 arc-elf32OPT-with-cpu=arc700 \
   arc-linux-uclibcOPT-with-cpu=arc700 arceb-linux-uclibcOPT-with-cpu=arc700 \
   arm-wrs-vxworks arm-netbsdelf \
+  armv7b-hyperbolabsdeabi armv7b-hyperbolabsdeabihf \
+  armv7l-hyperbolabsdeabi armv7l-hyperbolabsdeabihf \
   arm-linux-androideabi arm-uclinux_eabi arm-eabi arm-rtems \
   arm-symbianelf avr-elf \
   bfin-elf bfin-uclinux bfin-linux-uclibc bfin-rtems bfin-openbsd \
@@ -48,7 +50,7 @@ LIST = aarch64-elf aarch64-linux-gnu aarch64-rtems \
   i686-pc-linux-gnu i686-apple-darwin i686-apple-darwin9 i686-apple-darwin10 \
   i486-freebsd4 i686-freebsd6 i686-kfreebsd-gnu \
   i686-netbsdelf9 \
-  i686-openbsd i686-elf i686-kopensolaris-gnu i686-symbolics-gnu \
+  i686-openbsd i686-hyperbolabsd i686-elf i686-kopensolaris-gnu i686-symbolics-gnu \
   i686-pc-msdosdjgpp i686-lynxos i686-nto-qnx \
   i686-rtems i686-solaris2.10 i686-wrs-vxworks \
   i686-wrs-vxworksae \
@@ -72,6 +74,7 @@ LIST = aarch64-elf aarch64-linux-gnu aarch64-rtems \
   pdp11-aout \
   powerpc-darwin8 \
   powerpc-darwin7 powerpc64-darwin powerpc-freebsd6 powerpc-netbsd \
+  powerpc-hyperbolabsd powerpc64-hyperbolabsd \
   powerpc-eabispe powerpc-eabisimaltivec powerpc-eabisim ppc-elf \
   powerpc-eabialtivec powerpc-xilinx-eabi powerpc-eabi \
   powerpc-rtems powerpc-linux_spe \
@@ -79,7 +82,9 @@ LIST = aarch64-elf aarch64-linux-gnu aarch64-rtems \
   powerpc-wrs-vxworks powerpc-wrs-vxworksae powerpc-wrs-vxworksmils \
   powerpc-lynxos powerpcle-elf \
   powerpcle-eabisim powerpcle-eabi \
+  powerpcle-hyperbolabsd powerpc64le-hyperbolabsd \
   riscv32-unknown-linux-gnu riscv64-unknown-linux-gnu \
+  riscv32-hyperbolabsd riscv64-hyperbolabsd \
   rs6000-ibm-aix5.3.0 rs6000-ibm-aix6.1 rs6000-ibm-aix7.1 \
   rl78-elf rx-elf s390-linux-gnu s390x-linux-gnu s390x-ibm-tpf sh-elf \
   shle-linux sh-netbsdelf sh-superh-elf \
@@ -94,7 +99,7 @@ LIST = aarch64-elf aarch64-linux-gnu aarch64-rtems \
   vax-netbsdelf vax-openbsd visium-elf x86_64-apple-darwin \
   x86_64-pc-linux-gnuOPT-with-fpmath=avx \
   x86_64-elfOPT-with-fpmath=sse x86_64-freebsd6 x86_64-netbsd \
-  x86_64-w64-mingw32 \
+  x86_64-hyperbolabsd x86_64-w64-mingw32 \
   x86_64-mingw32OPT-enable-sjlj-exceptions=yes x86_64-rtems \
   xstormy16-elf xtensa-elf \
   xtensa-linux
diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
index 9578c99..d60286b 100644
--- a/fixincludes/fixincl.x
+++ b/fixincludes/fixincl.x
@@ -23,6 +23,9 @@
  *                         2006, 2007, 2008
  *  The Free Software Foundation, Inc.
  *
+ *  Modifications to support HyperbolaBSD:
+ *  Copyright (C) 2020-2024 Hyperbola Project
+ *
  *  inclhack is free software: you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License as published by the
  *  Free Software Foundation, either version 3 of the License, or
@@ -6744,6 +6747,60 @@ static const char* apzOpenbsd_Null_DefinitionPatch[] = {
 ^#endif",
     (char*)NULL };
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Hyperbolabsd_Null_Definition fix
+ */
+tSCC zHyperbolabsd_Null_DefinitionName[] =
+     "hyperbolabsd_null_definition";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zHyperbolabsd_Null_DefinitionList[] =
+  "locale.h\0stddef.h\0stdio.h\0string.h\0time.h\0unistd.h\0wchar.h\0sys/param.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzHyperbolabsd_Null_DefinitionMachs[] = {
+        "*-*-hyperbolabsd*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zHyperbolabsd_Null_DefinitionSelect0[] =
+       "__GNUG__";
+
+#define    HYPERBOLABSD_NULL_DEFINITION_TEST_CT  1
+static tTestDesc aHyperbolabsd_Null_DefinitionTests[] = {
+  { TT_EGREP,    zHyperbolabsd_Null_DefinitionSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Hyperbolabsd_Null_Definition
+ */
+static const char* apzHyperbolabsd_Null_DefinitionPatch[] = {
+    "format",
+    "#ifndef NULL\n\
+#ifdef __cplusplus\n\
+#ifdef __GNUG__\n\
+#define NULL\t__null\n\
+#else\t /* ! __GNUG__  */\n\
+#define NULL\t0L\n\
+#endif\t /* __GNUG__  */\n\
+#else\t /* ! __cplusplus  */\n\
+#define NULL\t((void *)0)\n\
+#endif\t /* __cplusplus  */\n\
+#endif\t /* !NULL  */",
+    "^#ifndef[ \t]*NULL\n\
+^#ifdef[ \t]*__GNUG__\n\
+^#define[ \t]*NULL[ \t]*__null\n\
+^#else\n\
+^#define[ \t]*NULL[ \t]*0L\n\
+^#endif\n\
+^#endif",
+    (char*)NULL };
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Obstack_Lvalue_Cast fix
@@ -6816,6 +6873,43 @@ static const char* apzOpenbsd_Va_StartPatch[] = {
     "__builtin_va_start",
     (char*)NULL };
 
+/* * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *  Description of Hyperbolabsd_Va_Start fix
+ */
+tSCC zHyperbolabsd_Va_StartName[] =
+     "hyperbolabsd_va_start";
+
+/*
+ *  File name selection pattern
+ */
+tSCC zHyperbolabsd_Va_StartList[] =
+  "stdarg.h\0";
+/*
+ *  Machine/OS name selection pattern
+ */
+tSCC* apzHyperbolabsd_Va_StartMachs[] = {
+        "*-*-hyperbolabsd*",
+        (const char*)NULL };
+
+/*
+ *  content selection pattern - do fix if pattern found
+ */
+tSCC zHyperbolabsd_Va_StartSelect0[] =
+       "__builtin_stdarg_start";
+
+#define    HYPERBOLABSD_VA_START_TEST_CT  1
+static tTestDesc aHyperbolabsd_Va_StartTests[] = {
+  { TT_EGREP,    zHyperbolabsd_Va_StartSelect0, (regex_t*)NULL }, };
+
+/*
+ *  Fix Command Arguments for Hyperbolabsd_Va_Start
+ */
+static const char* apzHyperbolabsd_Va_StartPatch[] = {
+    "format",
+    "__builtin_va_start",
+    (char*)NULL };
+
 /* * * * * * * * * * * * * * * * * * * * * * * * * *
  *
  *  Description of Osf_Namespace_A fix
@@ -10528,8 +10622,10 @@ typedef enum {
     NEXT_WAIT_UNION_FIXIDX,
     NODEENT_SYNTAX_FIXIDX,
     OPENBSD_NULL_DEFINITION_FIXIDX,
+    HYPERBOLABSD_NULL_DEFINITION_FIXIDX,
     OBSTACK_LVALUE_CAST_FIXIDX,
     OPENBSD_VA_START_FIXIDX,
+    HYPERBOLABSD_VA_START_FIXIDX,
     OSF_NAMESPACE_A_FIXIDX,
     OSF_NAMESPACE_C_FIXIDX,
     PTHREAD_INCOMPLETE_STRUCT_ARGUMENT_FIXIDX,
@@ -11442,6 +11538,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      OPENBSD_NULL_DEFINITION_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aOpenbsd_Null_DefinitionTests,   apzOpenbsd_Null_DefinitionPatch, 0 },
 
+  {  zHyperbolabsd_Null_DefinitionName,    zHyperbolabsd_Null_DefinitionList,
+     apzHyperbolabsd_Null_DefinitionMachs,
+     HYPERBOLABSD_NULL_DEFINITION_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHyperbolabsd_Null_DefinitionTests,   apzHyperbolabsd_Null_DefinitionPatch, 0 },
+
   {  zObstack_Lvalue_CastName,    zObstack_Lvalue_CastList,
      apzObstack_Lvalue_CastMachs,
      OBSTACK_LVALUE_CAST_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
@@ -11452,6 +11553,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
      OPENBSD_VA_START_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
      aOpenbsd_Va_StartTests,   apzOpenbsd_Va_StartPatch, 0 },
 
+  {  zHyperbolabsd_Va_StartName,    zHyperbolabsd_Va_StartList,
+     apzHyperbolabsd_Va_StartMachs,
+     HYPERBOLABSD_VA_START_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+     aHyperbolabsd_Va_StartTests,   apzHyperbolabsd_Va_StartPatch, 0 },
+
   {  zOsf_Namespace_AName,    zOsf_Namespace_AList,
      apzOsf_Namespace_AMachs,
      OSF_NAMESPACE_A_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
index 948ea1d..cd4717a 100644
--- a/fixincludes/inclhack.def
+++ b/fixincludes/inclhack.def
@@ -1008,8 +1008,8 @@ fix = {
 };
 
 /*
- *  Fix return value of sbrk in unistd.h on Alpha OSF/1 V2.0
- *  And OpenBSD.
+ *  Fix return value of sbrk in unistd.h on Alpha OSF/1 V2.0,
+ *  OpenBSD and HyperbolaBSD.
  */
 fix = {
     hackname = alpha_sbrk;
@@ -3394,6 +3394,45 @@ fix = {
 	"#endif\n";
 };
 
+/*
+ * Fix HyperbolaBSD's NULL definition.
+ */
+fix = {
+  hackname  = hyperbolabsd_null_definition;
+  mach      = "*-*-hyperbolabsd*";
+  files     = locale.h, stddef.h, stdio.h, string.h,
+  time.h, unistd.h, wchar.h, sys/param.h;
+  select    = "__GNUG__";
+  c_fix = format;
+  c_fix_arg = "#ifndef NULL\n"
+	      "#ifdef __cplusplus\n"
+	      "#ifdef __GNUG__\n"
+	      "#define NULL\t__null\n"
+	      "#else\t /* ! __GNUG__  */\n"
+	      "#define NULL\t0L\n"
+              "#endif\t /* __GNUG__  */\n"
+	      "#else\t /* ! __cplusplus  */\n"
+	      "#define NULL\t((void *)0)\n"
+              "#endif\t /* __cplusplus  */\n"
+              "#endif\t /* !NULL  */";
+
+  c_fix_arg = "^#ifndef[ \t]*NULL\n"
+	      "^#ifdef[ \t]*__GNUG__\n"
+  	      "^#define[ \t]*NULL[ \t]*__null\n"
+  	      "^#else\n"
+              "^#define[ \t]*NULL[ \t]*0L\n"
+              "^#endif\n"
+              "^#endif";
+  test_text = 
+	"#ifndef NULL\n"
+	"#ifdef  __GNUG__\n"
+	"#define NULL    __null\n"
+	"#else\n"
+	"#define NULL    0L\n"
+	"#endif\n"
+	"#endif\n";
+};
+
 /*
  *  obstack.h used casts as lvalues.
  *
@@ -3432,6 +3471,20 @@ fix = {
   test_text = "#define va_start(v,l)   __builtin_stdarg_start((v),l)";
 };
 
+/* 
+ * Fix HyperbolaBSD's va_start define.
+ */
+fix = {
+  hackname  = hyperbolabsd_va_start;
+  mach      = "*-*-hyperbolabsd*";
+  files     = stdarg.h;
+  select    = '__builtin_stdarg_start';
+  c_fix     = format;
+  c_fix_arg = __builtin_va_start;
+
+  test_text = "#define va_start(v,l)   __builtin_stdarg_start((v),l)";
+};
+
 /*
  *  sys/lc_core.h on some versions of OSF1/4.x pollutes the namespace by
  *  defining regex.h related types.  This causes libg++ build and usage
@@ -4366,7 +4419,7 @@ fix = {
  *  IRIX 4.0.5 <rpc/auth.h> uses struct sockaddr
  *  in prototype without previous definition.
  *
- *  Don't fix OpenBSD, which uses struct sockaddr_in prototyping the same
+ *  Don't fix OpenBSD and HyperbolaBSD, which uses struct sockaddr_in prototyping the same
  *  function, and does define it.
  */
 fix = {
diff --git a/fixincludes/tests/base/locale.h b/fixincludes/tests/base/locale.h
index 7a7273e..a23224b 100644
--- a/fixincludes/tests/base/locale.h
+++ b/fixincludes/tests/base/locale.h
@@ -9,7 +9,7 @@
 
 
 
-#if defined( OPENBSD_NULL_DEFINITION_CHECK )
+#if defined( OPENBSD_NULL_DEFINITION_CHECK ) || defined( HYPERBOLABSD_NULL_DEFINITION_CHECK )
 #ifndef NULL
 #ifdef __cplusplus
 #ifdef __GNUG__
@@ -22,4 +22,4 @@
 #endif	 /* __cplusplus  */
 #endif	 /* !NULL  */
 
-#endif  /* OPENBSD_NULL_DEFINITION_CHECK */
+#endif  /* OPENBSD_NULL_DEFINITION_CHECK || HYPERBOLABSD_NULL_DEFINITION_CHECK */
diff --git a/fixincludes/tests/base/stdarg.h b/fixincludes/tests/base/stdarg.h
index 686d0b3..aabd92e 100644
--- a/fixincludes/tests/base/stdarg.h
+++ b/fixincludes/tests/base/stdarg.h
@@ -9,6 +9,6 @@
 
 
 
-#if defined( OPENBSD_VA_START_CHECK )
+#if defined( OPENBSD_VA_START_CHECK ) || defined( HYPERBOLABSD_VA_START_CHECK )
 #define va_start(v,l)   __builtin_va_start((v),l)
-#endif  /* OPENBSD_VA_START_CHECK */
+#endif  /* OPENBSD_VA_START_CHECK || HYPERBOLABSD_VA_START_CHECK */
diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c
index 4143465..21de10a 100644
--- a/gcc/ada/adaint.c
+++ b/gcc/ada/adaint.c
@@ -8,6 +8,9 @@
  *                                                                          *
  *          Copyright (C) 1992-2018, Free Software Foundation, Inc.         *
  *                                                                          *
+ *                  Modifications to support HyperbolaBSD:                  *
+ *                 Copyright (C) 2020-2024 Hyperbola Project                *
+ *                                                                          *
  * GNAT is free software;  you can  redistribute it  and/or modify it under *
  * terms of the  GNU General Public License as published  by the Free Soft- *
  * ware  Foundation;  either version 3,  or (at your option) any later ver- *
@@ -1014,7 +1017,8 @@ __gnat_open_new_temp (char *path, int fmode)
 
   strcpy (path, "GNAT-XXXXXX");
 
-#if (defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) \
+#if (defined (__FreeBSD__) || defined (__NetBSD__) \
+  || defined (__OpenBSD__) || defined (__HyperbolaBSD__) \
   || defined (__linux__) || defined (__GLIBC__) || defined (__ANDROID__) \
   || defined (__DragonFly__) || defined (__QNX__)) && !defined (__vxworks)
   return mkstemp (path);
@@ -1188,7 +1192,8 @@ __gnat_tmp_name (char *tmp_filename)
   }
 
 #elif defined (__linux__) || defined (__FreeBSD__) || defined (__NetBSD__) \
-  || defined (__OpenBSD__) || defined (__GLIBC__) || defined (__ANDROID__) \
+  || defined (__OpenBSD__) || defined (__HyperbolaBSD__) \
+  || defined (__GLIBC__) || defined (__ANDROID__) \
   || defined (__DragonFly__) || defined (__QNX__)
 #define MAX_SAFE_PATH 1000
   char *tmpdir = getenv ("TMPDIR");
@@ -2349,7 +2354,8 @@ __gnat_number_of_cpus (void)
   int cores = 1;
 
 #if defined (__linux__) || defined (__sun__) || defined (_AIX) \
-  || defined (__APPLE__) || defined (__FreeBSD__) || defined (__OpenBSD__) \
+  || defined (__APPLE__) || defined (__FreeBSD__) \
+  || defined (__OpenBSD__) || defined (__HyperbolaBSD__) \
   || defined (__DragonFly__) || defined (__NetBSD__) || defined (__QNX__)
   cores = (int) sysconf (_SC_NPROCESSORS_ONLN);
 
diff --git a/gcc/ada/cstreams.c b/gcc/ada/cstreams.c
index cdcb531..0ee99b3 100644
--- a/gcc/ada/cstreams.c
+++ b/gcc/ada/cstreams.c
@@ -8,6 +8,9 @@
  *                                                                          *
  *          Copyright (C) 1992-2018, Free Software Foundation, Inc.         *
  *                                                                          *
+ *                  Modifications to support HyperbolaBSD:                  *
+ *                   Copyright (C) 2024 Hyperbola Project                   *
+ *                                                                          *
  * GNAT is free software;  you can  redistribute it  and/or modify it under *
  * terms of the  GNU General Public License as published  by the Free Soft- *
  * ware  Foundation;  either version 3,  or (at your option) any later ver- *
@@ -190,7 +193,8 @@ __gnat_full_name (char *nam, char *buffer)
 	  *p = '\\';
     }
 
-#elif defined (__FreeBSD__) || defined (__DragonFly__) || defined (__OpenBSD__)
+#elif defined (__FreeBSD__) || defined (__DragonFly__) || defined (__OpenBSD__) \
+    || defined (__HyperbolaBSD__)
 
   /* Use realpath function which resolves links and references to . and ..
      on those Unix systems that support it. Note that GNU/Linux provides it but
diff --git a/gcc/ada/env.c b/gcc/ada/env.c
index b6ab097..7e9357c 100644
--- a/gcc/ada/env.c
+++ b/gcc/ada/env.c
@@ -8,6 +8,9 @@
  *                                                                          *
  *            Copyright (C) 2005-2018, Free Software Foundation, Inc.       *
  *                                                                          *
+ *                  Modifications to support HyperbolaBSD:                  *
+ *                 Copyright (C) 2020-2024 Hyperbola Project                *
+ *                                                                          *
  * GNAT is free software;  you can  redistribute it  and/or modify it under *
  * terms of the  GNU General Public License as published  by the Free Soft- *
  * ware  Foundation;  either version 3,  or (at your option) any later ver- *
@@ -301,8 +304,8 @@ void __gnat_clearenv (void)
   }
 #elif defined (__MINGW32__) || defined (__FreeBSD__) || defined (__APPLE__) \
    || (defined (__vxworks) && defined (__RTP__)) || defined (__CYGWIN__) \
-   || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__rtems__) \
-   || defined (__DragonFly__) || defined (__DJGPP__)
+   || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__HyperbolaBSD__) \
+   || defined (__rtems__) || defined (__DragonFly__) || defined (__DJGPP__)
   /* On Windows, FreeBSD and MacOS there is no function to clean all the
      environment but there is a "clean" way to unset a variable. So go
      through the environ table and call __gnat_unsetenv on all entries */
diff --git a/gcc/ada/gsocket.h b/gcc/ada/gsocket.h
index 8b85854..4fcf150 100644
--- a/gcc/ada/gsocket.h
+++ b/gcc/ada/gsocket.h
@@ -8,6 +8,9 @@
  *                                                                          *
  *         Copyright (C) 2004-2018, Free Software Foundation, Inc.          *
  *                                                                          *
+ *                  Modifications to support HyperbolaBSD:                  *
+ *                 Copyright (C) 2020-2024 Hyperbola Project                *
+ *                                                                          *
  * GNAT is free software;  you can  redistribute it  and/or modify it under *
  * terms of the  GNU General Public License as published  by the Free Soft- *
  * ware  Foundation;  either version 3,  or (at your option) any later ver- *
@@ -211,7 +214,8 @@
 
 #if defined (_AIX) || defined (__FreeBSD__) || defined (__hpux__) || \
     defined (_WIN32) || defined (__APPLE__) || defined (__ANDROID__) || \
-    defined (__DragonFly__) || defined (__NetBSD__) || defined (__OpenBSD__)
+    defined (__DragonFly__) || defined (__NetBSD__) || defined (__OpenBSD__) || \
+    defined (__HyperbolaBSD__)
 # define HAVE_THREAD_SAFE_GETxxxBYyyy 1
 
 #elif defined (__linux__) || defined (__GLIBC__) || \
@@ -244,7 +248,8 @@
 #endif
 
 #if defined (__FreeBSD__) || defined (__vxworks) || defined(__rtems__) \
- || defined (__DragonFly__) || defined (__NetBSD__) || defined (__OpenBSD__)
+ || defined (__DragonFly__) || defined (__NetBSD__) || defined (__OpenBSD__) \
+ || defined (__HyperbolaBSD__)
 # define Has_Sockaddr_Len 1
 #else
 # define Has_Sockaddr_Len 0
diff --git a/gcc/ada/init.c b/gcc/ada/init.c
index 5088ecf..7632726 100644
--- a/gcc/ada/init.c
+++ b/gcc/ada/init.c
@@ -8,6 +8,9 @@
  *                                                                          *
  *          Copyright (C) 1992-2018, Free Software Foundation, Inc.         *
  *                                                                          *
+ *                  Modifications to support HyperbolaBSD:                  *
+ *                 Copyright (C) 2020-2024 Hyperbola Project                *
+ *                                                                          *
  * GNAT is free software;  you can  redistribute it  and/or modify it under *
  * terms of the  GNU General Public License as published  by the Free Soft- *
  * ware  Foundation;  either version 3,  or (at your option) any later ver- *
@@ -2297,6 +2300,69 @@ __gnat_install_handler (void)
   __gnat_handler_installed = 1;
 }
 
+/************************/
+/* HyperbolaBSD Section */
+/************************/
+
+#elif defined(__HyperbolaBSD__)
+
+#include <signal.h>
+#include <unistd.h>
+
+static void
+__gnat_error_handler (int sig)
+{
+  struct Exception_Data *exception;
+  const char *msg;
+
+  switch(sig)
+  {
+    case SIGFPE:
+      exception = &constraint_error;
+      msg = "SIGFPE";
+      break;
+    case SIGILL:
+      exception = &constraint_error;
+      msg = "SIGILL";
+      break;
+    case SIGSEGV:
+      exception = &storage_error;
+      msg = "stack overflow or erroneous memory access";
+      break;
+    case SIGBUS:
+      exception = &constraint_error;
+      msg = "SIGBUS";
+      break;
+    default:
+      exception = &program_error;
+      msg = "unhandled signal";
+    }
+
+    Raise_From_Signal_Handler (exception, msg);
+}
+
+void
+__gnat_install_handler (void)
+{
+  struct sigaction act;
+
+  act.sa_handler = __gnat_error_handler;
+  act.sa_flags = SA_NODEFER | SA_RESTART;
+  sigemptyset (&act.sa_mask);
+
+  /* Do not install handlers if interrupt state is "System" */
+  if (__gnat_get_interrupt_state (SIGFPE) != 's')
+    sigaction (SIGFPE,  &act, NULL);
+  if (__gnat_get_interrupt_state (SIGILL) != 's')
+    sigaction (SIGILL,  &act, NULL);
+  if (__gnat_get_interrupt_state (SIGSEGV) != 's')
+    sigaction (SIGSEGV, &act, NULL);
+  if (__gnat_get_interrupt_state (SIGBUS) != 's')
+    sigaction (SIGBUS,  &act, NULL);
+
+  __gnat_handler_installed = 1;
+}
+
 /******************/
 /* Darwin Section */
 /******************/
@@ -2750,7 +2816,8 @@ __gnat_install_handler (void)
 
 #if defined (_WIN32) || defined (__INTERIX) \
   || defined (__Lynx__) || defined(__NetBSD__) || defined(__FreeBSD__) \
-  || defined (__OpenBSD__) || defined (__DragonFly__) || defined(__QNX__)
+  || defined (__OpenBSD__) || defined(__HyperbolaBSD__) \
+  || defined (__DragonFly__) || defined(__QNX__)
 
 #define HAVE_GNAT_INIT_FLOAT
 
diff --git a/gcc/ada/initialize.c b/gcc/ada/initialize.c
index d3f495c..a8bc662 100644
--- a/gcc/ada/initialize.c
+++ b/gcc/ada/initialize.c
@@ -8,6 +8,9 @@
  *                                                                          *
  *          Copyright (C) 1992-2018, Free Software Foundation, Inc.         *
  *                                                                          *
+ *                  Modifications to support HyperbolaBSD:                  *
+ *                 Copyright (C) 2020-2024 Hyperbola Project                *
+ *                                                                          *
  * GNAT is free software;  you can  redistribute it  and/or modify it under *
  * terms of the  GNU General Public License as published  by the Free Soft- *
  * ware  Foundation;  either version 3,  or (at your option) any later ver- *
@@ -86,7 +89,7 @@ __gnat_initialize (void *eh ATTRIBUTE_UNUSED)
 /******************************************/
 
 #elif defined (__Lynx__) || defined (__FreeBSD__) || defined(__NetBSD__) \
-  || defined (__OpenBSD__) || defined (__DragonFly__)
+  || defined (__OpenBSD__) || defined (__HyperbolaBSD__) || defined (__DragonFly__)
 
 void
 __gnat_initialize (void *eh ATTRIBUTE_UNUSED)
diff --git a/gcc/ada/link.c b/gcc/ada/link.c
index 84dff73..357d9cf 100644
--- a/gcc/ada/link.c
+++ b/gcc/ada/link.c
@@ -8,6 +8,9 @@
  *                                                                          *
  *          Copyright (C) 1992-2018, Free Software Foundation, Inc.         *
  *                                                                          *
+ *                  Modifications to support HyperbolaBSD:                  *
+ *                 Copyright (C) 2020-2024 Hyperbola Project                *
+ *                                                                          *
  * GNAT is free software;  you can  redistribute it  and/or modify it under *
  * terms of the  GNU General Public License as published  by the Free Soft- *
  * ware  Foundation;  either version 3,  or (at your option) any later ver- *
@@ -105,7 +108,7 @@ const char *__gnat_default_libgcc_subdir = "lib";
 
 #elif defined (__FreeBSD__) || defined (__DragonFly__) \
    || defined (__NetBSD__) || defined (__OpenBSD__) \
-   || defined (__QNX__)
+   || defined (__HyperbolaBSD__) || defined (__QNX__)
 const char *__gnat_object_file_option = "-Wl,@";
 const char *__gnat_run_path_option = "-Wl,-rpath,";
 char __gnat_shared_libgnat_default = STATIC;
diff --git a/gcc/ada/rtinit.c b/gcc/ada/rtinit.c
index 1aa1dc9..bef1798 100644
--- a/gcc/ada/rtinit.c
+++ b/gcc/ada/rtinit.c
@@ -8,6 +8,9 @@
  *                                                                          *
  *            Copyright (C) 2014-2018, Free Software Foundation, Inc.       *
  *                                                                          *
+ *                  Modifications to support HyperbolaBSD:                  *
+ *                 Copyright (C) 2020-2024 Hyperbola Project                *
+ *                                                                          *
  * GNAT is free software;  you can  redistribute it  and/or modify it under *
  * terms of the  GNU General Public License as published  by the Free Soft- *
  * ware  Foundation;  either version 3,  or (at your option) any later ver- *
@@ -314,7 +317,7 @@ __gnat_runtime_initialize(int install_handler)
 /**************************************************/
 
 #elif defined (__Lynx__) || defined (__FreeBSD__) || defined(__NetBSD__) \
-  || defined (__OpenBSD__)
+  || defined (__OpenBSD__) || defined (__HyperbolaBSD__)
 
 extern void __gnat_init_float (void);
 
diff --git a/gcc/ada/socket.c b/gcc/ada/socket.c
index 2de38a9..7066dca 100644
--- a/gcc/ada/socket.c
+++ b/gcc/ada/socket.c
@@ -8,6 +8,9 @@
  *                                                                          *
  *          Copyright (C) 2003-2018, Free Software Foundation, Inc.         *
  *                                                                          *
+ *                  Modifications to support HyperbolaBSD:                  *
+ *                 Copyright (C) 2020-2024 Hyperbola Project                *
+ *                                                                          *
  * GNAT is free software;  you can  redistribute it  and/or modify it under *
  * terms of the  GNU General Public License as published  by the Free Soft- *
  * ware  Foundation;  either version 3,  or (at your option) any later ver- *
@@ -38,7 +41,7 @@
 #include "gsocket.h"
 
 #if defined (__FreeBSD__) || defined (__DragonFly__) \
- || defined (__NetBSD__) || defined (__OpenBSD__)
+ || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__HyperbolaBSD__)
 typedef unsigned int IOCTL_Req_T;
 #else
 typedef int IOCTL_Req_T;
diff --git a/gcc/ada/sysdep.c b/gcc/ada/sysdep.c
index 98b3901..ab4c90c 100644
--- a/gcc/ada/sysdep.c
+++ b/gcc/ada/sysdep.c
@@ -8,6 +8,9 @@
  *                                                                          *
  *         Copyright (C) 1992-2018, Free Software Foundation, Inc.          *
  *                                                                          *
+ *                  Modifications to support HyperbolaBSD:                  *
+ *                   Copyright (C) 2024 Hyperbola Project                   *
+ *                                                                          *
  * GNAT is free software;  you can  redistribute it  and/or modify it under *
  * terms of the  GNU General Public License as published  by the Free Soft- *
  * ware  Foundation;  either version 3,  or (at your option) any later ver- *
@@ -317,6 +320,7 @@ __gnat_ttyname (int filedes)
   || defined (__MACHTEN__) || defined (__hpux__) || defined (_AIX) \
   || (defined (__svr4__) && defined (__i386__)) || defined (__Lynx__) \
   || defined (__CYGWIN__) || defined (__FreeBSD__) || defined (__OpenBSD__) \
+  || defined (__HyperbolaBSD__) \
   || defined (__GLIBC__) || defined (__APPLE__) || defined (__DragonFly__) \
   || defined (__QNX__)
 
@@ -370,6 +374,7 @@ getc_immediate_common (FILE *stream,
     || defined (__CYGWIN32__) || defined (__MACHTEN__) || defined (__hpux__) \
     || defined (_AIX) || (defined (__svr4__) && defined (__i386__)) \
     || defined (__Lynx__) || defined (__FreeBSD__) || defined (__OpenBSD__) \
+    || defined (__HyperbolaBSD__) \
     || defined (__GLIBC__) || defined (__APPLE__) || defined (__DragonFly__) \
     || defined (__QNX__)
   char c;
@@ -391,6 +396,7 @@ getc_immediate_common (FILE *stream,
     || defined (__MACHTEN__) || defined (__hpux__) \
     || defined (_AIX) || (defined (__svr4__) && defined (__i386__)) \
     || defined (__Lynx__) || defined (__FreeBSD__) || defined (__OpenBSD__) \
+    || defined (__HyperbolaBSD__) \
     || defined (__GLIBC__) || defined (__APPLE__) || defined (__DragonFly__) \
     || defined (__QNX__)
       eof_ch = termios_rec.c_cc[VEOF];
@@ -829,6 +835,7 @@ __gnat_localtime_tzoff (const time_t *timer ATTRIBUTE_UNUSED,
 
 #elif defined (__APPLE__) || defined (__FreeBSD__) || defined (__linux__) \
   || defined (__GLIBC__) || defined (__DragonFly__) || defined (__OpenBSD__) \
+  || defined (__HyperbolaBSD__) \
   || defined (__DJGPP__) || defined (__QNX__)
 {
   localtime_r (timer, &tp);
diff --git a/gcc/ada/terminals.c b/gcc/ada/terminals.c
index 7025f57..7ae2fed 100644
--- a/gcc/ada/terminals.c
+++ b/gcc/ada/terminals.c
@@ -8,6 +8,9 @@
  *                                                                          *
  *                     Copyright (C) 2008-2018, AdaCore                     *
  *                                                                          *
+ *                  Modifications to support HyperbolaBSD:                  *
+ *                 Copyright (C) 2020-2024 Hyperbola Project                *
+ *                                                                          *
  * GNAT is free software;  you can  redistribute it  and/or modify it under *
  * terms of the  GNU General Public License as published  by the Free Soft- *
  * ware  Foundation;  either version 3,  or (at your option) any later ver- *
@@ -1096,6 +1099,7 @@ __gnat_setup_winsize (void *desc, int rows, int columns)
 
 /* First defined some macro to identify easily some systems */
 #if defined (__FreeBSD__) \
+ || defined (__HyperbolaBSD__) \
  || defined (__OpenBSD__) \
  || defined (__NetBSD__)  \
  || defined (__DragonFly__)
diff --git a/gcc/ada/tracebak.c b/gcc/ada/tracebak.c
index fe63bc3..57ac493 100644
--- a/gcc/ada/tracebak.c
+++ b/gcc/ada/tracebak.c
@@ -8,6 +8,9 @@
  *                                                                          *
  *            Copyright (C) 2000-2018, Free Software Foundation, Inc.       *
  *                                                                          *
+ *                  Modifications to support HyperbolaBSD:                  *
+ *                 Copyright (C) 2020-2024 Hyperbola Project                *
+ *                                                                          *
  * GNAT is free software;  you can  redistribute it  and/or modify it under *
  * terms of the  GNU General Public License as published  by the Free Soft- *
  * ware  Foundation;  either version 3,  or (at your option) any later ver- *
@@ -289,7 +292,8 @@ __gnat_backtrace (void **array,
 /*---------------------------- x86 *BSD --------------------------------*/
 
 #elif defined (__i386__) &&   \
-    ( defined (__NetBSD__) || defined (__FreeBSD__) || defined (__OpenBSD__) )
+    ( defined (__NetBSD__) || defined (__FreeBSD__) \
+      || defined (__OpenBSD__) || defined (__HyperbolaBSD__) )
 
 #define USE_GCC_UNWINDER
 /* The generic unwinder is not used for this target because the default
diff --git b/gcc/config/arm/hyperbolabsd.h b/gcc/config/arm/hyperbolabsd.h
new file mode 100644
index 0000000..f7b9059
--- /dev/null
+++ b/gcc/config/arm/hyperbolabsd.h
@@ -0,0 +1,214 @@
+/* Definitions of target machine for GNU compiler, HyperbolaBSD ARM ELF version.
+   Copyright (C) 2002 Free Software Foundation, Inc.
+   Contributed by Wasabi Systems, Inc.
+
+   Modifications to support HyperbolaBSD:
+   Copyright (C) 2020-2024 Hyperbola Project
+
+This file is part of GNU CC.
+
+GNU CC is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU CC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU CC; see the file COPYING.  If not, write to
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+/* This is used in ASM_FILE_START.  */
+#undef ARM_OS_NAME
+#define ARM_OS_NAME "HyperbolaBSD"
+
+/* Unsigned chars produces much better code than signed.  */
+#define DEFAULT_SIGNED_CHAR  0
+
+
+/* This defaults us to little-endian.  */
+#ifndef TARGET_ENDIAN_DEFAULT
+#define TARGET_ENDIAN_DEFAULT 0
+#endif
+
+#undef MULTILIB_DEFAULTS
+
+/* armv6k default cpu.  */
+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_mpcore
+
+/* We default to a soft-float ABI so that binaries can run on all
+   target hardware.  */
+#undef TARGET_DEFAULT_FLOAT_ABI
+#define TARGET_DEFAULT_FLOAT_ABI ARM_FLOAT_ABI_SOFT
+
+/* We default to the "aapcs-linux" ABI so that enums are int-sized by
+   default.  */
+#undef ARM_DEFAULT_ABI
+#define ARM_DEFAULT_ABI ARM_ABI_AAPCS_LINUX
+
+#define TARGET_OS_CPP_BUILTINS()	\
+  do					\
+    {					\
+      builtin_define ("__GXX_MERGED_TYPEINFO_NAMES=0"); \
+      HYPERBOLABSD_OS_CPP_BUILTINS_ELF(); \
+    }					\
+  while (0)
+
+#undef SUBTARGET_CPP_SPEC
+#define SUBTARGET_CPP_SPEC HBBSD_CPP_SPEC
+
+/* HBBSD_LINK_SPEC appropriate for HyperbolaBSD.  Support for GCC options
+   -static, -assert, and -nostdlib.  */
+#undef HBBSD_LINK_SPEC
+#ifdef HBBSD_NO_DYNAMIC_LIBRARIES
+#define HBBSD_LINK_SPEC \
+  "%{!nostdlib:%{!r*:%{!e*:-e __start}}} %{assert*}"
+#else
+#define HBBSD_LINK_SPEC \
+  "%{!shared:%{!nostdlib:%{!r*:%{!e*:-e __start}}}} \
+   %{shared:-shared} %{R*} \
+   %{static:-Bstatic} \
+   %{!static:-Bdynamic} \
+   %{rdynamic:-export-dynamic} \
+   %{assert*} \
+   %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so} \
+   %{!nostdlib:-L/lib -L/usr/lib}"
+#endif
+
+#undef SUBTARGET_EXTRA_ASM_SPEC
+#define SUBTARGET_EXTRA_ASM_SPEC	\
+  "%{mabi=apcs-gnu|mabi=atpcs:-meabi=gnu;:-meabi=4} %{fpic|fPIC|fpie|fPIE:-k}"
+
+/* Default floating point model is soft-VFP.
+   FIXME: -mhard-float currently implies FPA.  */
+#undef SUBTARGET_ASM_FLOAT_SPEC
+#define SUBTARGET_ASM_FLOAT_SPEC	\
+  "%{mhard-float:-mfpu=fpa} \
+   %{msoft-float:-mfpu=softvfp} \
+   %{!mhard-float: \
+     %{!msoft-float:-mfpu=softvfp}}"
+
+#undef SUBTARGET_EXTRA_SPECS
+#define SUBTARGET_EXTRA_SPECS				\
+  { "subtarget_extra_asm_spec",	SUBTARGET_EXTRA_ASM_SPEC }, \
+  { "subtarget_asm_float_spec",	SUBTARGET_ASM_FLOAT_SPEC }, \
+  { "hyperbolabsd_link_spec",	HBBSD_LINK_SPEC },	\
+  { "hyperbolabsd_entry_point",	HYPERBOLABSD_ENTRY_POINT },
+
+#define HYPERBOLABSD_ENTRY_POINT "__start"
+
+/* Pass -X to the linker so that it will strip symbols starting with 'L' */
+#undef LINK_SPEC
+#define LINK_SPEC \
+  "-X %{mbig-endian:-EB} %{mlittle-endian:-EL} \
+   %(hyperbolabsd_link_spec)"
+
+/* Make GCC agree with <machine/_types.h>.  */
+
+#undef SIZE_TYPE
+#define SIZE_TYPE "long unsigned int"
+
+#undef PTRDIFF_TYPE
+#define PTRDIFF_TYPE "long int"
+
+#undef INTMAX_TYPE
+#define INTMAX_TYPE "long long int"
+
+#undef UINTMAX_TYPE
+#define UINTMAX_TYPE "long long unsigned int"
+
+#undef WCHAR_TYPE
+#define WCHAR_TYPE "int"
+
+#undef WCHAR_TYPE_SIZE
+#define WCHAR_TYPE_SIZE 32
+
+/* We don't have any limit on the length as out debugger is GDB.  */
+#undef DBX_CONTIN_LENGTH
+
+/* HyperbolaBSD and NetBSD do their profiling differently to the Acorn compiler. We
+   don't need a word following the mcount call; and to skip it
+   requires either an assembly stub or use of fomit-frame-pointer when
+   compiling the profiling functions.  Since we break Acorn CC
+   compatibility below a little more won't hurt.  */
+
+#undef ARM_FUNCTION_PROFILER
+#define ARM_FUNCTION_PROFILER(STREAM,LABELNO)           \
+{                                                       \
+  asm_fprintf (STREAM, "\tmov\t%Rip, %Rlr\n");          \
+  asm_fprintf (STREAM, "\tbl\t__mcount%s\n",            \
+               NEED_PLT_RELOC ? "(PLT)" : "");          \
+}
+
+/* On the ARM `@' introduces a comment, so we must use something else
+   for .type directives.  */
+#undef TYPE_OPERAND_FMT
+#define TYPE_OPERAND_FMT "%%%s"
+
+#undef FPUTYPE_DEFAULT
+#define FPUTYPE_DEFAULT FPUTYPE_VFP
+
+/* VERY BIG NOTE: Change of structure alignment for HyperbolaBSD|NetBSD ARM.
+   There are consequences you should be aware of...
+
+   Normally GCC/arm uses a structure alignment of 32 for compatibility
+   with armcc.  This means that structures are padded to a word
+   boundary.  However this causes problems with bugged HyperbolaBSD|NetBSD kernel
+   code (possibly userland code as well - I have not checked every
+   binary).  The nature of this bugged code is to rely on sizeof()
+   returning the correct size of various structures rounded to the
+   nearest byte (SCSI and ether code are two examples, the vm system
+   is another).  This code breaks when the structure alignment is 32
+   as sizeof() will report a word=rounded size.  By changing the
+   structure alignment to 8. GCC will conform to what is expected by
+   HyperbolaBSD|NetBSD.
+
+   This has several side effects that should be considered.
+   1. Structures will only be aligned to the size of the largest member.
+      i.e. structures containing only bytes will be byte aligned.
+	   structures containing shorts will be half word alinged.
+	   structures containing ints will be word aligned.
+
+      This means structures should be padded to a word boundary if
+      alignment of 32 is required for byte structures etc.
+
+   2. A potential performance penalty may exist if strings are no longer
+      word aligned.  GCC will not be able to use word load/stores to copy
+      short strings.
+
+   This modification is not encouraged but with the present state of the
+   HyperbolaBSD|NetBSD source tree it is currently the only solution that meets the
+   requirements.  */
+
+#undef DEFAULT_STRUCTURE_SIZE_BOUNDARY
+#define DEFAULT_STRUCTURE_SIZE_BOUNDARY 8
+
+/* Clear the instruction cache from `BEG' to `END'.  This makes a
+   call to the ARM_SYNC_ICACHE architecture specific syscall.  */
+#define CLEAR_INSN_CACHE(BEG, END)					\
+do									\
+  {									\
+    extern int sysarch(int number, void *args);				\
+    struct {								\
+	unsigned int addr;						\
+	int          len;						\
+    } s;								\
+    s.addr = (unsigned int)(BEG);					\
+    s.len = (END) - (BEG);						\
+    (void) sysarch (0, &s);						\
+  }									\
+while (0)
+
+/* As an elf system, we need crtbegin/crtend stuff.  */
+#undef STARTFILE_SPEC
+#define STARTFILE_SPEC "\
+        %{!shared: %{pg:gcrt0%O%s} %{!pg:%{p:gcrt0%O%s} \
+        %{!p:%{!static:crt0%O%s} %{static:%{nopie:crt0%O%s} \
+        %{!nopie:rcrt0%O%s}}}} \
+        crtbegin%O%s} %{shared:crtbeginS%O%s}"
+#undef ENDFILE_SPEC
+#define ENDFILE_SPEC "%{!shared:crtend%O%s} %{shared:crtendS%O%s}"
diff --git b/gcc/config/arm/hyperbolabsd_bpabi.h b/gcc/config/arm/hyperbolabsd_bpabi.h
new file mode 100644
index 0000000..3e85fa1
--- /dev/null
+++ b/gcc/config/arm/hyperbolabsd_bpabi.h
@@ -0,0 +1,64 @@
+/* Definitions of target machine for GNU compiler, HyperbolaBSD ARM ELF version.
+   Copyright (C) 2002 Free Software Foundation, Inc.
+   Contributed by Wasabi Systems, Inc.
+
+   Modifications to support HyperbolaBSD:
+   Copyright (C) 2024 Hyperbola Project
+
+This file is part of GNU CC.
+
+GNU CC is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU CC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU CC; see the file COPYING.  If not, write to
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+#define HBBSD_HAS_DECLARE_FUNCTION_NAME
+#define HBBSD_HAS_DECLARE_FUNCTION_SIZE
+
+/* use EABI frame unwinding tables.  */
+#define TARGET_UNWIND_INFO 1
+
+#if defined (__thumb__)
+#define RENAME_LIBRARY_SET ".thumb_set"
+#else
+#define RENAME_LIBRARY_SET ".set"
+#endif
+
+/* Make __aeabi_AEABI_NAME an alias for __GCC_NAME.  */
+#define RENAME_LIBRARY(GCC_NAME, AEABI_NAME)            \
+  __asm__ (".globl\t__aeabi_" #AEABI_NAME "\n"          \
+           RENAME_LIBRARY_SET "\t__aeabi_" #AEABI_NAME  \
+             ", __" #GCC_NAME "\n");
+
+/* Give some libgcc functions an additional __aeabi name.  */
+#ifdef L_muldi3
+#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (muldi3, lmul)
+#endif
+#ifdef L_fixdfdi
+#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (fixdfdi, d2lz)
+#endif
+#ifdef L_fixunsdfdi
+#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (fixunsdfdi, d2ulz)
+#endif
+#ifdef L_fixsfdi
+#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (fixsfdi, f2lz)
+#endif
+#ifdef L_fixunssfdi
+#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (fixunssfdi, f2ulz)
+#endif
+#ifdef L_floatdidf
+#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (floatdidf, l2d)
+#endif
+#ifdef L_floatdisf
+#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (floatdisf, l2f)
+#endif
diff --git b/gcc/config/host-hyperbolabsd.c b/gcc/config/host-hyperbolabsd.c
new file mode 100644
index 0000000..54844a6
--- /dev/null
+++ b/gcc/config/host-hyperbolabsd.c
@@ -0,0 +1,86 @@
+/* HyperbolaBSD host-specific hook definitions.
+   Copyright (C) 2004-2018 Free Software Foundation, Inc.
+
+   Modifications to support HyperbolaBSD:
+   Copyright (C) 2020-2024 Hyperbola Project
+
+   This file is part of GCC.
+
+   GCC is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published
+   by the Free Software Foundation; either version 3, or (at your
+   option) any later version.
+
+   GCC is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+   License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with GCC; see the file COPYING3.  If not see
+   <http://www.gnu.org/licenses/>.  */
+
+#include "config.h"
+#include "system.h"
+#include "coretypes.h"
+#include "hosthooks.h"
+#include "hosthooks-def.h"
+
+
+#undef HOST_HOOKS_GT_PCH_GET_ADDRESS
+#define HOST_HOOKS_GT_PCH_GET_ADDRESS hyperbolabsd_gt_pch_get_address
+#undef HOST_HOOKS_GT_PCH_USE_ADDRESS
+#define HOST_HOOKS_GT_PCH_USE_ADDRESS hyperbolabsd_gt_pch_use_address
+
+/* For various ports, try to guess a fixed spot in the vm space
+   that's probably free.  */
+#if defined(__amd64__)
+# define TRY_EMPTY_VM_SPACE	0x400000000000
+#elif defined(__i386__)
+# define TRY_EMPTY_VM_SPACE	0xb0000000
+#else
+# define TRY_EMPTY_VM_SPACE	0
+#endif
+
+/* Determine a location where we might be able to reliably allocate
+   SIZE bytes.  FD is the PCH file, though we should return with the
+   file unmapped.  */
+
+static void *
+hyperbolabsd_gt_pch_get_address (size_t size, int fd)
+{
+  void *addr;
+
+  addr = mmap ((void *) TRY_EMPTY_VM_SPACE, size, PROT_READ | PROT_WRITE,
+	       MAP_PRIVATE, fd, 0);
+
+  /* If we failed the map, that means there's *no* free space.  */
+  if (addr == (void *) MAP_FAILED)
+    return NULL;
+  /* Unmap the area before returning.  */
+  munmap (addr, size);
+
+  return addr;
+}
+
+/* Map SIZE bytes of FD+OFFSET at BASE.  Return 1 if we succeeded at 
+   mapping the data at BASE, -1 if we couldn't.  */
+
+static int
+hyperbolabsd_gt_pch_use_address (void *base, size_t size, int fd, size_t offset)
+{
+  void *addr;
+
+  /* We're called with size == 0 if we're not planning to load a PCH
+     file at all.  This allows the hook to free any static space that
+     we might have allocated at link time.  */
+  if (size == 0)
+    return -1;
+
+  addr = mmap (base, size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, offset);
+
+  return addr == base ? 1 : -1;
+}
+
+
+const struct host_hooks host_hooks = HOST_HOOKS_INITIALIZER;
diff --git b/gcc/config/hyperbolabsd-libpthread.h b/gcc/config/hyperbolabsd-libpthread.h
new file mode 100644
index 0000000..3e7a072
--- /dev/null
+++ b/gcc/config/hyperbolabsd-libpthread.h
@@ -0,0 +1,25 @@
+/* LIB_SPEC appropriate for OpenBSD.  Include -lpthread if -pthread is
+   specified on the command line. */
+/*   Copyright (C) 2004-2018 Free Software Foundation, Inc.
+
+     Modifications to support HyperbolaBSD:
+     Copyright (C) 2024 Hyperbola Project
+
+   This file is part of GCC.
+
+   GCC is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published
+   by the Free Software Foundation; either version 3, or (at your
+   option) any later version.
+
+   GCC is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+   License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with GCC; see the file COPYING3.  If not see
+   <http://www.gnu.org/licenses/>.  */
+
+#define HBBSD_LIB_SPEC "%{pthread:-lpthread%{!shared:%{p|pg:_p}}} %{!shared:-lc%{p|pg:_p}}"
+
diff --git b/gcc/config/hyperbolabsd-stdint.h b/gcc/config/hyperbolabsd-stdint.h
new file mode 100644
index 0000000..2ee5dba
--- /dev/null
+++ b/gcc/config/hyperbolabsd-stdint.h
@@ -0,0 +1,61 @@
+/* Definitions for <stdint.h> types for HyperbolaBSD systems.
+   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+
+   Modifications to support HyperbolaBSD:
+   Copyright (C) 2020-2024 Hyperbola Project
+
+This file is part of GCC.
+
+GCC is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3, or (at your option)
+any later version.
+
+GCC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+Under Section 7 of GPL version 3, you are granted additional
+permissions described in the GCC Runtime Library Exception, version
+3.1, as published by the Free Software Foundation.
+
+You should have received a copy of the GNU General Public License and
+a copy of the GCC Runtime Library Exception along with this program;
+see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+<http://www.gnu.org/licenses/>.  */
+
+#define SIG_ATOMIC_TYPE		"int"
+ 
+#define INT8_TYPE		"signed char"
+#define INT16_TYPE		"short int"
+#define INT32_TYPE		"int"
+#define INT64_TYPE		"long long int"
+#define UINT8_TYPE		"unsigned char"
+#define UINT16_TYPE		"short unsigned int"
+#define UINT32_TYPE		"unsigned int"
+#define UINT64_TYPE		"long long unsigned int"
+ 
+#define INT_LEAST8_TYPE		"signed char"
+#define INT_LEAST16_TYPE	"short int"
+#define INT_LEAST32_TYPE	"int"
+#define INT_LEAST64_TYPE	"long long int"
+#define UINT_LEAST8_TYPE	"unsigned char"
+#define UINT_LEAST16_TYPE	"short unsigned int"
+#define UINT_LEAST32_TYPE	"unsigned int"
+#define UINT_LEAST64_TYPE	"long long unsigned int"
+ 
+#define INT_FAST8_TYPE		"int"
+#define INT_FAST16_TYPE		"int"
+#define INT_FAST32_TYPE		"int"
+#define INT_FAST64_TYPE		"long long int"
+#define UINT_FAST8_TYPE		"unsigned int"
+#define UINT_FAST16_TYPE	"unsigned int"
+#define UINT_FAST32_TYPE	"unsigned int"
+#define UINT_FAST64_TYPE	"long long unsigned int"
+
+#define INTMAX_TYPE		"long long int"
+#define UINTMAX_TYPE		"long long unsigned int"
+ 
+#define INTPTR_TYPE		"long int"
+#define UINTPTR_TYPE		"long unsigned int"
diff --git b/gcc/config/hyperbolabsd.h b/gcc/config/hyperbolabsd.h
new file mode 100644
index 0000000..861dff2
--- /dev/null
+++ b/gcc/config/hyperbolabsd.h
@@ -0,0 +1,254 @@
+/* Base configuration file for all HyperbolaBSD targets.
+   Copyright (C) 1999-2018 Free Software Foundation, Inc.
+
+   Modifications to support HyperbolaBSD:
+   Copyright (C) 2020-2024 Hyperbola Project
+
+This file is part of GCC.
+
+GCC is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3, or (at your option)
+any later version.
+
+GCC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */
+
+/* Common HyperbolaBSD configuration. 
+   All HyperbolaBSD architectures include this file, which is intended as
+   a repository for common defines. 
+
+   Some defines are common to all architectures, a few of them are
+   triggered by HBBSD_* guards, so that we won't override architecture
+   defaults by mistakes.
+
+   HBBSD_HAS_CORRECT_SPECS: 
+      another mechanism provides correct specs already.
+   HBBSD_NO_DYNAMIC_LIBRARIES: 
+      no implementation of dynamic libraries.
+   HBBSD_HAS_DECLARE_FUNCTION_NAME, HBBSD_HAS_DECLARE_FUNCTION_SIZE,
+   HBBSD_HAS_DECLARE_OBJECT: 
+      PIC support, FUNCTION_NAME/FUNCTION_SIZE are independent, whereas
+      the corresponding logic for OBJECTS is necessarily coupled.
+
+   There are also a few `default' defines such as ASM_WEAKEN_LABEL,
+   intended as common ground for arch that don't provide 
+   anything suitable.  */
+
+/* Controlling the compilation driver.  */
+/* TARGET_OS_CPP_BUILTINS() common to all HyperbolaBSD targets.  */
+#define HYPERBOLABSD_OS_CPP_BUILTINS()		\
+  do						\
+    {						\
+      builtin_define ("__HyperbolaBSD__");	\
+      builtin_define ("__unix__");		\
+      builtin_define ("__ANSI_COMPAT");		\
+      builtin_assert ("system=unix");		\
+      builtin_assert ("system=bsd");		\
+      builtin_assert ("system=HyperbolaBSD");	\
+    }						\
+  while (0)
+
+/* TARGET_OS_CPP_BUILTINS() common to all HyperbolaBSD ELF targets.  */
+#define HYPERBOLABSD_OS_CPP_BUILTINS_ELF()		\
+  do						\
+    {						\
+      HYPERBOLABSD_OS_CPP_BUILTINS();		\
+      builtin_define ("__ELF__");		\
+    }						\
+while (0)
+
+/* TARGET_OS_CPP_BUILTINS() common to all LP64 HyperbolaBSD targets.  */
+#define HYPERBOLABSD_OS_CPP_BUILTINS_LP64()		\
+  do						\
+    {						\
+      builtin_define ("_LP64");			\
+      builtin_define ("__LP64__");		\
+    }						\
+  while (0)
+
+/* CPP_SPEC appropriate for HyperbolaBSD. We deal with -posix and -pthread.
+   XXX the way threads are handled currently is not very satisfying,
+   since all code must be compiled with -pthread to work. 
+   This two-stage defines makes it easy to pick that for targets that
+   have subspecs.  */
+#ifdef CPP_CPU_SPEC
+#define HBBSD_CPP_SPEC "%(cpp_cpu) %{posix:-D_POSIX_SOURCE} %{pthread:-D_POSIX_THREADS}"
+#else
+#define HBBSD_CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_POSIX_THREADS}"
+#endif
+
+#undef LIB_SPEC
+#define LIB_SPEC HBBSD_LIB_SPEC
+
+#ifndef HBBSD_HAS_CORRECT_SPECS
+
+#undef CPP_SPEC
+#define CPP_SPEC HBBSD_CPP_SPEC
+
+/* Since we use gas, stdin -> - is a good idea.  */
+#define AS_NEEDS_DASH_FOR_PIPED_INPUT
+
+#undef LIB_SPEC
+#define LIB_SPEC HBBSD_LIB_SPEC
+
+#if defined(HAVE_LD_EH_FRAME_HDR)
+#define LINK_EH_SPEC "%{!static|static-pie:--eh-frame-hdr} "
+#endif
+
+#undef LIB_SPEC
+#define LIB_SPEC HBBSD_LIB_SPEC
+#endif
+
+#define TARGET_POSIX_IO
+
+
+/* Runtime target specification.  */
+
+/* Miscellaneous parameters.  */
+
+/* Controlling debugging info: dbx options.  */
+
+/* Don't use the `xsTAG;' construct in DBX output; HyperbolaBSD systems that
+   use DBX don't support it.  */
+#define DBX_NO_XREFS
+
+
+/* - we use . - _func instead of a local label,
+   - we put extra spaces in expressions such as 
+     .type _func , @function
+     This is more readable for a human being and confuses c++filt less.  */
+
+/* Assembler format: output and generation of labels.  */
+
+/* Define the strings used for the .type and .size directives.
+   These strings generally do not vary from one system running HyperbolaBSD
+   to another, but if a given system needs to use different pseudo-op
+   names for these, they may be overridden in the arch specific file.  */ 
+
+/* HyperbolaBSD assembler is hacked to have .type & .size support even in a.out
+   format object files.  Functions size are supported but not activated 
+   yet (look for GRACE_PERIOD_EXPIRED in gas/config/obj-aout.c).  
+   SET_ASM_OP is needed for attribute alias to work.  */
+
+#undef TYPE_ASM_OP
+#undef SIZE_ASM_OP
+#undef SET_ASM_OP
+#undef GLOBAL_ASM_OP
+
+#define TYPE_ASM_OP	"\t.type\t"
+#define SIZE_ASM_OP	"\t.size\t"
+#define SET_ASM_OP	"\t.set\t"
+#define GLOBAL_ASM_OP	"\t.globl\t"
+
+/* The following macro defines the format used to output the second
+   operand of the .type assembler directive.  */
+#undef TYPE_OPERAND_FMT
+#define TYPE_OPERAND_FMT	"@%s"
+
+/* Provision if extra assembler code is needed to declare a function's result
+   (taken from svr4, not needed yet actually).  */
+#ifndef ASM_DECLARE_RESULT
+#define ASM_DECLARE_RESULT(FILE, RESULT)
+#endif
+
+/* These macros generate the special .type and .size directives which
+   are used to set the corresponding fields of the linker symbol table
+   entries under HyperbolaBSD.  These macros also have to output the starting 
+   labels for the relevant functions/objects.  */
+
+#ifndef HBBSD_HAS_DECLARE_FUNCTION_NAME
+/* Extra assembler code needed to declare a function properly.
+   Some assemblers may also need to also have something extra said 
+   about the function's return value.  We allow for that here.  */
+#undef ASM_DECLARE_FUNCTION_NAME
+#define ASM_DECLARE_FUNCTION_NAME(FILE, NAME, DECL)			\
+  do {									\
+    ASM_OUTPUT_TYPE_DIRECTIVE (FILE, NAME, "function");			\
+    ASM_DECLARE_RESULT (FILE, DECL_RESULT (DECL));			\
+    ASM_OUTPUT_FUNCTION_LABEL (FILE, NAME, DECL);			\
+  } while (0)
+#endif
+
+#ifndef HBBSD_HAS_DECLARE_FUNCTION_SIZE
+/* Declare the size of a function.  */
+#undef ASM_DECLARE_FUNCTION_SIZE
+#define ASM_DECLARE_FUNCTION_SIZE(FILE, FNAME, DECL)		\
+  do {								\
+    if (!flag_inhibit_size_directive)				\
+      ASM_OUTPUT_MEASURED_SIZE (FILE, FNAME);			\
+  } while (0)
+#endif
+
+#ifndef HBBSD_HAS_DECLARE_OBJECT
+/* Extra assembler code needed to declare an object properly.  */
+#undef ASM_DECLARE_OBJECT_NAME
+#define ASM_DECLARE_OBJECT_NAME(FILE, NAME, DECL)		\
+  do {								\
+      HOST_WIDE_INT size;					\
+      ASM_OUTPUT_TYPE_DIRECTIVE (FILE, NAME, "object");		\
+      size_directive_output = 0;				\
+      if (!flag_inhibit_size_directive				\
+	  && (DECL) && DECL_SIZE (DECL))			\
+	{							\
+	  size_directive_output = 1;				\
+	  size = int_size_in_bytes (TREE_TYPE (DECL));		\
+	  ASM_OUTPUT_SIZE_DIRECTIVE (FILE, NAME, size);		\
+	}							\
+      ASM_OUTPUT_LABEL (FILE, NAME);				\
+  } while (0)
+
+/* Output the size directive for a decl in rest_of_decl_compilation
+   in the case where we did not do so before the initializer.
+   Once we find the error_mark_node, we know that the value of
+   size_directive_output was set by ASM_DECLARE_OBJECT_NAME 
+   when it was run for the same decl.  */
+#undef ASM_FINISH_DECLARE_OBJECT
+#define ASM_FINISH_DECLARE_OBJECT(FILE, DECL, TOP_LEVEL, AT_END)	 \
+do {									 \
+     const char *name = XSTR (XEXP (DECL_RTL (DECL), 0), 0);		 \
+     HOST_WIDE_INT size;						 \
+     if (!flag_inhibit_size_directive && DECL_SIZE (DECL)		 \
+         && ! AT_END && TOP_LEVEL					 \
+	 && DECL_INITIAL (DECL) == error_mark_node			 \
+	 && !size_directive_output)					 \
+       {								 \
+	 size_directive_output = 1;					 \
+	 size = int_size_in_bytes (TREE_TYPE (DECL));			 \
+	 ASM_OUTPUT_SIZE_DIRECTIVE (FILE, name, size);			 \
+       }								 \
+   } while (0)
+#endif
+
+
+/* Those are `generic' ways to weaken/globalize a label. We shouldn't need
+   to override a processor specific definition. Hence, #ifndef ASM_*
+   In case overriding turns out to be needed, one can always #undef ASM_* 
+   before including this file.  */
+
+/* Tell the assembler that a symbol is weak.  */
+/* Note: netbsd arm32 assembler needs a .globl here. An override may 
+   be needed when/if we go for arm32 support.  */
+#ifndef ASM_WEAKEN_LABEL
+#define ASM_WEAKEN_LABEL(FILE,NAME) \
+  do { fputs ("\t.weak\t", FILE); assemble_name (FILE, NAME); \
+       fputc ('\n', FILE); } while (0)
+#endif
+
+/* Storage layout.  */
+
+
+#define HAVE_ENABLE_EXECUTE_STACK
+
+/* Don't assume anything about the header files.  */
+#undef  NO_IMPLICIT_EXTERN_C
+#define NO_IMPLICIT_EXTERN_C    1
+
+#include <sys/types.h>
+#include <sys/mman.h>
diff --git b/gcc/config/hyperbolabsd.opt b/gcc/config/hyperbolabsd.opt
new file mode 100644
index 0000000..29f5eb1
--- /dev/null
+++ b/gcc/config/hyperbolabsd.opt
@@ -0,0 +1,38 @@
+; HyperbolaBSD options.
+
+; Copyright (C) 2010-2018 Free Software Foundation, Inc.
+;
+; Modifications to support HyperbolaBSD:
+; Copyright (C) 2020-2024 Hyperbola Project
+;
+; This file is part of GCC.
+;
+; GCC is free software; you can redistribute it and/or modify it under
+; the terms of the GNU General Public License as published by the Free
+; Software Foundation; either version 3, or (at your option) any later
+; version.
+;
+; GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+; WARRANTY; without even the implied warranty of MERCHANTABILITY or
+; FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+; for more details.
+;
+; You should have received a copy of the GNU General Public License
+; along with GCC; see the file COPYING3.  If not see
+; <http://www.gnu.org/licenses/>.
+
+; See the GCC internals manual (options.texi) for a description of
+; this file's format.
+
+; Please try to keep this file in ASCII collating order.
+
+assert=
+Driver JoinedOrMissing
+
+posix
+Driver
+
+pthread
+Driver
+
+; This comment is to ensure we retain the blank line above.
diff --git b/gcc/config/i386/hyperbolabsd.h b/gcc/config/i386/hyperbolabsd.h
new file mode 100644
index 0000000..47920a5
--- /dev/null
+++ b/gcc/config/i386/hyperbolabsd.h
@@ -0,0 +1,119 @@
+/* Configuration for an HyperbolaBSD i386 target.
+   
+   Copyright (C) 2005-2018 Free Software Foundation, Inc.
+
+   Modifications to support HyperbolaBSD:
+   Copyright (C) 2020-2024 Hyperbola Project
+
+This file is part of GCC.
+
+GCC is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3, or (at your option)
+any later version.
+
+GCC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */
+
+#define TARGET_OS_CPP_BUILTINS()			\
+  do							\
+    {							\
+	HYPERBOLABSD_OS_CPP_BUILTINS();			\
+    }						\
+  while (0)
+
+#undef DBX_REGISTER_NUMBER
+#define DBX_REGISTER_NUMBER(n) \
+  (TARGET_64BIT ? dbx64_register_map[n] : svr4_dbx_register_map[n])
+
+/* This must agree with <machine/ansi.h>.  */
+#undef SIZE_TYPE
+#define SIZE_TYPE "long unsigned int"
+
+#undef PTRDIFF_TYPE
+#define PTRDIFF_TYPE "long int"
+
+#undef WCHAR_TYPE
+#define WCHAR_TYPE "int"
+
+#undef WCHAR_TYPE_SIZE
+#define WCHAR_TYPE_SIZE 32
+
+#undef WINT_TYPE
+#define WINT_TYPE "int"
+
+/* Don't default to pcc-struct-return, because gcc is the only compiler, and
+   we want to retain compatibility with older gcc versions.  */
+
+#undef DEFAULT_PCC_STRUCT_RETURN
+#define DEFAULT_PCC_STRUCT_RETURN 0
+
+/* Override the default comment-starter of "/".  */
+#undef ASM_COMMENT_START
+#define ASM_COMMENT_START "#"
+
+#undef ASM_APP_ON
+#define ASM_APP_ON "#APP\n"
+
+#undef ASM_APP_OFF
+#define ASM_APP_OFF "#NO_APP\n"
+
+/* A C statement to output to the stdio stream FILE an assembler
+   command to advance the location counter to a multiple of 1<<LOG
+   bytes if it is within MAX_SKIP bytes.
+
+   This is used to align code labels according to Intel recommendations.  */
+
+#ifdef HAVE_GAS_MAX_SKIP_P2ALIGN
+#define ASM_OUTPUT_MAX_SKIP_ALIGN(FILE,LOG,MAX_SKIP)			\
+  do {									\
+    if ((LOG) != 0) {							\
+      if ((MAX_SKIP) == 0) fprintf ((FILE), "\t.p2align %d\n", (LOG));	\
+      else {								\
+	fprintf ((FILE), "\t.p2align %d,,%d\n", (LOG), (MAX_SKIP));	\
+	/* Make sure that we have at least 8 byte alignment if > 8 byte \
+	   alignment is preferred.  */					\
+	if ((LOG) > 3							\
+	    && (1 << (LOG)) > ((MAX_SKIP) + 1)				\
+	    && (MAX_SKIP) >= 7)						\
+	  fputs ("\t.p2align 3\n", (FILE));				\
+      }									\
+    }									\
+  } while (0)
+#endif
+
+/* HyperbolaBSD's profiler recovers all information from the stack pointer.
+   The icky part is not here, but in <machine/profile.h>.  */
+#undef FUNCTION_PROFILER
+#define FUNCTION_PROFILER(FILE, LABELNO)  \
+  fputs (flag_pic ? "\tcall __mcount@PLT\n": "\tcall __mcount\n", FILE);
+
+#undef LINK_SPEC
+#define LINK_SPEC \
+  "%{!shared:%{!nostdlib:%{!r:%{!e*:-e __start}}}} \
+   %{shared:-shared} %{R*} \
+   %{static:-Bstatic} \
+   %{!static:-Bdynamic} \
+   %{rdynamic:-export-dynamic} \
+   %{assert*} \
+   %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so} \
+   %{!nostdlib:-L/lib -L/usr/lib}"
+
+#undef STARTFILE_SPEC
+#define STARTFILE_SPEC "\
+	%{!shared: %{pg:gcrt0%O%s} %{!pg:%{p:gcrt0%O%s} \
+	%{!p:%{!static:crt0%O%s} %{static:%{nopie:crt0%O%s} \
+	%{!nopie:rcrt0%O%s}}}} crtbegin%O%s} %{shared:crtbeginS%O%s}"
+
+#undef ENDFILE_SPEC
+#define ENDFILE_SPEC "%{!shared:crtend%O%s} %{shared:crtendS%O%s}"
+
+#define HBBSD_HAS_CORRECT_SPECS
+
+#define HAVE_ENABLE_EXECUTE_STACK
diff --git b/gcc/config/i386/hyperbolabsd64.h b/gcc/config/i386/hyperbolabsd64.h
new file mode 100644
index 0000000..d93aa51
--- /dev/null
+++ b/gcc/config/i386/hyperbolabsd64.h
@@ -0,0 +1,102 @@
+/* Configuration for an HyperbolaBSD x86_64 target.
+   
+   Copyright (C) 2003-2018 Free Software Foundation, Inc.
+
+   Modifications to support HyperbolaBSD:
+   Copyright (C) 2020-2024 Hyperbola Project
+
+This file is part of GCC.
+
+GCC is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3, or (at your option)
+any later version.
+
+GCC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */
+
+#define TARGET_OS_CPP_BUILTINS()			\
+  do							\
+    {							\
+	HYPERBOLABSD_OS_CPP_BUILTINS_ELF();		\
+	if (TARGET_64BIT)				\
+		HYPERBOLABSD_OS_CPP_BUILTINS_LP64();	\
+    }							\
+  while (0)
+
+/* This must agree with <machine/_types.h>.  */
+#undef SIZE_TYPE
+#define SIZE_TYPE "long unsigned int"
+
+#undef PTRDIFF_TYPE
+#define PTRDIFF_TYPE "long int"
+
+#undef WCHAR_TYPE
+#define WCHAR_TYPE "int"
+
+#undef WCHAR_TYPE_SIZE
+#define WCHAR_TYPE_SIZE 32
+
+#undef WINT_TYPE
+#define WINT_TYPE "int"
+
+#undef INTMAX_TYPE
+#define INTMAX_TYPE "long long int"
+
+#undef UINTMAX_TYPE
+#define UINTMAX_TYPE "long long unsigned int"
+
+/* Don't default to pcc-struct-return, because gcc is the only compiler, and
+   we want to retain compatibility with older gcc versions.  */
+
+#undef DEFAULT_PCC_STRUCT_RETURN
+#define DEFAULT_PCC_STRUCT_RETURN 0
+
+/* Override the default comment-starter of "/".  */
+#undef ASM_COMMENT_START
+#define ASM_COMMENT_START "#"
+
+#undef ASM_APP_ON
+#define ASM_APP_ON "#APP\n"
+
+#undef ASM_APP_OFF
+#define ASM_APP_OFF "#NO_APP\n"
+
+/* HyperbolaBSD's profiler recovers all information from the stack pointer.
+   The icky part is not here, but in <machine/profile.h>.  */
+#undef FUNCTION_PROFILER
+#define FUNCTION_PROFILER(FILE, LABELNO)  \
+  fputs (flag_pic ? "\tcall __mcount@PLT\n": "\tcall __mcount\n", FILE);
+
+#undef LINK_SPEC
+#define LINK_SPEC \
+  "%{!shared:%{!nostdlib:%{!r:%{!e*:-e __start}}}} \
+   %{shared:-shared} %{R*} \
+   %{static:-Bstatic} \
+   %{!static:-Bdynamic} \
+   %{rdynamic:-export-dynamic} \
+   %{assert*} \
+   %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so} \
+   %{!nostdlib:-L/lib -L/usr/lib}"
+
+#undef STARTFILE_SPEC
+#define STARTFILE_SPEC "\
+	%{!shared: %{pg:gcrt0%O%s} %{!pg:%{p:gcrt0%O%s} \
+	%{!p:%{!static:crt0%O%s} %{static:%{nopie:crt0%O%s} \
+	%{!nopie:rcrt0%O%s}}}} crtbegin%O%s} %{shared:crtbeginS%O%s}"
+
+#undef ENDFILE_SPEC
+#define ENDFILE_SPEC "%{!shared:crtend%O%s} %{shared:crtendS%O%s}"
+
+#define HBBSD_HAS_CORRECT_SPECS
+
+#define HAVE_ENABLE_EXECUTE_STACK
+
+#undef JUMP_TABLES_IN_TEXT_SECTION
+#define JUMP_TABLES_IN_TEXT_SECTION 0
diff --git b/gcc/config/rs6000/hyperbolabsd.h b/gcc/config/rs6000/hyperbolabsd.h
new file mode 100644
index 0000000..b32f84e
--- /dev/null
+++ b/gcc/config/rs6000/hyperbolabsd.h
@@ -0,0 +1,132 @@
+/* Definitions for PowerPC running HyperbolaBSD using the ELF format
+   Copyright (C) 1999, 2001-2018 Free Software Foundation, Inc.
+   Contributed by David E. O'Brien <obrien@FreeBSD.org> and BSDi.
+
+   Modifications to support HyperbolaBSD:
+   Copyright (C) 2024 Hyperbola Project
+
+   This file is part of GCC.
+
+   GCC is free software; you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published
+   by the Free Software Foundation; either version 3, or (at your
+   option) any later version.
+
+   GCC is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+   or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+   License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with GCC; see the file COPYING3.  If not see
+   <http://www.gnu.org/licenses/>.  */
+
+/* Override the defaults, which exist to force the proper definition.  */
+
+/* XXX need to check ASM_WEAKEN_LABEL/ASM_GLOBALIZE_LABEL. */
+
+/* Run-time target specifications. */
+#undef  TARGET_OS_CPP_BUILTINS	/* FIXME: sysv4.h should not define this! */
+#define TARGET_OS_CPP_BUILTINS()		\
+  do						\
+    {						\
+	HYPERBOLABSD_OS_CPP_BUILTINS_ELF();	\
+	builtin_define ("__PPC");		\
+	builtin_define ("__PPC__");		\
+	builtin_define ("__powerpc");		\
+	builtin_define ("__powerpc__");		\
+	builtin_assert ("cpu=powerpc");		\
+	builtin_assert ("machine=powerpc");	\
+    }						\
+  while (0)
+
+/* Override the default from rs6000.h to avoid conflicts with macros
+   defined in HyperbolaBSD header files.  */
+
+#undef  RS6000_CPU_CPP_ENDIAN_BUILTINS
+#define RS6000_CPU_CPP_ENDIAN_BUILTINS()	\
+  do						\
+    {						\
+      if (BYTES_BIG_ENDIAN)			\
+	{					\
+	  builtin_define ("__BIG_ENDIAN__");	\
+	  builtin_assert ("machine=bigendian");	\
+	}					\
+      else					\
+	{					\
+	  builtin_define ("__LITTLE_ENDIAN__");	\
+	  builtin_assert ("machine=littleendian"); \
+	}					\
+    }						\
+  while (0)
+
+#undef  LINK_SPEC
+#define LINK_SPEC "%{shared:-shared} \
+  %{!shared: \
+    %{!static: \
+      %{rdynamic:-export-dynamic} \
+      %{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}} \
+    %{static:-static}}"
+
+#undef	CPP_OS_DEFAULT_SPEC
+#define CPP_OS_DEFAULT_SPEC "%(cpp_os_hyperbolabsd)"
+
+#undef	STARTFILE_DEFAULT_SPEC
+#define STARTFILE_DEFAULT_SPEC "%(startfile_hyperbolabsd)"
+
+#undef	ENDFILE_DEFAULT_SPEC
+#define ENDFILE_DEFAULT_SPEC "%(endfile_hyperbolabsd)"
+
+#undef	LIB_DEFAULT_SPEC
+#define LIB_DEFAULT_SPEC "%(lib_hyperbolabsd)"
+
+#undef	LINK_START_DEFAULT_SPEC
+#define LINK_START_DEFAULT_SPEC "%(link_start_hyperbolabsd)"
+
+#undef	LINK_OS_DEFAULT_SPEC
+#define	LINK_OS_DEFAULT_SPEC "%(link_os_hyperbolabsd)"
+
+#undef  CRTSAVRES_DEFAULT_SPEC
+#define CRTSAVRES_DEFAULT_SPEC ""
+
+/* Default ABI to use */
+#undef  RS6000_ABI_NAME
+#define RS6000_ABI_NAME "hyperbolabsd"
+
+/************************[  Target stuff  ]***********************************/
+
+/* Define this macro as a C expression for the initializer of an
+   array of string to tell the driver program which options are
+   defaults for this target and thus do not need to be handled
+   specially when using `MULTILIB_OPTIONS'.
+
+   Do not define this macro if `MULTILIB_OPTIONS' is not defined in
+   the target makefile fragment or if none of the options listed in
+   `MULTILIB_OPTIONS' are set by default.  *Note Target Fragment::.  */
+
+#undef  MULTILIB_DEFAULTS
+#define MULTILIB_DEFAULTS { "mbig", "mcall-hyperbolabsd" }
+
+/* Don't tell collect2 we use COFF as we don't have (yet ?) a dynamic ld
+   library with the proper functions to handle this -> collect2 will
+   default to using nm. */
+#undef OBJECT_FORMAT_COFF
+
+/* Define the actual types of some ANSI-mandated types.
+   Needs to agree with <machine/_types.h>.  GCC defaults come from c-decl.c,
+   c-common.c, and config/<arch>/<arch>.h.  */
+
+#undef  SIZE_TYPE
+#define SIZE_TYPE "long unsigned int"
+
+#undef  WCHAR_TYPE
+#define WCHAR_TYPE "int"
+
+#undef  WCHAR_TYPE_SIZE
+#define WCHAR_TYPE_SIZE 32
+
+#undef  PTRDIFF_TYPE
+#define PTRDIFF_TYPE "long int"
+
+#undef  TRAMPOLINE_SIZE
+#define TRAMPOLINE_SIZE 40
diff --git b/gcc/config/t-hyperbolabsd b/gcc/config/t-hyperbolabsd
new file mode 100644
index 0000000..7637da0
--- /dev/null
+++ b/gcc/config/t-hyperbolabsd
@@ -0,0 +1,2 @@
+# We don't need GCC's own include files.
+USER_H = $(EXTRA_HEADERS)
diff --git b/gcc/config/x-hyperbolabsd b/gcc/config/x-hyperbolabsd
new file mode 100644
index 0000000..a0c7a48
--- /dev/null
+++ b/gcc/config/x-hyperbolabsd
@@ -0,0 +1,4 @@
+host-hyperbolabsd.o : $(srcdir)/config/host-hyperbolabsd.c $(CONFIG_H) $(SYSTEM_H) \
+  coretypes.h hosthooks.h hosthooks-def.h $(HOOKS_H)
+	$(COMPILER) -c $(ALL_COMPILERFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
+		$(srcdir)/config/host-hyperbolabsd.c
diff --git a/gcc/config.gcc b/gcc/config.gcc
index af9d122..856f2ff 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1,6 +1,9 @@
 # GCC target-specific configuration file.
 # Copyright (C) 1997-2018 Free Software Foundation, Inc.
 
+# Modifications to support HyperbolaBSD:
+# Copyright (C) 2020-2024 Hyperbola Project
+
 #This file is part of GCC.
 
 #GCC is free software; you can redistribute it and/or modify it under
@@ -831,6 +834,19 @@ case ${target} in
       ;;
   esac
   ;;
+*-*-hyperbolabsd*)
+  tmake_file="t-hyperbolabsd"
+  extra_options="${extra_options} hyperbolabsd.opt"
+  gas=yes
+  gnu_ld=yes
+  case ${enable_threads} in
+    yes)
+      thread_file='posix'
+      ;;
+  esac
+  hbbsd_tm_file="hyperbolabsd.h hyperbolabsd-stdint.h hyperbolabsd-libpthread.h"
+  default_use_cxa_atexit=yes
+  ;;
 *-*-phoenix*)
   gas=yes
   gnu_ld=yes
@@ -1131,6 +1147,11 @@ arm*-*-netbsdelf*)
 	tmake_file="${tmake_file} arm/t-arm"
 	target_cpu_cname="arm6"
 	;;
+arm*-*-hyperbolabsd*)
+	tm_file="dbxelf.h elfos.h arm/hyperbolabsd_bpabi.h arm/elf.h ${tm_file}"
+	tm_file="${tm_file} ${hbbsd_tm_file} arm/hyperbolabsd.h"
+	target_cpu_cname="generic-armv7-a"
+	;;
 arm*-*-linux-*)			# ARM GNU/Linux with ELF
 	tm_file="dbxelf.h elfos.h gnu-user.h linux.h linux-android.h glibc-stdint.h arm/elf.h arm/linux-gas.h arm/linux-elf.h"
 	extra_options="${extra_options} linux-android.opt"
@@ -1554,6 +1575,14 @@ x86_64-*-openbsd*)
 	gas=yes
 	gnu_ld=yes
 	;;
+i[34567]86-*-hyperbolabsd*)
+	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h"
+	tm_file="${tm_file} ${hbbsd_tm_file} i386/hyperbolabsd.h"
+	;;
+x86_64-*-hyperbolabsd*)
+	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h"
+	tm_file="${tm_file} ${hbbsd_tm_file} i386/x86-64.h i386/hyperbolabsd64.h"
+	;;
 i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-gnu* | i[34567]86-*-kopensolaris*-gnu)
 			# Intel 80386's running GNU/*
 			# with ELF format using glibc 2
@@ -2444,6 +2473,11 @@ powerpc-*-netbsd*)
 	tmake_file="${tmake_file} rs6000/t-netbsd"
 	extra_options="${extra_options} rs6000/sysv4.opt"
 	;;
+powerpc-*-hyperbolabsd*)
+        tm_file="rs6000/rs6000.h rs6000/hyperbolabsd.h dbxelf.h elfos.h ${tm_file}"
+        tm_file="${tm_file} ${hbbsd_tm_file} exec-stack.h"
+        tmake_file="${tmake_file} rs6000/t-ppcos"
+        ;;
 powerpc-*-eabispe*)
 	tm_file="${tm_file} dbxelf.h elfos.h freebsd-spec.h newlib-stdint.h ${cpu_type}/sysv4.h ${cpu_type}/eabi.h ${cpu_type}/e500.h ${cpu_type}/eabispe.h"
 	extra_options="${extra_options} ${cpu_type}/sysv4.opt"
diff --git a/gcc/config.host b/gcc/config.host
index c65569d..ba235d6 100644
--- a/gcc/config.host
+++ b/gcc/config.host
@@ -1,6 +1,9 @@
 # GCC host-specific configuration file.
 # Copyright (C) 1997-2018 Free Software Foundation, Inc.
 
+# Modifications to support HyperbolaBSD:
+# Copyright (C) 2020-2024 Hyperbola Project
+
 #This file is part of GCC.
 
 #GCC is free software; you can redistribute it and/or modify it under
@@ -282,6 +285,10 @@ case ${host} in
     out_host_hook_obj=host-openbsd.o
     host_xmake_file="${host_xmake_file} x-openbsd"
     ;;
+  *-*-hyperbolabsd*)
+    out_host_hook_obj=host-hyperbolabsd.o
+    host_xmake_file="${host_xmake_file} x-hyperbolabsd"
+    ;;
   ia64-*-hpux*)
     use_long_long_for_widest_fast_int=yes
     out_host_hook_obj=host-hpux.o
diff --git a/gcc/configure b/gcc/configure
index aa37763..95655d6 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -6,6 +6,9 @@
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
 # Foundation, Inc.
 #
+# Modifications to support HyperbolaBSD:
+# Copyright (C) 2020-2024 Hyperbola Project
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## -------------------- ##
@@ -13010,7 +13013,7 @@ else
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly* | hyperbolabsd*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -13448,6 +13451,10 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  ;;
+
 osf3* | osf4* | osf5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -16314,6 +16321,11 @@ _LT_EOF
       fi
       ;;
 
+    hyperbolabsd*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      ;;
+
     solaris*)
       if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
 	ld_shlibs=no
@@ -16900,6 +16912,18 @@ rm -f core conftest.err conftest.$ac_objext \
       fi
       ;;
 
+    hyperbolabsd*)
+      if test -f /usr/libexec/ld.so || test -f /libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
     os2*)
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_minus_L=yes
@@ -17887,6 +17911,16 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
 os2*)
   libname_spec='$name'
   shrext_cmds=".dll"
@@ -19865,6 +19899,18 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	fi
 	;;
 
+      hyperbolabsd*)
+	if test -f /usr/libexec/ld.so || test -f /libexec/ld.so; then
+	  hardcode_direct_CXX=yes
+	  hardcode_shlibpath_var_CXX=no
+	  hardcode_direct_absolute_CXX=yes
+	  archive_cmds_CXX='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	else
+	  ld_shlibs_CXX=no
+	fi
+	;;
+
       osf3* | osf4* | osf5*)
         case $cc_basename in
           KCC*)
@@ -20563,7 +20609,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 	    ;;
 	esac
 	;;
-      netbsd*)
+      netbsd* | hyperbolabsd*)
 	;;
       *qnx* | *nto*)
         # QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -21547,6 +21593,16 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
 os2*)
   libname_spec='$name'
   shrext_cmds=".dll"
diff --git a/gcc/doc/g++.1 b/gcc/doc/g++.1
index 14efb7e..7f2c7a7 100644
--- a/gcc/doc/g++.1
+++ b/gcc/doc/g++.1
@@ -1089,7 +1089,7 @@ See \s-1RS/6000\s0 and PowerPC Options.
 \&\fB\-msched\-costly\-dep=\fR\fIdependence_type\fR 
 \&\fB\-minsert\-sched\-nops=\fR\fIscheme\fR 
 \&\fB\-mcall\-aixdesc  \-mcall\-eabi  \-mcall\-freebsd  
-\&\-mcall\-linux  \-mcall\-netbsd  \-mcall\-openbsd  
+\&\-mcall\-linux  \-mcall\-netbsd  \-mcall\-openbsd  \-mcall\-hyperbolabsd  
 \&\-mcall\-sysv  \-mcall\-sysv\-eabi  \-mcall\-sysv\-noeabi 
 \&\-mtraceback=\fR\fItraceback_type\fR 
 \&\fB\-maix\-struct\-return  \-msvr4\-struct\-return 
@@ -21871,6 +21871,10 @@ NetBSD operating system.
 .IX Item "-mcall-openbsd"
 On System V.4 and embedded PowerPC systems compile code for the
 OpenBSD operating system.
+.IP "\fB\-mcall\-hyperbolabsd\fR" 4
+.IX Item "-mcall-hyperbolabsd"
+On System V.4 and embedded PowerPC systems compile code for the
+HyperbolaBSD operating system.
 .IP "\fB\-maix\-struct\-return\fR" 4
 .IX Item "-maix-struct-return"
 Return all structures in memory (as specified by the \s-1AIX ABI\s0).
@@ -23192,6 +23196,10 @@ NetBSD operating system.
 .IX Item "-mcall-openbsd"
 On System V.4 and embedded PowerPC systems compile code for the
 OpenBSD operating system.
+.IP "\fB\-mcall\-hyperbolabsd\fR" 4
+.IX Item "-mcall-hyperbolabsd"
+On System V.4 and embedded PowerPC systems compile code for the
+HyperbolaBSD operating system.
 .IP "\fB\-mtraceback=\fR\fItraceback_type\fR" 4
 .IX Item "-mtraceback=traceback_type"
 Select the type of traceback table. Valid values for \fItraceback_type\fR
@@ -26068,9 +26076,9 @@ in ordinary \s-1CPU\s0 registers instead.
 Some 387 emulators do not support the \f(CW\*(C`sin\*(C'\fR, \f(CW\*(C`cos\*(C'\fR and
 \&\f(CW\*(C`sqrt\*(C'\fR instructions for the 387.  Specify this option to avoid
 generating those instructions.  This option is the default on
-OpenBSD and NetBSD.  This option is overridden when \fB\-march\fR
-indicates that the target \s-1CPU\s0 always has an \s-1FPU\s0 and so the
-instruction does not need emulation.  These
+HyperbolaBSD, OpenBSD and NetBSD.  This option is overridden when
+\fB\-march\fR indicates that the target \s-1CPU\s0 always has an \s-1FPU\s0 and
+so the instruction does not need emulation.  These
 instructions are not generated unless you also use the
 \&\fB\-funsafe\-math\-optimizations\fR switch.
 .IP "\fB\-malign\-double\fR" 4
@@ -27533,6 +27541,9 @@ for contributors to \s-1GCC.\s0
 .IX Header "COPYRIGHT"
 Copyright (c) 1988\-2018 Free Software Foundation, Inc.
 .PP
+Modifications to support HyperbolaBSD:
+Copyright (C) 2020\-2024 Hyperbola Project
+.PP
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the \s-1GNU\s0 Free Documentation License, Version 1.3 or
 any later version published by the Free Software Foundation; with the
diff --git a/gcc/doc/gcc.1 b/gcc/doc/gcc.1
index 14efb7e..0de6e70 100644
--- a/gcc/doc/gcc.1
+++ b/gcc/doc/gcc.1
@@ -27533,6 +27533,9 @@ for contributors to \s-1GCC.\s0
 .IX Header "COPYRIGHT"
 Copyright (c) 1988\-2018 Free Software Foundation, Inc.
 .PP
+Modifications to support HyperbolaBSD:
+Copyright (C) 2020\-2024 Hyperbola Project
+.PP
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the \s-1GNU\s0 Free Documentation License, Version 1.3 or
 any later version published by the Free Software Foundation; with the
diff --git a/gcc/doc/gcc.info b/gcc/doc/gcc.info
index ccf781f..cff5b93 100644
--- a/gcc/doc/gcc.info
+++ b/gcc/doc/gcc.info
@@ -2,6 +2,9 @@ This is gcc.info, produced by makeinfo version 6.7 from gcc.texi.
 
 Copyright (C) 1988-2018 Free Software Foundation, Inc.
 
+Modifications to support HyperbolaBSD:
+Copyright (C) 2020-2024 Hyperbola Project
+
  Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
 any later version published by the Free Software Foundation; with the
@@ -1391,7 +1394,7 @@ _Machine-Dependent Options_
           -msched-costly-dep=DEPENDENCE_TYPE
           -minsert-sched-nops=SCHEME
           -mcall-aixdesc  -mcall-eabi  -mcall-freebsd
-          -mcall-linux  -mcall-netbsd  -mcall-openbsd
+          -mcall-linux  -mcall-netbsd  -mcall-openbsd  -mcall-hyperbolabsd
           -mcall-sysv  -mcall-sysv-eabi  -mcall-sysv-noeabi
           -mtraceback=TRACEBACK_TYPE
           -maix-struct-return  -msvr4-struct-return
@@ -20965,6 +20968,10 @@ These '-m' options are defined for PowerPC SPE:
      On System V.4 and embedded PowerPC systems compile code for the
      OpenBSD operating system.
 
+'-mcall-hyperbolabsd'
+     On System V.4 and embedded PowerPC systems compile code for the
+     HyperbolaBSD operating system.
+
 '-maix-struct-return'
      Return all structures in memory (as specified by the AIX ABI).
 
@@ -22073,6 +22080,10 @@ These '-m' options are defined for the IBM RS/6000 and PowerPC:
      On System V.4 and embedded PowerPC systems compile code for the
      OpenBSD operating system.
 
+'-mcall-hyperbolabsd'
+     On System V.4 and embedded PowerPC systems compile code for the
+     HyperbolaBSD operating system.
+
 '-mtraceback=TRACEBACK_TYPE'
      Select the type of traceback table.  Valid values for
      TRACEBACK_TYPE are 'full', 'part', and 'no'.
@@ -24702,11 +24713,12 @@ These '-m' options are defined for the x86 family of computers.
 '-mno-fancy-math-387'
      Some 387 emulators do not support the 'sin', 'cos' and 'sqrt'
      instructions for the 387.  Specify this option to avoid generating
-     those instructions.  This option is the default on OpenBSD and
-     NetBSD.  This option is overridden when '-march' indicates that the
-     target CPU always has an FPU and so the instruction does not need
-     emulation.  These instructions are not generated unless you also
-     use the '-funsafe-math-optimizations' switch.
+     those instructions.  This option is the default on HyperbolaBSD,
+     OpenBSD and NetBSD.  This option is overridden when '-march'
+     indicates that the target CPU always has an FPU and so the
+     instruction does not need emulation.  These instructions are not
+     generated unless you also use the '-funsafe-math-optimizations'
+     switch.
 
 '-malign-double'
 '-mno-align-double'
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 78ca773..47d02b4 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -1,4 +1,8 @@
 @c Copyright (C) 1988-2018 Free Software Foundation, Inc.
+
+@c Modifications to support HyperbolaBSD:
+@c Copyright (C) 2020-2024 Hyperbola Project
+
 @c This is part of the GCC manual.
 @c For copying conditions, see the file gcc.texi.
 
@@ -10,6 +14,9 @@
 @c man begin COPYRIGHT
 Copyright @copyright{} 1988-2018 Free Software Foundation, Inc.
 
+Modifications to support HyperbolaBSD:
+Copyright @copyright{} 2020-2024 Hyperbola Project
+
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.3 or
 any later version published by the Free Software Foundation; with the
@@ -1077,7 +1084,7 @@ See RS/6000 and PowerPC Options.
 -msched-costly-dep=@var{dependence_type} @gol
 -minsert-sched-nops=@var{scheme} @gol
 -mcall-aixdesc  -mcall-eabi  -mcall-freebsd  @gol
--mcall-linux  -mcall-netbsd  -mcall-openbsd  @gol
+-mcall-linux  -mcall-netbsd  -mcall-openbsd  -mcall-hyperbolabsd  @gol
 -mcall-sysv  -mcall-sysv-eabi  -mcall-sysv-noeabi @gol
 -mtraceback=@var{traceback_type} @gol
 -maix-struct-return  -msvr4-struct-return @gol
@@ -22707,10 +22714,15 @@ On System V.4 and embedded PowerPC systems compile code for the
 NetBSD operating system.
 
 @item -mcall-openbsd
-@opindex mcall-netbsd
+@opindex mcall-openbsd
 On System V.4 and embedded PowerPC systems compile code for the
 OpenBSD operating system.
 
+@item -mcall-hyperbolabsd
+@opindex mcall-hyperbolabsd
+On System V.4 and embedded PowerPC systems compile code for the
+HyperbolaBSD operating system.
+
 @item -maix-struct-return
 @opindex maix-struct-return
 Return all structures in memory (as specified by the AIX ABI)@.
@@ -24015,10 +24027,15 @@ On System V.4 and embedded PowerPC systems compile code for the
 NetBSD operating system.
 
 @item -mcall-openbsd
-@opindex mcall-netbsd
+@opindex mcall-openbsd
 On System V.4 and embedded PowerPC systems compile code for the
 OpenBSD operating system.
 
+@item -mcall-hyperbolabsd
+@opindex mcall-hyperbolabsd
+On System V.4 and embedded PowerPC systems compile code for the
+HyperbolaBSD operating system.
+
 @item -mtraceback=@var{traceback_type}
 @opindex mtraceback
 Select the type of traceback table. Valid values for @var{traceback_type}
@@ -26985,9 +27002,9 @@ in ordinary CPU registers instead.
 Some 387 emulators do not support the @code{sin}, @code{cos} and
 @code{sqrt} instructions for the 387.  Specify this option to avoid
 generating those instructions.  This option is the default on
-OpenBSD and NetBSD@.  This option is overridden when @option{-march}
-indicates that the target CPU always has an FPU and so the
-instruction does not need emulation.  These
+HyperbolaBSD, OpenBSD and NetBSD@.  This option is overridden when
+@option{-march} indicates that the target CPU always has an FPU and
+so the instruction does not need emulation.  These
 instructions are not generated unless you also use the
 @option{-funsafe-math-optimizations} switch.
 
diff --git a/gcc/ginclude/stddef.h b/gcc/ginclude/stddef.h
index 31b96a7..2d004de 100644
--- a/gcc/ginclude/stddef.h
+++ b/gcc/ginclude/stddef.h
@@ -1,5 +1,8 @@
 /* Copyright (C) 1989-2018 Free Software Foundation, Inc.
 
+   Modifications to support HyperbolaBSD:
+   Copyright (C) 2020-2024 Hyperbola Project
+
 This file is part of GCC.
 
 GCC is free software; you can redistribute it and/or modify
@@ -52,7 +55,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 #include <machine/ansi.h>
 #endif
 /* On FreeBSD 5, machine/ansi.h does not exist anymore... */
-#if defined (__FreeBSD__) && (__FreeBSD__ >= 5)
+#if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) || defined (__HyperbolaBSD__)
 #include <sys/_types.h>
 #endif
 
@@ -201,6 +204,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t;
 #define _GCC_SIZE_T
 #define _SIZET_
 #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \
+  || defined(__HyperbolaBSD__) \
   || defined(__DragonFly__) \
   || defined(__FreeBSD_kernel__)
 /* __size_t is a typedef on FreeBSD 5, must not trash it. */
diff --git a/gcc/testsuite/gcc.dg/cpp/assert4.c b/gcc/testsuite/gcc.dg/cpp/assert4.c
index 92e3dba..51ca15b 100644
--- a/gcc/testsuite/gcc.dg/cpp/assert4.c
+++ b/gcc/testsuite/gcc.dg/cpp/assert4.c
@@ -1,6 +1,9 @@
 /* Copyright (C) 2003, 2006, 2008, 2009, 2011, 2012
    Free Software Foundation, Inc.
 
+   Modifications to support HyperbolaBSD:
+   Copyright (C) 2020-2024 Hyperbola Project
+
    Test builtin preprocessor assertions.
    By Kaveh Ghazi <ghazi@caip.rutgers.edu>.  */
 
@@ -49,6 +52,14 @@
 # error
 #endif
 
+#if defined __HyperbolaBSD__
+# if !#system(HyperbolaBSD) || !#system(unix) || !#system(bsd)
+#  error
+# endif
+#elif #system(HyperbolaBSD)
+# error
+#endif
+
 #if defined __svr4__ || defined __SYSTYPE_SVR4__
 # if !#system(svr4) || !#system(unix)
 #  error
diff --git a/include/libiberty.h b/include/libiberty.h
index dc09e79..7049083 100644
--- a/include/libiberty.h
+++ b/include/libiberty.h
@@ -1,6 +1,9 @@
 /* Function declarations for libiberty.
 
    Copyright (C) 1997-2018 Free Software Foundation, Inc.
+
+   Modifications to support HyperbolaBSD:
+   Copyright (C) 2020-2024 Hyperbola Project
    
    Note - certain prototypes declared in this header file are for
    functions whoes implementation copyright does not belong to the
@@ -106,7 +109,8 @@ extern int countargv (char * const *);
    is 1, we found it so don't provide any declaration at all.  */
 #if !HAVE_DECL_BASENAME
 #if defined (__GNU_LIBRARY__ ) || defined (__linux__) \
- || defined (__FreeBSD__) || defined (__OpenBSD__) || defined (__NetBSD__) \
+ || defined (__FreeBSD__) || defined (__HyperbolaBSD__) \
+ || defined (__OpenBSD__) || defined (__NetBSD__) \
  || defined (__CYGWIN__) || defined (__CYGWIN32__) || defined (__MINGW32__) \
  || defined (__DragonFly__) || defined (HAVE_DECL_BASENAME) 
 extern char *basename (const char *) ATTRIBUTE_RETURNS_NONNULL ATTRIBUTE_NONNULL(1);
diff --git a/libatomic/configure b/libatomic/configure
index b902e2c..9749f76 100755
--- a/libatomic/configure
+++ b/libatomic/configure
@@ -6,6 +6,9 @@
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
 # Foundation, Inc.
 #
+# Modifications to support HyperbolaBSD:
+# Copyright (C) 2020-2024 Hyperbola Project
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## -------------------- ##
@@ -5411,7 +5414,7 @@ else
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly* | hyperbolabsd*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -5849,6 +5852,10 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  ;;
+
 osf3* | osf4* | osf5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -8985,6 +8992,11 @@ _LT_EOF
       fi
       ;;
 
+    hyperbolabsd*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      ;;
+
     solaris*)
       if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
 	ld_shlibs=no
@@ -9571,6 +9583,18 @@ rm -f core conftest.err conftest.$ac_objext \
       fi
       ;;
 
+    hyperbolabsd*)
+      if test -f /usr/libexec/ld.so || test -f /libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
     os2*)
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_minus_L=yes
@@ -10558,6 +10582,16 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
 os2*)
   libname_spec='$name'
   shrext_cmds=".dll"
diff --git a/libatomic/configure.tgt b/libatomic/configure.tgt
index ea8c34f..2890cf0 100644
--- a/libatomic/configure.tgt
+++ b/libatomic/configure.tgt
@@ -2,6 +2,9 @@
 #  Copyright (C) 2012-2018 Free Software Foundation, Inc.
 #  Contributed by Richard Henderson <rth@redhat.com>.
 #
+#  Modifications to support HyperbolaBSD:
+#  Copyright (C) 2020-2024 Hyperbola Project
+#
 #  This file is part of the GNU Atomic Library (libatomic).
 #
 #  Libatomic is free software; you can redistribute it and/or modify it
@@ -135,7 +138,7 @@ case "${target}" in
 	;;
 
   *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu \
-  | *-*-netbsd* | *-*-freebsd* | *-*-openbsd* | *-*-dragonfly* \
+  | *-*-netbsd* | *-*-freebsd* | *-*-openbsd* | *-*-dragonfly* | *-*-hyperbolabsd \
   | *-*-solaris2* | *-*-sysv4* | *-*-irix6* | *-*-osf* | *-*-hpux11* \
   | *-*-darwin* | *-*-aix* | *-*-cygwin*)
 	# POSIX system.  The OS is supported.
diff --git a/libbacktrace/configure b/libbacktrace/configure
index 87cadda..91af34e 100755
--- a/libbacktrace/configure
+++ b/libbacktrace/configure
@@ -6,6 +6,9 @@
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
 # Foundation, Inc.
 #
+# Modifications to support HyperbolaBSD:
+# Copyright (C) 2020-2024 Hyperbola Project
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## -------------------- ##
@@ -5708,7 +5711,7 @@ else
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly* | hyperbolabsd*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -6146,6 +6149,10 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  ;;
+
 osf3* | osf4* | osf5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -9013,6 +9020,11 @@ _LT_EOF
       fi
       ;;
 
+    hyperbolabsd*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      ;;
+
     solaris*)
       if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
 	ld_shlibs=no
@@ -9599,6 +9611,18 @@ rm -f core conftest.err conftest.$ac_objext \
       fi
       ;;
 
+    hyperbolabsd*)
+      if test -f /usr/libexec/ld.so || test -f /libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
     os2*)
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_minus_L=yes
@@ -10586,6 +10610,16 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
 os2*)
   libname_spec='$name'
   shrext_cmds=".dll"
diff --git a/libcc1/configure b/libcc1/configure
index f53a121..cd29d82 100755
--- a/libcc1/configure
+++ b/libcc1/configure
@@ -6,6 +6,9 @@
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
 # Foundation, Inc.
 #
+# Modifications to support HyperbolaBSD:
+# Copyright (C) 2020-2024 Hyperbola Project
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## -------------------- ##
@@ -5105,7 +5108,7 @@ else
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly* | hyperbolabsd*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -5543,6 +5546,10 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  ;;
+
 osf3* | osf4* | osf5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -8409,6 +8416,11 @@ _LT_EOF
       fi
       ;;
 
+    hyperbolabsd*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      ;;
+
     solaris*)
       if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
 	ld_shlibs=no
@@ -8995,6 +9007,18 @@ rm -f core conftest.err conftest.$ac_objext \
       fi
       ;;
 
+    hyperbolabsd*)
+      if test -f /usr/libexec/ld.so || test -f /libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
     os2*)
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_minus_L=yes
@@ -9982,6 +10006,16 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
 os2*)
   libname_spec='$name'
   shrext_cmds=".dll"
@@ -12366,6 +12400,18 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	fi
 	;;
 
+      hyperbolabsd*)
+	if test -f /usr/libexec/ld.so || test -f /libexec/ld.so; then
+	  hardcode_direct_CXX=yes
+	  hardcode_shlibpath_var_CXX=no
+	  hardcode_direct_absolute_CXX=yes
+	  archive_cmds_CXX='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	else
+	  ld_shlibs_CXX=no
+	fi
+	;;
+
       osf3* | osf4* | osf5*)
         case $cc_basename in
           KCC*)
@@ -13064,7 +13110,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 	    ;;
 	esac
 	;;
-      netbsd*)
+      netbsd* | hyperbolabsd*)
 	;;
       *qnx* | *nto*)
         # QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -14048,6 +14094,16 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
 os2*)
   libname_spec='$name'
   shrext_cmds=".dll"
diff --git a/libffi/README b/libffi/README
index c072101..7282589 100644
--- a/libffi/README
+++ b/libffi/README
@@ -101,6 +101,7 @@ tested:
 | X86             | Linux            | GCC                     |
 | X86             | Mac OSX          | GCC                     |
 | X86             | OpenBSD          | GCC                     |
+| X86             | HyperbolaBSD     | GCC                     |
 | X86             | OS/2             | GCC                     |
 | X86             | Solaris          | GCC                     |
 | X86             | Solaris          | Oracle Solaris Studio C |
@@ -110,6 +111,7 @@ tested:
 | X86-64          | Linux            | GCC                     |
 | X86-64          | Linux/x32        | GCC                     |
 | X86-64          | OpenBSD          | GCC                     |
+| X86-64          | HyperbolaBSD     | GCC                     |
 | X86-64          | Solaris          | Oracle Solaris Studio C |
 | X86-64          | Windows/Cygwin   | GCC                     |
 | X86-64          | Windows/MingW    | GCC                     |
diff --git a/libffi/configure b/libffi/configure
index 790a291..1691544 100755
--- a/libffi/configure
+++ b/libffi/configure
@@ -8,6 +8,9 @@
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
 # Foundation, Inc.
 #
+# Modifications to support HyperbolaBSD:
+# Copyright (C) 2020-2024 Hyperbola Project
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## -------------------- ##
@@ -5680,7 +5683,7 @@ else
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly* | hyperbolabsd*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -6118,6 +6121,10 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  ;;
+
 osf3* | osf4* | osf5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -9255,6 +9262,11 @@ _LT_EOF
       fi
       ;;
 
+    hyperbolabsd*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      ;;
+
     solaris*)
       if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
 	ld_shlibs=no
@@ -9841,6 +9853,18 @@ rm -f core conftest.err conftest.$ac_objext \
       fi
       ;;
 
+    hyperbolabsd*)
+      if test -f /usr/libexec/ld.so || test -f /libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
     os2*)
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_minus_L=yes
@@ -10828,6 +10852,16 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
 os2*)
   libname_spec='$name'
   shrext_cmds=".dll"
@@ -12806,6 +12840,18 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	fi
 	;;
 
+      hyperbolabsd*)
+	if test -f /usr/libexec/ld.so || test -f /libexec/ld.so; then
+	  hardcode_direct_CXX=yes
+	  hardcode_shlibpath_var_CXX=no
+	  hardcode_direct_absolute_CXX=yes
+	  archive_cmds_CXX='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	else
+	  ld_shlibs_CXX=no
+	fi
+	;;
+
       osf3* | osf4* | osf5*)
         case $cc_basename in
           KCC*)
@@ -13504,7 +13550,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 	    ;;
 	esac
 	;;
-      netbsd*)
+      netbsd* | hyperbolabsd*)
 	;;
       *qnx* | *nto*)
         # QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -14488,6 +14534,16 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
 os2*)
   libname_spec='$name'
   shrext_cmds=".dll"
@@ -15808,7 +15864,7 @@ case "$target" in
 $as_echo "#define FFI_EXEC_TRAMPOLINE_TABLE 1" >>confdefs.h
 
      ;;
-     *-apple-darwin1* | *-*-freebsd* | *-*-kfreebsd* | *-*-openbsd* | *-pc-solaris*)
+     *-apple-darwin1* | *-*-freebsd* | *-*-kfreebsd* | *-*-openbsd* | *-pc-solaris* | *-*-hyperbolabsd*)
 
 $as_echo "#define FFI_MMAP_EXEC_WRIT 1" >>confdefs.h
 
diff --git a/libffi/configure.ac b/libffi/configure.ac
index a01d8ac..c8bc716 100644
--- a/libffi/configure.ac
+++ b/libffi/configure.ac
@@ -193,7 +193,7 @@ case "$target" in
                  [Cannot use PROT_EXEC on this target, so, we revert to
                    alternative means])
      ;;
-     *-apple-darwin1* | *-*-freebsd* | *-*-kfreebsd* | *-*-openbsd* | *-pc-solaris*)
+     *-apple-darwin1* | *-*-freebsd* | *-*-kfreebsd* | *-*-openbsd* | *-pc-solaris* | *-*-hyperbolabsd*)
        AC_DEFINE(FFI_MMAP_EXEC_WRIT, 1,
                  [Cannot use malloc on this target, so, we revert to
                    alternative means])
diff --git a/libffi/configure.host b/libffi/configure.host
index 24fbfc4..6e87357 100644
--- a/libffi/configure.host
+++ b/libffi/configure.host
@@ -64,6 +64,10 @@ case "${host}" in
 	TARGET=X86_FREEBSD; TARGETDIR=x86
 	;;
 
+  i?86-*-hyperbolabsd*)
+	TARGET=X86_HYPERBOLABSD; TARGETDIR=x86
+	;;
+
   i?86-win32* | i?86-*-cygwin* | i?86-*-mingw* | i?86-*-os2* | i?86-*-interix* \
   | x86_64-*-cygwin* | x86_64-*-mingw*)
 	TARGETDIR=x86
@@ -188,6 +192,10 @@ case "${host}" in
 	TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc
 	HAVE_LONG_DOUBLE_VARIANT=1
 	;;
+  powerpc-*-hyperbolabsd*)
+	TARGET=POWER_HYPERBOLABSD; TARGETDIR=powerpc
+	HAVE_LONG_DOUBLE_VARIANT=1
+	;;
   powerpc64-*-freebsd*)
 	TARGET=POWERPC; TARGETDIR=powerpc
 	;;
diff --git a/libffi/src/dlmalloc.c b/libffi/src/dlmalloc.c
index 7e4ea83..886dd6b 100644
--- a/libffi/src/dlmalloc.c
+++ b/libffi/src/dlmalloc.c
@@ -1195,7 +1195,8 @@ int mspace_mallopt(int, int);
 #ifndef LACKS_UNISTD_H
 #include <unistd.h>     /* for sbrk */
 #else /* LACKS_UNISTD_H */
-#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
+#if !defined(__FreeBSD__) && !defined(__HyperbolaBSD__) \
+ && !defined(__OpenBSD__) && !defined(__NetBSD__)
 extern void*     sbrk(ptrdiff_t);
 #endif /* FreeBSD etc */
 #endif /* LACKS_UNISTD_H */
diff --git a/libffi/src/powerpc/ffitarget.h b/libffi/src/powerpc/ffitarget.h
index 90aa36b..7201411 100644
--- a/libffi/src/powerpc/ffitarget.h
+++ b/libffi/src/powerpc/ffitarget.h
@@ -3,6 +3,9 @@
                  Copyright (C) 2007, 2008, 2010 Free Software Foundation, Inc
                  Copyright (c) 1996-2003  Red Hat, Inc.
 
+                 Modifications to support HyperbolaBSD:
+                 Copyright (C) 2024 Hyperbola Project
+
    Target configuration macros for PowerPC.
 
    Permission is hereby granted, free of charge, to any person obtaining
@@ -116,7 +119,7 @@ typedef enum ffi_abi {
 		     | FFI_SYSV_SOFT_FLOAT
 #  endif
 #  if (defined (__SVR4_STRUCT_RETURN)					\
-       || defined (POWERPC_FREEBSD) && !defined (__AIX_STRUCT_RETURN))
+       || (defined (POWERPC_FREEBSD) || defined (POWER_HYPERBOLABSD)) && !defined (__AIX_STRUCT_RETURN))
 		     | FFI_SYSV_STRUCT_RET
 #  endif
 #  if __LDBL_MANT_DIG__ == 106
@@ -137,7 +140,7 @@ typedef enum ffi_abi {
 
 #define FFI_CLOSURES 1
 #define FFI_NATIVE_RAW_API 0
-#if defined (POWERPC) || defined (POWERPC_FREEBSD)
+#if defined (POWERPC) || defined (POWERPC_FREEBSD) || defined (POWER_HYPERBOLABSD)
 # define FFI_GO_CLOSURES 1
 # define FFI_TARGET_SPECIFIC_VARIADIC 1
 # define FFI_EXTRA_CIF_FIELDS unsigned nfixedargs
diff --git a/libffi/testsuite/lib/libffi.exp b/libffi/testsuite/lib/libffi.exp
index a0f6ab3..5163273 100644
--- a/libffi/testsuite/lib/libffi.exp
+++ b/libffi/testsuite/lib/libffi.exp
@@ -1,5 +1,8 @@
 #   Copyright (C) 2003, 2005, 2008, 2009, 2010, 2011, 2014 Free Software Foundation, Inc.
 
+#   Modifications to support HyperbolaBSD:
+#   Copyright (C) 2024 Hyperbola Project
+
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
@@ -215,6 +218,10 @@ proc libffi_target_compile { source dest type options } {
 	lappend options "libs= -lpthread"
     }
 
+    if { [string match "*-*-hyperbolabsd*" $target_triplet] } {
+	lappend options "libs= -lpthread"
+    }
+
     lappend options "libs= -lffi"
 
     if { [string match "aarch64*-*-linux*" $target_triplet] } {
diff --git a/libgcc/config/arm/unwind-arm.h b/libgcc/config/arm/unwind-arm.h
index 9f7d3f2..eed7c06 100644
--- a/libgcc/config/arm/unwind-arm.h
+++ b/libgcc/config/arm/unwind-arm.h
@@ -2,6 +2,9 @@
    Copyright (C) 2003-2018 Free Software Foundation, Inc.
    Contributed by Paul Brook
 
+   Modifications to support HyperbolaBSD:
+   Copyright (C) 2020-2024 Hyperbola Project
+
    This file is free software; you can redistribute it and/or modify it
    under the terms of the GNU General Public License as published by the
    Free Software Foundation; either version 3, or (at your option) any
@@ -49,7 +52,7 @@ extern "C" {
 	return 0;
 
 #if (defined(linux) && !defined(__uClinux__)) || defined(__NetBSD__) \
-    || defined(__FreeBSD__) || defined(__fuchsia__)
+    || defined(__FreeBSD__) || defined(__fuchsia__) || defined(__HyperbolaBSD__)
       /* Pc-relative indirect.  */
 #define _GLIBCXX_OVERRIDE_TTYPE_ENCODING (DW_EH_PE_pcrel | DW_EH_PE_indirect)
       tmp += ptr;
diff --git b/libgcc/config/t-hyperbolabsd-thread b/libgcc/config/t-hyperbolabsd-thread
new file mode 100644
index 0000000..50b61e5
--- /dev/null
+++ b/libgcc/config/t-hyperbolabsd-thread
@@ -0,0 +1,3 @@
+# This is currently needed to compile libgcc2 for threads support
+HOST_LIBGCC2_CFLAGS += -pthread
+
diff --git a/libgcc/config.host b/libgcc/config.host
index 677173e..6bf48cc 100644
--- a/libgcc/config.host
+++ b/libgcc/config.host
@@ -1,6 +1,9 @@
 # libgcc host-specific configuration file.
 # Copyright (C) 1997-2018 Free Software Foundation, Inc.
 
+# Modifications to support HyperbolaBSD:
+# Copyright (C) 2020-2024 Hyperbola Project
+
 #This file is part of GCC.
 
 #GCC is free software; you can redistribute it and/or modify it under
@@ -260,6 +263,14 @@ case ${host} in
       ;;
   esac
   ;;
+*-*-hyperbolabsd*)
+  tmake_file="$tmake_file t-crtstuff-pic t-libgcc-pic t-eh-dw2-dip"
+  case ${target_thread_file} in
+    posix)
+      tmake_file="$tmake_file t-hyperbolabsd-thread"
+      ;;
+  esac
+  ;;
 *-*-rtems*)
   tmake_file="$tmake_file t-rtems"
   extra_parts="crtbegin.o crtend.o"
@@ -317,7 +328,8 @@ case ${host} in
 esac
 
 case ${host} in
-*-*-darwin* | *-*-dragonfly* | *-*-freebsd* | *-*-netbsd* | *-*-openbsd* | \
+*-*-darwin* | *-*-dragonfly* | *-*-freebsd* | \
+  *-*-netbsd* | *-*-openbsd* | *-*-hyperbolabsd* | \
   *-*-solaris2*)
   enable_execute_stack=enable-execute-stack-mprotect.c
   ;;
diff --git a/libgcc/unwind-dw2-fde-dip.c b/libgcc/unwind-dw2-fde-dip.c
index ce6a46c..3aba7f9 100644
--- a/libgcc/unwind-dw2-fde-dip.c
+++ b/libgcc/unwind-dw2-fde-dip.c
@@ -1,6 +1,9 @@
 /* Copyright (C) 2001-2018 Free Software Foundation, Inc.
    Contributed by Jakub Jelinek <jakub@redhat.com>.
 
+   Modifications to support HyperbolaBSD:
+   Copyright (C) 2020-2024 Hyperbola Project
+
    This file is part of GCC.
 
    GCC is free software; you can redistribute it and/or modify
@@ -32,7 +35,7 @@
 
 #include "tconfig.h"
 #include "tsystem.h"
-#if !defined(inhibit_libc) && !defined(__OpenBSD__)
+#if !defined(inhibit_libc) && !defined(__OpenBSD__) && !defined(__HyperbolaBSD__)
 #include <elf.h>		/* Get DT_CONFIG.  */
 #endif
 #include "coretypes.h"
@@ -71,7 +74,7 @@
 #endif
 
 #if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
-    && (defined(__OpenBSD__) || defined(__NetBSD__))
+    && (defined(__HyperbolaBSD__) || defined(__OpenBSD__) || defined(__NetBSD__))
 # define ElfW(type) Elf_##type
 # define USE_PT_GNU_EH_FRAME
 #endif
diff --git a/libgfortran/configure b/libgfortran/configure
index 91fce8f..1a9710b 100755
--- a/libgfortran/configure
+++ b/libgfortran/configure
@@ -6,6 +6,9 @@
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
 # Foundation, Inc.
 #
+# Modifications to support HyperbolaBSD:
+# Copyright (C) 2020-2024 Hyperbola Project
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## -------------------- ##
@@ -7041,7 +7044,7 @@ else
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly* | hyperbolabsd*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -7479,6 +7482,10 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  ;;
+
 osf3* | osf4* | osf5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -10350,6 +10357,11 @@ _LT_EOF
       fi
       ;;
 
+    hyperbolabsd*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      ;;
+
     solaris*)
       if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
 	ld_shlibs=no
@@ -10945,6 +10957,18 @@ rm -f core conftest.err conftest.$ac_objext \
       fi
       ;;
 
+    hyperbolabsd*)
+      if test -f /usr/libexec/ld.so || test -f /libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
     os2*)
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_minus_L=yes
@@ -11935,6 +11959,16 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
 os2*)
   libname_spec='$name'
   shrext_cmds=".dll"
@@ -14199,6 +14233,11 @@ _LT_EOF
       fi
       ;;
 
+    hyperbolabsd*)
+      archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      ;;
+
     solaris*)
       if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
 	ld_shlibs_FC=no
@@ -14742,6 +14781,18 @@ rm -f core conftest.err conftest.$ac_objext \
       fi
       ;;
 
+    hyperbolabsd*)
+      if test -f /usr/libexec/ld.so || test -f /libexec/ld.so; then
+	hardcode_direct_FC=yes
+	hardcode_shlibpath_var_FC=no
+	hardcode_direct_absolute_FC=yes
+	archive_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	hardcode_libdir_flag_spec_FC='${wl}-rpath,$libdir'
+      else
+	ld_shlibs_FC=no
+      fi
+      ;;
+
     os2*)
       hardcode_libdir_flag_spec_FC='-L$libdir'
       hardcode_minus_L_FC=yes
@@ -15558,6 +15609,16 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
 os2*)
   libname_spec='$name'
   shrext_cmds=".dll"
diff --git a/libgfortran/intrinsics/random.c b/libgfortran/intrinsics/random.c
index 4a40ce4..808cbaa 100644
--- a/libgfortran/intrinsics/random.c
+++ b/libgfortran/intrinsics/random.c
@@ -3,6 +3,9 @@
    Contributed by Lars Segerlund <seger@linuxmail.org>,
    Steve Kargl and Janne Blomqvist.
 
+   Modifications to support HyperbolaBSD:
+   Copyright (C) 2024 Hyperbola Project
+
 This file is part of the GNU Fortran runtime library (libgfortran).
 
 Libgfortran is free software; you can redistribute it and/or
@@ -303,7 +306,7 @@ getosrandom (void *buf, size_t buflen)
      TODO: When glibc adds a wrapper for the getrandom() system call
      on Linux, one could use that.
 
-     TODO: One could use getentropy() on OpenBSD.  */
+     TODO: One could use getentropy() on OpenBSD (and HyperbolaBSD).  */
   int flags = O_RDONLY;
 #ifdef O_CLOEXEC
   flags |= O_CLOEXEC;
diff --git a/libgo/Makefile.am b/libgo/Makefile.am
index 1a9e498..b0fa65a 100644
--- a/libgo/Makefile.am
+++ b/libgo/Makefile.am
@@ -1,6 +1,10 @@
 # Makefile.am -- Go library Makefile.
 
 # Copyright 2009 The Go Authors. All rights reserved.
+#
+# Modifications to support HyperbolaBSD:
+# Copyright (C) 2020-2024 Hyperbola Project
+#
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
@@ -426,6 +430,9 @@ else
 if LIBGO_IS_NETBSD
 runtime_getncpu_file = runtime/getncpu-bsd.c
 else
+if LIBGO_IS_HYPERBOLABSD
+runtime_getncpu_file = runtime/getncpu-bsd.c
+else
 if LIBGO_IS_AIX
 runtime_getncpu_file = runtime/getncpu-aix.c
 else
@@ -437,6 +444,7 @@ endif
 endif
 endif
 endif
+endif
 
 runtime_files = \
 	runtime/aeshash.c \
diff --git a/libgo/Makefile.in b/libgo/Makefile.in
index b9f2700..13abb62 100644
--- a/libgo/Makefile.in
+++ b/libgo/Makefile.in
@@ -4,6 +4,10 @@
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 # 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
 # Foundation, Inc.
+#
+# Modifications to support HyperbolaBSD:
+# Copyright (C) 2024 Hyperbola Project
+#
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -186,9 +190,10 @@ am__DEPENDENCIES_4 = $(am__DEPENDENCIES_2) \
 	$(am__DEPENDENCIES_3) $(am__DEPENDENCIES_3)
 libgo_llgo_la_DEPENDENCIES = $(am__DEPENDENCIES_4)
 @LIBGO_IS_RTEMS_TRUE@am__objects_1 = rtems-task-variable-add.lo
-@LIBGO_IS_AIX_FALSE@@LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_FREEBSD_FALSE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_NETBSD_FALSE@@LIBGO_IS_SOLARIS_FALSE@am__objects_2 = getncpu-none.lo
-@LIBGO_IS_AIX_TRUE@@LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_FREEBSD_FALSE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_NETBSD_FALSE@@LIBGO_IS_SOLARIS_FALSE@am__objects_2 = getncpu-aix.lo
-@LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_FREEBSD_FALSE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_NETBSD_TRUE@@LIBGO_IS_SOLARIS_FALSE@am__objects_2 = getncpu-bsd.lo
+@LIBGO_IS_AIX_FALSE@@LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_FREEBSD_FALSE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_NETBSD_FALSE@@LIBGO_IS_HYPERBOLABSD_FALSE@@LIBGO_IS_SOLARIS_FALSE@am__objects_2 = getncpu-none.lo
+@LIBGO_IS_AIX_TRUE@@LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_FREEBSD_FALSE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_NETBSD_FALSE@@LIBGO_IS_HYPERBOLABSD_FALSE@@LIBGO_IS_SOLARIS_FALSE@am__objects_2 = getncpu-aix.lo
+@LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_FREEBSD_FALSE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_NETBSD_TRUE@@LIBGO_IS_HYPERBOLABSD_FALSE@@LIBGO_IS_SOLARIS_FALSE@am__objects_2 = getncpu-bsd.lo
+@LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_FREEBSD_FALSE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_HYPERBOLABSD_TRUE@@LIBGO_IS_SOLARIS_FALSE@am__objects_2 = getncpu-bsd.lo
 @LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_FREEBSD_TRUE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@am__objects_2 = getncpu-bsd.lo
 @LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_TRUE@am__objects_2 = getncpu-solaris.lo
 @LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_IRIX_TRUE@@LIBGO_IS_LINUX_FALSE@am__objects_2 = getncpu-irix.lo
@@ -762,9 +767,10 @@ noinst_DATA = golang_org/x/net/internal/nettest.gox \
 	zdefaultcc.go
 @LIBGO_IS_RTEMS_FALSE@rtems_task_variable_add_file = 
 @LIBGO_IS_RTEMS_TRUE@rtems_task_variable_add_file = runtime/rtems-task-variable-add.c
-@LIBGO_IS_AIX_FALSE@@LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_FREEBSD_FALSE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_NETBSD_FALSE@@LIBGO_IS_SOLARIS_FALSE@runtime_getncpu_file = runtime/getncpu-none.c
-@LIBGO_IS_AIX_TRUE@@LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_FREEBSD_FALSE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_NETBSD_FALSE@@LIBGO_IS_SOLARIS_FALSE@runtime_getncpu_file = runtime/getncpu-aix.c
-@LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_FREEBSD_FALSE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_NETBSD_TRUE@@LIBGO_IS_SOLARIS_FALSE@runtime_getncpu_file = runtime/getncpu-bsd.c
+@LIBGO_IS_AIX_FALSE@@LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_FREEBSD_FALSE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_NETBSD_FALSE@@LIBGO_IS_HYPERBOLABSD_FALSE@@LIBGO_IS_SOLARIS_FALSE@runtime_getncpu_file = runtime/getncpu-none.c
+@LIBGO_IS_AIX_TRUE@@LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_FREEBSD_FALSE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_NETBSD_FALSE@@LIBGO_IS_HYPERBOLABSD_FALSE@@LIBGO_IS_SOLARIS_FALSE@runtime_getncpu_file = runtime/getncpu-aix.c
+@LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_FREEBSD_FALSE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_NETBSD_TRUE@@LIBGO_IS_HYPERBOLABSD_FALSE@@LIBGO_IS_SOLARIS_FALSE@runtime_getncpu_file = runtime/getncpu-bsd.c
+@LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_FREEBSD_FALSE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_HYPERBOLABSD_TRUE@@LIBGO_IS_SOLARIS_FALSE@runtime_getncpu_file = runtime/getncpu-bsd.c
 @LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_FREEBSD_TRUE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_FALSE@runtime_getncpu_file = runtime/getncpu-bsd.c
 @LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_IRIX_FALSE@@LIBGO_IS_LINUX_FALSE@@LIBGO_IS_SOLARIS_TRUE@runtime_getncpu_file = runtime/getncpu-solaris.c
 @LIBGO_IS_DARWIN_FALSE@@LIBGO_IS_IRIX_TRUE@@LIBGO_IS_LINUX_FALSE@runtime_getncpu_file = runtime/getncpu-irix.c
diff --git a/libgo/config/libtool.m4 b/libgo/config/libtool.m4
index f700594..a1cb1b5 100644
--- a/libgo/config/libtool.m4
+++ b/libgo/config/libtool.m4
@@ -4,6 +4,9 @@
 #                 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
+#   Modifications to support HyperbolaBSD:
+#   Copyright (C) 2020-2024 Hyperbola Project
+#
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
@@ -13,6 +16,9 @@ m4_define([_LT_COPYING], [dnl
 #                 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
+#   Modifications to support HyperbolaBSD:
+#   Copyright (C) 2020-2024 Hyperbola Project
+#
 #   This file is part of GNU Libtool.
 #
 # GNU Libtool is free software; you can redistribute it and/or
@@ -1518,7 +1524,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly* | hyperbolabsd*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -2562,6 +2568,16 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
 os2*)
   libname_spec='$name'
   shrext_cmds=".dll"
@@ -3124,6 +3140,10 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  ;;
+
 osf3* | osf4* | osf5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -3803,7 +3823,7 @@ m4_if([$1], [CXX], [
 	    ;;
 	esac
 	;;
-      netbsd*)
+      netbsd* | hyperbolabsd*)
 	;;
       *qnx* | *nto*)
         # QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4539,6 +4559,11 @@ _LT_EOF
       fi
       ;;
 
+    hyperbolabsd*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      ;;
+
     solaris*)
       if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
 	_LT_TAGVAR(ld_shlibs, $1)=no
@@ -5001,6 +5026,18 @@ _LT_EOF
       fi
       ;;
 
+    hyperbolabsd*)
+      if test -f /usr/libexec/ld.so || test -f /libexec/ld.so; then
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
     os2*)
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -6155,6 +6192,18 @@ if test "$_lt_caught_CXX_error" != yes; then
 	fi
 	;;
 
+      hyperbolabsd*)
+	if test -f /usr/libexec/ld.so || test -f /libexec/ld.so; then
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
       osf3* | osf4* | osf5*)
         case $cc_basename in
           KCC*)
diff --git a/libgo/config/ltmain.sh b/libgo/config/ltmain.sh
index ce66b44..ca77049 100644
--- a/libgo/config/ltmain.sh
+++ b/libgo/config/ltmain.sh
@@ -5,6 +5,10 @@
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
 # 2007, 2008, 2009 Free Software Foundation, Inc.
+#
+# Modifications to support HyperbolaBSD:
+# Copyright (C) 2020-2024 Hyperbola Project
+#
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -4741,7 +4745,7 @@ func_mode_link ()
 	    # These systems don't actually have a C library (as such)
 	    test "X$arg" = "X-lc" && continue
 	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	  *-*-openbsd* | *-*-hyperbolabsd* | *-*-freebsd* | *-*-dragonfly*)
 	    # Do not include libc due to us having libc/libc_r.
 	    test "X$arg" = "X-lc" && continue
 	    ;;
@@ -4764,7 +4768,7 @@ func_mode_link ()
 	  esac
 	elif test "X$arg" = "X-lc_r"; then
 	 case $host in
-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	 *-*-openbsd* | *-*-hyperbolabsd* | *-*-freebsd* | *-*-dragonfly*)
 	   # Do not include libc_r directly, use -pthread flag.
 	   continue
 	   ;;
@@ -6703,7 +6707,7 @@ func_mode_link ()
 	  *-*-netbsd*)
 	    # Don't link with libc until the a.out ld.so is fixed.
 	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	  *-*-openbsd* | *-*-hyperbolabsd* | *-*-freebsd* | *-*-dragonfly*)
 	    # Do not include libc due to us having libc/libc_r.
 	    ;;
 	  *-*-sco3.2v5* | *-*-sco5v6*)
diff --git a/libgo/configure b/libgo/configure
index 7138eda..f548a2a 100755
--- a/libgo/configure
+++ b/libgo/configure
@@ -6,6 +6,9 @@
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
 # Foundation, Inc.
 #
+# Modifications to support HyperbolaBSD:
+# Copyright (C) 2020-2024 Hyperbola Project
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## -------------------- ##
@@ -646,6 +649,8 @@ LIBGO_IS_RTEMS_FALSE
 LIBGO_IS_RTEMS_TRUE
 LIBGO_IS_DRAGONFLY_FALSE
 LIBGO_IS_DRAGONFLY_TRUE
+LIBGO_IS_HYPERBOLABSD_FALSE
+LIBGO_IS_HYPERBOLABSD_TRUE
 LIBGO_IS_OPENBSD_FALSE
 LIBGO_IS_OPENBSD_TRUE
 LIBGO_IS_NETBSD_FALSE
@@ -5306,7 +5311,7 @@ else
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly* | hyperbolabsd*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -5744,6 +5749,10 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  ;;
+
 osf3* | osf4* | osf5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -8971,6 +8980,11 @@ _LT_EOF
       fi
       ;;
 
+    hyperbolabsd*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      ;;
+
     solaris*)
       if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
 	ld_shlibs=no
@@ -9557,6 +9571,18 @@ rm -f core conftest.err conftest.$ac_objext \
       fi
       ;;
 
+    hyperbolabsd*)
+      if test -f /usr/libexec/ld.so || test -f /libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
     os2*)
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_minus_L=yes
@@ -10544,6 +10570,16 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
 os2*)
   libname_spec='$name'
   shrext_cmds=".dll"
@@ -12388,6 +12424,11 @@ _LT_EOF
       fi
       ;;
 
+    hyperbolabsd*)
+      archive_cmds_GO='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds_GO='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      ;;
+
     solaris*)
       if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
 	ld_shlibs_GO=no
@@ -12935,6 +12976,18 @@ rm -f core conftest.err conftest.$ac_objext \
       fi
       ;;
 
+    hyperbolabsd*)
+      if test -f /usr/libexec/ld.so || test -f /libexec/ld.so; then
+	hardcode_direct_GO=yes
+	hardcode_shlibpath_var_GO=no
+	hardcode_direct_absolute_GO=yes
+	archive_cmds_GO='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	hardcode_libdir_flag_spec_GO='${wl}-rpath,$libdir'
+      else
+	ld_shlibs_GO=no
+      fi
+      ;;
+
     os2*)
       hardcode_libdir_flag_spec_GO='-L$libdir'
       hardcode_minus_L_GO=yes
@@ -13509,7 +13562,7 @@ go_include="-include"
 # All known GOOS values.  This is the union of all operating systems
 # supported by the gofrontend and all operating systems supported by
 # the gc toolchain.
-ALLGOOS="aix android darwin dragonfly freebsd irix linux netbsd openbsd plan9 rtems solaris windows"
+ALLGOOS="aix android darwin dragonfly freebsd irix linux netbsd openbsd hyperbolabsd plan9 rtems solaris windows"
 
 is_darwin=no
 is_freebsd=no
@@ -13518,6 +13571,7 @@ is_linux=no
 is_netbsd=no
 is_openbsd=no
 is_dragonfly=no
+is_hyperbolabsd=no
 is_rtems=no
 is_solaris=no
 is_aix=no
@@ -13530,6 +13584,7 @@ case ${host} in
   *-*-netbsd*)	 is_netbsd=yes;  GOOS=netbsd ;;
   *-*-openbsd*)  is_openbsd=yes; GOOS=openbsd ;;
   *-*-dragonfly*) is_dragonfly=yes; GOOS=dragonfly ;;
+  *-*-hyperbolabsd*) is_hyperbolabsd=yes; GOOS=hyperbolabsd ;;
   *-*-rtems*)    is_rtems=yes;   GOOS=rtems ;;
   *-*-solaris2*) is_solaris=yes; GOOS=solaris ;;
   *-*-aix*)      is_aix=yes;     GOOS=aix ;;
@@ -13590,6 +13645,14 @@ else
   LIBGO_IS_DRAGONFLY_FALSE=
 fi
 
+ if test $is_hyperbolabsd = yes; then
+  LIBGO_IS_HYPERBOLABSD_TRUE=
+  LIBGO_IS_HYPERBOLABSD_FALSE='#'
+else
+  LIBGO_IS_HYPERBOLABSD_TRUE='#'
+  LIBGO_IS_HYPERBOLABSD_FALSE=
+fi
+
  if test $is_rtems = yes; then
   LIBGO_IS_RTEMS_TRUE=
   LIBGO_IS_RTEMS_FALSE='#'
@@ -13614,7 +13677,7 @@ else
   LIBGO_IS_AIX_FALSE=
 fi
 
- if test $is_darwin = yes -o $is_dragonfly = yes -o $is_freebsd = yes -o $is_netbsd = yes -o $is_openbsd = yes; then
+ if test $is_darwin = yes -o $is_dragonfly = yes -o $is_freebsd = yes -o $is_netbsd = yes -o $is_openbsd = yes -o $is_hyperbolabsd = yes; then
   LIBGO_IS_BSD_TRUE=
   LIBGO_IS_BSD_FALSE='#'
 else
@@ -15672,6 +15735,10 @@ if test -z "${LIBGO_IS_DRAGONFLY_TRUE}" && test -z "${LIBGO_IS_DRAGONFLY_FALSE}"
   as_fn_error "conditional \"LIBGO_IS_DRAGONFLY\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${LIBGO_IS_HYPERBOLABSD_TRUE}" && test -z "${LIBGO_IS_HYPERBOLABSD_FALSE}"; then
+  as_fn_error "conditional \"LIBGO_IS_HYPERBOLABSD\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${LIBGO_IS_RTEMS_TRUE}" && test -z "${LIBGO_IS_RTEMS_FALSE}"; then
   as_fn_error "conditional \"LIBGO_IS_RTEMS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/libgo/configure.ac b/libgo/configure.ac
index 2c6b08f..33a5eda 100644
--- a/libgo/configure.ac
+++ b/libgo/configure.ac
@@ -1,6 +1,10 @@
 # configure.ac -- Go library configure script.
 
 # Copyright 2009 The Go Authors. All rights reserved.
+#
+# Modifications to support HyperbolaBSD:
+# Copyright (C) 2020-2024 Hyperbola Project
+#
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
@@ -154,7 +158,7 @@ AC_SUBST(go_include)
 # All known GOOS values.  This is the union of all operating systems
 # supported by the gofrontend and all operating systems supported by
 # the gc toolchain.
-ALLGOOS="aix android darwin dragonfly freebsd irix linux netbsd openbsd plan9 rtems solaris windows"
+ALLGOOS="aix android darwin dragonfly freebsd irix linux netbsd openbsd hyperbolabsd plan9 rtems solaris windows"
 
 is_darwin=no
 is_freebsd=no
@@ -163,6 +167,7 @@ is_linux=no
 is_netbsd=no
 is_openbsd=no
 is_dragonfly=no
+is_hyperbolabsd=no
 is_rtems=no
 is_solaris=no
 is_aix=no
@@ -175,6 +180,7 @@ case ${host} in
   *-*-netbsd*)	 is_netbsd=yes;  GOOS=netbsd ;;
   *-*-openbsd*)  is_openbsd=yes; GOOS=openbsd ;;
   *-*-dragonfly*) is_dragonfly=yes; GOOS=dragonfly ;;
+  *-*-hyperbolabsd*) is_hyperbolabsd=yes; GOOS=hyperbolabsd ;;
   *-*-rtems*)    is_rtems=yes;   GOOS=rtems ;;
   *-*-solaris2*) is_solaris=yes; GOOS=solaris ;;
   *-*-aix*)      is_aix=yes;     GOOS=aix ;;
@@ -186,10 +192,11 @@ AM_CONDITIONAL(LIBGO_IS_LINUX, test $is_linux = yes)
 AM_CONDITIONAL(LIBGO_IS_NETBSD, test $is_netbsd = yes)
 AM_CONDITIONAL(LIBGO_IS_OPENBSD, test $is_openbsd = yes)
 AM_CONDITIONAL(LIBGO_IS_DRAGONFLY, test $is_dragonfly = yes)
+AM_CONDITIONAL(LIBGO_IS_HYPERBOLABSD, test $is_hyperbolabsd = yes)
 AM_CONDITIONAL(LIBGO_IS_RTEMS, test $is_rtems = yes)
 AM_CONDITIONAL(LIBGO_IS_SOLARIS, test $is_solaris = yes)
 AM_CONDITIONAL(LIBGO_IS_AIX, test $is_aix = yes)
-AM_CONDITIONAL(LIBGO_IS_BSD, test $is_darwin = yes -o $is_dragonfly = yes -o $is_freebsd = yes -o $is_netbsd = yes -o $is_openbsd = yes)
+AM_CONDITIONAL(LIBGO_IS_BSD, test $is_darwin = yes -o $is_dragonfly = yes -o $is_freebsd = yes -o $is_netbsd = yes -o $is_openbsd = yes -o $is_hyperbolabsd = yes)
 AC_SUBST(GOOS)
 AC_SUBST(ALLGOOS)
 
diff --git a/libgo/go/archive/tar/stat_actime1.go b/libgo/go/archive/tar/stat_actime1.go
index 1bdd1c9..7979ca8 100644
--- a/libgo/go/archive/tar/stat_actime1.go
+++ b/libgo/go/archive/tar/stat_actime1.go
@@ -1,8 +1,12 @@
 // Copyright 2012 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix linux dragonfly openbsd solaris
+// +build aix linux dragonfly openbsd hyperbolabsd solaris
 
 package tar
 
diff --git a/libgo/go/archive/tar/stat_unix.go b/libgo/go/archive/tar/stat_unix.go
index c37a57a..bf7e6ec 100644
--- a/libgo/go/archive/tar/stat_unix.go
+++ b/libgo/go/archive/tar/stat_unix.go
@@ -1,8 +1,12 @@
 // Copyright 2012 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix linux darwin dragonfly freebsd openbsd netbsd solaris
+// +build aix linux darwin dragonfly freebsd hyperbolabsd openbsd netbsd solaris
 
 package tar
 
@@ -98,6 +102,12 @@ func statUnix(fi os.FileInfo, h *Header) error {
 			minor := uint32((dev & 0x000000ff) >> 0)
 			minor |= uint32((dev & 0xffff0000) >> 8)
 			h.Devmajor, h.Devminor = int64(major), int64(minor)
+		case "hyperbolabsd":
+			// Copied from golang.org/x/sys/unix/dev_openbsd.go.
+			major := uint32((dev & 0x0000ff00) >> 8)
+			minor := uint32((dev & 0x000000ff) >> 0)
+			minor |= uint32((dev & 0xffff0000) >> 8)
+			h.Devmajor, h.Devminor = int64(major), int64(minor)
 		default:
 			// TODO: Implement solaris (see https://golang.org/issue/8106)
 		}
diff --git a/libgo/go/cmd/go/go_test.go b/libgo/go/cmd/go/go_test.go
index 959fcb5..57fc207 100644
--- a/libgo/go/cmd/go/go_test.go
+++ b/libgo/go/cmd/go/go_test.go
@@ -1,4 +1,8 @@
 // Copyright 2015 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -2845,10 +2849,11 @@ func TestCgoPkgConfig(t *testing.T) {
 		t.Skipf("%s --atleast-pkgconfig-version 0.24: %v\n%s", pkgConfig, err, out)
 	}
 
-	// OpenBSD's pkg-config is strict about whitespace and only
-	// supports backslash-escaped whitespace. It does not support
-	// quotes, which the normal freedesktop.org pkg-config does
-	// support. See http://man.openbsd.org/pkg-config.1
+	// HyperbolaBSD and OpenBSD's pkg-config is strict about
+	// whitespace and only supports backslash-escaped whitespace.
+	// It does not support quotes, which the normal freedesktop.org
+	// pkg-config does support.
+	// See http://man.openbsd.org/pkg-config.1
 	tg.tempFile("foo.pc", `
 Name: foo
 Description: The foo library
@@ -4555,6 +4560,8 @@ func TestExecutableGOROOT(t *testing.T) {
 	skipIfGccgo(t, "gccgo has no GOROOT")
 	if runtime.GOOS == "openbsd" {
 		t.Skipf("test case does not work on %s, missing os.Executable", runtime.GOOS)
+	} else if runtime.GOOS == "hyperbolabsd" {
+		t.Skipf("test case does not work on %s, missing os.Executable", runtime.GOOS)
 	}
 
 	// Env with no GOROOT.
diff --git a/libgo/go/cmd/go/go_unix_test.go b/libgo/go/cmd/go/go_unix_test.go
index f6e10ca..1a8d5ee 100644
--- a/libgo/go/cmd/go/go_unix_test.go
+++ b/libgo/go/cmd/go/go_unix_test.go
@@ -1,8 +1,12 @@
 // Copyright 2015 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris
 
 package main_test
 
diff --git a/libgo/go/cmd/go/internal/base/signal_unix.go b/libgo/go/cmd/go/internal/base/signal_unix.go
index b90f3a2..e7384f5 100644
--- a/libgo/go/cmd/go/internal/base/signal_unix.go
+++ b/libgo/go/cmd/go/internal/base/signal_unix.go
@@ -1,8 +1,12 @@
 // Copyright 2012 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris
 
 package base
 
diff --git a/libgo/go/cmd/go/internal/bug/bug.go b/libgo/go/cmd/go/internal/bug/bug.go
index 963da94..1cad669 100644
--- a/libgo/go/cmd/go/internal/bug/bug.go
+++ b/libgo/go/cmd/go/internal/bug/bug.go
@@ -1,4 +1,8 @@
 // Copyright 2016 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -96,7 +100,7 @@ func printOSDetails(w io.Writer) {
 		printCmdOut(w, "uname -sr: ", "uname", "-sr")
 		printCmdOut(w, "", "lsb_release", "-a")
 		printGlibcVersion(w)
-	case "openbsd", "netbsd", "freebsd", "dragonfly":
+	case "hyperbolabsd", "openbsd", "netbsd", "freebsd", "dragonfly":
 		printCmdOut(w, "uname -v: ", "uname", "-v")
 	case "solaris":
 		out, err := ioutil.ReadFile("/etc/release")
diff --git a/libgo/go/cmd/go/internal/work/exec.go b/libgo/go/cmd/go/internal/work/exec.go
index 5994dbc..8bd93a4 100644
--- a/libgo/go/cmd/go/internal/work/exec.go
+++ b/libgo/go/cmd/go/internal/work/exec.go
@@ -1,4 +1,8 @@
 // Copyright 2011 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -642,7 +646,7 @@ func (b *Builder) build(a *Action) (err error) {
 	// This is read by readGccgoArchive in cmd/internal/buildid/buildid.go.
 	if a.buildID != "" && cfg.BuildToolchainName == "gccgo" {
 		switch cfg.Goos {
-		case "android", "dragonfly", "freebsd", "linux", "netbsd", "openbsd", "solaris":
+		case "android", "dragonfly", "freebsd", "linux", "netbsd", "openbsd", "hyperbolabsd", "solaris":
 			asmfile, err := b.gccgoBuildIDELFFile(a)
 			if err != nil {
 				return err
diff --git a/libgo/go/cmd/go/internal/work/init.go b/libgo/go/cmd/go/internal/work/init.go
index c2beb3b..2cee120 100644
--- a/libgo/go/cmd/go/internal/work/init.go
+++ b/libgo/go/cmd/go/internal/work/init.go
@@ -1,4 +1,8 @@
 // Copyright 2017 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -82,7 +86,7 @@ func buildModeInit() {
 			codegenArg = "-shared"
 		default:
 			switch cfg.Goos {
-			case "dragonfly", "freebsd", "linux", "netbsd", "openbsd", "solaris":
+			case "dragonfly", "freebsd", "linux", "netbsd", "openbsd", "hyperbolabsd", "solaris":
 				// Use -shared so that the result is
 				// suitable for inclusion in a PIE or
 				// shared library.
diff --git a/libgo/go/cmd/go/note_test.go b/libgo/go/cmd/go/note_test.go
index 7ef4c64..2fe3c3b 100644
--- a/libgo/go/cmd/go/note_test.go
+++ b/libgo/go/cmd/go/note_test.go
@@ -1,4 +1,8 @@
 // Copyright 2015 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -36,6 +40,8 @@ func TestNoteReading(t *testing.T) {
 		t.Skipf("skipping - no cgo, so assuming external linking not available")
 	case runtime.GOOS == "openbsd" && runtime.GOARCH == "arm":
 		t.Skipf("skipping - external linking not supported, golang.org/issue/10619")
+	case runtime.GOOS == "hyperbolabsd" && runtime.GOARCH == "arm":
+		t.Skipf("skipping - external linking not supported, golang.org/issue/10619")
 	case runtime.GOOS == "plan9":
 		t.Skipf("skipping - external linking not supported")
 	}
@@ -50,7 +56,7 @@ func TestNoteReading(t *testing.T) {
 	}
 
 	switch runtime.GOOS {
-	case "dragonfly", "freebsd", "linux", "netbsd", "openbsd":
+	case "dragonfly", "freebsd", "linux", "netbsd", "openbsd", "hyperbolabsd":
 		// Test while forcing use of the gold linker, since in the past
 		// we've had trouble reading the notes generated by gold.
 		err := tg.doRun([]string{"build", "-ldflags", "-buildid=" + buildID + " -linkmode=external -extldflags=-fuse-ld=gold", "-o", tg.path("hello3.exe"), tg.path("hello.go")})
diff --git a/libgo/go/cmd/internal/objabi/head.go b/libgo/go/cmd/internal/objabi/head.go
index ff19606..9d9f1b5 100644
--- a/libgo/go/cmd/internal/objabi/head.go
+++ b/libgo/go/cmd/internal/objabi/head.go
@@ -10,6 +10,9 @@
 //	Revisions Copyright © 2000-2007 Lucent Technologies Inc. and others
 //	Portions Copyright © 2009 The Go Authors. All rights reserved.
 //
+//      Modifications to support HyperbolaBSD:
+//      Copyright (C) 2020-2024 Hyperbola Project
+//
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
 // in the Software without restriction, including without limitation the rights
@@ -44,6 +47,7 @@ const (
 	Hnacl
 	Hnetbsd
 	Hopenbsd
+	Hhyperbolabsd
 	Hplan9
 	Hsolaris
 	Hwindows
@@ -65,6 +69,8 @@ func (h *HeadType) Set(s string) error {
 		*h = Hnetbsd
 	case "openbsd":
 		*h = Hopenbsd
+	case "hyperbolabsd":
+		*h = Hhyperbolabsd
 	case "plan9":
 		*h = Hplan9
 	case "solaris":
@@ -93,6 +99,8 @@ func (h *HeadType) String() string {
 		return "netbsd"
 	case Hopenbsd:
 		return "openbsd"
+	case Hhyperbolabsd:
+		return "hyperbolabsd"
 	case Hplan9:
 		return "plan9"
 	case Hsolaris:
diff --git b/libgo/go/cmd/vet/all/whitelist/hyperbolabsd_386.txt b/libgo/go/cmd/vet/all/whitelist/hyperbolabsd_386.txt
new file mode 100644
index 0000000..93f6404
--- /dev/null
+++ b/libgo/go/cmd/vet/all/whitelist/hyperbolabsd_386.txt
@@ -0,0 +1,17 @@
+// hyperbolabsd-386-specific vet whitelist. See readme.txt for details.
+
+runtime/sys_hyperbolabsd_386.s: [386] sigtramp: unknown variable signo
+runtime/sys_hyperbolabsd_386.s: [386] sigtramp: unknown variable info
+runtime/sys_hyperbolabsd_386.s: [386] sigtramp: unknown variable context
+runtime/sys_hyperbolabsd_386.s: [386] setldt: function setldt missing Go declaration
+runtime/sys_hyperbolabsd_386.s: [386] settls: function settls missing Go declaration
+syscall/asm_unix_386.s: [386] Syscall: 8(SP) should be a1+4(FP)
+syscall/asm_unix_386.s: [386] Syscall: 4(SP) should be trap+0(FP)
+syscall/asm_unix_386.s: [386] Syscall6: 8(SP) should be a1+4(FP)
+syscall/asm_unix_386.s: [386] Syscall6: 4(SP) should be trap+0(FP)
+syscall/asm_unix_386.s: [386] Syscall9: 8(SP) should be a1+4(FP)
+syscall/asm_unix_386.s: [386] Syscall9: 4(SP) should be num+0(FP)
+syscall/asm_unix_386.s: [386] RawSyscall: 8(SP) should be a1+4(FP)
+syscall/asm_unix_386.s: [386] RawSyscall: 4(SP) should be trap+0(FP)
+syscall/asm_unix_386.s: [386] RawSyscall6: 8(SP) should be a1+4(FP)
+syscall/asm_unix_386.s: [386] RawSyscall6: 4(SP) should be trap+0(FP)
diff --git b/libgo/go/cmd/vet/all/whitelist/hyperbolabsd_amd64.txt b/libgo/go/cmd/vet/all/whitelist/hyperbolabsd_amd64.txt
new file mode 100644
index 0000000..c58a57a
--- /dev/null
+++ b/libgo/go/cmd/vet/all/whitelist/hyperbolabsd_amd64.txt
@@ -0,0 +1,3 @@
+// hyperbolabsd-amd64-specific vet whitelist. See readme.txt for details.
+
+runtime/sys_hyperbolabsd_amd64.s: [amd64] settls: function settls missing Go declaration
diff --git b/libgo/go/cmd/vet/all/whitelist/hyperbolabsd_arm.txt b/libgo/go/cmd/vet/all/whitelist/hyperbolabsd_arm.txt
new file mode 100644
index 0000000..ea8dcd2
--- /dev/null
+++ b/libgo/go/cmd/vet/all/whitelist/hyperbolabsd_arm.txt
@@ -0,0 +1,4 @@
+// hyperbolabsd-arm-specific vet whitelist. See readme.txt for details.
+
+runtime/asm_arm.s: [arm] sigreturn: function sigreturn missing Go declaration
+runtime/sys_hyperbolabsd_arm.s: [arm] read_tls_fallback: function read_tls_fallback missing Go declaration
diff --git a/libgo/go/crypto/rand/eagain.go b/libgo/go/crypto/rand/eagain.go
index 045d037..7956518 100644
--- a/libgo/go/crypto/rand/eagain.go
+++ b/libgo/go/crypto/rand/eagain.go
@@ -1,8 +1,12 @@
 // Copyright 2014 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris
 
 package rand
 
diff --git a/libgo/go/crypto/rand/rand.go b/libgo/go/crypto/rand/rand.go
index 6f7523d..5b1ff0b 100644
--- a/libgo/go/crypto/rand/rand.go
+++ b/libgo/go/crypto/rand/rand.go
@@ -1,4 +1,8 @@
 // Copyright 2010 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -12,7 +16,7 @@ import "io"
 // strong pseudo-random generator.
 //
 // On Linux, Reader uses getrandom(2) if available, /dev/urandom otherwise.
-// On OpenBSD, Reader uses getentropy(2).
+// On OpenBSD (and HyperbolaBSD), Reader uses getentropy(2).
 // On other Unix-like systems, Reader reads from /dev/urandom.
 // On Windows systems, Reader uses the CryptGenRandom API.
 var Reader io.Reader
diff --git b/libgo/go/crypto/rand/rand_hyperbolabsd.go b/libgo/go/crypto/rand/rand_hyperbolabsd.go
new file mode 100644
index 0000000..ca4f9bd
--- /dev/null
+++ b/libgo/go/crypto/rand/rand_hyperbolabsd.go
@@ -0,0 +1,32 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package rand
+
+import (
+	"internal/syscall/unix"
+)
+
+func init() {
+	altGetRandom = getRandomHyperbolaBSD
+}
+
+func getRandomHyperbolaBSD(p []byte) (ok bool) {
+	// getentropy(2) returns a maximum of 256 bytes per call
+	for i := 0; i < len(p); i += 256 {
+		end := i + 256
+		if len(p) < end {
+			end = len(p)
+		}
+		err := unix.GetEntropy(p[i:end])
+		if err != nil {
+			return false
+		}
+	}
+	return true
+}
diff --git a/libgo/go/crypto/rand/rand_unix.go b/libgo/go/crypto/rand/rand_unix.go
index ec474d3..f7aa49a 100644
--- a/libgo/go/crypto/rand/rand_unix.go
+++ b/libgo/go/crypto/rand/rand_unix.go
@@ -1,8 +1,12 @@
 // Copyright 2010 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd plan9 solaris
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd plan9 solaris
 
 // Unix cryptographically secure pseudorandom number
 // generator.
diff --git a/libgo/go/crypto/x509/root_bsd.go b/libgo/go/crypto/x509/root_bsd.go
index 1371933..abaeaf7 100644
--- a/libgo/go/crypto/x509/root_bsd.go
+++ b/libgo/go/crypto/x509/root_bsd.go
@@ -1,15 +1,19 @@
 // Copyright 2015 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build dragonfly freebsd netbsd openbsd
+// +build dragonfly freebsd netbsd openbsd hyperbolabsd
 
 package x509
 
 // Possible certificate files; stop after finding one.
 var certFiles = []string{
 	"/usr/local/etc/ssl/cert.pem",            // FreeBSD
-	"/etc/ssl/cert.pem",                      // OpenBSD
+	"/etc/ssl/cert.pem",                      // OpenBSD and HyperbolaBSD
 	"/usr/local/share/certs/ca-root-nss.crt", // DragonFly
 	"/etc/openssl/certs/ca-certificates.crt", // NetBSD
 }
diff --git a/libgo/go/crypto/x509/root_unix.go b/libgo/go/crypto/x509/root_unix.go
index 0547460..9f7cfe2 100644
--- a/libgo/go/crypto/x509/root_unix.go
+++ b/libgo/go/crypto/x509/root_unix.go
@@ -1,8 +1,12 @@
 // Copyright 2011 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix dragonfly freebsd linux nacl netbsd openbsd solaris
+// +build aix dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris
 
 package x509
 
diff --git a/libgo/go/crypto/x509/root_unix_test.go b/libgo/go/crypto/x509/root_unix_test.go
index 03f935d..31913ca 100644
--- a/libgo/go/crypto/x509/root_unix_test.go
+++ b/libgo/go/crypto/x509/root_unix_test.go
@@ -1,8 +1,12 @@
 // Copyright 2017 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build dragonfly freebsd linux netbsd openbsd solaris
+// +build dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris
 
 package x509
 
diff --git a/libgo/go/debug/elf/elf.go b/libgo/go/debug/elf/elf.go
index c8a4fe6..e74597e 100644
--- a/libgo/go/debug/elf/elf.go
+++ b/libgo/go/debug/elf/elf.go
@@ -17,6 +17,9 @@
  * Copyright (c) 2001 David E. O'Brien
  * Portions Copyright 2009 The Go Authors. All rights reserved.
  *
+ * Modifications to support HyperbolaBSD:
+ * Copyright (C) 2020-2024 Hyperbola Project
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -132,6 +135,7 @@ const (
 	ELFOSABI_OPENBSD    OSABI = 12  /* OpenBSD */
 	ELFOSABI_OPENVMS    OSABI = 13  /* Open VMS */
 	ELFOSABI_NSK        OSABI = 14  /* HP Non-Stop Kernel */
+	ELFOSABI_HYPERBOLABSD OSABI = 19 /* HyperbolaBSD */
 	ELFOSABI_ARM        OSABI = 97  /* ARM */
 	ELFOSABI_STANDALONE OSABI = 255 /* Standalone (embedded) application */
 )
@@ -152,6 +156,7 @@ var osabiStrings = []intName{
 	{12, "ELFOSABI_OPENBSD"},
 	{13, "ELFOSABI_OPENVMS"},
 	{14, "ELFOSABI_NSK"},
+	{19, "ELFOSABI_HYPERBOLABSD"},
 	{97, "ELFOSABI_ARM"},
 	{255, "ELFOSABI_STANDALONE"},
 }
diff --git a/libgo/go/debug/elf/file_test.go b/libgo/go/debug/elf/file_test.go
index 58bdf27..978f05e 100644
--- a/libgo/go/debug/elf/file_test.go
+++ b/libgo/go/debug/elf/file_test.go
@@ -1,4 +1,8 @@
 // Copyright 2009 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -613,6 +617,35 @@ var relocationTests = []relocationTest{
 			}},
 		},
 	},
+	{
+		"testdata/gcc-amd64-hyperbolabsd-debug-with-rela.obj",
+		[]relocationTestEntry{
+			{203, &dwarf.Entry{
+				Offset:   0xc62,
+				Tag:      dwarf.TagMember,
+				Children: false,
+				Field: []dwarf.Field{
+					{Attr: dwarf.AttrName, Val: "it_interval", Class: dwarf.ClassString},
+					{Attr: dwarf.AttrDeclFile, Val: int64(7), Class: dwarf.ClassConstant},
+					{Attr: dwarf.AttrDeclLine, Val: int64(236), Class: dwarf.ClassConstant},
+					{Attr: dwarf.AttrType, Val: dwarf.Offset(0xb7f), Class: dwarf.ClassReference},
+					{Attr: dwarf.AttrDataMemberLoc, Val: []byte{0x23, 0x0}, Class: dwarf.ClassExprLoc},
+				},
+			}},
+			{204, &dwarf.Entry{
+				Offset:   0xc70,
+				Tag:      dwarf.TagMember,
+				Children: false,
+				Field: []dwarf.Field{
+					{Attr: dwarf.AttrName, Val: "it_value", Class: dwarf.ClassString},
+					{Attr: dwarf.AttrDeclFile, Val: int64(7), Class: dwarf.ClassConstant},
+					{Attr: dwarf.AttrDeclLine, Val: int64(237), Class: dwarf.ClassConstant},
+					{Attr: dwarf.AttrType, Val: dwarf.Offset(0xb7f), Class: dwarf.ClassReference},
+					{Attr: dwarf.AttrDataMemberLoc, Val: []byte{0x23, 0x10}, Class: dwarf.ClassExprLoc},
+				},
+			}},
+		},
+	},
 }
 
 func TestDWARFRelocations(t *testing.T) {
diff --git b/libgo/go/debug/elf/testdata/gcc-amd64-hyperbolabsd-debug-with-rela.obj b/libgo/go/debug/elf/testdata/gcc-amd64-hyperbolabsd-debug-with-rela.obj
new file mode 100644
index 0000000..f62b1ea
Binary files /dev/null and b/libgo/go/debug/elf/testdata/gcc-amd64-hyperbolabsd-debug-with-rela.obj differ
diff --git a/libgo/go/debug/gosym/pclntab_test.go b/libgo/go/debug/gosym/pclntab_test.go
index 7e7cee6..89d157e 100644
--- a/libgo/go/debug/gosym/pclntab_test.go
+++ b/libgo/go/debug/gosym/pclntab_test.go
@@ -1,4 +1,8 @@
 // Copyright 2009 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -79,7 +83,7 @@ func endtest() {
 // These tests open and examine the test binary, and use elf.Open to do so.
 func skipIfNotELF(t *testing.T) {
 	switch runtime.GOOS {
-	case "dragonfly", "freebsd", "linux", "netbsd", "openbsd", "solaris":
+	case "dragonfly", "freebsd", "linux", "netbsd", "openbsd", "hyperbolabsd", "solaris":
 		// OK.
 	default:
 		t.Skipf("skipping on non-ELF system %s", runtime.GOOS)
diff --git a/libgo/go/go/build/syslist.go b/libgo/go/go/build/syslist.go
index 679d195..1ab5ee5 100644
--- a/libgo/go/go/build/syslist.go
+++ b/libgo/go/go/build/syslist.go
@@ -1,8 +1,12 @@
 // Copyright 2011 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 package build
 
-const goosList = "aix android darwin dragonfly freebsd linux nacl netbsd openbsd plan9 solaris windows zos "
+const goosList = "aix android darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd plan9 solaris windows zos "
 const goarchList = "386 amd64 amd64p32 arm armbe arm64 arm64be alpha m68k ppc64 ppc64le mips mipsle mips64 mips64le mips64p32 mips64p32le ppc riscv64 s390 s390x sh shbe sparc sparc64"
diff --git a/libgo/go/golang_org/x/net/internal/nettest/helper_bsd.go b/libgo/go/golang_org/x/net/internal/nettest/helper_bsd.go
index a6e433b..9e9b5b2 100644
--- a/libgo/go/golang_org/x/net/internal/nettest/helper_bsd.go
+++ b/libgo/go/golang_org/x/net/internal/nettest/helper_bsd.go
@@ -1,8 +1,12 @@
 // Copyright 2016 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd netbsd openbsd
+// +build darwin dragonfly freebsd netbsd openbsd hyperbolabsd
 
 package nettest
 
diff --git a/libgo/go/golang_org/x/net/internal/nettest/helper_posix.go b/libgo/go/golang_org/x/net/internal/nettest/helper_posix.go
index efc67a8..1f1dbcd 100644
--- a/libgo/go/golang_org/x/net/internal/nettest/helper_posix.go
+++ b/libgo/go/golang_org/x/net/internal/nettest/helper_posix.go
@@ -1,8 +1,12 @@
 // Copyright 2014 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris windows
+// +build aix darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris windows
 
 package nettest
 
diff --git a/libgo/go/golang_org/x/net/internal/nettest/helper_unix.go b/libgo/go/golang_org/x/net/internal/nettest/helper_unix.go
index b6839dc..8df875b 100644
--- a/libgo/go/golang_org/x/net/internal/nettest/helper_unix.go
+++ b/libgo/go/golang_org/x/net/internal/nettest/helper_unix.go
@@ -1,8 +1,12 @@
 // Copyright 2015 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris
 
 package nettest
 
diff --git a/libgo/go/golang_org/x/net/route/address.go b/libgo/go/golang_org/x/net/route/address.go
index e6bfa39..874fb3b 100644
--- a/libgo/go/golang_org/x/net/route/address.go
+++ b/libgo/go/golang_org/x/net/route/address.go
@@ -1,8 +1,12 @@
 // Copyright 2016 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd netbsd openbsd
+// +build darwin dragonfly freebsd netbsd openbsd hyperbolabsd
 
 package route
 
diff --git a/libgo/go/golang_org/x/net/route/address_test.go b/libgo/go/golang_org/x/net/route/address_test.go
index 2005ef7..a891882 100644
--- a/libgo/go/golang_org/x/net/route/address_test.go
+++ b/libgo/go/golang_org/x/net/route/address_test.go
@@ -1,8 +1,12 @@
 // Copyright 2016 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd netbsd openbsd
+// +build darwin dragonfly freebsd netbsd openbsd hyperbolabsd
 
 package route
 
diff --git a/libgo/go/golang_org/x/net/route/binary.go b/libgo/go/golang_org/x/net/route/binary.go
index 6910520..0f2cf50 100644
--- a/libgo/go/golang_org/x/net/route/binary.go
+++ b/libgo/go/golang_org/x/net/route/binary.go
@@ -1,8 +1,12 @@
 // Copyright 2016 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd netbsd openbsd
+// +build darwin dragonfly freebsd netbsd openbsd hyperbolabsd
 
 package route
 
diff --git b/libgo/go/golang_org/x/net/route/defs_hyperbolabsd.go b/libgo/go/golang_org/x/net/route/defs_hyperbolabsd.go
new file mode 100644
index 0000000..47d089b
--- /dev/null
+++ b/libgo/go/golang_org/x/net/route/defs_hyperbolabsd.go
@@ -0,0 +1,120 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build ignore
+
+package route
+
+/*
+#include <sys/socket.h>
+#include <sys/sysctl.h>
+
+#include <net/if.h>
+#include <net/if_dl.h>
+#include <net/route.h>
+
+#include <netinet/in.h>
+*/
+import "C"
+
+const (
+	sysAF_UNSPEC = C.AF_UNSPEC
+	sysAF_INET   = C.AF_INET
+	sysAF_ROUTE  = C.AF_ROUTE
+	sysAF_LINK   = C.AF_LINK
+	sysAF_INET6  = C.AF_INET6
+
+	sysSOCK_RAW = C.SOCK_RAW
+
+	sysNET_RT_DUMP    = C.NET_RT_DUMP
+	sysNET_RT_FLAGS   = C.NET_RT_FLAGS
+	sysNET_RT_IFLIST  = C.NET_RT_IFLIST
+	sysNET_RT_STATS   = C.NET_RT_STATS
+	sysNET_RT_TABLE   = C.NET_RT_TABLE
+	sysNET_RT_IFNAMES = C.NET_RT_IFNAMES
+	sysNET_RT_MAXID   = C.NET_RT_MAXID
+)
+
+const (
+	sysCTL_MAXNAME = C.CTL_MAXNAME
+
+	sysCTL_UNSPEC  = C.CTL_UNSPEC
+	sysCTL_KERN    = C.CTL_KERN
+	sysCTL_VM      = C.CTL_VM
+	sysCTL_FS      = C.CTL_FS
+	sysCTL_NET     = C.CTL_NET
+	sysCTL_DEBUG   = C.CTL_DEBUG
+	sysCTL_HW      = C.CTL_HW
+	sysCTL_MACHDEP = C.CTL_MACHDEP
+	sysCTL_DDB     = C.CTL_DDB
+	sysCTL_VFS     = C.CTL_VFS
+	sysCTL_MAXID   = C.CTL_MAXID
+)
+
+const (
+	sysRTM_VERSION = C.RTM_VERSION
+
+	sysRTM_ADD        = C.RTM_ADD
+	sysRTM_DELETE     = C.RTM_DELETE
+	sysRTM_CHANGE     = C.RTM_CHANGE
+	sysRTM_GET        = C.RTM_GET
+	sysRTM_LOSING     = C.RTM_LOSING
+	sysRTM_REDIRECT   = C.RTM_REDIRECT
+	sysRTM_MISS       = C.RTM_MISS
+	sysRTM_LOCK       = C.RTM_LOCK
+	sysRTM_RESOLVE    = C.RTM_RESOLVE
+	sysRTM_NEWADDR    = C.RTM_NEWADDR
+	sysRTM_DELADDR    = C.RTM_DELADDR
+	sysRTM_IFINFO     = C.RTM_IFINFO
+	sysRTM_IFANNOUNCE = C.RTM_IFANNOUNCE
+	sysRTM_DESYNC     = C.RTM_DESYNC
+	sysRTM_INVALIDATE = C.RTM_INVALIDATE
+	sysRTM_BFD        = C.RTM_BFD
+	sysRTM_PROPOSAL   = C.RTM_PROPOSAL
+
+	sysRTA_DST     = C.RTA_DST
+	sysRTA_GATEWAY = C.RTA_GATEWAY
+	sysRTA_NETMASK = C.RTA_NETMASK
+	sysRTA_GENMASK = C.RTA_GENMASK
+	sysRTA_IFP     = C.RTA_IFP
+	sysRTA_IFA     = C.RTA_IFA
+	sysRTA_AUTHOR  = C.RTA_AUTHOR
+	sysRTA_BRD     = C.RTA_BRD
+	sysRTA_SRC     = C.RTA_SRC
+	sysRTA_SRCMASK = C.RTA_SRCMASK
+	sysRTA_LABEL   = C.RTA_LABEL
+	sysRTA_BFD     = C.RTA_BFD
+	sysRTA_DNS     = C.RTA_DNS
+	sysRTA_STATIC  = C.RTA_STATIC
+	sysRTA_SEARCH  = C.RTA_SEARCH
+
+	sysRTAX_DST     = C.RTAX_DST
+	sysRTAX_GATEWAY = C.RTAX_GATEWAY
+	sysRTAX_NETMASK = C.RTAX_NETMASK
+	sysRTAX_GENMASK = C.RTAX_GENMASK
+	sysRTAX_IFP     = C.RTAX_IFP
+	sysRTAX_IFA     = C.RTAX_IFA
+	sysRTAX_AUTHOR  = C.RTAX_AUTHOR
+	sysRTAX_BRD     = C.RTAX_BRD
+	sysRTAX_SRC     = C.RTAX_SRC
+	sysRTAX_SRCMASK = C.RTAX_SRCMASK
+	sysRTAX_LABEL   = C.RTAX_LABEL
+	sysRTAX_BFD     = C.RTAX_BFD
+	sysRTAX_DNS     = C.RTAX_DNS
+	sysRTAX_STATIC  = C.RTAX_STATIC
+	sysRTAX_SEARCH  = C.RTAX_SEARCH
+	sysRTAX_MAX     = C.RTAX_MAX
+)
+
+const (
+	sizeofRtMsghdr = C.sizeof_struct_rt_msghdr
+
+	sizeofSockaddrStorage = C.sizeof_struct_sockaddr_storage
+	sizeofSockaddrInet    = C.sizeof_struct_sockaddr_in
+	sizeofSockaddrInet6   = C.sizeof_struct_sockaddr_in6
+)
diff --git a/libgo/go/golang_org/x/net/route/interface.go b/libgo/go/golang_org/x/net/route/interface.go
index 854906d..3213e64 100644
--- a/libgo/go/golang_org/x/net/route/interface.go
+++ b/libgo/go/golang_org/x/net/route/interface.go
@@ -1,8 +1,12 @@
 // Copyright 2016 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd netbsd openbsd
+// +build darwin dragonfly freebsd netbsd openbsd hyperbolabsd
 
 package route
 
diff --git b/libgo/go/golang_org/x/net/route/interface_hyperbolabsd.go b/libgo/go/golang_org/x/net/route/interface_hyperbolabsd.go
new file mode 100644
index 0000000..11dd5c8
--- /dev/null
+++ b/libgo/go/golang_org/x/net/route/interface_hyperbolabsd.go
@@ -0,0 +1,94 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package route
+
+func (*wireFormat) parseInterfaceMessage(_ RIBType, b []byte) (Message, error) {
+	if len(b) < 32 {
+		return nil, errMessageTooShort
+	}
+	l := int(nativeEndian.Uint16(b[:2]))
+	if len(b) < l {
+		return nil, errInvalidMessage
+	}
+	attrs := uint(nativeEndian.Uint32(b[12:16]))
+	if attrs&sysRTA_IFP == 0 {
+		return nil, nil
+	}
+	m := &InterfaceMessage{
+		Version: int(b[2]),
+		Type:    int(b[3]),
+		Flags:   int(nativeEndian.Uint32(b[16:20])),
+		Index:   int(nativeEndian.Uint16(b[6:8])),
+		Addrs:   make([]Addr, sysRTAX_MAX),
+		raw:     b[:l],
+	}
+	ll := int(nativeEndian.Uint16(b[4:6]))
+	if len(b) < ll {
+		return nil, errInvalidMessage
+	}
+	a, err := parseLinkAddr(b[ll:])
+	if err != nil {
+		return nil, err
+	}
+	m.Addrs[sysRTAX_IFP] = a
+	m.Name = a.(*LinkAddr).Name
+	return m, nil
+}
+
+func (*wireFormat) parseInterfaceAddrMessage(_ RIBType, b []byte) (Message, error) {
+	if len(b) < 24 {
+		return nil, errMessageTooShort
+	}
+	l := int(nativeEndian.Uint16(b[:2]))
+	if len(b) < l {
+		return nil, errInvalidMessage
+	}
+	bodyOff := int(nativeEndian.Uint16(b[4:6]))
+	if len(b) < bodyOff {
+		return nil, errInvalidMessage
+	}
+	m := &InterfaceAddrMessage{
+		Version: int(b[2]),
+		Type:    int(b[3]),
+		Flags:   int(nativeEndian.Uint32(b[12:16])),
+		Index:   int(nativeEndian.Uint16(b[6:8])),
+		raw:     b[:l],
+	}
+	var err error
+	m.Addrs, err = parseAddrs(uint(nativeEndian.Uint32(b[12:16])), parseKernelInetAddr, b[bodyOff:])
+	if err != nil {
+		return nil, err
+	}
+	return m, nil
+}
+
+func (*wireFormat) parseInterfaceAnnounceMessage(_ RIBType, b []byte) (Message, error) {
+	if len(b) < 26 {
+		return nil, errMessageTooShort
+	}
+	l := int(nativeEndian.Uint16(b[:2]))
+	if len(b) < l {
+		return nil, errInvalidMessage
+	}
+	m := &InterfaceAnnounceMessage{
+		Version: int(b[2]),
+		Type:    int(b[3]),
+		Index:   int(nativeEndian.Uint16(b[6:8])),
+		What:    int(nativeEndian.Uint16(b[8:10])),
+		raw:     b[:l],
+	}
+	for i := 0; i < 16; i++ {
+		if b[10+i] != 0 {
+			continue
+		}
+		m.Name = string(b[10 : 10+i])
+		break
+	}
+	return m, nil
+}
diff --git a/libgo/go/golang_org/x/net/route/message.go b/libgo/go/golang_org/x/net/route/message.go
index 0fa7e09..e35a27f 100644
--- a/libgo/go/golang_org/x/net/route/message.go
+++ b/libgo/go/golang_org/x/net/route/message.go
@@ -1,8 +1,12 @@
 // Copyright 2016 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd netbsd openbsd
+// +build darwin dragonfly freebsd netbsd openbsd hyperbolabsd
 
 package route
 
diff --git a/libgo/go/golang_org/x/net/route/message_test.go b/libgo/go/golang_org/x/net/route/message_test.go
index e848dab..d40796a 100644
--- a/libgo/go/golang_org/x/net/route/message_test.go
+++ b/libgo/go/golang_org/x/net/route/message_test.go
@@ -1,8 +1,12 @@
 // Copyright 2016 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd netbsd openbsd
+// +build darwin dragonfly freebsd netbsd openbsd hyperbolabsd
 
 package route
 
diff --git a/libgo/go/golang_org/x/net/route/route.go b/libgo/go/golang_org/x/net/route/route.go
index 081da0d..659051c 100644
--- a/libgo/go/golang_org/x/net/route/route.go
+++ b/libgo/go/golang_org/x/net/route/route.go
@@ -1,15 +1,19 @@
 // Copyright 2016 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd netbsd openbsd
+// +build darwin dragonfly freebsd netbsd openbsd hyperbolabsd
 
 // Package route provides basic functions for the manipulation of
 // packet routing facilities on BSD variants.
 //
 // The package supports any version of Darwin, any version of
-// DragonFly BSD, FreeBSD 7 through 11, NetBSD 6 and above, and
-// OpenBSD 5.6 and above.
+// DragonFly BSD, FreeBSD 7 through 11, NetBSD 6 and above,
+// OpenBSD 5.6 and above, and HyperbolaBSD.
 package route
 
 import (
diff --git b/libgo/go/golang_org/x/net/route/route_hyperbolabsd.go b/libgo/go/golang_org/x/net/route/route_hyperbolabsd.go
new file mode 100644
index 0000000..7c33b20
--- /dev/null
+++ b/libgo/go/golang_org/x/net/route/route_hyperbolabsd.go
@@ -0,0 +1,69 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package route
+
+import "syscall"
+
+func (m *RouteMessage) marshal() ([]byte, error) {
+	l := sizeofRtMsghdr + addrsSpace(m.Addrs)
+	b := make([]byte, l)
+	nativeEndian.PutUint16(b[:2], uint16(l))
+	if m.Version == 0 {
+		b[2] = sysRTM_VERSION
+	} else {
+		b[2] = byte(m.Version)
+	}
+	b[3] = byte(m.Type)
+	nativeEndian.PutUint16(b[4:6], uint16(sizeofRtMsghdr))
+	nativeEndian.PutUint32(b[16:20], uint32(m.Flags))
+	nativeEndian.PutUint16(b[6:8], uint16(m.Index))
+	nativeEndian.PutUint32(b[24:28], uint32(m.ID))
+	nativeEndian.PutUint32(b[28:32], uint32(m.Seq))
+	attrs, err := marshalAddrs(b[sizeofRtMsghdr:], m.Addrs)
+	if err != nil {
+		return nil, err
+	}
+	if attrs > 0 {
+		nativeEndian.PutUint32(b[12:16], uint32(attrs))
+	}
+	return b, nil
+}
+
+func (*wireFormat) parseRouteMessage(_ RIBType, b []byte) (Message, error) {
+	if len(b) < sizeofRtMsghdr {
+		return nil, errMessageTooShort
+	}
+	l := int(nativeEndian.Uint16(b[:2]))
+	if len(b) < l {
+		return nil, errInvalidMessage
+	}
+	m := &RouteMessage{
+		Version: int(b[2]),
+		Type:    int(b[3]),
+		Flags:   int(nativeEndian.Uint32(b[16:20])),
+		Index:   int(nativeEndian.Uint16(b[6:8])),
+		ID:      uintptr(nativeEndian.Uint32(b[24:28])),
+		Seq:     int(nativeEndian.Uint32(b[28:32])),
+		raw:     b[:l],
+	}
+	ll := int(nativeEndian.Uint16(b[4:6]))
+	if len(b) < ll {
+		return nil, errInvalidMessage
+	}
+	errno := syscall.Errno(nativeEndian.Uint32(b[32:36]))
+	if errno != 0 {
+		m.Err = errno
+	}
+	as, err := parseAddrs(uint(nativeEndian.Uint32(b[12:16])), parseKernelInetAddr, b[ll:])
+	if err != nil {
+		return nil, err
+	}
+	m.Addrs = as
+	return m, nil
+}
diff --git a/libgo/go/golang_org/x/net/route/route_test.go b/libgo/go/golang_org/x/net/route/route_test.go
index 61bd174..09b3219 100644
--- a/libgo/go/golang_org/x/net/route/route_test.go
+++ b/libgo/go/golang_org/x/net/route/route_test.go
@@ -1,8 +1,12 @@
 // Copyright 2016 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd netbsd openbsd
+// +build darwin dragonfly freebsd netbsd openbsd hyperbolabsd
 
 package route
 
@@ -21,6 +25,8 @@ func (m *InterfaceMessage) String() string {
 	var attrs addrAttrs
 	if runtime.GOOS == "openbsd" {
 		attrs = addrAttrs(nativeEndian.Uint32(m.raw[12:16]))
+	} else if runtime.GOOS == "hyperbolabsd" {
+		attrs = addrAttrs(nativeEndian.Uint32(m.raw[12:16]))
 	} else {
 		attrs = addrAttrs(nativeEndian.Uint32(m.raw[4:8]))
 	}
@@ -31,6 +37,8 @@ func (m *InterfaceAddrMessage) String() string {
 	var attrs addrAttrs
 	if runtime.GOOS == "openbsd" {
 		attrs = addrAttrs(nativeEndian.Uint32(m.raw[12:16]))
+	} else if runtime.GOOS == "hyperbolabsd" {
+		attrs = addrAttrs(nativeEndian.Uint32(m.raw[12:16]))
 	} else {
 		attrs = addrAttrs(nativeEndian.Uint32(m.raw[4:8]))
 	}
@@ -71,13 +79,13 @@ var addrAttrNames = [...]string{
 	"ifa",
 	"author",
 	"brd",
-	"df:mpls1-n:tag-o:src", // mpls1 for dragonfly, tag for netbsd, src for openbsd
-	"df:mpls2-o:srcmask",   // mpls2 for dragonfly, srcmask for openbsd
-	"df:mpls3-o:label",     // mpls3 for dragonfly, label for openbsd
-	"o:bfd",                // bfd for openbsd
-	"o:dns",                // dns for openbsd
-	"o:static",             // static for openbsd
-	"o:search",             // search for openbsd
+	"df:mpls1-n:tag-o:src-hb:src",   // mpls1 for dragonfly, tag for netbsd, src for openbsd (and hyperbolabsd)
+	"df:mpls2-o:srcmask-hb:srcmask", // mpls2 for dragonfly, srcmask for openbsd (and hyperbolabsd)
+	"df:mpls3-o:label-hb:label;",    // mpls3 for dragonfly, label for openbsd (and hyperbolabsd)
+	"o:bfd-hb:bfd",                  // bfd for openbsd (and hyperbolabsd)
+	"o:dns-hb:dns",                  // dns for openbsd (and hyperbolabsd)
+	"o:static-hb:static",            // static for openbsd (and hyperbolabsd)
+	"o:search-hb:search",            // search for openbsd (and hyperbolabsd)
 }
 
 func (attrs addrAttrs) String() string {
@@ -115,6 +123,8 @@ func (ms msgs) validate() ([]string, error) {
 			var attrs addrAttrs
 			if runtime.GOOS == "openbsd" {
 				attrs = addrAttrs(nativeEndian.Uint32(m.raw[12:16]))
+			} else if runtime.GOOS == "hyperbolabsd" {
+				attrs = addrAttrs(nativeEndian.Uint32(m.raw[12:16]))
 			} else {
 				attrs = addrAttrs(nativeEndian.Uint32(m.raw[4:8]))
 			}
@@ -130,6 +140,8 @@ func (ms msgs) validate() ([]string, error) {
 			var attrs addrAttrs
 			if runtime.GOOS == "openbsd" {
 				attrs = addrAttrs(nativeEndian.Uint32(m.raw[12:16]))
+			} else if runtime.GOOS == "hyperbolabsd" {
+				attrs = addrAttrs(nativeEndian.Uint32(m.raw[12:16]))
 			} else {
 				attrs = addrAttrs(nativeEndian.Uint32(m.raw[4:8]))
 			}
@@ -359,6 +371,8 @@ func (pv *propVirtual) teardown() error {
 func (pv *propVirtual) configure(suffix int) error {
 	if runtime.GOOS == "openbsd" {
 		pv.name = fmt.Sprintf("vether%d", suffix)
+	} else if runtime.GOOS == "hyperbolabsd" {
+		pv.name = fmt.Sprintf("vether%d", suffix)
 	} else {
 		pv.name = fmt.Sprintf("vlan%d", suffix)
 	}
diff --git a/libgo/go/golang_org/x/net/route/sys.go b/libgo/go/golang_org/x/net/route/sys.go
index 3d0ee9b..94a85e9 100644
--- a/libgo/go/golang_org/x/net/route/sys.go
+++ b/libgo/go/golang_org/x/net/route/sys.go
@@ -1,8 +1,12 @@
 // Copyright 2016 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd netbsd openbsd
+// +build darwin dragonfly freebsd netbsd openbsd hyperbolabsd
 
 package route
 
diff --git b/libgo/go/golang_org/x/net/route/sys_hyperbolabsd.go b/libgo/go/golang_org/x/net/route/sys_hyperbolabsd.go
new file mode 100644
index 0000000..e6cb3ca
--- /dev/null
+++ b/libgo/go/golang_org/x/net/route/sys_hyperbolabsd.go
@@ -0,0 +1,84 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package route
+
+import "unsafe"
+
+func (typ RIBType) parseable() bool {
+	switch typ {
+	case sysNET_RT_STATS, sysNET_RT_TABLE:
+		return false
+	default:
+		return true
+	}
+}
+
+// RouteMetrics represents route metrics.
+type RouteMetrics struct {
+	PathMTU int // path maximum transmission unit
+}
+
+// SysType implements the SysType method of Sys interface.
+func (rmx *RouteMetrics) SysType() SysType { return SysMetrics }
+
+// Sys implements the Sys method of Message interface.
+func (m *RouteMessage) Sys() []Sys {
+	return []Sys{
+		&RouteMetrics{
+			PathMTU: int(nativeEndian.Uint32(m.raw[60:64])),
+		},
+	}
+}
+
+// InterfaceMetrics represents interface metrics.
+type InterfaceMetrics struct {
+	Type int // interface type
+	MTU  int // maximum transmission unit
+}
+
+// SysType implements the SysType method of Sys interface.
+func (imx *InterfaceMetrics) SysType() SysType { return SysMetrics }
+
+// Sys implements the Sys method of Message interface.
+func (m *InterfaceMessage) Sys() []Sys {
+	return []Sys{
+		&InterfaceMetrics{
+			Type: int(m.raw[24]),
+			MTU:  int(nativeEndian.Uint32(m.raw[28:32])),
+		},
+	}
+}
+
+func probeRoutingStack() (int, map[int]*wireFormat) {
+	var p uintptr
+	rtm := &wireFormat{extOff: -1, bodyOff: -1}
+	rtm.parse = rtm.parseRouteMessage
+	ifm := &wireFormat{extOff: -1, bodyOff: -1}
+	ifm.parse = ifm.parseInterfaceMessage
+	ifam := &wireFormat{extOff: -1, bodyOff: -1}
+	ifam.parse = ifam.parseInterfaceAddrMessage
+	ifanm := &wireFormat{extOff: -1, bodyOff: -1}
+	ifanm.parse = ifanm.parseInterfaceAnnounceMessage
+	return int(unsafe.Sizeof(p)), map[int]*wireFormat{
+		sysRTM_ADD:        rtm,
+		sysRTM_DELETE:     rtm,
+		sysRTM_CHANGE:     rtm,
+		sysRTM_GET:        rtm,
+		sysRTM_LOSING:     rtm,
+		sysRTM_REDIRECT:   rtm,
+		sysRTM_MISS:       rtm,
+		sysRTM_LOCK:       rtm,
+		sysRTM_RESOLVE:    rtm,
+		sysRTM_NEWADDR:    ifam,
+		sysRTM_DELADDR:    ifam,
+		sysRTM_IFINFO:     ifm,
+		sysRTM_IFANNOUNCE: ifanm,
+		sysRTM_DESYNC:     rtm,
+	}
+}
diff --git a/libgo/go/golang_org/x/net/route/syscall.go b/libgo/go/golang_org/x/net/route/syscall.go
index c211188..6a16d7f 100644
--- a/libgo/go/golang_org/x/net/route/syscall.go
+++ b/libgo/go/golang_org/x/net/route/syscall.go
@@ -1,8 +1,12 @@
 // Copyright 2016 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd netbsd openbsd
+// +build darwin dragonfly freebsd netbsd openbsd hyperbolabsd
 
 package route
 
diff --git b/libgo/go/golang_org/x/net/route/zsys_hyperbolabsd.go b/libgo/go/golang_org/x/net/route/zsys_hyperbolabsd.go
new file mode 100644
index 0000000..d63ec70
--- /dev/null
+++ b/libgo/go/golang_org/x/net/route/zsys_hyperbolabsd.go
@@ -0,0 +1,101 @@
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs defs_hyperbolabsd.go
+
+package route
+
+const (
+	sysAF_UNSPEC = 0x0
+	sysAF_INET   = 0x2
+	sysAF_ROUTE  = 0x11
+	sysAF_LINK   = 0x12
+	sysAF_INET6  = 0x18
+
+	sysSOCK_RAW = 0x3
+
+	sysNET_RT_DUMP    = 0x1
+	sysNET_RT_FLAGS   = 0x2
+	sysNET_RT_IFLIST  = 0x3
+	sysNET_RT_STATS   = 0x4
+	sysNET_RT_TABLE   = 0x5
+	sysNET_RT_IFNAMES = 0x6
+	sysNET_RT_MAXID   = 0x7
+)
+
+const (
+	sysCTL_MAXNAME = 0xc
+
+	sysCTL_UNSPEC  = 0x0
+	sysCTL_KERN    = 0x1
+	sysCTL_VM      = 0x2
+	sysCTL_FS      = 0x3
+	sysCTL_NET     = 0x4
+	sysCTL_DEBUG   = 0x5
+	sysCTL_HW      = 0x6
+	sysCTL_MACHDEP = 0x7
+	sysCTL_DDB     = 0x9
+	sysCTL_VFS     = 0xa
+	sysCTL_MAXID   = 0xb
+)
+
+const (
+	sysRTM_VERSION = 0x5
+
+	sysRTM_ADD        = 0x1
+	sysRTM_DELETE     = 0x2
+	sysRTM_CHANGE     = 0x3
+	sysRTM_GET        = 0x4
+	sysRTM_LOSING     = 0x5
+	sysRTM_REDIRECT   = 0x6
+	sysRTM_MISS       = 0x7
+	sysRTM_LOCK       = 0x8
+	sysRTM_RESOLVE    = 0xb
+	sysRTM_NEWADDR    = 0xc
+	sysRTM_DELADDR    = 0xd
+	sysRTM_IFINFO     = 0xe
+	sysRTM_IFANNOUNCE = 0xf
+	sysRTM_DESYNC     = 0x10
+	sysRTM_INVALIDATE = 0x11
+	sysRTM_BFD        = 0x12
+	sysRTM_PROPOSAL   = 0x13
+
+	sysRTA_DST     = 0x1
+	sysRTA_GATEWAY = 0x2
+	sysRTA_NETMASK = 0x4
+	sysRTA_GENMASK = 0x8
+	sysRTA_IFP     = 0x10
+	sysRTA_IFA     = 0x20
+	sysRTA_AUTHOR  = 0x40
+	sysRTA_BRD     = 0x80
+	sysRTA_SRC     = 0x100
+	sysRTA_SRCMASK = 0x200
+	sysRTA_LABEL   = 0x400
+	sysRTA_BFD     = 0x800
+	sysRTA_DNS     = 0x1000
+	sysRTA_STATIC  = 0x2000
+	sysRTA_SEARCH  = 0x4000
+
+	sysRTAX_DST     = 0x0
+	sysRTAX_GATEWAY = 0x1
+	sysRTAX_NETMASK = 0x2
+	sysRTAX_GENMASK = 0x3
+	sysRTAX_IFP     = 0x4
+	sysRTAX_IFA     = 0x5
+	sysRTAX_AUTHOR  = 0x6
+	sysRTAX_BRD     = 0x7
+	sysRTAX_SRC     = 0x8
+	sysRTAX_SRCMASK = 0x9
+	sysRTAX_LABEL   = 0xa
+	sysRTAX_BFD     = 0xb
+	sysRTAX_DNS     = 0xc
+	sysRTAX_STATIC  = 0xd
+	sysRTAX_SEARCH  = 0xe
+	sysRTAX_MAX     = 0xf
+)
+
+const (
+	sizeofRtMsghdr = 0x60
+
+	sizeofSockaddrStorage = 0x100
+	sizeofSockaddrInet    = 0x10
+	sizeofSockaddrInet6   = 0x1c
+)
diff --git a/libgo/go/internal/poll/export_posix_test.go b/libgo/go/internal/poll/export_posix_test.go
index 6b9bb8b..71b4b17 100644
--- a/libgo/go/internal/poll/export_posix_test.go
+++ b/libgo/go/internal/poll/export_posix_test.go
@@ -1,8 +1,12 @@
 // Copyright 2017 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd solaris windows
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris windows
 
 // Export guts for testing on posix.
 // Since testing imports os and os imports internal/poll,
diff --git a/libgo/go/internal/poll/fd_poll_runtime.go b/libgo/go/internal/poll/fd_poll_runtime.go
index b91cbe4..9453e61 100644
--- a/libgo/go/internal/poll/fd_poll_runtime.go
+++ b/libgo/go/internal/poll/fd_poll_runtime.go
@@ -1,8 +1,12 @@
 // Copyright 2013 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux netbsd openbsd windows solaris
+// +build aix darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd windows solaris
 
 package poll
 
diff --git a/libgo/go/internal/poll/fd_posix.go b/libgo/go/internal/poll/fd_posix.go
index 4e6e355..f3a52cb 100644
--- a/libgo/go/internal/poll/fd_posix.go
+++ b/libgo/go/internal/poll/fd_posix.go
@@ -1,8 +1,12 @@
 // Copyright 2009 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd solaris windows
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris windows
 
 package poll
 
diff --git a/libgo/go/internal/poll/fd_posix_test.go b/libgo/go/internal/poll/fd_posix_test.go
index 246d498..fc0efff 100644
--- a/libgo/go/internal/poll/fd_posix_test.go
+++ b/libgo/go/internal/poll/fd_posix_test.go
@@ -1,8 +1,12 @@
 // Copyright 2012 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd solaris windows
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris windows
 
 package poll_test
 
diff --git a/libgo/go/internal/poll/fd_unix.go b/libgo/go/internal/poll/fd_unix.go
index cfd441e..ba4d0e8 100644
--- a/libgo/go/internal/poll/fd_unix.go
+++ b/libgo/go/internal/poll/fd_unix.go
@@ -1,8 +1,12 @@
 // Copyright 2017 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris
 
 package poll
 
diff --git a/libgo/go/internal/poll/hook_unix.go b/libgo/go/internal/poll/hook_unix.go
index 4cf36cc..cb3c59f 100644
--- a/libgo/go/internal/poll/hook_unix.go
+++ b/libgo/go/internal/poll/hook_unix.go
@@ -1,8 +1,12 @@
 // Copyright 2017 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris
 
 package poll
 
diff --git a/libgo/go/internal/poll/sockopt.go b/libgo/go/internal/poll/sockopt.go
index bb5ea02..0eb50f8 100644
--- a/libgo/go/internal/poll/sockopt.go
+++ b/libgo/go/internal/poll/sockopt.go
@@ -1,8 +1,12 @@
 // Copyright 2009 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris windows
+// +build aix darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris windows
 
 package poll
 
diff --git a/libgo/go/internal/poll/sockopt_unix.go b/libgo/go/internal/poll/sockopt_unix.go
index b33644d..6da6011 100644
--- a/libgo/go/internal/poll/sockopt_unix.go
+++ b/libgo/go/internal/poll/sockopt_unix.go
@@ -1,8 +1,12 @@
 // Copyright 2017 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris
 
 package poll
 
diff --git a/libgo/go/internal/poll/sockoptip.go b/libgo/go/internal/poll/sockoptip.go
index c55a1e3..6599a1a 100644
--- a/libgo/go/internal/poll/sockoptip.go
+++ b/libgo/go/internal/poll/sockoptip.go
@@ -1,8 +1,12 @@
 // Copyright 2011 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris windows
+// +build aix darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris windows
 
 package poll
 
diff --git a/libgo/go/internal/poll/sys_cloexec.go b/libgo/go/internal/poll/sys_cloexec.go
index fb5f2bc..5a8a9ad 100644
--- a/libgo/go/internal/poll/sys_cloexec.go
+++ b/libgo/go/internal/poll/sys_cloexec.go
@@ -1,11 +1,15 @@
 // Copyright 2013 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 // This file implements sysSocket and accept for platforms that do not
 // provide a fast path for setting SetNonblock and CloseOnExec.
 
-// +build aix darwin nacl netbsd openbsd solaris
+// +build aix darwin nacl netbsd openbsd hyperbolabsd solaris
 
 package poll
 
diff --git a/libgo/go/internal/poll/writev.go b/libgo/go/internal/poll/writev.go
index 4bf8804..ef593d3 100644
--- a/libgo/go/internal/poll/writev.go
+++ b/libgo/go/internal/poll/writev.go
@@ -1,8 +1,12 @@
 // Copyright 2016 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd linux netbsd openbsd
+// +build darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd
 
 package poll
 
diff --git b/libgo/go/internal/syscall/unix/getentropy_hyperbolabsd.go b/libgo/go/internal/syscall/unix/getentropy_hyperbolabsd.go
new file mode 100644
index 0000000..d6cb275
--- /dev/null
+++ b/libgo/go/internal/syscall/unix/getentropy_hyperbolabsd.go
@@ -0,0 +1,29 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+// getentropy(2)'s syscall number, from /usr/src/sys/kern/syscalls.master
+const entropyTrap uintptr = 7
+
+// GetEntropy calls the HyperbolaBSD getentropy system call.
+func GetEntropy(p []byte) error {
+	_, _, errno := syscall.Syscall(entropyTrap,
+		uintptr(unsafe.Pointer(&p[0])),
+		uintptr(len(p)),
+		0)
+	if errno != 0 {
+		return errno
+	}
+	return nil
+}
diff --git b/libgo/go/mime/type_hyperbolabsd.go b/libgo/go/mime/type_hyperbolabsd.go
new file mode 100644
index 0000000..ee5fc43
--- /dev/null
+++ b/libgo/go/mime/type_hyperbolabsd.go
@@ -0,0 +1,13 @@
+// Copyright 2015 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package mime
+
+func init() {
+	typeFiles = append(typeFiles, "/usr/share/misc/mime.types")
+}
diff --git a/libgo/go/mime/type_unix.go b/libgo/go/mime/type_unix.go
index 8e177ca..93a9d59 100644
--- a/libgo/go/mime/type_unix.go
+++ b/libgo/go/mime/type_unix.go
@@ -1,8 +1,12 @@
 // Copyright 2010 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris
 
 package mime
 
diff --git a/libgo/go/net/addrselect.go b/libgo/go/net/addrselect.go
index 7c0dfe2..dab82d8 100644
--- a/libgo/go/net/addrselect.go
+++ b/libgo/go/net/addrselect.go
@@ -1,8 +1,12 @@
 // Copyright 2015 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris
 
 // Minimal RFC 6724 address selection.
 
diff --git a/libgo/go/net/addrselect_test.go b/libgo/go/net/addrselect_test.go
index d6e0e63..00dda3b 100644
--- a/libgo/go/net/addrselect_test.go
+++ b/libgo/go/net/addrselect_test.go
@@ -1,8 +1,12 @@
 // Copyright 2015 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris
 
 package net
 
diff --git b/libgo/go/net/cgo_hyperbolabsd.go b/libgo/go/net/cgo_hyperbolabsd.go
new file mode 100644
index 0000000..dc37c72
--- /dev/null
+++ b/libgo/go/net/cgo_hyperbolabsd.go
@@ -0,0 +1,18 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build cgo,!netgo
+
+package net
+
+/*
+#include <netdb.h>
+*/
+import "C"
+
+const cgoAddrInfoFlags = C.AI_CANONNAME
diff --git a/libgo/go/net/cgo_resold.go b/libgo/go/net/cgo_resold.go
index 8e13e41..142ce84 100644
--- a/libgo/go/net/cgo_resold.go
+++ b/libgo/go/net/cgo_resold.go
@@ -1,9 +1,13 @@
 // Copyright 2015 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 // +build cgo,!netgo
-// +build android freebsd dragonfly openbsd
+// +build android freebsd dragonfly openbsd hyperbolabsd
 
 package net
 
diff --git a/libgo/go/net/cgo_sockold.go b/libgo/go/net/cgo_sockold.go
index 25d4f67..01e616f 100644
--- a/libgo/go/net/cgo_sockold.go
+++ b/libgo/go/net/cgo_sockold.go
@@ -1,9 +1,13 @@
 // Copyright 2015 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 // +build cgo,!netgo
-// +build aix darwin dragonfly freebsd netbsd openbsd
+// +build aix darwin dragonfly freebsd netbsd openbsd hyperbolabsd
 
 package net
 
diff --git a/libgo/go/net/cgo_unix.go b/libgo/go/net/cgo_unix.go
index 5ea13bc..d057073 100644
--- a/libgo/go/net/cgo_unix.go
+++ b/libgo/go/net/cgo_unix.go
@@ -1,9 +1,13 @@
 // Copyright 2011 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 // +build cgo,!netgo
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris
 
 package net
 
diff --git a/libgo/go/net/cgo_unix_test.go b/libgo/go/net/cgo_unix_test.go
index 49da993..aaf7297 100644
--- a/libgo/go/net/cgo_unix_test.go
+++ b/libgo/go/net/cgo_unix_test.go
@@ -1,9 +1,13 @@
 // Copyright 2013 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 // +build cgo,!netgo
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris
 
 package net
 
diff --git a/libgo/go/net/conf.go b/libgo/go/net/conf.go
index a798699..230ccd7 100644
--- a/libgo/go/net/conf.go
+++ b/libgo/go/net/conf.go
@@ -1,8 +1,12 @@
 // Copyright 2015 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris
 
 package net
 
@@ -85,14 +89,18 @@ func initConfVal() {
 		return
 	}
 
-	// OpenBSD apparently lets you override the location of resolv.conf
-	// with ASR_CONFIG. If we notice that, defer to libc.
+	// OpenBSD (and HyperbolaBSD) apparently lets you override the
+	// location of resolv.conf with ASR_CONFIG.
+	// If we notice that, defer to libc.
 	if runtime.GOOS == "openbsd" && os.Getenv("ASR_CONFIG") != "" {
 		confVal.forceCgoLookupHost = true
 		return
+	} else if runtime.GOOS == "hyperbolabsd" && os.Getenv("ASR_CONFIG") != "" {
+		confVal.forceCgoLookupHost = true
+		return
 	}
 
-	if runtime.GOOS != "openbsd" {
+	if (runtime.GOOS != "openbsd" && runtime.GOOS != "hyperbolabsd") {
 		confVal.nss = parseNSSConfFile("/etc/nsswitch.conf")
 	}
 
@@ -137,10 +145,10 @@ func (c *conf) hostLookupOrder(hostname string) (ret hostLookupOrder) {
 		return fallbackOrder
 	}
 
-	// OpenBSD is unique and doesn't use nsswitch.conf.
+	// OpenBSD (and HyperbolaBSD) is unique and doesn't use nsswitch.conf.
 	// It also doesn't support mDNS.
-	if c.goos == "openbsd" {
-		// OpenBSD's resolv.conf manpage says that a non-existent
+	if (c.goos == "openbsd" || c.goos == "hyperbolabsd") {
+		// HyperbolaBSD and OpenBSD's resolv.conf manpage says that a non-existent
 		// resolv.conf means "lookup" defaults to only "files",
 		// without DNS lookups.
 		if os.IsNotExist(c.resolv.err) {
diff --git a/libgo/go/net/conf_test.go b/libgo/go/net/conf_test.go
index 17d03f4..b89f5c7 100644
--- a/libgo/go/net/conf_test.go
+++ b/libgo/go/net/conf_test.go
@@ -1,8 +1,12 @@
 // Copyright 2015 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris
 
 package net
 
@@ -101,6 +105,15 @@ func TestConfHostLookupOrder(t *testing.T) {
 			},
 			hostTests: []nssHostTest{{"google.com", "myhostname", hostLookupFiles}},
 		},
+		// On HyperbolaBSD, no resolv.conf means no DNS.
+		{
+			name: "hyperbolabsd_no_resolv_conf",
+			c: &conf{
+				goos:   "hyperbolabsd",
+				resolv: defaultResolvConf,
+			},
+			hostTests: []nssHostTest{{"google.com", "myhostname", hostLookupFiles}},
+		},
 		{
 			name: "solaris_no_nsswitch",
 			c: &conf{
@@ -110,6 +123,7 @@ func TestConfHostLookupOrder(t *testing.T) {
 			},
 			hostTests: []nssHostTest{{"google.com", "myhostname", hostLookupCgo}},
 		},
+		// OpenBSD lookup
 		{
 			name: "openbsd_lookup_bind_file",
 			c: &conf{
@@ -169,6 +183,66 @@ func TestConfHostLookupOrder(t *testing.T) {
 			},
 			hostTests: []nssHostTest{{"google.com", "myhostname", hostLookupDNSFiles}},
 		},
+		// HyperbolaBSD lookup
+		{
+			name: "hyperbolabsd_lookup_bind_file",
+			c: &conf{
+				goos:   "hypeerbolabsd",
+				resolv: &dnsConfig{lookup: []string{"bind", "file"}},
+			},
+			hostTests: []nssHostTest{
+				{"google.com", "myhostname", hostLookupDNSFiles},
+				{"foo.local", "myhostname", hostLookupDNSFiles},
+			},
+		},
+		{
+			name: "hyperbolabsd_lookup_file_bind",
+			c: &conf{
+				goos:   "hyperbolabsd",
+				resolv: &dnsConfig{lookup: []string{"file", "bind"}},
+			},
+			hostTests: []nssHostTest{{"google.com", "myhostname", hostLookupFilesDNS}},
+		},
+		{
+			name: "hyperbolabsd_lookup_bind",
+			c: &conf{
+				goos:   "hyperbolabsd",
+				resolv: &dnsConfig{lookup: []string{"bind"}},
+			},
+			hostTests: []nssHostTest{{"google.com", "myhostname", hostLookupDNS}},
+		},
+		{
+			name: "hyperbolabsd_lookup_file",
+			c: &conf{
+				goos:   "hyperbolabsd",
+				resolv: &dnsConfig{lookup: []string{"file"}},
+			},
+			hostTests: []nssHostTest{{"google.com", "myhostname", hostLookupFiles}},
+		},
+		{
+			name: "hyperbolabsd_lookup_yp",
+			c: &conf{
+				goos:   "hyperbolabsd",
+				resolv: &dnsConfig{lookup: []string{"file", "bind", "yp"}},
+			},
+			hostTests: []nssHostTest{{"google.com", "myhostname", hostLookupCgo}},
+		},
+		{
+			name: "hyperbolabsd_lookup_two",
+			c: &conf{
+				goos:   "hyperbolabsd",
+				resolv: &dnsConfig{lookup: []string{"file", "foo"}},
+			},
+			hostTests: []nssHostTest{{"google.com", "myhostname", hostLookupCgo}},
+		},
+		{
+			name: "hyperbolabsd_lookup_empty",
+			c: &conf{
+				goos:   "hyperbolabsd",
+				resolv: &dnsConfig{lookup: nil},
+			},
+			hostTests: []nssHostTest{{"google.com", "myhostname", hostLookupDNSFiles}},
+		},
 		// glibc lacking an nsswitch.conf, per
 		// http://www.gnu.org/software/libc/manual/html_node/Notes-on-NSS-Configuration-File.html
 		{
diff --git a/libgo/go/net/dial_test.go b/libgo/go/net/dial_test.go
index b5f1dc9..a42e7c6 100644
--- a/libgo/go/net/dial_test.go
+++ b/libgo/go/net/dial_test.go
@@ -1,4 +1,8 @@
 // Copyright 2011 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -81,6 +85,8 @@ func TestDialerDualStackFDLeak(t *testing.T) {
 		t.Skipf("not implemented a way to cancel dial racers in TCP SYN-SENT state on %s", runtime.GOOS)
 	case "openbsd":
 		testenv.SkipFlaky(t, 15157)
+	case "hyperbolabsd":
+		testenv.SkipFlaky(t, 15157)
 	}
 	if !supportsIPv4() || !supportsIPv6() {
 		t.Skip("both IPv4 and IPv6 are required")
@@ -169,9 +175,9 @@ func dialClosedPort() (actual, expected time.Duration) {
 	}
 	addr := l.Addr().String()
 	l.Close()
-	// On OpenBSD, interference from TestSelfConnect is mysteriously
-	// causing the first attempt to hang for a few seconds, so we throw
-	// away the first result and keep the second.
+	// On OpenBSD (and HyperbolaBSD), interference from TestSelfConnect
+	// is mysteriously causing the first attempt to hang for a few
+	// seconds, so we throw away the first result and keep the second.
 	for i := 1; ; i++ {
 		startTime := time.Now()
 		c, err := Dial("tcp", addr)
diff --git a/libgo/go/net/dial_unix_test.go b/libgo/go/net/dial_unix_test.go
index d5c6dde..39806a6 100644
--- a/libgo/go/net/dial_unix_test.go
+++ b/libgo/go/net/dial_unix_test.go
@@ -1,8 +1,12 @@
 // Copyright 2016 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris
 
 package net
 
diff --git a/libgo/go/net/dnsclient_unix.go b/libgo/go/net/dnsclient_unix.go
index 73a507e..a4d3ff4 100644
--- a/libgo/go/net/dnsclient_unix.go
+++ b/libgo/go/net/dnsclient_unix.go
@@ -1,8 +1,12 @@
 // Copyright 2009 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris
 
 // DNS client: see RFC 1035.
 // Has to be linked into package net for Dial.
diff --git a/libgo/go/net/dnsclient_unix_test.go b/libgo/go/net/dnsclient_unix_test.go
index 9e4015f..9218d1e 100644
--- a/libgo/go/net/dnsclient_unix_test.go
+++ b/libgo/go/net/dnsclient_unix_test.go
@@ -1,8 +1,12 @@
 // Copyright 2013 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris
 
 package net
 
diff --git a/libgo/go/net/dnsconfig_unix.go b/libgo/go/net/dnsconfig_unix.go
index 24487af..ea4f84f 100644
--- a/libgo/go/net/dnsconfig_unix.go
+++ b/libgo/go/net/dnsconfig_unix.go
@@ -1,8 +1,12 @@
 // Copyright 2009 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris
 
 // Read system DNS config from /etc/resolv.conf
 
@@ -27,7 +31,7 @@ type dnsConfig struct {
 	attempts   int           // lost packets before giving up on server
 	rotate     bool          // round robin among servers
 	unknownOpt bool          // anything unknown was encountered
-	lookup     []string      // OpenBSD top-level database "lookup" order
+	lookup     []string      // OpenBSD (and HyperbolaBSD) top-level database "lookup" order
 	err        error         // any error that occurs during open of resolv.conf
 	mtime      time.Time     // time of resolv.conf modification
 	soffset    uint32        // used by serverOffset
@@ -120,7 +124,7 @@ func dnsReadConfig(filename string) *dnsConfig {
 			}
 
 		case "lookup":
-			// OpenBSD option:
+			// OpenBSD (and HyperbolaBSD) option:
 			// http://www.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man5/resolv.conf.5
 			// "the legal space-separated values are: bind, file, yp"
 			conf.lookup = f[1:]
diff --git a/libgo/go/net/dnsconfig_unix_test.go b/libgo/go/net/dnsconfig_unix_test.go
index 0797559..aa7daac 100644
--- a/libgo/go/net/dnsconfig_unix_test.go
+++ b/libgo/go/net/dnsconfig_unix_test.go
@@ -1,8 +1,12 @@
 // Copyright 2013 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris
 
 package net
 
@@ -102,6 +106,17 @@ var dnsReadConfigTests = []struct {
 			search:   []string{"c.symbolic-datum-552.internal."},
 		},
 	},
+	{
+		name: "testdata/hyperbolabsd-resolv.conf",
+		want: &dnsConfig{
+			ndots:    1,
+			timeout:  5 * time.Second,
+			attempts: 2,
+			lookup:   []string{"file", "bind"},
+			servers:  []string{"169.254.169.254:53", "10.240.0.1:53"},
+			search:   []string{"c.symbolic-datum-552.internal."},
+		},
+	},
 }
 
 func TestDNSReadConfig(t *testing.T) {
diff --git a/libgo/go/net/error_posix.go b/libgo/go/net/error_posix.go
index d0ffaae..84e087f 100644
--- a/libgo/go/net/error_posix.go
+++ b/libgo/go/net/error_posix.go
@@ -1,8 +1,12 @@
 // Copyright 2017 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd solaris windows
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris windows
 
 package net
 
diff --git a/libgo/go/net/fd_unix.go b/libgo/go/net/fd_unix.go
index 95d5e4f..57f511d 100644
--- a/libgo/go/net/fd_unix.go
+++ b/libgo/go/net/fd_unix.go
@@ -1,8 +1,12 @@
 // Copyright 2009 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris
 
 package net
 
diff --git a/libgo/go/net/file_unix.go b/libgo/go/net/file_unix.go
index 3655a89..8f94677 100644
--- a/libgo/go/net/file_unix.go
+++ b/libgo/go/net/file_unix.go
@@ -1,8 +1,12 @@
 // Copyright 2011 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris
 
 package net
 
diff --git a/libgo/go/net/hook_unix.go b/libgo/go/net/hook_unix.go
index 7d58d0f..e5a9f14 100644
--- a/libgo/go/net/hook_unix.go
+++ b/libgo/go/net/hook_unix.go
@@ -1,8 +1,12 @@
 // Copyright 2015 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris
 
 package net
 
diff --git a/libgo/go/net/http/cgi/host.go b/libgo/go/net/http/cgi/host.go
index 58e9f71..9f9a8a8 100644
--- a/libgo/go/net/http/cgi/host.go
+++ b/libgo/go/net/http/cgi/host.go
@@ -1,4 +1,8 @@
 // Copyright 2011 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -39,6 +43,7 @@ var osDefaultInheritEnv = map[string][]string{
 	"irix":    {"LD_LIBRARY_PATH", "LD_LIBRARYN32_PATH", "LD_LIBRARY64_PATH"},
 	"linux":   {"LD_LIBRARY_PATH"},
 	"openbsd": {"LD_LIBRARY_PATH"},
+	"hyperbolabsd": {"LD_LIBRARY_PATH"},
 	"solaris": {"LD_LIBRARY_PATH", "LD_LIBRARY_PATH_32", "LD_LIBRARY_PATH_64"},
 	"windows": {"SystemRoot", "COMSPEC", "PATHEXT", "WINDIR"},
 }
diff --git a/libgo/go/net/interface.go b/libgo/go/net/interface.go
index 4036a7f..6a7d6dc 100644
--- a/libgo/go/net/interface.go
+++ b/libgo/go/net/interface.go
@@ -1,4 +1,8 @@
 // Copyright 2011 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -13,7 +17,7 @@ import (
 // BUG(mikio): On NaCl, methods and functions related to
 // Interface are not implemented.
 
-// BUG(mikio): On DragonFly BSD, NetBSD, OpenBSD, Plan 9 and Solaris,
+// BUG(mikio): On DragonFly BSD, NetBSD, OpenBSD, HyperbolaBSD, Plan 9 and Solaris,
 // the MulticastAddrs method of Interface is not implemented.
 
 var (
diff --git a/libgo/go/net/interface_bsd.go b/libgo/go/net/interface_bsd.go
index 35b1c26..563cf77 100644
--- a/libgo/go/net/interface_bsd.go
+++ b/libgo/go/net/interface_bsd.go
@@ -1,8 +1,12 @@
 // Copyright 2011 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd netbsd openbsd
+// +build darwin dragonfly freebsd netbsd openbsd hyperbolabsd
 
 package net
 
diff --git a/libgo/go/net/interface_bsdvar.go b/libgo/go/net/interface_bsdvar.go
index 0b84ca3..c161ad9 100644
--- a/libgo/go/net/interface_bsdvar.go
+++ b/libgo/go/net/interface_bsdvar.go
@@ -1,8 +1,12 @@
 // Copyright 2011 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build dragonfly netbsd openbsd
+// +build dragonfly netbsd openbsd hyperbolabsd
 
 package net
 
diff --git a/libgo/go/net/interface_test.go b/libgo/go/net/interface_test.go
index 534137a..32df538 100644
--- a/libgo/go/net/interface_test.go
+++ b/libgo/go/net/interface_test.go
@@ -1,4 +1,8 @@
 // Copyright 2011 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -276,7 +280,7 @@ func checkUnicastStats(ifStats *ifStats, uniStats *routeStats) error {
 
 func checkMulticastStats(ifStats *ifStats, uniStats, multiStats *routeStats) error {
 	switch runtime.GOOS {
-	case "dragonfly", "nacl", "netbsd", "openbsd", "plan9", "solaris":
+	case "dragonfly", "nacl", "netbsd", "openbsd", "hyperbolabsd", "plan9", "solaris":
 	default:
 		// Test the existence of connected multicast route
 		// clones for IPv4. Unlike IPv6, IPv4 multicast
diff --git a/libgo/go/net/internal/socktest/switch_unix.go b/libgo/go/net/internal/socktest/switch_unix.go
index 8fb15f3..b68e6bc 100644
--- a/libgo/go/net/internal/socktest/switch_unix.go
+++ b/libgo/go/net/internal/socktest/switch_unix.go
@@ -1,8 +1,12 @@
 // Copyright 2015 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris
 
 package socktest
 
diff --git a/libgo/go/net/internal/socktest/sys_unix.go b/libgo/go/net/internal/socktest/sys_unix.go
index 397c524..caf08f6 100644
--- a/libgo/go/net/internal/socktest/sys_unix.go
+++ b/libgo/go/net/internal/socktest/sys_unix.go
@@ -1,8 +1,12 @@
 // Copyright 2015 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris
 
 package socktest
 
diff --git a/libgo/go/net/iprawsock_posix.go b/libgo/go/net/iprawsock_posix.go
index d613e6f..946910f 100644
--- a/libgo/go/net/iprawsock_posix.go
+++ b/libgo/go/net/iprawsock_posix.go
@@ -1,8 +1,12 @@
 // Copyright 2010 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd solaris windows
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris windows
 
 package net
 
diff --git a/libgo/go/net/ipsock.go b/libgo/go/net/ipsock.go
index 947bdf3..cf8956b 100644
--- a/libgo/go/net/ipsock.go
+++ b/libgo/go/net/ipsock.go
@@ -1,4 +1,8 @@
 // Copyright 2009 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -9,11 +13,11 @@ import (
 	"sync"
 )
 
-// BUG(rsc,mikio): On DragonFly BSD and OpenBSD, listening on the
-// "tcp" and "udp" networks does not listen for both IPv4 and IPv6
-// connections. This is due to the fact that IPv4 traffic will not be
-// routed to an IPv6 socket - two separate sockets are required if
-// both address families are to be supported.
+// BUG(rsc,mikio): On DragonFly BSD, HyperbolaBSD and OpenBSD,
+// listening on the "tcp" and "udp" networks does not listen for both
+// IPv4 and IPv6 connections. This is due to the fact that
+// IPv4 traffic will not be routed to an IPv6 socket - two separate
+// sockets are required if both address families are to be supported.
 // See inet6(4) for details.
 
 type ipStackCapabilities struct {
diff --git a/libgo/go/net/ipsock_posix.go b/libgo/go/net/ipsock_posix.go
index 9cff960..17cf6c3 100644
--- a/libgo/go/net/ipsock_posix.go
+++ b/libgo/go/net/ipsock_posix.go
@@ -1,8 +1,12 @@
 // Copyright 2009 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd solaris windows
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris windows
 
 package net
 
@@ -41,8 +45,8 @@ func (p *ipStackCapabilities) probe() {
 		{laddr: TCPAddr{IP: IPv4(127, 0, 0, 1)}, value: 0},
 	}
 	switch runtime.GOOS {
-	case "dragonfly", "openbsd":
-		// The latest DragonFly BSD and OpenBSD kernels don't
+	case "dragonfly", "openbsd", "hyperbolabsd":
+		// The latest DragonFly BSD, HyperbolaBSD and OpenBSD kernels don't
 		// support IPV6_V6ONLY=0. They always return an error
 		// and we don't need to probe the capability.
 		probes = probes[:1]
@@ -105,7 +109,7 @@ func (p *ipStackCapabilities) probe() {
 // or else returns AF_INET6. It also returns a boolean value what
 // designates IPV6_V6ONLY option.
 //
-// Note that the latest DragonFly BSD and OpenBSD kernels allow
+// Note that the latest DragonFly BSD, HyperbolaBSD and OpenBSD kernels allow
 // neither "net.inet6.ip6.v6only=1" change nor IPPROTO_IPV6 level
 // IPV6_V6ONLY socket option setting.
 func favoriteAddrFamily(network string, laddr, raddr sockaddr, mode string) (family int, ipv6only bool) {
@@ -134,7 +138,7 @@ func favoriteAddrFamily(network string, laddr, raddr sockaddr, mode string) (fam
 }
 
 func internetSocket(ctx context.Context, net string, laddr, raddr sockaddr, sotype, proto int, mode string) (fd *netFD, err error) {
-	if (runtime.GOOS == "windows" || runtime.GOOS == "openbsd" || runtime.GOOS == "nacl") && mode == "dial" && raddr.isWildcard() {
+	if (runtime.GOOS == "windows" || runtime.GOOS == "openbsd" ||  runtime.GOOS == "hyperbolabsd" || runtime.GOOS == "nacl") && mode == "dial" && raddr.isWildcard() {
 		raddr = raddr.toLocal(net)
 	}
 	family, ipv6only := favoriteAddrFamily(net, laddr, raddr, mode)
diff --git a/libgo/go/net/listen_test.go b/libgo/go/net/listen_test.go
index 96624f9..c58e8bf 100644
--- a/libgo/go/net/listen_test.go
+++ b/libgo/go/net/listen_test.go
@@ -1,4 +1,8 @@
 // Copyright 2011 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -192,6 +196,8 @@ var dualStackTCPListenerTests = []struct {
 	//	net.ipv6.bindv6only=0 (overridable by sysctl or IPV6_V6ONLY option)
 	// openbsd, kernel version 5.0
 	//	net.inet6.ip6.v6only=1 (overriding is prohibited)
+	// hyperbolabsd (openbsd based)
+	//	net.inet6.ip6.v6only=1 (overriding is prohibited)
 
 	{"tcp", "", "tcp", "", syscall.EADDRINUSE},
 	{"tcp", "", "tcp", "0.0.0.0", syscall.EADDRINUSE},
@@ -673,7 +679,7 @@ func checkMulticastListener(c *UDPConn, ip IP) error {
 
 func multicastRIBContains(ip IP) (bool, error) {
 	switch runtime.GOOS {
-	case "dragonfly", "netbsd", "openbsd", "plan9", "solaris", "windows":
+	case "dragonfly", "netbsd", "openbsd", "hyperbolabsd", "plan9", "solaris", "windows":
 		return true, nil // not implemented yet
 	case "linux":
 		if runtime.GOARCH == "arm" || runtime.GOARCH == "alpha" {
diff --git a/libgo/go/net/lookup_unix.go b/libgo/go/net/lookup_unix.go
index 2813f14..ebdcf08 100644
--- a/libgo/go/net/lookup_unix.go
+++ b/libgo/go/net/lookup_unix.go
@@ -1,8 +1,12 @@
 // Copyright 2011 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris
 
 package net
 
diff --git a/libgo/go/net/main_test.go b/libgo/go/net/main_test.go
index 3e7a85a..1e8beba 100644
--- a/libgo/go/net/main_test.go
+++ b/libgo/go/net/main_test.go
@@ -1,4 +1,8 @@
 // Copyright 2015 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -131,7 +135,7 @@ func setupTestData() {
 			{"udp6", "[" + addr + "%" + ifi.Name + "]:0", false},
 		}...)
 		switch runtime.GOOS {
-		case "darwin", "dragonfly", "freebsd", "openbsd", "netbsd":
+		case "darwin", "dragonfly", "freebsd", "hyperbolabsd", "openbsd", "netbsd":
 			ipv6LinkLocalUnicastTCPTests = append(ipv6LinkLocalUnicastTCPTests, []ipv6LinkLocalUnicastTest{
 				{"tcp", "[localhost%" + ifi.Name + "]:0", true},
 				{"tcp6", "[localhost%" + ifi.Name + "]:0", true},
diff --git a/libgo/go/net/main_unix_test.go b/libgo/go/net/main_unix_test.go
index 34a8a10..649d0fe 100644
--- a/libgo/go/net/main_unix_test.go
+++ b/libgo/go/net/main_unix_test.go
@@ -1,8 +1,12 @@
 // Copyright 2015 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris
 
 package net
 
diff --git a/libgo/go/net/net.go b/libgo/go/net/net.go
index 3ad9103..b9659de 100644
--- a/libgo/go/net/net.go
+++ b/libgo/go/net/net.go
@@ -1,4 +1,8 @@
 // Copyright 2009 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -52,7 +56,7 @@ When cgo is available, the cgo-based resolver is used instead under a variety of
 conditions: on systems that do not let programs make direct DNS requests (OS X),
 when the LOCALDOMAIN environment variable is present (even if empty),
 when the RES_OPTIONS or HOSTALIASES environment variable is non-empty,
-when the ASR_CONFIG environment variable is non-empty (OpenBSD only),
+when the ASR_CONFIG environment variable is non-empty (OpenBSD and HyperbolaBSD only),
 when /etc/resolv.conf or /etc/nsswitch.conf specify the use of features that the
 Go resolver does not implement, and when the name being looked up ends in .local
 or is an mDNS name.
diff --git a/libgo/go/net/nss.go b/libgo/go/net/nss.go
index 1650f5e..315891b 100644
--- a/libgo/go/net/nss.go
+++ b/libgo/go/net/nss.go
@@ -1,8 +1,12 @@
 // Copyright 2015 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris
 
 package net
 
diff --git a/libgo/go/net/nss_test.go b/libgo/go/net/nss_test.go
index 371deb5..ce32d75 100644
--- a/libgo/go/net/nss_test.go
+++ b/libgo/go/net/nss_test.go
@@ -1,8 +1,12 @@
 // Copyright 2015 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris
 
 package net
 
diff --git a/libgo/go/net/port_unix.go b/libgo/go/net/port_unix.go
index 8dd1c32..2de66b6 100644
--- a/libgo/go/net/port_unix.go
+++ b/libgo/go/net/port_unix.go
@@ -1,8 +1,12 @@
 // Copyright 2009 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris nacl
+// +build aix darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris nacl
 
 // Read system port mappings from /etc/services
 
diff --git a/libgo/go/net/rawconn_unix_test.go b/libgo/go/net/rawconn_unix_test.go
index 913ad86..af8b335 100644
--- a/libgo/go/net/rawconn_unix_test.go
+++ b/libgo/go/net/rawconn_unix_test.go
@@ -1,8 +1,12 @@
 // Copyright 2017 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris
 
 package net
 
diff --git a/libgo/go/net/sendfile_stub.go b/libgo/go/net/sendfile_stub.go
index f043062..de3e305 100644
--- a/libgo/go/net/sendfile_stub.go
+++ b/libgo/go/net/sendfile_stub.go
@@ -1,8 +1,12 @@
 // Copyright 2011 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin nacl netbsd openbsd
+// +build aix darwin nacl netbsd openbsd hyperbolabsd
 
 package net
 
diff --git a/libgo/go/net/sock_bsd.go b/libgo/go/net/sock_bsd.go
index 516e557..752d6f3 100644
--- a/libgo/go/net/sock_bsd.go
+++ b/libgo/go/net/sock_bsd.go
@@ -1,8 +1,12 @@
 // Copyright 2009 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd netbsd openbsd
+// +build darwin dragonfly freebsd netbsd openbsd hyperbolabsd
 
 package net
 
@@ -25,6 +29,8 @@ func maxListenerBacklog() int {
 		// NOTE: NetBSD has no somaxconn-like kernel state so far
 	case "openbsd":
 		n, err = syscall.SysctlUint32("kern.somaxconn")
+	case "hyperbolabsd":
+		n, err = syscall.SysctlUint32("kern.somaxconn")
 	}
 	if n == 0 || err != nil {
 		return syscall.SOMAXCONN
diff --git a/libgo/go/net/sock_posix.go b/libgo/go/net/sock_posix.go
index 4733c42..8ac4274 100644
--- a/libgo/go/net/sock_posix.go
+++ b/libgo/go/net/sock_posix.go
@@ -1,8 +1,12 @@
 // Copyright 2009 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd solaris windows
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris windows
 
 package net
 
diff --git a/libgo/go/net/sockopt_bsd.go b/libgo/go/net/sockopt_bsd.go
index 1aae88a..cb43158 100644
--- a/libgo/go/net/sockopt_bsd.go
+++ b/libgo/go/net/sockopt_bsd.go
@@ -1,8 +1,12 @@
 // Copyright 2011 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd netbsd openbsd
+// +build darwin dragonfly freebsd netbsd openbsd hyperbolabsd
 
 package net
 
diff --git a/libgo/go/net/sockopt_posix.go b/libgo/go/net/sockopt_posix.go
index 29edddb..c63689f 100644
--- a/libgo/go/net/sockopt_posix.go
+++ b/libgo/go/net/sockopt_posix.go
@@ -1,8 +1,12 @@
 // Copyright 2009 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris windows
+// +build aix darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris windows
 
 package net
 
diff --git a/libgo/go/net/sockoptip_bsdvar.go b/libgo/go/net/sockoptip_bsdvar.go
index 9560101..637be78 100644
--- a/libgo/go/net/sockoptip_bsdvar.go
+++ b/libgo/go/net/sockoptip_bsdvar.go
@@ -1,8 +1,12 @@
 // Copyright 2011 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd netbsd openbsd solaris
+// +build darwin dragonfly freebsd netbsd openbsd hyperbolabsd solaris
 
 package net
 
diff --git a/libgo/go/net/sockoptip_posix.go b/libgo/go/net/sockoptip_posix.go
index b14963f..9b6e1a9 100644
--- a/libgo/go/net/sockoptip_posix.go
+++ b/libgo/go/net/sockoptip_posix.go
@@ -1,8 +1,12 @@
 // Copyright 2011 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris windows
+// +build aix darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris windows
 
 package net
 
diff --git a/libgo/go/net/sys_cloexec.go b/libgo/go/net/sys_cloexec.go
index def05cb..5f3fe60 100644
--- a/libgo/go/net/sys_cloexec.go
+++ b/libgo/go/net/sys_cloexec.go
@@ -1,11 +1,15 @@
 // Copyright 2013 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 // This file implements sysSocket and accept for platforms that do not
 // provide a fast path for setting SetNonblock and CloseOnExec.
 
-// +build aix darwin nacl netbsd openbsd solaris
+// +build aix darwin nacl netbsd openbsd hyperbolabsd solaris
 
 package net
 
diff --git a/libgo/go/net/tcpsock_posix.go b/libgo/go/net/tcpsock_posix.go
index 9ba199d..49f177e 100644
--- a/libgo/go/net/tcpsock_posix.go
+++ b/libgo/go/net/tcpsock_posix.go
@@ -1,8 +1,12 @@
 // Copyright 2009 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd solaris windows
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris windows
 
 package net
 
diff --git a/libgo/go/net/tcpsock_test.go b/libgo/go/net/tcpsock_test.go
index 04b38b6..5e15763 100644
--- a/libgo/go/net/tcpsock_test.go
+++ b/libgo/go/net/tcpsock_test.go
@@ -1,4 +1,8 @@
 // Copyright 2012 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -654,7 +658,7 @@ func TestTCPSelfConnect(t *testing.T) {
 		n = 1000
 	}
 	switch runtime.GOOS {
-	case "darwin", "dragonfly", "freebsd", "netbsd", "openbsd", "plan9", "solaris", "windows":
+	case "darwin", "dragonfly", "freebsd", "netbsd", "openbsd", "hyperbolabsd", "plan9", "solaris", "windows":
 		// Non-Linux systems take a long time to figure
 		// out that there is nothing listening on localhost.
 		n = 100
diff --git b/libgo/go/net/tcpsockopt_hyperbolabsd.go b/libgo/go/net/tcpsockopt_hyperbolabsd.go
new file mode 100644
index 0000000..5b90893
--- /dev/null
+++ b/libgo/go/net/tcpsockopt_hyperbolabsd.go
@@ -0,0 +1,20 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package net
+
+import (
+	"syscall"
+	"time"
+)
+
+func setKeepAlivePeriod(fd *netFD, d time.Duration) error {
+	// HyperbolaBSD has no user-settable per-socket TCP keepalive
+	// options.
+	return syscall.ENOPROTOOPT
+}
diff --git a/libgo/go/net/tcpsockopt_posix.go b/libgo/go/net/tcpsockopt_posix.go
index 5e00ba1..3aacb33 100644
--- a/libgo/go/net/tcpsockopt_posix.go
+++ b/libgo/go/net/tcpsockopt_posix.go
@@ -1,8 +1,12 @@
 // Copyright 2009 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris windows
+// +build aix darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris windows
 
 package net
 
diff --git b/libgo/go/net/testdata/hyperbolabsd-resolv.conf b/libgo/go/net/testdata/hyperbolabsd-resolv.conf
new file mode 100644
index 0000000..8281a91
--- /dev/null
+++ b/libgo/go/net/testdata/hyperbolabsd-resolv.conf
@@ -0,0 +1,5 @@
+# Generated by vio0 dhclient
+search c.symbolic-datum-552.internal.
+nameserver 169.254.169.254
+nameserver 10.240.0.1
+lookup file bind
diff --git a/libgo/go/net/timeout_test.go b/libgo/go/net/timeout_test.go
index 9de7801..84b6346 100644
--- a/libgo/go/net/timeout_test.go
+++ b/libgo/go/net/timeout_test.go
@@ -1,4 +1,8 @@
 // Copyright 2009 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -102,6 +106,8 @@ var dialTimeoutMaxDurationTests = []struct {
 func TestDialTimeoutMaxDuration(t *testing.T) {
 	if runtime.GOOS == "openbsd" {
 		testenv.SkipFlaky(t, 15157)
+	} else if runtime.GOOS == "hyperbolabsd" {
+		testenv.SkipFlaky(t, 15157)
 	}
 
 	ln, err := newLocalListener("tcp")
diff --git a/libgo/go/net/udpsock_posix.go b/libgo/go/net/udpsock_posix.go
index fe552ba..625f830 100644
--- a/libgo/go/net/udpsock_posix.go
+++ b/libgo/go/net/udpsock_posix.go
@@ -1,8 +1,12 @@
 // Copyright 2009 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd solaris windows
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris windows
 
 package net
 
diff --git a/libgo/go/net/unixsock_posix.go b/libgo/go/net/unixsock_posix.go
index 945aa03..d44219d 100644
--- a/libgo/go/net/unixsock_posix.go
+++ b/libgo/go/net/unixsock_posix.go
@@ -1,8 +1,12 @@
 // Copyright 2009 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd solaris windows
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris windows
 
 package net
 
diff --git a/libgo/go/net/unixsock_test.go b/libgo/go/net/unixsock_test.go
index 3e5c8bc..5230ee9 100644
--- a/libgo/go/net/unixsock_test.go
+++ b/libgo/go/net/unixsock_test.go
@@ -1,4 +1,8 @@
 // Copyright 2013 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -24,6 +28,8 @@ func TestReadUnixgramWithUnnamedSocket(t *testing.T) {
 	}
 	if runtime.GOOS == "openbsd" {
 		testenv.SkipFlaky(t, 15157)
+	} else if runtime.GOOS == "hyperbolabsd" {
+		testenv.SkipFlaky(t, 15157)
 	}
 
 	addr := testUnixAddr()
diff --git a/libgo/go/net/write_unix_test.go b/libgo/go/net/write_unix_test.go
index 6d8cb6a..bcb1560 100644
--- a/libgo/go/net/write_unix_test.go
+++ b/libgo/go/net/write_unix_test.go
@@ -1,8 +1,12 @@
 // Copyright 2017 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris
 
 package net
 
diff --git a/libgo/go/net/writev_test.go b/libgo/go/net/writev_test.go
index 4c05be4..cf7e558 100644
--- a/libgo/go/net/writev_test.go
+++ b/libgo/go/net/writev_test.go
@@ -1,4 +1,8 @@
 // Copyright 2016 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -152,7 +156,7 @@ func testBuffer_writeTo(t *testing.T, chunks int, useCopy bool) {
 
 		var wantSum int
 		switch runtime.GOOS {
-		case "android", "darwin", "dragonfly", "freebsd", "linux", "netbsd", "openbsd":
+		case "android", "darwin", "dragonfly", "freebsd", "linux", "netbsd", "openbsd", "hyperbolabsd":
 			var wantMinCalls int
 			wantSum = want.Len()
 			v := chunks
diff --git a/libgo/go/net/writev_unix.go b/libgo/go/net/writev_unix.go
index bf0fbf8..c98bd9c 100644
--- a/libgo/go/net/writev_unix.go
+++ b/libgo/go/net/writev_unix.go
@@ -1,8 +1,12 @@
 // Copyright 2016 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd linux netbsd openbsd
+// +build darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd
 
 package net
 
diff --git a/libgo/go/os/dir_unix.go b/libgo/go/os/dir_unix.go
index 2dc6a89..40875df 100644
--- a/libgo/go/os/dir_unix.go
+++ b/libgo/go/os/dir_unix.go
@@ -1,8 +1,12 @@
 // Copyright 2009 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris
 
 package os
 
diff --git a/libgo/go/os/env_unix_test.go b/libgo/go/os/env_unix_test.go
index f7b67eb..3dda1a5 100644
--- a/libgo/go/os/env_unix_test.go
+++ b/libgo/go/os/env_unix_test.go
@@ -1,8 +1,12 @@
 // Copyright 2013 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris
 
 package os_test
 
diff --git a/libgo/go/os/error_posix.go b/libgo/go/os/error_posix.go
index 2049e44..23f490a 100644
--- a/libgo/go/os/error_posix.go
+++ b/libgo/go/os/error_posix.go
@@ -1,8 +1,12 @@
 // Copyright 2017 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd linux nacl netbsd openbsd solaris windows
+// +build darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris windows
 
 package os
 
diff --git a/libgo/go/os/error_unix.go b/libgo/go/os/error_unix.go
index 2349851..6a62d66 100644
--- a/libgo/go/os/error_unix.go
+++ b/libgo/go/os/error_unix.go
@@ -1,8 +1,12 @@
 // Copyright 2009 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris
 
 package os
 
diff --git a/libgo/go/os/error_unix_test.go b/libgo/go/os/error_unix_test.go
index 76fe015..484df8b 100644
--- a/libgo/go/os/error_unix_test.go
+++ b/libgo/go/os/error_unix_test.go
@@ -1,8 +1,12 @@
 // Copyright 2016 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd linux nacl netbsd openbsd solaris
+// +build darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris
 
 package os_test
 
diff --git a/libgo/go/os/exec/exec_posix_test.go b/libgo/go/os/exec/exec_posix_test.go
index 865b6c3..6e7a19c 100644
--- a/libgo/go/os/exec/exec_posix_test.go
+++ b/libgo/go/os/exec/exec_posix_test.go
@@ -1,8 +1,12 @@
 // Copyright 2017 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris
 
 package exec_test
 
diff --git a/libgo/go/os/exec/exec_test.go b/libgo/go/os/exec/exec_test.go
index aa33570..e27ae94 100644
--- a/libgo/go/os/exec/exec_test.go
+++ b/libgo/go/os/exec/exec_test.go
@@ -1,4 +1,8 @@
 // Copyright 2009 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -676,7 +680,7 @@ func TestHelperProcess(*testing.T) {
 	// Determine which command to use to display open files.
 	ofcmd := "lsof"
 	switch runtime.GOOS {
-	case "dragonfly", "freebsd", "netbsd", "openbsd":
+	case "dragonfly", "freebsd", "netbsd", "openbsd", "hyperbolabsd":
 		ofcmd = "fstat"
 	case "plan9":
 		ofcmd = "/bin/cat"
diff --git a/libgo/go/os/exec/lp_unix.go b/libgo/go/os/exec/lp_unix.go
index 20ce7a4..d4590f2 100644
--- a/libgo/go/os/exec/lp_unix.go
+++ b/libgo/go/os/exec/lp_unix.go
@@ -1,8 +1,12 @@
 // Copyright 2010 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris
 
 package exec
 
diff --git a/libgo/go/os/exec/lp_unix_test.go b/libgo/go/os/exec/lp_unix_test.go
index d467acf..e514f18 100644
--- a/libgo/go/os/exec/lp_unix_test.go
+++ b/libgo/go/os/exec/lp_unix_test.go
@@ -1,8 +1,12 @@
 // Copyright 2013 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris
 
 package exec
 
diff --git a/libgo/go/os/exec_posix.go b/libgo/go/os/exec_posix.go
index 056f139..87d1bcf 100644
--- a/libgo/go/os/exec_posix.go
+++ b/libgo/go/os/exec_posix.go
@@ -1,8 +1,12 @@
 // Copyright 2009 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd solaris windows
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris windows
 
 package os
 
diff --git a/libgo/go/os/exec_unix.go b/libgo/go/os/exec_unix.go
index d6433bf..6de906d 100644
--- a/libgo/go/os/exec_unix.go
+++ b/libgo/go/os/exec_unix.go
@@ -1,8 +1,12 @@
 // Copyright 2009 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris
 
 package os
 
diff --git a/libgo/go/os/executable_path.go b/libgo/go/os/executable_path.go
index 7b8b836..39c991a 100644
--- a/libgo/go/os/executable_path.go
+++ b/libgo/go/os/executable_path.go
@@ -1,8 +1,12 @@
 // Copyright 2017 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix openbsd
+// +build aix openbsd hyperbolabsd
 
 package os
 
diff --git a/libgo/go/os/executable_test.go b/libgo/go/os/executable_test.go
index 4a9a883..bfc93c7 100644
--- a/libgo/go/os/executable_test.go
+++ b/libgo/go/os/executable_test.go
@@ -1,4 +1,8 @@
 // Copyright 2016 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -39,6 +43,9 @@ func TestExecutable(t *testing.T) {
 	if runtime.GOOS == "openbsd" {
 		// OpenBSD relies on argv[0]
 		cmd.Args[0] = fn
+	} else if runtime.GOOS == "hyperbolabsd" {
+		// HyperbolaBSD relies on argv[0]
+		cmd.Args[0] = fn
 	}
 	cmd.Env = append(os.Environ(), fmt.Sprintf("%s=1", executable_EnvVar))
 	out, err := cmd.CombinedOutput()
diff --git a/libgo/go/os/file_posix.go b/libgo/go/os/file_posix.go
index 67da384..ad7fc9a 100644
--- a/libgo/go/os/file_posix.go
+++ b/libgo/go/os/file_posix.go
@@ -1,8 +1,12 @@
 // Copyright 2009 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd solaris windows
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris windows
 
 package os
 
diff --git a/libgo/go/os/file_unix.go b/libgo/go/os/file_unix.go
index 67d2ee1..f00220c 100644
--- a/libgo/go/os/file_unix.go
+++ b/libgo/go/os/file_unix.go
@@ -1,8 +1,12 @@
 // Copyright 2009 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris
 
 package os
 
diff --git a/libgo/go/os/os_test.go b/libgo/go/os/os_test.go
index 8ed9252..9554544 100644
--- a/libgo/go/os/os_test.go
+++ b/libgo/go/os/os_test.go
@@ -1,4 +1,8 @@
 // Copyright 2009 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -2225,9 +2229,11 @@ func TestPipeThreads(t *testing.T) {
 
 	threads := 100
 
-	// OpenBSD has a low default for max number of files.
+	// OpenBSD (and HyperbolaBSD) has a low default for max number of files.
 	if runtime.GOOS == "openbsd" {
 		threads = 50
+	} else if runtime.GOOS == "hyperbolabsd" {
+		threads = 50
 	}
 
 	r := make([]*File, threads)
diff --git a/libgo/go/os/os_unix_test.go b/libgo/go/os/os_unix_test.go
index 56c885c..1269eb6 100644
--- a/libgo/go/os/os_unix_test.go
+++ b/libgo/go/os/os_unix_test.go
@@ -1,8 +1,12 @@
 // Copyright 2009 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris
 
 package os_test
 
diff --git a/libgo/go/os/path_unix.go b/libgo/go/os/path_unix.go
index bc0f239..f5e67b0 100644
--- a/libgo/go/os/path_unix.go
+++ b/libgo/go/os/path_unix.go
@@ -1,8 +1,12 @@
 // Copyright 2011 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris
 
 package os
 
diff --git a/libgo/go/os/pipe_bsd.go b/libgo/go/os/pipe_bsd.go
index 8398a24..14e6ef6 100644
--- a/libgo/go/os/pipe_bsd.go
+++ b/libgo/go/os/pipe_bsd.go
@@ -1,8 +1,12 @@
 // Copyright 2009 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly nacl netbsd openbsd solaris
+// +build aix darwin dragonfly nacl netbsd openbsd hyperbolabsd solaris
 
 package os
 
diff --git a/libgo/go/os/signal/internal/pty/pty.go b/libgo/go/os/signal/internal/pty/pty.go
index e52d19a..87708c7 100644
--- a/libgo/go/os/signal/internal/pty/pty.go
+++ b/libgo/go/os/signal/internal/pty/pty.go
@@ -1,8 +1,12 @@
 // Copyright 2017 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux,!android netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux,!android netbsd openbsd hyperbolabsd solaris
 
 // Package pty is a simple pseudo-terminal package for Unix systems,
 // implemented by calling C functions via cgo.
diff --git a/libgo/go/os/signal/signal_cgo_test.go b/libgo/go/os/signal/signal_cgo_test.go
index 16aeea8..a99ec3a 100644
--- a/libgo/go/os/signal/signal_cgo_test.go
+++ b/libgo/go/os/signal/signal_cgo_test.go
@@ -1,8 +1,12 @@
 // Copyright 2017 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd linux,!android netbsd openbsd
+// +build darwin dragonfly freebsd linux,!android netbsd openbsd hyperbolabsd
 // +build cgo
 
 // Note that this test does not work on Solaris: issue #22849.
diff --git a/libgo/go/os/signal/signal_test.go b/libgo/go/os/signal/signal_test.go
index d27ff0b..035a781 100644
--- a/libgo/go/os/signal/signal_test.go
+++ b/libgo/go/os/signal/signal_test.go
@@ -1,8 +1,12 @@
 // Copyright 2009 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris
 
 package signal
 
diff --git a/libgo/go/os/signal/signal_unix.go b/libgo/go/os/signal/signal_unix.go
index 5ec7e97..f93d44d 100644
--- a/libgo/go/os/signal/signal_unix.go
+++ b/libgo/go/os/signal/signal_unix.go
@@ -1,8 +1,12 @@
 // Copyright 2012 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd solaris windows
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris windows
 
 package signal
 
diff --git a/libgo/go/os/stat_atim.go b/libgo/go/os/stat_atim.go
index ef8a574..bf64005 100644
--- a/libgo/go/os/stat_atim.go
+++ b/libgo/go/os/stat_atim.go
@@ -1,8 +1,12 @@
 // Copyright 2009 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build linux openbsd solaristag
+// +build linux openbsd hyperbolabsd solaristag
 
 package os
 
diff --git a/libgo/go/os/stat_unix.go b/libgo/go/os/stat_unix.go
index bc5d06c..12aa701 100644
--- a/libgo/go/os/stat_unix.go
+++ b/libgo/go/os/stat_unix.go
@@ -1,8 +1,12 @@
 // Copyright 2016 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris
 
 package os
 
diff --git a/libgo/go/os/sticky_bsd.go b/libgo/go/os/sticky_bsd.go
index 6b54c75..41c08fc 100644
--- a/libgo/go/os/sticky_bsd.go
+++ b/libgo/go/os/sticky_bsd.go
@@ -1,8 +1,12 @@
 // Copyright 2014 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd netbsd openbsd solaris
+// +build darwin dragonfly freebsd netbsd openbsd hyperbolabsd solaris
 
 package os
 
diff --git a/libgo/go/os/sticky_notbsd.go b/libgo/go/os/sticky_notbsd.go
index 834e79b..182271b 100644
--- a/libgo/go/os/sticky_notbsd.go
+++ b/libgo/go/os/sticky_notbsd.go
@@ -1,4 +1,8 @@
 // Copyright 2014 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -7,6 +11,7 @@
 // +build !freebsd
 // +build !netbsd
 // +build !openbsd
+// +build !hyperbolabsd
 // +build !solaris
 
 package os
diff --git a/libgo/go/os/sys_bsd.go b/libgo/go/os/sys_bsd.go
index 8ad5e21..de090bc 100644
--- a/libgo/go/os/sys_bsd.go
+++ b/libgo/go/os/sys_bsd.go
@@ -1,8 +1,12 @@
 // Copyright 2009 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd nacl netbsd openbsd
+// +build darwin dragonfly freebsd nacl netbsd openbsd hyperbolabsd
 
 // os code shared between *BSD systems including OS X (Darwin)
 // and FreeBSD.
diff --git a/libgo/go/os/sys_unix.go b/libgo/go/os/sys_unix.go
index 4caf8bd..f6e2d28 100644
--- a/libgo/go/os/sys_unix.go
+++ b/libgo/go/os/sys_unix.go
@@ -1,8 +1,12 @@
 // Copyright 2014 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix dragonfly linux netbsd openbsd solaris
+// +build aix dragonfly linux netbsd openbsd hyperbolabsd solaris
 
 package os
 
diff --git a/libgo/go/os/user/cgo_lookup_unix.go b/libgo/go/os/user/cgo_lookup_unix.go
index 6c815b4..14441d5 100644
--- a/libgo/go/os/user/cgo_lookup_unix.go
+++ b/libgo/go/os/user/cgo_lookup_unix.go
@@ -1,8 +1,12 @@
 // Copyright 2011 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd !android,linux netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd !android,linux netbsd openbsd hyperbolabsd solaris
 // +build cgo
 
 package user
diff --git a/libgo/go/os/user/cgo_unix_test.go b/libgo/go/os/user/cgo_unix_test.go
index 6741118..31f69d5 100644
--- a/libgo/go/os/user/cgo_unix_test.go
+++ b/libgo/go/os/user/cgo_unix_test.go
@@ -1,8 +1,12 @@
 // Copyright 2017 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd !android,linux netbsd openbsd solaris
+// +build darwin dragonfly freebsd !android,linux netbsd openbsd hyperbolabsd solaris
 // +build cgo
 
 package user
diff --git a/libgo/go/os/user/decls_unix.go b/libgo/go/os/user/decls_unix.go
index c2eb51e..c965bcb 100644
--- a/libgo/go/os/user/decls_unix.go
+++ b/libgo/go/os/user/decls_unix.go
@@ -1,8 +1,12 @@
 // Copyright 2014 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd linux netbsd openbsd
+// +build darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd
 // +build cgo
 
 package user
diff --git a/libgo/go/os/user/listgroups_unix.go b/libgo/go/os/user/listgroups_unix.go
index b142e2b..f196f11 100644
--- a/libgo/go/os/user/listgroups_unix.go
+++ b/libgo/go/os/user/listgroups_unix.go
@@ -1,8 +1,12 @@
 // Copyright 2016 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build dragonfly darwin freebsd !android,linux netbsd openbsd
+// +build dragonfly darwin freebsd !android,linux netbsd openbsd hyperbolabsd
 
 package user
 
diff --git a/libgo/go/os/user/lookup_unix.go b/libgo/go/os/user/lookup_unix.go
index 5f34ba8..5797707 100644
--- a/libgo/go/os/user/lookup_unix.go
+++ b/libgo/go/os/user/lookup_unix.go
@@ -1,8 +1,12 @@
 // Copyright 2016 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd !android,linux nacl netbsd openbsd solaris
+// +build darwin dragonfly freebsd !android,linux nacl netbsd openbsd hyperbolabsd solaris
 // +build !cgo
 
 package user
diff --git a/libgo/go/os/user/lookup_unix_test.go b/libgo/go/os/user/lookup_unix_test.go
index 02c88ab..5b22d94 100644
--- a/libgo/go/os/user/lookup_unix_test.go
+++ b/libgo/go/os/user/lookup_unix_test.go
@@ -1,8 +1,12 @@
 // Copyright 2016 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd !android,linux nacl netbsd openbsd solaris
+// +build darwin dragonfly freebsd !android,linux nacl netbsd openbsd hyperbolabsd solaris
 // +build !cgo
 
 package user
diff --git a/libgo/go/os/wait_unimp.go b/libgo/go/os/wait_unimp.go
index 98243b5..2e979e0 100644
--- a/libgo/go/os/wait_unimp.go
+++ b/libgo/go/os/wait_unimp.go
@@ -1,8 +1,12 @@
 // Copyright 2016 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly nacl netbsd openbsd solaris
+// +build aix darwin dragonfly nacl netbsd openbsd hyperbolabsd solaris
 
 package os
 
diff --git a/libgo/go/path/filepath/path_unix.go b/libgo/go/path/filepath/path_unix.go
index 2d407a8..38d63da 100644
--- a/libgo/go/path/filepath/path_unix.go
+++ b/libgo/go/path/filepath/path_unix.go
@@ -1,8 +1,12 @@
 // Copyright 2010 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris
 
 package filepath
 
diff --git a/libgo/go/runtime/crash_unix_test.go b/libgo/go/runtime/crash_unix_test.go
index 584a6c7..35eb901 100644
--- a/libgo/go/runtime/crash_unix_test.go
+++ b/libgo/go/runtime/crash_unix_test.go
@@ -1,8 +1,12 @@
 // Copyright 2012 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris
 
 package runtime_test
 
@@ -35,7 +39,7 @@ func init() {
 
 func TestCrashDumpsAllThreads(t *testing.T) {
 	switch runtime.GOOS {
-	case "darwin", "dragonfly", "freebsd", "linux", "netbsd", "openbsd", "solaris":
+	case "darwin", "dragonfly", "freebsd", "linux", "netbsd", "openbsd", "hyperbolabsd", "solaris":
 	default:
 		t.Skipf("skipping; not supported on %v", runtime.GOOS)
 	}
@@ -274,7 +278,7 @@ func TestSignalIgnoreSIGTRAP(t *testing.T) {
 
 func TestSignalDuringExec(t *testing.T) {
 	switch runtime.GOOS {
-	case "darwin", "dragonfly", "freebsd", "linux", "netbsd", "openbsd":
+	case "darwin", "dragonfly", "freebsd", "linux", "netbsd", "openbsd", "hyperbolabsd":
 	default:
 		t.Skipf("skipping test on %s", runtime.GOOS)
 	}
diff --git a/libgo/go/runtime/env_posix.go b/libgo/go/runtime/env_posix.go
index ddf3c02..0826e3d 100644
--- a/libgo/go/runtime/env_posix.go
+++ b/libgo/go/runtime/env_posix.go
@@ -1,8 +1,12 @@
 // Copyright 2012 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd solaris windows
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris windows
 
 package runtime
 
diff --git a/libgo/go/runtime/export_unix_test.go b/libgo/go/runtime/export_unix_test.go
index eecdfb7..15aea2a 100644
--- a/libgo/go/runtime/export_unix_test.go
+++ b/libgo/go/runtime/export_unix_test.go
@@ -1,8 +1,12 @@
 // Copyright 2017 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris
 
 package runtime
 
diff --git a/libgo/go/runtime/lock_sema.go b/libgo/go/runtime/lock_sema.go
index d000b11..ada601b 100644
--- a/libgo/go/runtime/lock_sema.go
+++ b/libgo/go/runtime/lock_sema.go
@@ -1,8 +1,12 @@
 // Copyright 2011 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin nacl netbsd openbsd plan9 solaris windows
+// +build aix darwin nacl netbsd openbsd hyperbolabsd plan9 solaris windows
 
 package runtime
 
diff --git a/libgo/go/runtime/netpoll.go b/libgo/go/runtime/netpoll.go
index e9bbfec..ae8a44b 100644
--- a/libgo/go/runtime/netpoll.go
+++ b/libgo/go/runtime/netpoll.go
@@ -1,8 +1,12 @@
 // Copyright 2013 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd solaris windows
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris windows
 
 package runtime
 
diff --git a/libgo/go/runtime/netpoll_kqueue.go b/libgo/go/runtime/netpoll_kqueue.go
index 1f68eff..c69accc 100644
--- a/libgo/go/runtime/netpoll_kqueue.go
+++ b/libgo/go/runtime/netpoll_kqueue.go
@@ -1,8 +1,12 @@
 // Copyright 2013 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd netbsd openbsd
+// +build darwin dragonfly freebsd netbsd openbsd hyperbolabsd
 
 package runtime
 
diff --git b/libgo/go/runtime/os_hyperbolabsd.go b/libgo/go/runtime/os_hyperbolabsd.go
new file mode 100644
index 0000000..d7770dc
--- /dev/null
+++ b/libgo/go/runtime/os_hyperbolabsd.go
@@ -0,0 +1,80 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package runtime
+
+import (
+	"runtime/internal/atomic"
+	"unsafe"
+)
+
+type mOS struct {
+	waitsemacount uint32
+}
+
+//go:noescape
+//extern thrsleep
+func thrsleep(ident uintptr, clock_id int32, tsp *timespec, lock uintptr, abort *uint32) int32
+
+//go:noescape
+//extern thrwakeup
+func thrwakeup(ident uintptr, n int32) int32
+
+//go:nosplit
+func semacreate(mp *m) {
+}
+
+//go:nosplit
+func semasleep(ns int64) int32 {
+	_g_ := getg()
+
+	// Compute sleep deadline.
+	var tsp *timespec
+	if ns >= 0 {
+		var ts timespec
+		var nsec int32
+		ns += nanotime()
+		ts.set_sec(int64(timediv(ns, 1000000000, &nsec)))
+		ts.set_nsec(nsec)
+		tsp = &ts
+	}
+
+	for {
+		v := atomic.Load(&_g_.m.mos.waitsemacount)
+		if v > 0 {
+			if atomic.Cas(&_g_.m.mos.waitsemacount, v, v-1) {
+				return 0 // semaphore acquired
+			}
+			continue
+		}
+
+		// Sleep until woken by semawakeup or timeout; or abort if waitsemacount != 0.
+		//
+		// From HyperbolaBSD's __thrsleep(2) manual:
+		// "The abort argument, if not NULL, points to an int that will
+		// be examined [...] immediately before blocking. If that int
+		// is non-zero then __thrsleep() will immediately return EINTR
+		// without blocking."
+		ret := thrsleep(uintptr(unsafe.Pointer(&_g_.m.mos.waitsemacount)), _CLOCK_MONOTONIC, tsp, 0, &_g_.m.mos.waitsemacount)
+		if ret == _EWOULDBLOCK {
+			return -1
+		}
+	}
+}
+
+//go:nosplit
+func semawakeup(mp *m) {
+	atomic.Xadd(&mp.mos.waitsemacount, 1)
+	ret := thrwakeup(uintptr(unsafe.Pointer(&mp.mos.waitsemacount)), 1)
+	if ret != 0 && ret != _ESRCH {
+		// semawakeup can be called on signal stack.
+		systemstack(func() {
+			print("thrwakeup addr=", &mp.mos.waitsemacount, " sem=", mp.mos.waitsemacount, " ret=", ret, "\n")
+		})
+	}
+}
diff --git a/libgo/go/runtime/runtime_unix_test.go b/libgo/go/runtime/runtime_unix_test.go
index b0cbbbe..218125b 100644
--- a/libgo/go/runtime/runtime_unix_test.go
+++ b/libgo/go/runtime/runtime_unix_test.go
@@ -1,4 +1,8 @@
 // Copyright 2013 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -6,7 +10,7 @@
 // We need a fast system call to provoke the race,
 // and Close(-1) is nearly universally fast.
 
-// +build aix darwin dragonfly freebsd linux netbsd openbsd plan9
+// +build aix darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd plan9
 
 package runtime_test
 
diff --git a/libgo/go/runtime/signal_gccgo.go b/libgo/go/runtime/signal_gccgo.go
index 92143ea..1197598 100644
--- a/libgo/go/runtime/signal_gccgo.go
+++ b/libgo/go/runtime/signal_gccgo.go
@@ -1,8 +1,12 @@
 // Copyright 2016 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris
 
 package runtime
 
diff --git a/libgo/go/runtime/signal_sighandler.go b/libgo/go/runtime/signal_sighandler.go
index 698629d..c8cce0b 100644
--- a/libgo/go/runtime/signal_sighandler.go
+++ b/libgo/go/runtime/signal_sighandler.go
@@ -1,8 +1,12 @@
 // Copyright 2013 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris
 
 package runtime
 
diff --git a/libgo/go/runtime/signal_unix.go b/libgo/go/runtime/signal_unix.go
index a8f77fa..b63823b 100644
--- a/libgo/go/runtime/signal_unix.go
+++ b/libgo/go/runtime/signal_unix.go
@@ -1,8 +1,12 @@
 // Copyright 2012 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris
 
 package runtime
 
diff --git a/libgo/go/runtime/testdata/testprog/gc.go b/libgo/go/runtime/testdata/testprog/gc.go
index 5424517..f7f15c1 100644
--- a/libgo/go/runtime/testdata/testprog/gc.go
+++ b/libgo/go/runtime/testdata/testprog/gc.go
@@ -1,4 +1,8 @@
 // Copyright 2015 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -102,10 +106,10 @@ func GCFairness2() {
 	// to let all goroutines run, but for now we cycle through
 	// them rapidly.
 	//
-	// OpenBSD's scheduler makes every usleep() take at least
-	// 20ms, so we need a long time to ensure all goroutines have
-	// run. If they haven't run after 30ms, give it another 1000ms
-	// and check again.
+	// HyperbolaBSD and OpenBSD's scheduler makes every usleep()
+	// take at least 20ms, so we need a long time to ensure all
+	// goroutines have run. If they haven't run after 30ms, give it
+	// another 1000ms and check again.
 	time.Sleep(30 * time.Millisecond)
 	var fail bool
 	for i := range count {
diff --git a/libgo/go/runtime/testdata/testprognet/signalexec.go b/libgo/go/runtime/testdata/testprognet/signalexec.go
index 4a988ef..e16f25f 100644
--- a/libgo/go/runtime/testdata/testprognet/signalexec.go
+++ b/libgo/go/runtime/testdata/testprognet/signalexec.go
@@ -1,8 +1,12 @@
 // Copyright 2017 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd linux netbsd openbsd
+// +build darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd
 
 // This is in testprognet instead of testprog because testprog
 // must not import anything (like net, but also like os/signal)
diff --git a/libgo/go/runtime/trace/trace_test.go b/libgo/go/runtime/trace/trace_test.go
index 997d486..de842f4 100644
--- a/libgo/go/runtime/trace/trace_test.go
+++ b/libgo/go/runtime/trace/trace_test.go
@@ -1,4 +1,8 @@
 // Copyright 2014 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -223,6 +227,10 @@ func TestTraceStress(t *testing.T) {
 		// Reduce allocation to avoid running out of
 		// memory on the builder - see issue/12032.
 		n = 512
+	} else if runtime.GOOS == "hyperbolabsd" && runtime.GOARCH == "arm" {
+		// Reduce allocation to avoid running out of
+		// memory on the builder - see issue/12032.
+		n = 512
 	}
 	for i := 0; i < n; i++ {
 		_ = make([]byte, 1<<20)
@@ -361,6 +369,10 @@ func TestTraceStressStartStop(t *testing.T) {
 			// Reduce allocation to avoid running out of
 			// memory on the builder - see issue/12032.
 			n = 512
+		} else if runtime.GOOS == "hyperbolabsd" && runtime.GOARCH == "arm" {
+			// Reduce allocation to avoid running out of
+			// memory on the builder - see issue/12032.
+			n = 512
 		}
 		for i := 0; i < n; i++ {
 			_ = make([]byte, 1<<20)
diff --git a/libgo/go/syscall/bpf_bsd.go b/libgo/go/syscall/bpf_bsd.go
index 8b58755..6889ddc 100644
--- a/libgo/go/syscall/bpf_bsd.go
+++ b/libgo/go/syscall/bpf_bsd.go
@@ -1,8 +1,12 @@
 // Copyright 2011 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd netbsd openbsd
+// +build darwin dragonfly freebsd netbsd openbsd hyperbolabsd
 
 // Berkeley packet filter for BSD variants
 
diff --git a/libgo/go/syscall/dirent.go b/libgo/go/syscall/dirent.go
index a09bf05..4e836ee 100644
--- a/libgo/go/syscall/dirent.go
+++ b/libgo/go/syscall/dirent.go
@@ -1,8 +1,12 @@
 // Copyright 2009 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris
 
 package syscall
 
diff --git a/libgo/go/syscall/env_unix.go b/libgo/go/syscall/env_unix.go
index eb93e2e..7783585 100644
--- a/libgo/go/syscall/env_unix.go
+++ b/libgo/go/syscall/env_unix.go
@@ -1,8 +1,12 @@
 // Copyright 2010 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris
 
 // Unix environment variables.
 
diff --git a/libgo/go/syscall/exec_bsd.go b/libgo/go/syscall/exec_bsd.go
index 9115cf0..ec6e71a 100644
--- a/libgo/go/syscall/exec_bsd.go
+++ b/libgo/go/syscall/exec_bsd.go
@@ -1,8 +1,12 @@
 // Copyright 2011 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd netbsd openbsd hyperbolabsd solaris
 
 package syscall
 
diff --git a/libgo/go/syscall/exec_unix.go b/libgo/go/syscall/exec_unix.go
index 8d83e91..2598021 100644
--- a/libgo/go/syscall/exec_unix.go
+++ b/libgo/go/syscall/exec_unix.go
@@ -1,8 +1,12 @@
 // Copyright 2009 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris
 
 // Fork, exec, wait, etc.
 
diff --git a/libgo/go/syscall/exec_unix_test.go b/libgo/go/syscall/exec_unix_test.go
index 58708da..5f77986 100644
--- a/libgo/go/syscall/exec_unix_test.go
+++ b/libgo/go/syscall/exec_unix_test.go
@@ -1,8 +1,12 @@
 // Copyright 2015 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris
 
 package syscall_test
 
diff --git a/libgo/go/syscall/export_unix_test.go b/libgo/go/syscall/export_unix_test.go
index 120500c..e0dc72f 100644
--- a/libgo/go/syscall/export_unix_test.go
+++ b/libgo/go/syscall/export_unix_test.go
@@ -1,8 +1,12 @@
 // Copyright 2015 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris
 
 package syscall
 
diff --git a/libgo/go/syscall/forkpipe_bsd.go b/libgo/go/syscall/forkpipe_bsd.go
index d479284..65a8f84 100644
--- a/libgo/go/syscall/forkpipe_bsd.go
+++ b/libgo/go/syscall/forkpipe_bsd.go
@@ -1,8 +1,12 @@
 // Copyright 2011 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly netbsd openbsd solaris
+// +build aix darwin dragonfly netbsd openbsd hyperbola solaris
 
 package syscall
 
diff --git a/libgo/go/syscall/libcall_bsd.go b/libgo/go/syscall/libcall_bsd.go
index 9a4b2d6..bd337bd 100644
--- a/libgo/go/syscall/libcall_bsd.go
+++ b/libgo/go/syscall/libcall_bsd.go
@@ -1,8 +1,12 @@
 // Copyright 2015 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd netbsd openbsd solaris
+// +build darwin dragonfly freebsd netbsd openbsd hyperbolabsd solaris
 
 // BSD library calls.
 
diff --git a/libgo/go/syscall/libcall_posix_utimesnano.go b/libgo/go/syscall/libcall_posix_utimesnano.go
index 372b0d7..62696e8 100644
--- a/libgo/go/syscall/libcall_posix_utimesnano.go
+++ b/libgo/go/syscall/libcall_posix_utimesnano.go
@@ -1,8 +1,12 @@
 // Copyright 2012 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd openbsd netbsd solaris
+// +build aix darwin dragonfly freebsd hyperbolabsd openbsd netbsd solaris
 
 // General POSIX version of UtimesNano.
 
diff --git a/libgo/go/syscall/mmap_unix_test.go b/libgo/go/syscall/mmap_unix_test.go
index d0b3644..92140c9 100644
--- a/libgo/go/syscall/mmap_unix_test.go
+++ b/libgo/go/syscall/mmap_unix_test.go
@@ -1,8 +1,12 @@
 // Copyright 2014 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux netbsd openbsd
+// +build aix darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd
 
 package syscall_test
 
diff --git a/libgo/go/syscall/route_bsd.go b/libgo/go/syscall/route_bsd.go
index b364eea..e4b21a0 100644
--- a/libgo/go/syscall/route_bsd.go
+++ b/libgo/go/syscall/route_bsd.go
@@ -1,8 +1,12 @@
 // Copyright 2011 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd netbsd openbsd
+// +build darwin dragonfly freebsd netbsd openbsd hyperbolabsd
 
 package syscall
 
diff --git b/libgo/go/syscall/route_hyperbolabsd.go b/libgo/go/syscall/route_hyperbolabsd.go
new file mode 100644
index 0000000..d254531
--- /dev/null
+++ b/libgo/go/syscall/route_hyperbolabsd.go
@@ -0,0 +1,41 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package syscall
+
+import "unsafe"
+
+func (any *anyMessage) toRoutingMessage(b []byte) RoutingMessage {
+	switch any.Type {
+	case RTM_ADD, RTM_DELETE, RTM_CHANGE, RTM_GET, RTM_LOSING, RTM_REDIRECT, RTM_MISS, RTM_LOCK, RTM_RESOLVE:
+		p := (*RouteMessage)(unsafe.Pointer(any))
+		// We don't support sockaddr_rtlabel for now.
+		p.Header.Addrs &= RTA_DST | RTA_GATEWAY | RTA_NETMASK | RTA_GENMASK | RTA_IFA | RTA_IFP | RTA_BRD | RTA_AUTHOR | RTA_SRC | RTA_SRCMASK
+		return &RouteMessage{Header: p.Header, Data: b[p.Header.Hdrlen:any.Msglen]}
+	case RTM_IFINFO:
+		p := (*InterfaceMessage)(unsafe.Pointer(any))
+		return &InterfaceMessage{Header: p.Header, Data: b[p.Header.Hdrlen:any.Msglen]}
+	case RTM_IFANNOUNCE:
+		p := (*InterfaceAnnounceMessage)(unsafe.Pointer(any))
+		return &InterfaceAnnounceMessage{Header: p.Header}
+	case RTM_NEWADDR, RTM_DELADDR:
+		p := (*InterfaceAddrMessage)(unsafe.Pointer(any))
+		return &InterfaceAddrMessage{Header: p.Header, Data: b[p.Header.Hdrlen:any.Msglen]}
+	}
+	return nil
+}
+
+// InterfaceAnnounceMessage represents a routing message containing
+// network interface arrival and departure information.
+//
+// Deprecated: Use golang.org/x/net/route instead.
+type InterfaceAnnounceMessage struct {
+	Header IfAnnounceMsghdr
+}
+
+func (m *InterfaceAnnounceMessage) sockaddr() ([]Sockaddr, error) { return nil, nil }
diff --git a/libgo/go/syscall/sockcmsg_unix.go b/libgo/go/syscall/sockcmsg_unix.go
index c01602f..a58304c 100644
--- a/libgo/go/syscall/sockcmsg_unix.go
+++ b/libgo/go/syscall/sockcmsg_unix.go
@@ -1,8 +1,12 @@
 // Copyright 2011 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris
 
 // Socket control messages
 
diff --git a/libgo/go/syscall/socket_bsd.go b/libgo/go/syscall/socket_bsd.go
index cf3fc4f..d6d98d6 100644
--- a/libgo/go/syscall/socket_bsd.go
+++ b/libgo/go/syscall/socket_bsd.go
@@ -1,10 +1,14 @@
 // socket_bsd.go -- Socket handling specific to *BSD based systems.
 
 // Copyright 2010 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd openbsd netbsd
+// +build darwin dragonfly freebsd hyperbolabsd openbsd netbsd
 
 package syscall
 
diff --git b/libgo/go/syscall/syscall_hyperbolabsd.go b/libgo/go/syscall/syscall_hyperbolabsd.go
new file mode 100644
index 0000000..7e8dadf
--- /dev/null
+++ b/libgo/go/syscall/syscall_hyperbolabsd.go
@@ -0,0 +1,23 @@
+// Copyright 2009,2010 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package syscall
+
+import "unsafe"
+
+func direntIno(buf []byte) (uint64, bool) {
+	return readInt(buf, unsafe.Offsetof(Dirent{}.Fileno), unsafe.Sizeof(Dirent{}.Fileno))
+}
+
+func direntReclen(buf []byte) (uint64, bool) {
+	return readInt(buf, unsafe.Offsetof(Dirent{}.Reclen), unsafe.Sizeof(Dirent{}.Reclen))
+}
+
+func direntNamlen(buf []byte) (uint64, bool) {
+	return readInt(buf, unsafe.Offsetof(Dirent{}.Namlen), unsafe.Sizeof(Dirent{}.Namlen))
+}
diff --git a/libgo/go/syscall/syscall_unix.go b/libgo/go/syscall/syscall_unix.go
index 61aa1c4..771aed2 100644
--- a/libgo/go/syscall/syscall_unix.go
+++ b/libgo/go/syscall/syscall_unix.go
@@ -1,8 +1,12 @@
 // Copyright 2009 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris
 
 package syscall
 
diff --git a/libgo/go/syscall/syscall_unix_test.go b/libgo/go/syscall/syscall_unix_test.go
index 637aece..07fcb73 100644
--- a/libgo/go/syscall/syscall_unix_test.go
+++ b/libgo/go/syscall/syscall_unix_test.go
@@ -1,8 +1,12 @@
 // Copyright 2013 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris
 
 package syscall_test
 
diff --git a/libgo/go/syscall/timestruct.go b/libgo/go/syscall/timestruct.go
index 6ece338..1af1cf9 100644
--- a/libgo/go/syscall/timestruct.go
+++ b/libgo/go/syscall/timestruct.go
@@ -1,8 +1,12 @@
 // Copyright 2016 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris
 
 package syscall
 
diff --git a/libgo/go/time/sys_unix.go b/libgo/go/time/sys_unix.go
index 3827965..c836c23 100644
--- a/libgo/go/time/sys_unix.go
+++ b/libgo/go/time/sys_unix.go
@@ -1,8 +1,12 @@
 // Copyright 2011 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris
 
 package time
 
diff --git a/libgo/go/time/zoneinfo_unix.go b/libgo/go/time/zoneinfo_unix.go
index 32dc7d5..840a95f 100644
--- a/libgo/go/time/zoneinfo_unix.go
+++ b/libgo/go/time/zoneinfo_unix.go
@@ -1,8 +1,12 @@
 // Copyright 2009 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin,386 darwin,amd64 dragonfly freebsd linux,!android nacl netbsd openbsd solaris
+// +build aix darwin,386 darwin,amd64 dragonfly freebsd linux,!android nacl netbsd openbsd hyperbolabsd solaris
 
 // Parse "zoneinfo" time zone file.
 // This is a fairly standard file format used on OS X, Linux, BSD, Sun, and others.
diff --git a/libgo/match.sh b/libgo/match.sh
index 9247ec6..7d68729 100755
--- a/libgo/match.sh
+++ b/libgo/match.sh
@@ -1,6 +1,10 @@
 #!/bin/sh
 
 # Copyright 2016 The Go Authors. All rights reserved.
+#
+# Modifications to support HyperbolaBSD:
+# Copyright (C) 2020-2024 Hyperbola Project
+#
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
@@ -113,7 +117,7 @@ for f in $gofiles; do
 	"") ;;
 	$goarch) ;;
 	$goos) ;;
-	aix | android | darwin | dragonfly | freebsd | linux | nacl | netbsd | openbsd | plan9 | solaris | windows)
+	aix | android | darwin | dragonfly | freebsd | linux | nacl | netbsd | openbsd | hyperbolabsd | plan9 | solaris | windows)
 	    tag1=nonmatchingtag
 	    ;;
 	386 | amd64 | amd64p32 | arm | armbe | arm64 | arm64be | alpha | ia64 | m68k | ppc64 | ppc64le | mips | mipsle | mips64 | mips64le | mips64p32 | mips64p32le | ppc | riscv64 | s390 | s390x | sh | shbe | sparc | sparc64)
@@ -125,7 +129,7 @@ for f in $gofiles; do
 	"") ;;
 	$goarch) ;;
 	$goos) ;;
-	aix | android | darwin | dragonfly | freebsd | linux | nacl | netbsd | openbsd | plan9 | solaris | windows)
+	aix | android | darwin | dragonfly | freebsd | linux | nacl | netbsd | openbsd | hyperbolabsd | plan9 | solaris | windows)
 	    tag2=nonmatchingtag
 	    ;;
 	386 | amd64 | amd64p32 | arm | armbe | arm64 | arm64be | alpha | ia64 | m68k | ppc64 | ppc64le | mips | mipsle | mips64 | mips64le | mips64p32 | mips64p32le | ppc | riscv64 | s390 | s390x | sh | shbe | sparc | sparc64)
diff --git a/libgo/misc/cgo/test/basic.go b/libgo/misc/cgo/test/basic.go
index 3ceb4ce..879be07 100644
--- a/libgo/misc/cgo/test/basic.go
+++ b/libgo/misc/cgo/test/basic.go
@@ -1,4 +1,8 @@
 // Copyright 2010 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -125,6 +129,11 @@ func testMultipleAssign(t *testing.T) {
 		if (n != 0 && n != 239089) || m != 234 {
 			t.Fatal("Strtol x2: ", n, m)
 		}
+	} else if runtime.GOOS == "hyperbolabsd" {
+		// Bug in HyperbolaBSD strtol(3) - base > 36 succeeds.
+		if (n != 0 && n != 239089) || m != 234 {
+			t.Fatal("Strtol x2: ", n, m)
+		}
 	} else if n != 0 || m != 234 {
 		t.Fatal("Strtol x2: ", n, m)
 	}
diff --git a/libgo/misc/cgo/test/cgo_thread_lock.go b/libgo/misc/cgo/test/cgo_thread_lock.go
index b105068..a84b49e 100644
--- a/libgo/misc/cgo/test/cgo_thread_lock.go
+++ b/libgo/misc/cgo/test/cgo_thread_lock.go
@@ -1,8 +1,12 @@
 // Copyright 2016 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build linux,freebsd,openbsd
+// +build linux,freebsd,openbsd,hyperbolabsd
 
 package cgotest
 
diff --git a/libgo/misc/cgo/test/cthread_unix.c b/libgo/misc/cgo/test/cthread_unix.c
index 247d636..1c0877c 100644
--- a/libgo/misc/cgo/test/cthread_unix.c
+++ b/libgo/misc/cgo/test/cthread_unix.c
@@ -1,8 +1,12 @@
 // Copyright 2013 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build aix darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris
 
 #include <pthread.h>
 #include "_cgo_export.h"
diff --git a/libgo/misc/cgo/test/issue18146.go b/libgo/misc/cgo/test/issue18146.go
index a58aa1b..2d77c8e 100644
--- a/libgo/misc/cgo/test/issue18146.go
+++ b/libgo/misc/cgo/test/issue18146.go
@@ -1,4 +1,8 @@
 // Copyright 2016 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -48,7 +52,7 @@ func test18146(t *testing.T) {
 		setNproc = false
 	case "linux":
 		nproc = 6
-	case "darwin", "dragonfly", "freebsd", "netbsd", "openbsd":
+	case "darwin", "dragonfly", "freebsd", "netbsd", "openbsd", "hyperbolabsd":
 		nproc = 7
 	case "aix":
 		nproc = 9
@@ -97,7 +101,7 @@ func test18146(t *testing.T) {
 		if err := cmd.Start(); err != nil {
 			// We are starting so many processes that on
 			// some systems (problem seen on Darwin,
-			// Dragonfly, OpenBSD) the fork call will fail
+			// Dragonfly, OpenBSD, HyperbolaBSD) the fork call will fail
 			// with EAGAIN.
 			if pe, ok := err.(*os.PathError); ok {
 				err = pe.Err
diff --git a/libgo/misc/cgo/testcarchive/carchive_test.go b/libgo/misc/cgo/testcarchive/carchive_test.go
index 4a8cc0f..6028b6c 100644
--- a/libgo/misc/cgo/testcarchive/carchive_test.go
+++ b/libgo/misc/cgo/testcarchive/carchive_test.go
@@ -1,4 +1,8 @@
 // Copyright 2016 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -91,7 +95,7 @@ func init() {
 			if GOARCH == "arm" || GOARCH == "arm64" {
 				libgodir += "_shared"
 			}
-		case "dragonfly", "freebsd", "linux", "netbsd", "openbsd", "solaris":
+		case "dragonfly", "freebsd", "linux", "netbsd", "openbsd", "hyperbolabsd", "solaris":
 			libgodir += "_shared"
 		}
 	}
diff --git a/libgo/misc/cgo/testcshared/cshared_test.go b/libgo/misc/cgo/testcshared/cshared_test.go
index e43422d..c54e5e9 100644
--- a/libgo/misc/cgo/testcshared/cshared_test.go
+++ b/libgo/misc/cgo/testcshared/cshared_test.go
@@ -1,4 +1,8 @@
 // Copyright 2017 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -115,7 +119,7 @@ func TestMain(m *testing.M) {
 		if GOARCH == "arm" || GOARCH == "arm64" {
 			libgodir += "_shared"
 		}
-	case "dragonfly", "freebsd", "linux", "netbsd", "openbsd", "solaris":
+	case "dragonfly", "freebsd", "linux", "netbsd", "openbsd", "hyperbolabsd", "solaris":
 		libgodir += "_shared"
 	}
 	cc = append(cc, "-I", filepath.Join("pkg", libgodir))
diff --git a/libgo/misc/cgo/testcshared/src/libgo2/dup2.go b/libgo/misc/cgo/testcshared/src/libgo2/dup2.go
index d343aa5..6850d9f 100644
--- a/libgo/misc/cgo/testcshared/src/libgo2/dup2.go
+++ b/libgo/misc/cgo/testcshared/src/libgo2/dup2.go
@@ -1,8 +1,12 @@
 // Copyright 2015 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd linux,!arm64,!riscv64 netbsd openbsd
+// +build darwin dragonfly freebsd linux,!arm64,!riscv64 netbsd openbsd hyperbolabsd
 
 package main
 
diff --git a/libgo/misc/cgo/testcshared/src/libgo2/libgo2.go b/libgo/misc/cgo/testcshared/src/libgo2/libgo2.go
index e57c93b..2b989b5 100644
--- a/libgo/misc/cgo/testcshared/src/libgo2/libgo2.go
+++ b/libgo/misc/cgo/testcshared/src/libgo2/libgo2.go
@@ -1,8 +1,12 @@
 // Copyright 2015 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+// +build darwin dragonfly freebsd linux netbsd openbsd hyperbolabsd solaris
 
 package main
 
diff --git a/libgo/misc/cgo/testso/cgoso.go b/libgo/misc/cgo/testso/cgoso.go
index 29814fa..23e9a97 100644
--- a/libgo/misc/cgo/testso/cgoso.go
+++ b/libgo/misc/cgo/testso/cgoso.go
@@ -1,4 +1,8 @@
 // Copyright 2011 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -10,6 +14,7 @@ package cgosotest
 #cgo linux LDFLAGS: -L. -lcgosotest
 #cgo dragonfly LDFLAGS: -L. -l cgosotest
 #cgo freebsd LDFLAGS: -L. -l cgosotest
+#cgo hyperbolabsd LDFLAGS: -L. -l cgosotest
 #cgo openbsd LDFLAGS: -L. -l cgosotest
 #cgo solaris LDFLAGS: -L. -lcgosotest
 #cgo netbsd LDFLAGS: -L. libcgosotest.so
diff --git a/libgo/misc/cgo/testso/cgoso_c.c b/libgo/misc/cgo/testso/cgoso_c.c
index 7a38022..3f8de46 100644
--- a/libgo/misc/cgo/testso/cgoso_c.c
+++ b/libgo/misc/cgo/testso/cgoso_c.c
@@ -1,4 +1,8 @@
 // Copyright 2011 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -19,8 +23,8 @@ extern void goCallback(void);
 void setCallback(void *f) { (void)f; }
 #endif
 
-// OpenBSD and older Darwin lack TLS support
-#if !defined(__OpenBSD__) && !defined(__APPLE__)
+// OpenBSD, HyperbolaBSD and older Darwin lack TLS support
+#if !defined(__OpenBSD__) && !defined(__HyperbolaBSD__) && !defined(__APPLE__)
 __thread int tlsvar = 12345;
 #endif
 
diff --git a/libgo/misc/cgo/testsovar/cgoso.go b/libgo/misc/cgo/testsovar/cgoso.go
index 88d44c2..01152a3 100644
--- a/libgo/misc/cgo/testsovar/cgoso.go
+++ b/libgo/misc/cgo/testsovar/cgoso.go
@@ -1,4 +1,8 @@
 // Copyright 2015 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -14,6 +18,7 @@ package cgosotest
 #cgo linux LDFLAGS: -L. -lcgosotest
 #cgo dragonfly LDFLAGS: -L. -l cgosotest
 #cgo freebsd LDFLAGS: -L. -l cgosotest
+#cgo hyperbolabsd LDFLAGS: -L. -l cgosotest
 #cgo openbsd LDFLAGS: -L. -l cgosotest
 #cgo solaris LDFLAGS: -L. -lcgosotest
 #cgo netbsd LDFLAGS: -L. libcgosotest.so
diff --git a/libgo/runtime/env_posix.c b/libgo/runtime/env_posix.c
index 8cffa73..f958b4f 100644
--- a/libgo/runtime/env_posix.c
+++ b/libgo/runtime/env_posix.c
@@ -1,8 +1,12 @@
 // Copyright 2012 The Go Authors. All rights reserved.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd linux nacl netbsd openbsd solaris windows
+// +build darwin dragonfly freebsd linux nacl netbsd openbsd hyperbolabsd solaris windows
 
 #include "runtime.h"
 #include "array.h"
diff --git a/libgo/testsuite/gotest b/libgo/testsuite/gotest
index 434c26d..8be4ef7 100755
--- a/libgo/testsuite/gotest
+++ b/libgo/testsuite/gotest
@@ -1,5 +1,9 @@
 #!/bin/sh
 # Copyright 2009 The Go Authors. All rights reserved.
+#
+# Modifications to support HyperbolaBSD:
+# Copyright (C) 2020-2024 Hyperbola Project
+#
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
@@ -311,7 +315,7 @@ x)
 	    "") ;;
 	    $goarch) ;;
 	    $goos) ;;
-	    aix | android | darwin | dragonfly | freebsd | linux | nacl | netbsd | openbsd | plan9 | solaris | windows)
+	    aix | android | darwin | dragonfly | freebsd | linux | nacl | netbsd | openbsd | hyperbolabsd | plan9 | solaris | windows)
 		tag1=nonmatchingtag
 		;;
 	    386 | amd64 | amd64p32 | arm | armbe | arm64 | arm64be | alpha | ia64 | m68k | ppc64 | ppc64le | mips | mipsle | mips64 | mips64le | mips64p32 | mips64p32le | ppc | riscv64 | s390 | s390x | sh | shbe | sparc | sparc64)
@@ -323,7 +327,7 @@ x)
 	    "") ;;
 	    $goarch) ;;
 	    $goos) ;;
-	    aix | android | darwin | dragonfly | freebsd | linux | nacl | netbsd | openbsd | plan9 | solaris | windows)
+	    aix | android | darwin | dragonfly | freebsd | linux | nacl | netbsd | openbsd | hyperbolabsd | plan9 | solaris | windows)
 		tag2=nonmatchingtag
 		;;
 	    386 | amd64 | amd64p32 | arm | armbe | arm64 | arm64be | alpha | ia64 | m68k | ppc64 | ppc64le | mips | mipsle | mips64 | mips64le | mips64p32 | mips64p32le | ppc | riscv64 | s390 | s390x | sh | shbe | sparc | sparc64)
diff --git a/libgomp/configure b/libgomp/configure
index b731d04..c08a29c 100755
--- a/libgomp/configure
+++ b/libgomp/configure
@@ -6,6 +6,9 @@
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
 # Foundation, Inc.
 #
+# Modifications to support HyperbolaBSD:
+# Copyright (C) 2020-2024 Hyperbola Project
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## -------------------- ##
@@ -5448,7 +5451,7 @@ else
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly* | hyperbolabsd*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -5886,6 +5889,10 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  ;;
+
 osf3* | osf4* | osf5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -9022,6 +9029,11 @@ _LT_EOF
       fi
       ;;
 
+    hyperbolabsd*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      ;;
+
     solaris*)
       if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
 	ld_shlibs=no
@@ -9608,6 +9620,18 @@ rm -f core conftest.err conftest.$ac_objext \
       fi
       ;;
 
+    hyperbolabsd*)
+      if test -f /usr/libexec/ld.so || test -f /libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
     os2*)
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_minus_L=yes
@@ -10595,6 +10619,16 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
 os2*)
   libname_spec='$name'
   shrext_cmds=".dll"
@@ -12882,6 +12916,11 @@ _LT_EOF
       fi
       ;;
 
+    hyperbolabsd*)
+      archive_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds_FC='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      ;;
+
     solaris*)
       if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
 	ld_shlibs_FC=no
@@ -13416,6 +13455,18 @@ rm -f core conftest.err conftest.$ac_objext \
       fi
       ;;
 
+    hyperbolabsd*)
+      if test -f /usr/libexec/ld.so || test -f /libexec/ld.so; then
+	hardcode_direct_FC=yes
+	hardcode_shlibpath_var_FC=no
+	hardcode_direct_absolute_FC=yes
+	archive_cmds_FC='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	hardcode_libdir_flag_spec_FC='${wl}-rpath,$libdir'
+      else
+	ld_shlibs_FC=no
+      fi
+      ;;
+
     os2*)
       hardcode_libdir_flag_spec_FC='-L$libdir'
       hardcode_minus_L_FC=yes
@@ -14229,6 +14280,16 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
 os2*)
   libname_spec='$name'
   shrext_cmds=".dll"
diff --git a/libhsail-rt/configure b/libhsail-rt/configure
index a4fcc10..4871b35 100755
--- a/libhsail-rt/configure
+++ b/libhsail-rt/configure
@@ -8,6 +8,9 @@
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
 # Foundation, Inc.
 #
+# Modifications to support HyperbolaBSD:
+# Copyright (C) 2020-2024 Hyperbola Project
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## -------------------- ##
@@ -5265,7 +5268,7 @@ else
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly* | hyperbolabsd*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -5703,6 +5706,10 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  ;;
+
 osf3* | osf4* | osf5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -8838,6 +8845,11 @@ _LT_EOF
       fi
       ;;
 
+    hyperbolabsd*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      ;;
+
     solaris*)
       if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
 	ld_shlibs=no
@@ -9424,6 +9436,18 @@ rm -f core conftest.err conftest.$ac_objext \
       fi
       ;;
 
+    hyperbolabsd*)
+      if test -f /usr/libexec/ld.so || test -f /libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
     os2*)
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_minus_L=yes
@@ -10411,6 +10435,16 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
 os2*)
   libname_spec='$name'
   shrext_cmds=".dll"
@@ -12389,6 +12423,18 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	fi
 	;;
 
+      hyperbolabsd*)
+	if test -f /usr/libexec/ld.so || test -f /libexec/ld.so; then
+	  hardcode_direct_CXX=yes
+	  hardcode_shlibpath_var_CXX=no
+	  hardcode_direct_absolute_CXX=yes
+	  archive_cmds_CXX='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	else
+	  ld_shlibs_CXX=no
+	fi
+	;;
+
       osf3* | osf4* | osf5*)
         case $cc_basename in
           KCC*)
@@ -13087,7 +13133,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 	    ;;
 	esac
 	;;
-      netbsd*)
+      netbsd* | hyperbolabsd*)
 	;;
       *qnx* | *nto*)
         # QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -14071,6 +14117,16 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
 os2*)
   libname_spec='$name'
   shrext_cmds=".dll"
diff --git a/libitm/configure b/libitm/configure
index dbf386d..5f34589 100644
--- a/libitm/configure
+++ b/libitm/configure
@@ -6,6 +6,9 @@
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
 # Foundation, Inc.
 #
+# Modifications to support HyperbolaBSD:
+# Copyright (C) 2020-2024 Hyperbola Project
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## -------------------- ##
@@ -6086,7 +6089,7 @@ else
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly* | hyperbolabsd*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -6524,6 +6527,10 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  ;;
+
 osf3* | osf4* | osf5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -9661,6 +9668,11 @@ _LT_EOF
       fi
       ;;
 
+    hyperbolabsd*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      ;;
+
     solaris*)
       if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
 	ld_shlibs=no
@@ -10247,6 +10259,18 @@ rm -f core conftest.err conftest.$ac_objext \
       fi
       ;;
 
+    hyperbolabsd*)
+      if test -f /usr/libexec/ld.so || test -f /libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
     os2*)
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_minus_L=yes
@@ -11234,6 +11258,16 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
 os2*)
   libname_spec='$name'
   shrext_cmds=".dll"
@@ -13212,6 +13246,18 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	fi
 	;;
 
+      hyperbolabsd*)
+	if test -f /usr/libexec/ld.so || test -f /libexec/ld.so; then
+	  hardcode_direct_CXX=yes
+	  hardcode_shlibpath_var_CXX=no
+	  hardcode_direct_absolute_CXX=yes
+	  archive_cmds_CXX='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	else
+	  ld_shlibs_CXX=no
+	fi
+	;;
+
       osf3* | osf4* | osf5*)
         case $cc_basename in
           KCC*)
@@ -13910,7 +13956,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 	    ;;
 	esac
 	;;
-      netbsd*)
+      netbsd* | hyperbolabsd*)
 	;;
       *qnx* | *nto*)
         # QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -14894,6 +14940,16 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
 os2*)
   libname_spec='$name'
   shrext_cmds=".dll"
diff --git a/libitm/configure.tgt b/libitm/configure.tgt
index 0cbb097..4b07b4a 100644
--- a/libitm/configure.tgt
+++ b/libitm/configure.tgt
@@ -1,5 +1,8 @@
 # -*- shell-script -*-
 #   Copyright (C) 2011-2018 Free Software Foundation, Inc.
+#
+# Modifications to support HyperbolaBSD:
+# Copyright (C) 2020-2024 Hyperbola Project
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -140,8 +143,10 @@ case "${target}" in
 
   *-*-gnu* | *-*-k*bsd*-gnu \
   | *-*-netbsd* | *-*-freebsd* | *-*-openbsd* \
+  | *-*-hyperbolabsd* \
   | *-*-solaris2* | *-*-sysv4* | *-*-hpux11* \
-  | *-*-darwin* | *-*-aix* | *-*-dragonfly*)
+  | *-*-darwin* | *-*-aix* | *-*-dragonfly*
+  | *-*-hyperbolabsd*)
 	# POSIX system.  The OS is supported.
 	;;
 
diff --git a/libmpx/configure b/libmpx/configure
index 7085659..783110c 100644
--- a/libmpx/configure
+++ b/libmpx/configure
@@ -8,6 +8,9 @@
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
 # Foundation, Inc.
 #
+# Modifications to support HyperbolaBSD:
+# Copyright (C) 2020-2024 Hyperbola Project
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## -------------------- ##
@@ -5798,7 +5801,7 @@ else
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly* | hyperbolabsd*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -6236,6 +6239,10 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  ;;
+
 osf3* | osf4* | osf5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -9101,6 +9108,11 @@ _LT_EOF
       fi
       ;;
 
+    hyperbolabsd*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      ;;
+
     solaris*)
       if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
 	ld_shlibs=no
@@ -9687,6 +9699,18 @@ rm -f core conftest.err conftest.$ac_objext \
       fi
       ;;
 
+    hyperbolabsd*)
+      if test -f /usr/libexec/ld.so || test -f /libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
     os2*)
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_minus_L=yes
@@ -10674,6 +10698,16 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
 os2*)
   libname_spec='$name'
   shrext_cmds=".dll"
diff --git a/libobjc/configure b/libobjc/configure
index d1a032f..bdd1f00 100755
--- a/libobjc/configure
+++ b/libobjc/configure
@@ -6,6 +6,9 @@
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
 # Foundation, Inc.
 #
+# Modifications to support HyperbolaBSD:
+# Copyright (C) 2020-2024 Hyperbola Project
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## -------------------- ##
@@ -4904,7 +4907,7 @@ else
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly* | hyperbolabsd*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -5339,6 +5342,10 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  ;;
+
 osf3* | osf4* | osf5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -8520,6 +8527,11 @@ _LT_EOF
       fi
       ;;
 
+    hyperbolabsd*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      ;;
+
     solaris*)
       if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
 	ld_shlibs=no
@@ -9115,6 +9127,18 @@ rm -f core conftest.err conftest.$ac_objext \
       fi
       ;;
 
+    hyperbolabsd*)
+      if test -f /usr/libexec/ld.so || test -f /libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
     os2*)
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_minus_L=yes
@@ -10105,6 +10129,16 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
 os2*)
   libname_spec='$name'
   shrext_cmds=".dll"
diff --git a/liboffloadmic/configure b/liboffloadmic/configure
index f873716..b5a40de 100644
--- a/liboffloadmic/configure
+++ b/liboffloadmic/configure
@@ -6,6 +6,9 @@
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
 # Foundation, Inc.
 #
+# Modifications to support HyperbolaBSD:
+# Copyright (C) 2020-2024 Hyperbola Project
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## -------------------- ##
@@ -5669,7 +5672,7 @@ else
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly* | hyperbolabsd*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -6107,6 +6110,10 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  ;;
+
 osf3* | osf4* | osf5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -8973,6 +8980,11 @@ _LT_EOF
       fi
       ;;
 
+    hyperbolabsd*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      ;;
+
     solaris*)
       if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
 	ld_shlibs=no
@@ -9559,6 +9571,18 @@ rm -f core conftest.err conftest.$ac_objext \
       fi
       ;;
 
+    hyperbolabsd*)
+      if test -f /usr/libexec/ld.so || test -f /libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
     os2*)
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_minus_L=yes
@@ -10546,6 +10570,16 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
 os2*)
   libname_spec='$name'
   shrext_cmds=".dll"
@@ -12524,6 +12558,18 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	fi
 	;;
 
+      hyperbolabsd*)
+	if test -f /usr/libexec/ld.so || test -f /libexec/ld.so; then
+	  hardcode_direct_CXX=yes
+	  hardcode_shlibpath_var_CXX=no
+	  hardcode_direct_absolute_CXX=yes
+	  archive_cmds_CXX='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	else
+	  ld_shlibs_CXX=no
+	fi
+	;;
+
       osf3* | osf4* | osf5*)
         case $cc_basename in
           KCC*)
@@ -13222,7 +13268,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 	    ;;
 	esac
 	;;
-      netbsd*)
+      netbsd* | hyperbolabsd*)
 	;;
       *qnx* | *nto*)
         # QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -14206,6 +14252,16 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
 os2*)
   libname_spec='$name'
   shrext_cmds=".dll"
diff --git a/liboffloadmic/plugin/configure b/liboffloadmic/plugin/configure
index c031eb3..80033fd 100644
--- a/liboffloadmic/plugin/configure
+++ b/liboffloadmic/plugin/configure
@@ -6,6 +6,9 @@
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
 # Foundation, Inc.
 #
+# Modifications to support HyperbolaBSD:
+# Copyright (C) 2020-2024 Hyperbola Project
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## -------------------- ##
@@ -5107,7 +5110,7 @@ else
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly* | hyperbolabsd*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -5545,6 +5548,10 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  ;;
+
 osf3* | osf4* | osf5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -8680,6 +8687,11 @@ _LT_EOF
       fi
       ;;
 
+    hyperbolabsd*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      ;;
+
     solaris*)
       if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
 	ld_shlibs=no
@@ -9266,6 +9278,18 @@ rm -f core conftest.err conftest.$ac_objext \
       fi
       ;;
 
+    hyperbolabsd*)
+      if test -f /usr/libexec/ld.so || test -f /libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
     os2*)
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_minus_L=yes
@@ -10253,6 +10277,16 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
 os2*)
   libname_spec='$name'
   shrext_cmds=".dll"
@@ -12231,6 +12265,18 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	fi
 	;;
 
+      hyperbolabsd*)
+	if test -f /usr/libexec/ld.so || test -f /libexec/ld.so; then
+	  hardcode_direct_CXX=yes
+	  hardcode_shlibpath_var_CXX=no
+	  hardcode_direct_absolute_CXX=yes
+	  archive_cmds_CXX='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	else
+	  ld_shlibs_CXX=no
+	fi
+	;;
+
       osf3* | osf4* | osf5*)
         case $cc_basename in
           KCC*)
@@ -12929,7 +12975,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 	    ;;
 	esac
 	;;
-      netbsd*)
+      netbsd* | hyperbolabsd*)
 	;;
       *qnx* | *nto*)
         # QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -13913,6 +13959,16 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
 os2*)
   libname_spec='$name'
   shrext_cmds=".dll"
diff --git a/libquadmath/configure b/libquadmath/configure
index 14610d6..bb1fecc 100755
--- a/libquadmath/configure
+++ b/libquadmath/configure
@@ -6,6 +6,9 @@
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
 # Foundation, Inc.
 #
+# Modifications to support HyperbolaBSD:
+# Copyright (C) 2020-2024 Hyperbola Project
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## -------------------- ##
@@ -5102,7 +5105,7 @@ else
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly* | hyperbolabsd*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -5540,6 +5543,10 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  ;;
+
 osf3* | osf4* | osf5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -8413,6 +8420,11 @@ _LT_EOF
       fi
       ;;
 
+    hyperbolabsd*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      ;;
+
     solaris*)
       if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
 	ld_shlibs=no
@@ -9008,6 +9020,18 @@ rm -f core conftest.err conftest.$ac_objext \
       fi
       ;;
 
+    hyperbolabsd*)
+      if test -f /usr/libexec/ld.so || test -f /libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
     os2*)
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_minus_L=yes
@@ -9998,6 +10022,16 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
 os2*)
   libname_spec='$name'
   shrext_cmds=".dll"
diff --git a/libsanitizer/configure b/libsanitizer/configure
index 4695bc7..79c8df9 100755
--- a/libsanitizer/configure
+++ b/libsanitizer/configure
@@ -8,6 +8,9 @@
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
 # Foundation, Inc.
 #
+# Modifications to support HyperbolaBSD:
+# Copyright (C) 2020-2024 Hyperbola Project
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## -------------------- ##
@@ -6598,7 +6601,7 @@ else
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly* | hyperbolabsd*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -7036,6 +7039,10 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  ;;
+
 osf3* | osf4* | osf5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -9902,6 +9909,11 @@ _LT_EOF
       fi
       ;;
 
+    hyperbolabsd*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      ;;
+
     solaris*)
       if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
 	ld_shlibs=no
@@ -10488,6 +10500,18 @@ rm -f core conftest.err conftest.$ac_objext \
       fi
       ;;
 
+    hyperbolabsd*)
+      if test -f /usr/libexec/ld.so || test -f /libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
     os2*)
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_minus_L=yes
@@ -11475,6 +11499,16 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
 os2*)
   libname_spec='$name'
   shrext_cmds=".dll"
@@ -13453,6 +13487,18 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	fi
 	;;
 
+      hyperbolabsd*)
+	if test -f /usr/libexec/ld.so || test -f /libexec/ld.so; then
+	  hardcode_direct_CXX=yes
+	  hardcode_shlibpath_var_CXX=no
+	  hardcode_direct_absolute_CXX=yes
+	  archive_cmds_CXX='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	else
+	  ld_shlibs_CXX=no
+	fi
+	;;
+
       osf3* | osf4* | osf5*)
         case $cc_basename in
           KCC*)
@@ -14151,7 +14197,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 	    ;;
 	esac
 	;;
-      netbsd*)
+      netbsd* | hyperbolabsd*)
 	;;
       *qnx* | *nto*)
         # QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -15135,6 +15181,16 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
 os2*)
   libname_spec='$name'
   shrext_cmds=".dll"
diff --git a/libssp/configure b/libssp/configure
index 4e88e49..ca2ca79 100755
--- a/libssp/configure
+++ b/libssp/configure
@@ -6,6 +6,9 @@
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
 # Foundation, Inc.
 #
+# Modifications to support HyperbolaBSD:
+# Copyright (C) 2020-2024 Hyperbola Project
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## -------------------- ##
@@ -5286,7 +5289,7 @@ else
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly* | hyperbolabsd*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -5724,6 +5727,10 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  ;;
+
 osf3* | osf4* | osf5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -8597,6 +8604,11 @@ _LT_EOF
       fi
       ;;
 
+    hyperbolabsd*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      ;;
+
     solaris*)
       if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
 	ld_shlibs=no
@@ -9192,6 +9204,18 @@ rm -f core conftest.err conftest.$ac_objext \
       fi
       ;;
 
+    hyperbolabsd*)
+      if test -f /usr/libexec/ld.so || test -f /libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
     os2*)
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_minus_L=yes
@@ -10182,6 +10206,16 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
 os2*)
   libname_spec='$name'
   shrext_cmds=".dll"
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index b380a26..5b320c3 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -1431,7 +1431,7 @@ AC_DEFUN([GLIBCXX_ENABLE_LIBSTDCXX_TIME], [
         ac_has_nanosleep=yes
         ac_has_sched_yield=yes
         ;;
-      openbsd*)
+      openbsd*|hyperbolabsd*)
         ac_has_clock_monotonic=yes
         ac_has_clock_realtime=yes
         ac_has_nanosleep=yes
@@ -2422,7 +2422,7 @@ AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [
       dragonfly* | freebsd*)
 	enable_clocale_flag=dragonfly
 	;;
-      openbsd*)
+      openbsd* | hyperbolabsd*)
 	enable_clocale_flag=newlib
 	;;
       *)
@@ -4290,7 +4290,7 @@ AC_DEFUN([GLIBCXX_ENABLE_FILESYSTEM_TS], [
   fi
   if test x"$enable_libstdcxx_filesystem_ts" = x"auto"; then
     case "${target_os}" in
-      freebsd*|netbsd*|openbsd*|dragonfly*|darwin*)
+      freebsd*|netbsd*|openbsd*|dragonfly*|darwin*|hyperbolabsd*)
         enable_libstdcxx_filesystem_ts=yes
         ;;
       gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
diff --git b/libstdc++-v3/config/os/bsd/hyperbolabsd/ctype_base.h b/libstdc++-v3/config/os/bsd/hyperbolabsd/ctype_base.h
new file mode 100644
index 0000000..ad427d0
--- /dev/null
+++ b/libstdc++-v3/config/os/bsd/hyperbolabsd/ctype_base.h
@@ -0,0 +1,65 @@
+// Locale support -*- C++ -*-
+
+// Copyright (C) 2000-2018 Free Software Foundation, Inc.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// <http://www.gnu.org/licenses/>.
+
+//
+// ISO C++ 14882: 22.1  Locales
+//
+
+// Information as gleaned from /usr/include/ctype.h on HyperbolaBSD.
+
+namespace std _GLIBCXX_VISIBILITY(default)
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
+  /// @brief  Base class for ctype.
+  struct ctype_base
+  {
+    // Non-standard typedefs.
+    typedef const short*	__to_type;
+
+    // NB: Offsets into ctype<char>::_M_table force a particular size
+    // on the mask type. Because of this, we don't use an enum.
+    typedef char		mask;
+
+    static const mask upper	= _U;
+    static const mask lower	= _L;
+    static const mask alpha	= _U | _L;
+    static const mask digit	= _N;
+    static const mask xdigit	= _N | _X;
+    static const mask space	= _S;
+    static const mask print	= _P | _U | _L | _N | _B;
+    static const mask graph	= _P | _U | _L | _N;
+    static const mask cntrl	= _C;
+    static const mask punct	= _P;
+    static const mask alnum	= _U | _L | _N;
+#if __cplusplus >= 201103L
+    static const mask blank	= space;
+#endif
+  };
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace
diff --git b/libstdc++-v3/config/os/bsd/hyperbolabsd/ctype_configure_char.cc b/libstdc++-v3/config/os/bsd/hyperbolabsd/ctype_configure_char.cc
new file mode 100644
index 0000000..bfbbce9
--- /dev/null
+++ b/libstdc++-v3/config/os/bsd/hyperbolabsd/ctype_configure_char.cc
@@ -0,0 +1,102 @@
+// Locale support -*- C++ -*-
+
+// Copyright (C) 2011-2018 Free Software Foundation, Inc.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// <http://www.gnu.org/licenses/>.
+
+/** @file ctype_configure_char.cc */
+
+//
+// ISO C++ 14882: 22.1  Locales
+//
+
+#include <locale>
+#include <cstdlib>
+#include <cstring>
+
+namespace std _GLIBCXX_VISIBILITY(default)
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
+// Information as gleaned from /usr/include/ctype.h
+
+  const ctype_base::mask*
+  ctype<char>::classic_table() throw()
+  { return _ctype_ + 1; }
+
+  ctype<char>::ctype(__c_locale, const mask* __table, bool __del,
+		     size_t __refs)
+  : facet(__refs), _M_del(__table != 0 && __del),
+  _M_toupper(NULL), _M_tolower(NULL),
+  _M_table(__table ? __table : classic_table())
+  {
+    memset(_M_widen, 0, sizeof(_M_widen));
+    _M_widen_ok = 0;
+    memset(_M_narrow, 0, sizeof(_M_narrow));
+    _M_narrow_ok = 0;
+  }
+
+  ctype<char>::ctype(const mask* __table, bool __del, size_t __refs)
+  : facet(__refs), _M_del(__table != 0 && __del),
+  _M_toupper(NULL), _M_tolower(NULL),
+  _M_table(__table ? __table : classic_table())
+  {
+    memset(_M_widen, 0, sizeof(_M_widen));
+    _M_widen_ok = 0;
+    memset(_M_narrow, 0, sizeof(_M_narrow));
+    _M_narrow_ok = 0;
+  }
+
+  char
+  ctype<char>::do_toupper(char __c) const
+  { return ::toupper((int) __c); }
+
+  const char*
+  ctype<char>::do_toupper(char* __low, const char* __high) const
+  {
+    while (__low < __high)
+      {
+	*__low = ::toupper((int) *__low);
+	++__low;
+      }
+    return __high;
+  }
+
+  char
+  ctype<char>::do_tolower(char __c) const
+  { return ::tolower((int) __c); }
+
+  const char*
+  ctype<char>::do_tolower(char* __low, const char* __high) const
+  {
+    while (__low < __high)
+      {
+	*__low = ::tolower((int) *__low);
+	++__low;
+      }
+    return __high;
+  }
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace
diff --git b/libstdc++-v3/config/os/bsd/hyperbolabsd/ctype_inline.h b/libstdc++-v3/config/os/bsd/hyperbolabsd/ctype_inline.h
new file mode 100644
index 0000000..76654b3
--- /dev/null
+++ b/libstdc++-v3/config/os/bsd/hyperbolabsd/ctype_inline.h
@@ -0,0 +1,77 @@
+// Locale support -*- C++ -*-
+
+// Copyright (C) 2010-2018 Free Software Foundation, Inc.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// <http://www.gnu.org/licenses/>.
+
+/** @file bits/ctype_inline.h
+ *  This is an internal header file, included by other library headers.
+ *  Do not attempt to use it directly. @headername{locale}
+ */
+
+//
+// ISO C++ 14882: 22.1  Locales
+//
+
+// ctype bits to be inlined go here. Non-inlinable (ie virtual do_*)
+// functions go in ctype.cc
+
+namespace std _GLIBCXX_VISIBILITY(default)
+{
+_GLIBCXX_BEGIN_NAMESPACE_VERSION
+
+  bool
+  ctype<char>::
+  is(mask __m, char __c) const
+  { return _M_table[static_cast<unsigned char>(__c)] & __m; }
+
+  const char*
+  ctype<char>::
+  is(const char* __low, const char* __high, mask* __vec) const
+  {
+    while (__low < __high)
+      *__vec++ = _M_table[static_cast<unsigned char>(*__low++)];
+    return __high;
+  }
+
+  const char*
+  ctype<char>::
+  scan_is(mask __m, const char* __low, const char* __high) const
+  {
+    while (__low < __high && !this->is(__m, *__low))
+      ++__low;
+    return __low;
+  }
+
+  const char*
+  ctype<char>::
+  scan_not(mask __m, const char* __low, const char* __high) const
+  {
+    while (__low < __high && this->is(__m, *__low) != 0)
+      ++__low;
+    return __low;
+  }
+
+_GLIBCXX_END_NAMESPACE_VERSION
+} // namespace
diff --git b/libstdc++-v3/config/os/bsd/hyperbolabsd/os_defines.h b/libstdc++-v3/config/os/bsd/hyperbolabsd/os_defines.h
new file mode 100644
index 0000000..9a34bdf
--- /dev/null
+++ b/libstdc++-v3/config/os/bsd/hyperbolabsd/os_defines.h
@@ -0,0 +1,44 @@
+// Specific definitions for HyperbolaBSD  -*- C++ -*-
+
+// Copyright (C) 2000-2018 Free Software Foundation, Inc.
+//
+// Modifications to support HyperbolaBSD:
+// Copyright (C) 2020-2024 Hyperbola Project
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// Under Section 7 of GPL version 3, you are granted additional
+// permissions described in the GCC Runtime Library Exception, version
+// 3.1, as published by the Free Software Foundation.
+
+// You should have received a copy of the GNU General Public License and
+// a copy of the GCC Runtime Library Exception along with this program;
+// see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+// <http://www.gnu.org/licenses/>.
+
+/** @file bits/os_defines.h
+ *  This is an internal header file, included by other library headers.
+ *  Do not attempt to use it directly. @headername{iosfwd}
+ */
+
+#ifndef _GLIBCXX_OS_DEFINES
+#define _GLIBCXX_OS_DEFINES 1
+
+// System-specific #define, typedefs, corrections, etc, go here.  This
+// file will come before all others.
+
+#define _GLIBCXX_USE_C99_DYNAMIC (!(__ISO_C_VISIBLE >= 1999))
+#define _GLIBCXX_USE_C99_LONG_LONG_DYNAMIC _GLIBCXX_USE_C99_DYNAMIC
+#define _GLIBCXX_USE_C99_FLOAT_TRANSCENDENTALS_DYNAMIC _GLIBCXX_USE_C99_DYNAMIC
+#define _GLIBCXX_USE_C99_FP_MACROS_DYNAMIC _GLIBCXX_USE_C99_DYNAMIC
+
+#endif
diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure
index 61457e9..fb86e32 100755
--- a/libstdc++-v3/configure
+++ b/libstdc++-v3/configure
@@ -6,6 +6,9 @@
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
 # Foundation, Inc.
 #
+# Modifications to support HyperbolaBSD:
+# Copyright (C) 2020-2024 Hyperbola Project
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## -------------------- ##
@@ -6208,7 +6211,7 @@ else
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly* | hyperbolabsd*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -6646,6 +6649,10 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  ;;
+
 osf3* | osf4* | osf5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -9648,6 +9655,11 @@ _LT_EOF
       fi
       ;;
 
+    hyperbolabsd*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      ;;
+
     solaris*)
       if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
 	ld_shlibs=no
@@ -10243,6 +10255,18 @@ rm -f core conftest.err conftest.$ac_objext \
       fi
       ;;
 
+    hyperbolabsd*)
+      if test -f /usr/libexec/ld.so || test -f /libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
     os2*)
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_minus_L=yes
@@ -11233,6 +11257,16 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
 os2*)
   libname_spec='$name'
   shrext_cmds=".dll"
@@ -13232,6 +13266,18 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	fi
 	;;
 
+      hyperbolabsd*)
+	if test -f /usr/libexec/ld.so || test -f /libexec/ld.so; then
+	  hardcode_direct_CXX=yes
+	  hardcode_shlibpath_var_CXX=no
+	  hardcode_direct_absolute_CXX=yes
+	  archive_cmds_CXX='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	else
+	  ld_shlibs_CXX=no
+	fi
+	;;
+
       osf3* | osf4* | osf5*)
         case $cc_basename in
           KCC*)
@@ -13930,7 +13976,7 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 	    ;;
 	esac
 	;;
-      netbsd*)
+      netbsd* | hyperbolabsd*)
 	;;
       *qnx* | *nto*)
         # QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -14917,6 +14963,16 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
 os2*)
   libname_spec='$name'
   shrext_cmds=".dll"
@@ -16053,7 +16109,7 @@ fi
       dragonfly* | freebsd*)
 	enable_clocale_flag=dragonfly
 	;;
-      openbsd*)
+      openbsd* | hyperbolabsd*)
 	enable_clocale_flag=newlib
 	;;
       *)
@@ -20814,7 +20870,7 @@ fi
         ac_has_nanosleep=yes
         ac_has_sched_yield=yes
         ;;
-      openbsd*)
+      openbsd*|hyperbolabsd*)
         ac_has_clock_monotonic=yes
         ac_has_clock_realtime=yes
         ac_has_nanosleep=yes
@@ -80288,7 +80344,7 @@ $as_echo_n "checking whether to build Filesystem TS support... " >&6; }
   fi
   if test x"$enable_libstdcxx_filesystem_ts" = x"auto"; then
     case "${target_os}" in
-      freebsd*|netbsd*|openbsd*|dragonfly*|darwin*)
+      freebsd*|netbsd*|openbsd*|dragonfly*|darwin*|hyperbolabsd*)
         enable_libstdcxx_filesystem_ts=yes
         ;;
       gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu)
diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host
index 155a3cd..5417d5e 100644
--- a/libstdc++-v3/configure.host
+++ b/libstdc++-v3/configure.host
@@ -295,6 +295,9 @@ case "${host_os}" in
   openbsd*)
     os_include_dir="os/bsd/openbsd"
     ;;
+  hyperbolabsd*)
+    os_include_dir="os/bsd/hyperbolabsd"
+    ;;
   qnx6.[12]*)
     os_include_dir="os/qnx/qnx6.1"
     c_model=c
diff --git a/libstdc++-v3/doc/html/manual/configure.html b/libstdc++-v3/doc/html/manual/configure.html
index a7c8c30..4812224 100644
--- a/libstdc++-v3/doc/html/manual/configure.html
+++ b/libstdc++-v3/doc/html/manual/configure.html
@@ -57,9 +57,9 @@
       to guess the most suitable package from the choices above. The
       default is 'generic'. On glibc-based systems of sufficient
       vintage (2.3 and newer), 'gnu' is automatically selected. On newlib-based
-      systems (<code class="code">'--with_newlib=yes'</code>) and OpenBSD, 'newlib' is
-      automatically selected. On Mac OS X 'darwin' is automatically selected.
-      This option can change the library ABI.
+      systems (<code class="code">'--with_newlib=yes'</code>), HyperbolaBSD and OpenBSD,
+      'newlib' is automatically selected. On Mac OS X 'darwin' is automatically
+      selected. This option can change the library ABI.
      </p></dd><dt><span class="term"><code class="code">--enable-libstdcxx-allocator</code></span></dt><dd><p>This is an abbreviated form of
 	<code class="code">'--enable-libstdcxx-allocator=auto'</code> (described
 	next).
@@ -250,4 +250,4 @@
       as the usual libstdc++ and libsupc++ libraries. This is enabled by
       default on select POSIX targets where it is known to work and disabled
       otherwise.
-    </p></dd></dl></div></div><div class="navfooter"><hr /><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="setup.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="setup.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="make.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Chapter 2. Setup </td><td width="20%" align="center"><a accesskey="h" href="../index.html">Home</a></td><td width="40%" align="right" valign="top"> Make</td></tr></table></div></body></html>
\ No newline at end of file
+    </p></dd></dl></div></div><div class="navfooter"><hr /><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="setup.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="setup.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="make.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Chapter 2. Setup </td><td width="20%" align="center"><a accesskey="h" href="../index.html">Home</a></td><td width="40%" align="right" valign="top"> Make</td></tr></table></div></body></html>
diff --git a/libstdc++-v3/doc/xml/manual/configure.xml b/libstdc++-v3/doc/xml/manual/configure.xml
index 761ef5c..7629187 100644
--- a/libstdc++-v3/doc/xml/manual/configure.xml
+++ b/libstdc++-v3/doc/xml/manual/configure.xml
@@ -103,9 +103,9 @@
       to guess the most suitable package from the choices above. The
       default is 'generic'. On glibc-based systems of sufficient
       vintage (2.3 and newer), 'gnu' is automatically selected. On newlib-based
-      systems (<code>'--with_newlib=yes'</code>) and OpenBSD, 'newlib' is
-      automatically selected. On Mac OS X 'darwin' is automatically selected.
-      This option can change the library ABI.
+      systems (<code>'--with_newlib=yes'</code>), HyperbolaBSD and OpenBSD,
+      'newlib' is automatically selected. On Mac OS X 'darwin' is automatically
+      selected. This option can change the library ABI.
      </para>
  </listitem></varlistentry>
 
diff --git a/libtool.m4 b/libtool.m4
index 24d13f3..6e6e499 100644
--- a/libtool.m4
+++ b/libtool.m4
@@ -4,6 +4,9 @@
 #                 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
+# Modifications to support HyperbolaBSD:
+# Copyright (C) 2020-2024 Hyperbola Project
+#
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
@@ -13,6 +16,9 @@ m4_define([_LT_COPYING], [dnl
 #                 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
+# Modifications to support HyperbolaBSD:
+# Copyright (C) 2020-2024 Hyperbola Project
+#
 #   This file is part of GNU Libtool.
 #
 # GNU Libtool is free software; you can redistribute it and/or
@@ -1513,7 +1519,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly* | hyperbolabsd*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -2557,6 +2563,16 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
 os2*)
   libname_spec='$name'
   shrext_cmds=".dll"
@@ -3119,6 +3135,10 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  ;;
+
 osf3* | osf4* | osf5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -3798,7 +3818,7 @@ m4_if([$1], [CXX], [
 	    ;;
 	esac
 	;;
-      netbsd*)
+      netbsd* | hyperbolabsd*)
 	;;
       *qnx* | *nto*)
         # QNX uses GNU C++, but need to define -shared option too, otherwise
@@ -4534,6 +4554,11 @@ _LT_EOF
       fi
       ;;
 
+    hyperbolabsd*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      ;;
+
     solaris*)
       if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
 	_LT_TAGVAR(ld_shlibs, $1)=no
@@ -4996,6 +5021,18 @@ _LT_EOF
       fi
       ;;
 
+    hyperbolabsd*)
+      if test -f /usr/libexec/ld.so || test -f /libexec/ld.so; then
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
     os2*)
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -6150,6 +6187,18 @@ if test "$_lt_caught_CXX_error" != yes; then
 	fi
 	;;
 
+      hyperbolabsd*)
+	if test -f /usr/libexec/ld.so || test -f /libexec/ld.so; then
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
       osf3* | osf4* | osf5*)
         case $cc_basename in
           KCC*)
diff --git a/libvtv/configure b/libvtv/configure
index a197f75..7b2c3b2 100755
--- a/libvtv/configure
+++ b/libvtv/configure
@@ -6,6 +6,9 @@
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
 # Foundation, Inc.
 #
+# Modifications to support HyperbolaBSD:
+# Copyright (C) 2020-2024 Hyperbola Project
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## -------------------- ##
@@ -6629,7 +6632,7 @@ else
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly* | hyperbolabsd*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -7067,6 +7070,10 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  ;;
+
 osf3* | osf4* | osf5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -10519,6 +10526,18 @@ rm -f core conftest.err conftest.$ac_objext \
       fi
       ;;
 
+    hyperbolabsd*)
+      if test -f /usr/libexec/ld.so || test -f /libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
     os2*)
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_minus_L=yes
@@ -11506,6 +11525,16 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
 os2*)
   libname_spec='$name'
   shrext_cmds=".dll"
@@ -13484,6 +13513,18 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 	fi
 	;;
 
+      hyperbolabsd*)
+	if test -f /usr/libexec/ld.so || test -f /libexec/ld.so; then
+	  hardcode_direct_CXX=yes
+	  hardcode_shlibpath_var_CXX=no
+	  hardcode_direct_absolute_CXX=yes
+	  archive_cmds_CXX='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
+	else
+	  ld_shlibs_CXX=no
+	fi
+	;;
+
       osf3* | osf4* | osf5*)
         case $cc_basename in
           KCC*)
@@ -15166,6 +15207,16 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
 os2*)
   libname_spec='$name'
   shrext_cmds=".dll"
diff --git a/ltmain.sh b/ltmain.sh
index 9503ec8..304bd35 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -5,6 +5,10 @@
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
 # 2007, 2008, 2009 Free Software Foundation, Inc.
+#
+# Modifications to support HyperbolaBSD:
+# Copyright (C) 2020-2024 Hyperbola Project
+#
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -4741,7 +4745,7 @@ func_mode_link ()
 	    # These systems don't actually have a C library (as such)
 	    test "X$arg" = "X-lc" && continue
 	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	  *-*-openbsd* | *-*-hyperbolabsd* | *-*-freebsd* | *-*-dragonfly*)
 	    # Do not include libc due to us having libc/libc_r.
 	    test "X$arg" = "X-lc" && continue
 	    ;;
@@ -4764,7 +4768,7 @@ func_mode_link ()
 	  esac
 	elif test "X$arg" = "X-lc_r"; then
 	 case $host in
-	 *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	 *-*-openbsd* | *-*-hyperbolabsd* | *-*-freebsd* | *-*-dragonfly*)
 	   # Do not include libc_r directly, use -pthread flag.
 	   continue
 	   ;;
@@ -6703,7 +6707,7 @@ func_mode_link ()
 	  *-*-netbsd*)
 	    # Don't link with libc until the a.out ld.so is fixed.
 	    ;;
-	  *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+	  *-*-openbsd* | *-*-hyperbolabsd* | *-*-freebsd* | *-*-dragonfly*)
 	    # Do not include libc due to us having libc/libc_r.
 	    ;;
 	  *-*-sco3.2v5* | *-*-sco5v6*)
diff --git a/lto-plugin/configure b/lto-plugin/configure
index 7843cd7..25d561b 100755
--- a/lto-plugin/configure
+++ b/lto-plugin/configure
@@ -6,6 +6,9 @@
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
 # Foundation, Inc.
 #
+# Modifications to support HyperbolaBSD:
+# Copyright (C) 2020-2024 Hyperbola Project
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## -------------------- ##
@@ -6029,7 +6032,7 @@ else
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly* | hyperbolabsd*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -6467,6 +6470,10 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  ;;
+
 osf3* | osf4* | osf5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -9334,6 +9341,11 @@ _LT_EOF
       fi
       ;;
 
+    hyperbolabsd*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      ;;
+
     solaris*)
       if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
 	ld_shlibs=no
@@ -9920,6 +9932,18 @@ rm -f core conftest.err conftest.$ac_objext \
       fi
       ;;
 
+    hyperbolabsd*)
+      if test -f /usr/libexec/ld.so || test -f /libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
     os2*)
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_minus_L=yes
@@ -10907,6 +10931,16 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
 os2*)
   libname_spec='$name'
   shrext_cmds=".dll"
diff --git a/zlib/configure b/zlib/configure
index ee5527c..432dd1a 100755
--- a/zlib/configure
+++ b/zlib/configure
@@ -6,6 +6,9 @@
 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
 # Foundation, Inc.
 #
+# Modifications to support HyperbolaBSD:
+# Copyright (C) 2020-2024 Hyperbola Project
+#
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## -------------------- ##
@@ -4664,7 +4667,7 @@ else
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly* | hyperbolabsd*)
     # This has been around since 386BSD, at least.  Likely further.
     if test -x /sbin/sysctl; then
       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -5102,6 +5105,10 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+  ;;
+
 osf3* | osf4* | osf5*)
   lt_cv_deplibs_check_method=pass_all
   ;;
@@ -8244,6 +8251,11 @@ _LT_EOF
       fi
       ;;
 
+    hyperbolabsd*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+      ;;
+
     solaris*)
       if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
 	ld_shlibs=no
@@ -8839,6 +8851,18 @@ rm -f core conftest.err conftest.$ac_objext \
       fi
       ;;
 
+    hyperbolabsd*)
+      if test -f /usr/libexec/ld.so || test -f /libexec/ld.so; then
+	hardcode_direct=yes
+	hardcode_shlibpath_var=no
+	hardcode_direct_absolute=yes
+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+      else
+	ld_shlibs=no
+      fi
+      ;;
+
     os2*)
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_minus_L=yes
@@ -9829,6 +9853,16 @@ openbsd*)
   fi
   ;;
 
+hyperbolabsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
 os2*)
   libname_spec='$name'
   shrext_cmds=".dll"