diff --git a/dev-embedded/sdcc/patches/sdcc-4.3.0.patchset b/dev-embedded/sdcc/patches/sdcc-4.4.0.patchset similarity index 94% rename from dev-embedded/sdcc/patches/sdcc-4.3.0.patchset rename to dev-embedded/sdcc/patches/sdcc-4.4.0.patchset index f59e0e6d3..f502b511a 100644 --- a/dev-embedded/sdcc/patches/sdcc-4.3.0.patchset +++ b/dev-embedded/sdcc/patches/sdcc-4.4.0.patchset @@ -1,4 +1,4 @@ -From cc9bdc24b6ec8953ac318c2d2a47cfc74f8c8c80 Mon Sep 17 00:00:00 2001 +From f8949dbbebbe12300de6dea265f1f9bd74e7bb5c Mon Sep 17 00:00:00 2001 From: PulkoMandy Date: Mon, 14 Aug 2023 17:10:50 +0200 Subject: Kevin Thacker's patch for generating relocatable executables @@ -74,7 +74,7 @@ index 169e8c1..015e727 100644 int jflag; /* NoICE output flag */ diff --git a/sdas/linksrc/lkmain.c b/sdas/linksrc/lkmain.c -index daf5515..8f4b8bd 100644 +index 0f00244..8cddab5 100644 --- a/sdas/linksrc/lkmain.c +++ b/sdas/linksrc/lkmain.c @@ -212,6 +212,7 @@ main(int argc, char *argv[]) @@ -85,7 +85,7 @@ index daf5515..8f4b8bd 100644 for(i=1; i Date: Mon, 14 Aug 2023 17:11:04 +0200 Subject: Port changes from SDCC 4.2.0 patchset @@ -550,10 +550,10 @@ upstream binutils, but some remain in the toplevel directories which are not shared with binutils. diff --git a/configure.ac b/configure.ac -index ead779c..ac2523d 100644 +index adf5060..1d3878d 100644 --- a/configure.ac +++ b/configure.ac -@@ -388,10 +388,10 @@ if test "$ac_cv_c_compiler_gnu" = "yes"; then +@@ -390,10 +390,10 @@ if test "$ac_cv_c_compiler_gnu" = "yes"; then rm -f _test_.*) # This is the first time when CFLAGS are set/modified!! @@ -569,7 +569,7 @@ index ead779c..ac2523d 100644 sdcc_IS_VALID_OPTION(-pipe) diff --git a/src/Makefile.in b/src/Makefile.in -index df756fa..35b233d 100644 +index 84840bf..f7fe2e6 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -65,7 +65,6 @@ $(top_builddir)/support/gc/libgc.a: @@ -581,10 +581,10 @@ index df756fa..35b233d 100644 # Deleting all the installed files -- -2.37.3 +2.45.2 -From 9769294b9ce181217dbb53518ed5f60c097038dc Mon Sep 17 00:00:00 2001 +From 3e807960998c6fa19b65bd8ef2285c36f5c0a059 Mon Sep 17 00:00:00 2001 From: PulkoMandy Date: Mon, 14 Aug 2023 23:12:39 +0200 Subject: Remove no-PIE options @@ -714,10 +714,10 @@ index e5aad31..275e1c1 100644 GCC_CET_HOST_FLAGS(CET_HOST_FLAGS) case x$enable_languages in -- -2.37.3 +2.45.2 -From b69f4653706ad3bdf3e6287614e823a8f0bc4b39 Mon Sep 17 00:00:00 2001 +From f8c5010ba6564651fe121321ac4dacea8a769ba9 Mon Sep 17 00:00:00 2001 From: PulkoMandy Date: Wed, 16 Aug 2023 12:14:44 +0200 Subject: More Haiku support patches @@ -900,5 +900,41 @@ index 0000000..5b22f3b + +; This comment is to ensure we retain the blank line above. -- -2.37.3 +2.45.2 + + +From 3916bb42cdd25ac3ac9ce09214bdac2b18e5eb42 Mon Sep 17 00:00:00 2001 +From: PulkoMandy +Date: Mon, 30 Sep 2024 08:18:33 +0200 +Subject: Backport fix from https://sourceforge.net/p/sdcc/code/14821/ + + +diff --git a/src/z80/gen.c b/src/z80/gen.c +index 63ba67a..7e6166c 100644 +--- a/src/z80/gen.c ++++ b/src/z80/gen.c +@@ -4744,7 +4744,11 @@ genMove_o (asmop *result, int roffset, asmop *source, int soffset, int size, boo + } + else if (source->type == AOP_STL) + { +- if (i || soffset || !hl_dead) ++ if (!hl_dead && (result->regs[L_IDX] > roffset || result->regs[H_IDX] > roffset)) ++ UNIMPLEMENTED; ++ if (!hl_dead) ++ _push (PAIR_HL); ++ if (i || soffset) + UNIMPLEMENTED; + if (!f_dead) + _push (PAIR_AF); +@@ -4756,6 +4760,8 @@ genMove_o (asmop *result, int roffset, asmop *source, int soffset, int size, boo + _pop (PAIR_AF); + spillPair (PAIR_HL); + genMove_o (result, roffset, ASMOP_HL, 0, size, a_dead, true, de_dead_global, iy_dead, f_dead); ++ if (!hl_dead) ++ _pop (PAIR_HL); + i += 2; + continue; + } +-- +2.45.2 diff --git a/dev-embedded/sdcc/sdcc-4.4.0.recipe b/dev-embedded/sdcc/sdcc-4.4.0.recipe index 54972598b..bddea150a 100644 --- a/dev-embedded/sdcc/sdcc-4.4.0.recipe +++ b/dev-embedded/sdcc/sdcc-4.4.0.recipe @@ -9,10 +9,10 @@ other microprocessors." HOMEPAGE="http://sdcc.sourceforge.net" COPYRIGHT="1999-2023 Sandeep Dutta" LICENSE="GNU GPL v2" -REVISION="2" +REVISION="3" SOURCE_URI="http://sourceforge.net/projects/sdcc/files/sdcc/$portVersion/sdcc-src-$portVersion.tar.bz2" SOURCE_DIR="sdcc-$portVersion" -PATCHES="sdcc-4.3.0.patchset" +PATCHES="sdcc-$portVersion.patchset" CHECKSUM_SHA256="ae8c12165eb17680dff44b328d8879996306b7241efa3a83b2e3b2d2f7906a75" ARCHITECTURES="all !x86_gcc2" @@ -73,7 +73,7 @@ REQUIRES=" " BUILD_REQUIRES=" - devel:libboost_graph$secondaryArchSuffix >= 1.70.0 + devel:libboost_graph$secondaryArchSuffix >= 1.83.0 devel:libiconv$secondaryArchSuffix devel:libreadline$secondaryArchSuffix >= 8 devel:libz$secondaryArchSuffix