diff options
| author | he <he@pkgsrc.org> | 2019-10-12 20:52:53 +0000 |
|---|---|---|
| committer | he <he@pkgsrc.org> | 2019-10-12 20:52:53 +0000 |
| commit | 4c03b317c0a790a79dd7178a1868b518e7832d71 (patch) | |
| tree | 1ea3cd9c7b7bdf2b27a899609c384148d4318d08 /lang/smlnj/patches | |
| parent | d4d1d44f9e963d4ad6ab277709c176348c1ca409 (diff) | |
| download | pkgsrc-4c03b317c0a790a79dd7178a1868b518e7832d71.tar.gz | |
Various updates to smlnj so it builds on NetBSD/powerpc again:
* Modernize the powerpc entry in signal-sysdep.h to use the
various _UC_MACHINE_ macros.
* mk.ppc-netbsd: don't pass an empty RANLIB variable, causing build failure.
Also make checksums of all the three arch-specific distfiles ("boxes"),
for sparc, x86 and ppc.
Bump PKGREVISION.
Diffstat (limited to 'lang/smlnj/patches')
| -rw-r--r-- | lang/smlnj/patches/patch-src_runtime_mach-dep_signal-sysdep.h (renamed from lang/smlnj/patches/patch-af) | 20 | ||||
| -rw-r--r-- | lang/smlnj/patches/patch-src_runtime_objs_mk.ppc-netbsd | 12 |
2 files changed, 23 insertions, 9 deletions
diff --git a/lang/smlnj/patches/patch-af b/lang/smlnj/patches/patch-src_runtime_mach-dep_signal-sysdep.h index 5b67666297a..cc17fe5ef7b 100644 --- a/lang/smlnj/patches/patch-af +++ b/lang/smlnj/patches/patch-src_runtime_mach-dep_signal-sysdep.h @@ -1,10 +1,10 @@ -$NetBSD: patch-af,v 1.6 2016/04/14 22:04:47 dholland Exp $ +$NetBSD: patch-src_runtime_mach-dep_signal-sysdep.h,v 1.1 2019/10/12 20:52:54 he Exp $ Support for NetBSD, and for NetBSD on PPC. ---- src/runtime/mach-dep/signal-sysdep.h.orig 2006-02-27 17:47:32.000000000 +0000 -+++ src/runtime/mach-dep/signal-sysdep.h 2006-03-09 19:15:48.000000000 +0000 -@@ -171,7 +171,7 @@ +--- src/runtime/mach-dep/signal-sysdep.h.orig 2009-09-13 17:50:53.000000000 +0000 ++++ src/runtime/mach-dep/signal-sysdep.h +@@ -175,7 +175,7 @@ extern void SetFSR(int); /* disable all FP exceptions */ # define SIG_InitFPE() SetFSR(0) @@ -13,7 +13,7 @@ Support for NetBSD, and for NetBSD on PPC. /** SPARC, SUNOS **/ # define USE_ZERO_LIMIT_PTR_FN # define SIG_FAULT1 SIGFPE -@@ -340,6 +340,19 @@ +@@ -344,6 +344,21 @@ extern void SetFSR(); # define SIG_ResetFPE(scp) { (scp)->regs->gpr[PT_FPSCR] = 0x0; } typedef void SigReturn_t; @@ -24,10 +24,12 @@ Support for NetBSD, and for NetBSD on PPC. + +# define INT_DIVZERO(s, c) ((s) == SIGTRAP) +# define INT_OVFLW(s, c) ((s) == SIGTRAP) -+# define SIG_GetPC(scp) ((scp)->sc_frame.srr0) -+# define SIG_SetPC(scp, addr) { (scp)->sc_frame.srr0 = (long)(addr); } -+# define SIG_ZeroLimitPtr(scp) { ((scp)->sc_frame.fixreg[15] = 0); } /* limitptr = 15 (see src/runtime/mach-dep/PPC.prim.asm) */ -+# define SIG_GetCode(info,scp) (info) ++# define SIG_GetPC(scp) (_UC_MACHINE_PC(scp)) ++# define SIG_SetPC(scp, addr) { _UC_MACHINE_SET_PC(scp, ((long) (addr))); } ++# define SIG_ZeroLimitPtr(scp) { \ ++ (scp)->uc_mcontext.__gregs[_REG_R15] = 0; \ ++ } /* limitptr = 15 (see src/runtime/mach-dep/PPC.prim.asm) */ ++# define SIG_GetCode(info,scp) ((info)->si_code) + typedef void SigReturn_t; + # endif /* HOST_RS6000/HOST_PPC */ diff --git a/lang/smlnj/patches/patch-src_runtime_objs_mk.ppc-netbsd b/lang/smlnj/patches/patch-src_runtime_objs_mk.ppc-netbsd new file mode 100644 index 00000000000..7b92b702603 --- /dev/null +++ b/lang/smlnj/patches/patch-src_runtime_objs_mk.ppc-netbsd @@ -0,0 +1,12 @@ +$NetBSD: patch-src_runtime_objs_mk.ppc-netbsd,v 1.1 2019/10/12 20:52:54 he Exp $ + +Don't pass an empty RANLIB. + +--- src/runtime/objs/mk.ppc-netbsd.orig 2019-10-12 20:10:48.309504473 +0000 ++++ src/runtime/objs/mk.ppc-netbsd +@@ -22,4 +22,4 @@ VERSION = v-ppc-netbsd + RUNTIME = run.ppc-netbsd + + all: +- ($(MAKE) RUNTIME="$(RUNTIME)" MAKE="$(MAKE)" VERSION="$(VERSION)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" AS="$(AS)" AR="$(AR)" RANLIB="$(RANLIB)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME)) ++ ($(MAKE) RUNTIME="$(RUNTIME)" MAKE="$(MAKE)" VERSION="$(VERSION)" CC="$(CC)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" AS="$(AS)" AR="$(AR)" TARGET=$(TARGET) DEFS="$(DEFS)" XOBJS="$(XOBJS)" XLIBS="$(XLIBS)" LD_LIBS="$(LD_LIBS)" $(RUNTIME)) |