mirror/json-c
1
0 Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-11-09 23:40:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Amiga: build libm881 (FPU) slots for AmigaOS 3

Browse Source 
-m68881, -mhard-float and -m68040/-m68060 link from libm020/libm881. With no
json-c there, the linker fell back to the soft-float libm020 build, which
clib2 cannot link: its FPU libm has no soft-float helpers. Add the
libm020/libm881, libb/libm020/libm881 and libb32/libm020/libm881 slots for
newlib, libnix and clib2 (M68K_FPU=hard, from the image's cmake toolchain
file), taking AmigaOS 3 from 15 to 24 libraries.

Allow AMIGA_IMAGE_<OS> to override the compiler image, so the libraries
can be built against a local image before it is published.

Update the link tables. All 8 slots link for every runtime once the
compiler image has the AmigaSDK-gcc cleanup that removed stale toolchain
files. The old clib2 strtoll and newlib gettimeofday gaps came from those
files.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Cameron Armstrong (Nightfox)andClaude Opus 5.5 authored and Eric Hawicz committed 2026-11-08 10:34:00 -05:00
1 parent d9b375ff1b
commit 217808a23d
3 files changed
+54 -25
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

amiga/build-amiga-sdk.sh
+19 -3
View File
@@ -14,10 +14,12 @@ cd "$ROOT"
OSES=("$@"); [[ ${#OSES[@]} -eq 0 ]] && OSES=(AmigaOS3 AmigaOS4 MorphOS)
# os | image tag | sdk subdir
# Override an image with AMIGA_IMAGE_AmigaOS3 / _AmigaOS4 / _MorphOS, e.g. to
# build against a locally built compiler image before it is published.
os_image() { case "$1" in
AmigaOS3) echo "sacredbanana/amiga-compiler:m68k-amigaos m68k-amigaos" ;;
AmigaOS4) echo "sacredbanana/amiga-compiler:ppc-amigaos ppc-amigaos" ;;
MorphOS) echo "sacredbanana/amiga-compiler:ppc-morphos ppc-morphos" ;;
AmigaOS3) echo "${AMIGA_IMAGE_AmigaOS3:-sacredbanana/amiga-compiler:m68k-amigaos} m68k-amigaos" ;;
AmigaOS4) echo "${AMIGA_IMAGE_AmigaOS4:-sacredbanana/amiga-compiler:ppc-amigaos} ppc-amigaos" ;;
MorphOS) echo "${AMIGA_IMAGE_MorphOS:-sacredbanana/amiga-compiler:ppc-morphos} ppc-morphos" ;;
*) return 1 ;;
esac; }
@@ -46,6 +48,20 @@ variants_AmigaOS3=(
"clib2|libb|-DM68K_CRT=clib2 -DM68K_CPU=68000 -DM68K_BASEREL=baserel"
"clib2|libb/libm020|-DM68K_CRT=clib2 -DM68K_CPU=68020 -DM68K_BASEREL=baserel"
"clib2|libb32/libm020|-DM68K_CRT=clib2 -DM68K_CPU=68020 -DM68K_BASEREL=baserel32"
# FPU slots (M68K_FPU=hard -> -mhard-float). -m68881, -mhard-float, and
# -m68040/-m68060 (which the specs map here too) link
# from libm020/libm881; without these the linker falls back to the
# soft-float libm020 build, whose __adddf3/__nedf2 calls clib2's FPU libm
# cannot satisfy.
"libnix|libm020/libm881|-DM68K_CRT=nix20 -DM68K_CPU=68020 -DM68K_FPU=hard -DM68K_BASEREL=off"
"libnix|libb/libm020/libm881|-DM68K_CRT=nix20 -DM68K_CPU=68020 -DM68K_FPU=hard -DM68K_BASEREL=baserel"
"libnix|libb32/libm020/libm881|-DM68K_CRT=nix20 -DM68K_CPU=68020 -DM68K_FPU=hard -DM68K_BASEREL=baserel32"
".|libm020/libm881|-DM68K_CRT=newlib -DM68K_CPU=68020 -DM68K_FPU=hard -DM68K_BASEREL=off"
".|libb/libm020/libm881|-DM68K_CRT=newlib -DM68K_CPU=68020 -DM68K_FPU=hard -DM68K_BASEREL=baserel"
".|libb32/libm020/libm881|-DM68K_CRT=newlib -DM68K_CPU=68020 -DM68K_FPU=hard -DM68K_BASEREL=baserel32"
"clib2|libm020/libm881|-DM68K_CRT=clib2 -DM68K_CPU=68020 -DM68K_FPU=hard -DM68K_BASEREL=off"
"clib2|libb/libm020/libm881|-DM68K_CRT=clib2 -DM68K_CPU=68020 -DM68K_FPU=hard -DM68K_BASEREL=baserel"
"clib2|libb32/libm020/libm881|-DM68K_CRT=clib2 -DM68K_CPU=68020 -DM68K_FPU=hard -DM68K_BASEREL=baserel32"
)
# Unlike m68k, where each C runtime is its own tree (libnix/, clib2/), the PPC
# toolchains make the runtime a multilib SLOT under lib/, with headers coming
amiga/json-c.readme.template
+16 -11
View File
@@ -34,6 +34,13 @@ Contents
lib/libb/ 68000, -fbaserel
lib/libb/libm020/ 68020, -fbaserel
lib/libb32/libm020/ 68020, -fbaserel32
lib/libm020/libm881/ 68020 + FPU (-m68881, -mhard-float,
lib/libb/libm020/libm881/ also -m68040/-m68060), absolute,
lib/libb32/libm020/libm881/ -fbaserel and -fbaserel32
The libm881/ builds use FPU instructions. Without them an FPU program
would fall back to the soft-float libm020/ build, which clib2 cannot link
(its FPU libm has no soft-float helpers such as __adddf3).
On PPC a C runtime is not a separate tree but a multilib slot beneath one
shared lib/, with headers in the single shared include/:
@@ -68,18 +75,16 @@ Which variants link
Verified by compiling the snippet above against each shipped library.
AmigaOS3 libnix all 5 slots link.
AmigaOS3 all 8 slots link for newlib, libnix and clib2, provided the
compiler image carries the AmigaSDK-gcc cleanup of 2026-11 that
stopped stale 2023/2024 toolchain files overwriting the newer
newlib and clib2. Older images lack strtoll()/strtoull() in
clib2's 68000 multilib and gettimeofday() in newlib, and fail
-fbaserel clib2 links with a "dangerous relocation".
clib2 lib/libm020/ and lib/libb32/libm020/ link. The other
three fail inside clib2 itself: its 68000 multilib has
no strtoll()/strtoull(), and 16-bit -fbaserel overflows
with "truncated to fit: DREL16" once json-c's data is
added. -fbaserel32 has no such limit.
newlib builds, but does not link: the m68k newlib tree has no
gettimeofday(). The libraries are shipped anyway, since
that is a gap in the SDK rather than in json-c and a
newlib with gettimeofday() implemented would link.
Known toolchain issue: with clib2, -m68040/-m68060 on their
own compile soft-float code but link the FPU libraries. Add
-m68881.
AmigaOS4 all three (newlib, clib2, clib4) link.