From 9c1c363df49d4d751ebfdad015ca889f99301bd3 Mon Sep 17 00:00:00 2001 From: Matheus Date: Sat, 6 Dec 2025 18:47:55 -0300 Subject: [PATCH] userland: bump mlibc, gcc, binutils, etc --- host-recipes/libstdc++-v3 | 2 +- .../ace-of-penguins/jinx-working-patch.patch | 12 + patches/binutils/jinx-working-patch.patch | 168 ++--- patches/curl/jinx-working-patch.patch | 20 + patches/gcc/jinx-working-patch.patch | 34 +- patches/libffi/jinx-working-patch.patch | 14 +- patches/lwjgl3/jinx-working-patch.patch | 194 ++++-- patches/mesa-demos/jinx-working-patch.patch | 24 +- patches/mlibc/jinx-working-patch.patch | 619 +----------------- patches/openjdk17/jinx-working-patch.patch | 559 +++++++++------- patches/openssl/jinx-working-patch.patch | 16 +- patches/shadow/jinx-working-patch.patch | 6 +- patches/sudo/jinx-working-patch.patch | 12 + patches/vim/jinx-working-patch.patch | 13 + patches/wine/jinx-working-patch.patch | 6 +- patches/xneko/jinx-working-patch.patch | 24 + patches/xterm/jinx-working-patch.patch | 36 +- recipes/brogue | 2 +- recipes/curl | 4 +- recipes/doomgeneric | 2 +- recipes/doomgeneric-x11 | 2 +- recipes/links | 2 +- recipes/perl | 3 +- recipes/xf86-input-keyboard | 2 +- source-recipes/binutils | 4 +- source-recipes/dosfstools | 4 +- source-recipes/frigg | 4 +- source-recipes/gcc | 4 +- source-recipes/mlibc | 4 +- source-recipes/openjdk17 | 4 +- source-recipes/openssh | 2 +- source-recipes/xf86-input-mouse | 4 +- source-recipes/xf86-video-fbdev | 4 +- source-recipes/xfontalias | 4 +- source-recipes/xfontmiscethipic | 4 +- source-recipes/xfontmiscmisc | 4 +- source-recipes/xrandr | 4 +- 37 files changed, 763 insertions(+), 1063 deletions(-) create mode 100644 patches/curl/jinx-working-patch.patch create mode 100644 patches/xneko/jinx-working-patch.patch diff --git a/host-recipes/libstdc++-v3 b/host-recipes/libstdc++-v3 index c158b96b..71d4276a 100644 --- a/host-recipes/libstdc++-v3 +++ b/host-recipes/libstdc++-v3 @@ -13,5 +13,5 @@ build() { package(){ cd ${base_dir}/build-${JINX_ARCH}/host-builds/xgcc make DESTDIR="${dest_dir}" install-target-libstdc++-v3 - rm -rf ${dest_dir}/usr/local/lib/gcc/x86_64-astral/12.1.0/ + rm -rf ${dest_dir}/usr/local/lib/gcc/x86_64-astral/14.3.0/ } diff --git a/patches/ace-of-penguins/jinx-working-patch.patch b/patches/ace-of-penguins/jinx-working-patch.patch index 96bf9af8..8fdf95df 100644 --- a/patches/ace-of-penguins/jinx-working-patch.patch +++ b/patches/ace-of-penguins/jinx-working-patch.patch @@ -11,6 +11,18 @@ index 2056424..e93f8bd 100644 BUILD_CC = @BUILD_CC@ AR = @AR@ +diff --git ace-of-penguins-clean/lib/imagelib.c ace-of-penguins-workdir/lib/imagelib.c +index f71b96a..49c7545 100644 +--- ace-of-penguins-clean/lib/imagelib.c ++++ ace-of-penguins-workdir/lib/imagelib.c +@@ -2,6 +2,7 @@ + #include + #include "imagelib.h" + #include "cards.h" ++#include + + image_list *image_root = 0; + diff --git ace-of-penguins-clean/lib/make-imglib.c ace-of-penguins-workdir/lib/make-imglib.c index 84cda12..8f12d4a 100644 --- ace-of-penguins-clean/lib/make-imglib.c diff --git a/patches/binutils/jinx-working-patch.patch b/patches/binutils/jinx-working-patch.patch index 0e1d94f8..221e4123 100644 --- a/patches/binutils/jinx-working-patch.patch +++ b/patches/binutils/jinx-working-patch.patch @@ -1,34 +1,36 @@ -diff -ruN binutils-2.39/bfd/config.bfd binutils-2.39-patched/bfd/config.bfd ---- binutils-2.39/bfd/config.bfd 2022-07-08 06:46:47.000000000 -0300 -+++ binutils-2.39-patched/bfd/config.bfd 2022-08-07 18:29:37.305269269 -0300 -@@ -695,6 +695,11 @@ +diff --git binutils-clean/bfd/config.bfd binutils-workdir/bfd/config.bfd +index 4e5a838..d59805f 100644 +--- binutils-clean/bfd/config.bfd ++++ binutils-workdir/bfd/config.bfd +@@ -705,6 +705,11 @@ case "${targ}" in targ_selvecs="i386_elf32_vec" want64=true ;; + x86_64-*-astral*) + targ_defvec=x86_64_elf64_vec -+ targ_selvecs=i386_elf32_vec ++ targ_selvecs="i386_elf32_vec" + want64=true + ;; x86_64-*-netbsd* | x86_64-*-openbsd*) targ_defvec=x86_64_elf64_vec targ_selvecs="i386_elf32_vec iamcu_elf32_vec i386_coff_vec i386_pei_vec x86_64_pe_vec x86_64_pei_vec" -diff -ruN binutils-2.39/config.sub binutils-2.39-patched/config.sub ---- binutils-2.39/config.sub 2022-07-08 06:46:47.000000000 -0300 -+++ binutils-2.39-patched/config.sub 2022-08-07 18:26:48.218610095 -0300 -@@ -1754,7 +1754,7 @@ - | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ - | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ - | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \ -- | fiwix* ) -+ | fiwix* | astral* ) - ;; - # This one is extra strict with allowed versions - sco3.2v2 | sco3.2v[4-9]* | sco5v6*) -diff -ruN binutils-2.39/gas/configure.tgt binutils-2.39-patched/gas/configure.tgt ---- binutils-2.39/gas/configure.tgt 2022-07-08 06:46:47.000000000 -0300 -+++ binutils-2.39-patched/gas/configure.tgt 2022-08-07 18:31:46.391930215 -0300 -@@ -221,6 +221,7 @@ +diff --git binutils-clean/config.sub binutils-workdir/config.sub +index 4aaae46..7ddc8a7 100755 +--- binutils-clean/config.sub ++++ binutils-workdir/config.sub +@@ -2108,6 +2108,7 @@ case $os in + | skyos* \ + | solaris* \ + | solidbsd* \ ++ | astral* \ + | sortix* \ + | storm-chaos* \ + | sunos \ +diff --git binutils-clean/gas/configure.tgt binutils-workdir/gas/configure.tgt +index 7c81bff..81855f0 100644 +--- binutils-clean/gas/configure.tgt ++++ binutils-workdir/gas/configure.tgt +@@ -225,6 +225,7 @@ case ${generic_target} in h8300-*-elf) fmt=elf ;; h8300-*-linux*) fmt=elf em=linux ;; @@ -36,40 +38,11 @@ diff -ruN binutils-2.39/gas/configure.tgt binutils-2.39-patched/gas/configure.tg i386-*-beospe*) fmt=coff em=pe ;; i386-*-beos*) fmt=elf ;; i386-*-elfiamcu) fmt=elf arch=iamcu ;; -diff -ruN binutils-2.39/ld/configure.tgt binutils-2.39-patched/ld/configure.tgt ---- binutils-2.39/ld/configure.tgt 2022-07-29 04:37:48.000000000 -0300 -+++ binutils-2.39-patched/ld/configure.tgt 2022-08-07 18:34:19.615256758 -0300 -@@ -986,6 +986,10 @@ - ;; - visium-*-elf) targ_emul=elf32visium - ;; -+x86_64-*-astral*) -+ targ_emul=elf_x86_64_astral -+ targ_extra_emuls="elf_i386_astral elf_x86_64 elf_i386" -+ ;; - x86_64-*-rdos*) targ_emul=elf64rdos - ;; - x86_64-*-cloudabi*) targ_emul=elf_x86_64_cloudabi -diff -ruN binutils-2.39/ld/emulparams/elf_i386_astral.sh binutils-2.39-patched/ld/emulparams/elf_i386_astral.sh ---- binutils-2.39/ld/emulparams/elf_i386_astral.sh 1969-12-31 21:00:00.000000000 -0300 -+++ binutils-2.39-patched/ld/emulparams/elf_i386_astral.sh 2022-08-07 19:16:14.135145355 -0300 -@@ -0,0 +1,4 @@ -+source_sh ${srcdir}/emulparams/elf_i386.sh -+TEXT_START_ADDR=0x10000000 -+GENERATE_SHLIB_SCRIPT=yes -+GENERATE_PIE_SCRIPT=yes -diff -ruN binutils-2.39/ld/emulparams/elf_x86_64_astral.sh binutils-2.39-patched/ld/emulparams/elf_x86_64_astral.sh ---- binutils-2.39/ld/emulparams/elf_x86_64_astral.sh 1969-12-31 21:00:00.000000000 -0300 -+++ binutils-2.39-patched/ld/emulparams/elf_x86_64_astral.sh 2022-08-07 18:36:20.838584720 -0300 -@@ -0,0 +1,4 @@ -+source_sh ${srcdir}/emulparams/elf_x86_64.sh -+TEXT_START_ADDR=0x10000000 -+GENERATE_SHLIB_SCRIPT=yes -+GENERATE_PIE_SCRIPT=yes -diff -ruN binutils-2.39/ld/Makefile.am binutils-2.39-patched/ld/Makefile.am ---- binutils-2.39/ld/Makefile.am 2022-07-08 06:46:48.000000000 -0300 -+++ binutils-2.39-patched/ld/Makefile.am 2022-08-07 19:17:46.965141264 -0300 -@@ -275,6 +275,7 @@ +diff --git binutils-clean/ld/Makefile.am binutils-workdir/ld/Makefile.am +index ccff928..148be5b 100644 +--- binutils-clean/ld/Makefile.am ++++ binutils-workdir/ld/Makefile.am +@@ -277,6 +277,7 @@ ALL_EMULATION_SOURCES = \ eelf32xtensa.c \ eelf32z80.c \ eelf_i386.c \ @@ -77,7 +50,7 @@ diff -ruN binutils-2.39/ld/Makefile.am binutils-2.39-patched/ld/Makefile.am eelf_i386_be.c \ eelf_i386_fbsd.c \ eelf_i386_haiku.c \ -@@ -453,6 +454,7 @@ +@@ -459,6 +460,7 @@ ALL_64_EMULATION_SOURCES = \ eelf64tilegx_be.c \ eelf_mipsel_haiku.c \ eelf_x86_64.c \ @@ -85,26 +58,11 @@ diff -ruN binutils-2.39/ld/Makefile.am binutils-2.39-patched/ld/Makefile.am eelf_x86_64_cloudabi.c \ eelf_x86_64_fbsd.c \ eelf_x86_64_haiku.c \ -@@ -766,6 +768,7 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32xtensa.Pc@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32z80.Pc@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386.Pc@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_astral.Pc@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_be.Pc@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_fbsd.Pc@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_haiku.Pc@am__quote@ -@@ -941,6 +944,7 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64tilegx_be.Pc@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_mipsel_haiku.Pc@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64.Pc@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_astral.Pc@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_cloudabi.Pc@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_fbsd.Pc@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_haiku.Pc@am__quote@ -diff -ruN binutils-2.39/ld/Makefile.in binutils-2.39-patched/ld/Makefile.in ---- binutils-2.39/ld/Makefile.in 2022-08-05 06:56:53.000000000 -0300 -+++ binutils-2.39-patched/ld/Makefile.in 2022-08-07 19:17:51.741807718 -0300 -@@ -529,6 +529,7 @@ +diff --git binutils-clean/ld/Makefile.in binutils-workdir/ld/Makefile.in +index 3e24bd4..869875f 100644 +--- binutils-clean/ld/Makefile.in ++++ binutils-workdir/ld/Makefile.in +@@ -543,6 +543,7 @@ pdfdir = @pdfdir@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ @@ -112,7 +70,7 @@ diff -ruN binutils-2.39/ld/Makefile.in binutils-2.39-patched/ld/Makefile.in sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ -@@ -772,6 +773,7 @@ +@@ -788,6 +789,7 @@ ALL_EMULATION_SOURCES = \ eelf32xtensa.c \ eelf32z80.c \ eelf_i386.c \ @@ -120,7 +78,7 @@ diff -ruN binutils-2.39/ld/Makefile.in binutils-2.39-patched/ld/Makefile.in eelf_i386_be.c \ eelf_i386_fbsd.c \ eelf_i386_haiku.c \ -@@ -949,6 +951,7 @@ +@@ -969,6 +971,7 @@ ALL_64_EMULATION_SOURCES = \ eelf64tilegx_be.c \ eelf_mipsel_haiku.c \ eelf_x86_64.c \ @@ -128,7 +86,7 @@ diff -ruN binutils-2.39/ld/Makefile.in binutils-2.39-patched/ld/Makefile.in eelf_x86_64_cloudabi.c \ eelf_x86_64_fbsd.c \ eelf_x86_64_haiku.c \ -@@ -1441,6 +1444,7 @@ +@@ -1476,6 +1479,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64tilegx.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64tilegx_be.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386.Po@am__quote@ @@ -136,7 +94,7 @@ diff -ruN binutils-2.39/ld/Makefile.in binutils-2.39-patched/ld/Makefile.in @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_be.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_fbsd.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_haiku.Po@am__quote@ -@@ -1451,6 +1455,7 @@ +@@ -1486,6 +1490,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_mipsel_haiku.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_s390.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64.Po@am__quote@ @@ -144,19 +102,37 @@ diff -ruN binutils-2.39/ld/Makefile.in binutils-2.39-patched/ld/Makefile.in @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_cloudabi.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_fbsd.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_haiku.Po@am__quote@ -@@ -2432,6 +2437,7 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32xtensa.Pc@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf32z80.Pc@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386.Pc@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_astral.Pc@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_be.Pc@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_fbsd.Pc@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_haiku.Pc@am__quote@ -@@ -2607,6 +2613,7 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf64tilegx_be.Pc@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_mipsel_haiku.Pc@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64.Pc@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_astral.Pc@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_cloudabi.Pc@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_fbsd.Pc@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_haiku.Pc@am__quote@ +diff --git binutils-clean/ld/configure.tgt binutils-workdir/ld/configure.tgt +index ea01ccf..3bcd521 100644 +--- binutils-clean/ld/configure.tgt ++++ binutils-workdir/ld/configure.tgt +@@ -998,6 +998,9 @@ vax-*-linux-*) targ_emul=elf32vax + ;; + visium-*-elf) targ_emul=elf32visium + ;; ++x86_64-*-astral*) targ_emul=elf_x86_64_astral ++ targ_extra_emuls="elf_i386_astral elf_x86_64 elf_i386" ++ ;; + x86_64-*-rdos*) targ_emul=elf64rdos + ;; + x86_64-*-cloudabi*) targ_emul=elf_x86_64_cloudabi +diff --git binutils-workdir/ld/emulparams/elf_i386_astral.sh binutils-workdir/ld/emulparams/elf_i386_astral.sh +new file mode 100644 +index 0000000..926c55b +--- /dev/null ++++ binutils-workdir/ld/emulparams/elf_i386_astral.sh +@@ -0,0 +1,4 @@ ++source ${srcdir}/emulparams/elf_i386.sh ++TEXT_START_ADDR=0x10000000 ++GENERATE_SHLIB_SCRIPT=yes ++GENERATE_PIE_SCRIPT=yes +diff --git binutils-workdir/ld/emulparams/elf_x86_64_astral.sh binutils-workdir/ld/emulparams/elf_x86_64_astral.sh +new file mode 100644 +index 0000000..0d72b44 +--- /dev/null ++++ binutils-workdir/ld/emulparams/elf_x86_64_astral.sh +@@ -0,0 +1,4 @@ ++source ${srcdir}/emulparams/elf_x86_64.sh ++TEXT_START_ADDR=0x10000000 ++GENERATE_SHLIB_SCRIPT=yes ++GENERATE_PIE_SCRIPT=yes diff --git a/patches/curl/jinx-working-patch.patch b/patches/curl/jinx-working-patch.patch new file mode 100644 index 00000000..acb681cb --- /dev/null +++ b/patches/curl/jinx-working-patch.patch @@ -0,0 +1,20 @@ +diff --git curl-clean/src/tool_filetime.c curl-workdir/src/tool_filetime.c +index 1311388..15fd8dc 100644 +--- curl-clean/src/tool_filetime.c ++++ curl-workdir/src/tool_filetime.c +@@ -132,15 +132,6 @@ void setfiletime(curl_off_t filetime, const char *filename, + filetime, (unsigned int)GetLastError()); + } + +-#elif defined(HAVE_UTIMES) +- struct timeval times[2]; +- times[0].tv_sec = times[1].tv_sec = (time_t)filetime; +- times[0].tv_usec = times[1].tv_usec = 0; +- if(utimes(filename, times)) { +- warnf(global, "Failed to set filetime %" CURL_FORMAT_CURL_OFF_T +- " on '%s': %s", filetime, filename, strerror(errno)); +- } +- + #elif defined(HAVE_UTIME) + struct utimbuf times; + times.actime = (time_t)filetime; diff --git a/patches/gcc/jinx-working-patch.patch b/patches/gcc/jinx-working-patch.patch index 14659a30..d261d93d 100644 --- a/patches/gcc/jinx-working-patch.patch +++ b/patches/gcc/jinx-working-patch.patch @@ -12,7 +12,7 @@ index 38f3d03..ee981b0 100755 # This one is extra strict with allowed versions sco3.2v2 | sco3.2v[4-9]* | sco5v6*) diff --git gcc-clean/fixincludes/mkfixinc.sh gcc-workdir/fixincludes/mkfixinc.sh -index df90720..aebfb82 100755 +index 7112f4d..0acd4a7 100755 --- gcc-clean/fixincludes/mkfixinc.sh +++ gcc-workdir/fixincludes/mkfixinc.sh @@ -11,6 +11,8 @@ target=fixinc.sh @@ -22,11 +22,11 @@ index df90720..aebfb82 100755 + *-astral* | \ + *-*-astral* | \ i?86-*-cygwin* | \ - i?86-*-mingw32* | \ - x86_64-*-mingw32* | \ + *-mingw32* | \ + powerpc-*-eabisim* | \ diff --git gcc-workdir/gcc/config/astral.h gcc-workdir/gcc/config/astral.h new file mode 100644 -index 0000000..fe6e2e1 +index 0000000..1768e2c --- /dev/null +++ gcc-workdir/gcc/config/astral.h @@ -0,0 +1,24 @@ @@ -55,12 +55,12 @@ index 0000000..fe6e2e1 + builtin_assert ("system=posix"); \ + } while(0); diff --git gcc-clean/gcc/config.gcc gcc-workdir/gcc/config.gcc -index c5064dd..e151646 100644 +index 087aaa7..f6f72a0 100644 --- gcc-clean/gcc/config.gcc +++ gcc-workdir/gcc/config.gcc -@@ -773,6 +773,14 @@ case ${target} in - tmake_file="${tmake_file} t-dragonfly" - target_has_targetdm=yes +@@ -826,6 +826,14 @@ case ${target} in + rust_target_objs="${rust_target_objs} dragonfly-rust.o" + target_has_targetrustm=yes ;; +*-*-astral*) + extra_options="$extra_options gnu-user.opt" @@ -73,21 +73,21 @@ index c5064dd..e151646 100644 *-*-freebsd*) # This is the generic ELF configuration of FreeBSD. Later # machine-specific sections may refine and add to this -@@ -1087,6 +1095,9 @@ case ${target} in +@@ -1186,6 +1194,9 @@ case ${target} in esac case ${target} in +x86_64-*-astral*) -+ tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h glibc-stdint.h i386/i386elf.h i386/x86-64.h astral.h gnu-user.h" ++ tm_file="${tm_file} i386/unix.h i386/att.h elfos.h glibc-stdint.h i386/i386elf.h i386/x86-64.h astral.h gnu-user.h" + ;; aarch64*-*-elf | aarch64*-*-fuchsia* | aarch64*-*-rtems*) - tm_file="${tm_file} dbxelf.h elfos.h newlib-stdint.h" + tm_file="${tm_file} elfos.h newlib-stdint.h" tm_file="${tm_file} aarch64/aarch64-elf.h aarch64/aarch64-errata.h aarch64/aarch64-elf-raw.h" diff --git gcc-clean/libgcc/config.host gcc-workdir/libgcc/config.host -index 8c56fca..aecb1da 100644 +index 6a88ee5..c54151b 100644 --- gcc-clean/libgcc/config.host +++ gcc-workdir/libgcc/config.host -@@ -751,6 +751,10 @@ i[34567]86-*-openbsd*) +@@ -793,6 +793,10 @@ i[34567]86-*-openbsd*) ;; x86_64-*-openbsd*) ;; @@ -99,7 +99,7 @@ index 8c56fca..aecb1da 100644 extra_parts="$extra_parts crtprec32.o crtprec64.o crtprec80.o crtfastmath.o" tmake_file="${tmake_file} i386/t-crtpc t-crtfm i386/t-crtstuff t-dfprules" diff --git gcc-clean/libgcc/libgcov.h gcc-workdir/libgcc/libgcov.h -index 40e845c..cbe95b8 100644 +index 3d7d52a..cd9d819 100644 --- gcc-clean/libgcc/libgcov.h +++ gcc-workdir/libgcc/libgcov.h @@ -25,6 +25,8 @@ @@ -112,10 +112,10 @@ index 40e845c..cbe95b8 100644 #ifndef xmalloc #define xmalloc malloc diff --git gcc-clean/libstdc++-v3/configure.ac gcc-workdir/libstdc++-v3/configure.ac -index e59bcdb..c2ac19b 100644 +index a6c01b2..9e2faad 100644 --- gcc-clean/libstdc++-v3/configure.ac +++ gcc-workdir/libstdc++-v3/configure.ac -@@ -118,7 +118,7 @@ fi +@@ -134,7 +134,7 @@ fi # Use glibcxx_compiler_pic_flag to designate a compile-time flags for # creating position-independent objects. This varies with the target # hardware and operating system, but is often: -DPIC -fPIC. @@ -125,7 +125,7 @@ index e59bcdb..c2ac19b 100644 glibcxx_compiler_pic_flag="$lt_prog_compiler_pic_CXX" glibcxx_compiler_shared_flag="-D_GLIBCXX_SHARED" diff --git gcc-clean/libstdc++-v3/crossconfig.m4 gcc-workdir/libstdc++-v3/crossconfig.m4 -index ae5283b..15d769e 100644 +index b3269cb..a5d4014 100644 --- gcc-clean/libstdc++-v3/crossconfig.m4 +++ gcc-workdir/libstdc++-v3/crossconfig.m4 @@ -8,7 +8,12 @@ case "${host}" in diff --git a/patches/libffi/jinx-working-patch.patch b/patches/libffi/jinx-working-patch.patch index e5607993..826f11a4 100644 --- a/patches/libffi/jinx-working-patch.patch +++ b/patches/libffi/jinx-working-patch.patch @@ -1,7 +1,17 @@ -diff -urN --no-dereference libffi-clean/src/closures.c libffi-workdir/src/closures.c +diff --git libffi-clean/src/closures.c libffi-workdir/src/closures.c +index f7bead6..5a41ff1 100644 --- libffi-clean/src/closures.c +++ libffi-workdir/src/closures.c -@@ -139,6 +139,9 @@ +@@ -27,7 +27,7 @@ + DEALINGS IN THE SOFTWARE. + ----------------------------------------------------------------------- */ + +-#if defined __linux__ && !defined _GNU_SOURCE ++#if (defined __linux__ || defined __astral__) && !defined _GNU_SOURCE + #define _GNU_SOURCE 1 + #endif + +@@ -139,6 +139,9 @@ ffi_tramp_is_present (__attribute__((unused)) void *ptr) executable memory. */ # define FFI_MMAP_EXEC_WRIT 1 # endif diff --git a/patches/lwjgl3/jinx-working-patch.patch b/patches/lwjgl3/jinx-working-patch.patch index e2924a29..0c2287ce 100644 --- a/patches/lwjgl3/jinx-working-patch.patch +++ b/patches/lwjgl3/jinx-working-patch.patch @@ -1,4 +1,5 @@ -diff -urN --no-dereference lwjgl3-clean/build.xml lwjgl3-workdir/build.xml +diff --git lwjgl3-clean/build.xml lwjgl3-workdir/build.xml +index d0fad82..1f162b5 100644 --- lwjgl3-clean/build.xml +++ lwjgl3-workdir/build.xml @@ -1181,6 +1181,7 @@ @@ -156,8 +157,10 @@ diff -urN --no-dereference lwjgl3-clean/build.xml lwjgl3-workdir/build.xml -diff -urN --no-dereference lwjgl3-clean/config/astral/build.xml lwjgl3-workdir/config/astral/build.xml ---- lwjgl3-clean/config/astral/build.xml 1970-01-01 01:00:00.000000000 +0100 +diff --git lwjgl3-workdir/config/astral/build.xml lwjgl3-workdir/config/astral/build.xml +new file mode 100644 +index 0000000..323791d +--- /dev/null +++ lwjgl3-workdir/config/astral/build.xml @@ -0,0 +1,482 @@ +