- update to 0.9.2
from Alexander Shiryaev (MAINTAINER)
This commit is contained in:
jasper
parent
afc08089c0
commit
8d35a2603b
@ -1,13 +1,13 @@
|
||||
# $OpenBSD: Makefile,v 1.1.1.1 2011/01/15 13:07:50 jasper Exp $
|
||||
# $OpenBSD: Makefile,v 1.2 2011/10/21 20:23:02 jasper Exp $
|
||||
|
||||
# Fatal error: assertion sizeof(page_index) == GC_PAGESIZE failed on line 1090 of file gc.c
|
||||
# Fatal error: assertion sizeof(page_index) == GC_PAGESIZE failed on line 1110 of file gc.c
|
||||
ONLY_FOR_ARCHS= i386
|
||||
|
||||
SHARED_ONLY = Yes
|
||||
|
||||
COMMENT = Oxford Oberon-2 compiler
|
||||
|
||||
DISTNAME = obc-2.9.1
|
||||
DISTNAME = obc-2.9.2
|
||||
CATEGORIES = lang
|
||||
|
||||
HOMEPAGE = http://spivey.oriel.ox.ac.uk/corner/Oxford_Oberon-2_compiler
|
||||
@ -46,8 +46,7 @@ CONFIGURE_ENV = CFLAGS="${CFLAGS} -m32 -I${X11BASE}/include" \
|
||||
TCLSH="${MODTCL_BIN}" \
|
||||
DLFLAGS="-Wl,-E"
|
||||
|
||||
FAKE_FLAGS = prefix="${WRKINST}${PREFIX}" \
|
||||
mandir="${WRKINST}${PREFIX}/man"
|
||||
FAKE_FLAGS = prefix="${WRKINST}${PREFIX}"
|
||||
|
||||
MAKE_ENV += STRIP="/usr/bin/true"
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (obc-2.9.1.tar.gz) = uxKsRWKaryKFukuTqFQ2IQ==
|
||||
RMD160 (obc-2.9.1.tar.gz) = XSok8pJAsvWcRNYyd5XjjpzHVDc=
|
||||
SHA1 (obc-2.9.1.tar.gz) = TMgfola9HtkWa4dG8aUqAD4+00c=
|
||||
SHA256 (obc-2.9.1.tar.gz) = PQmMiZ4FT1NKbXWYefQPUkti+pXxdfrRNE2j+JZO2Qc=
|
||||
SIZE (obc-2.9.1.tar.gz) = 773485
|
||||
MD5 (obc-2.9.2.tar.gz) = Xzrz9Z2gRYR6WY8ziWL7BA==
|
||||
RMD160 (obc-2.9.2.tar.gz) = eqKayv4R1YL+dSf7Wd3QoUCAJCI=
|
||||
SHA1 (obc-2.9.2.tar.gz) = zgMBaTjSbwGgQiz2P8fxnKeayAc=
|
||||
SHA256 (obc-2.9.2.tar.gz) = rGk3eUje2vGpjVLRT5JgiUchyYUx3wkjc0WxUe+eSFw=
|
||||
SIZE (obc-2.9.2.tar.gz) = 783973
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2011/01/15 13:07:50 jasper Exp $
|
||||
--- Makefile.in.orig Wed Jan 5 13:11:55 2011
|
||||
+++ Makefile.in Thu Jan 13 01:08:31 2011
|
||||
@@ -94,7 +94,7 @@ else
|
||||
$OpenBSD: patch-Makefile_in,v 1.2 2011/10/21 20:23:02 jasper Exp $
|
||||
--- Makefile.in.orig Mon Mar 14 23:08:59 2011
|
||||
+++ Makefile.in Thu Jun 30 01:40:43 2011
|
||||
@@ -93,7 +93,7 @@ else
|
||||
endif
|
||||
|
||||
ifdef ENABLE_DEBUGGER
|
||||
@ -10,12 +10,3 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 2011/01/15 13:07:50 jasper Exp $
|
||||
SUBDIRS += debugger
|
||||
BUILD += obxdeb obdb
|
||||
DEBUILD += obdb0
|
||||
@@ -195,7 +195,7 @@ LIB = runtime/obx.a runtime/obx-j.a runtime/obx-p.a li
|
||||
$(MODULES:%=lib/%.k) $(CHECKMODS:%=lib/%-b.k)
|
||||
|
||||
# Man pages
|
||||
-MAN = $(wildcard $(srcdir)/doc/*.1)
|
||||
+MAN = $(wildcard $(srcdir)/man/*.1)
|
||||
|
||||
# Installation directories
|
||||
DIRS = $(bindir) $(libdir)/obc $(mandir)/man1
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-configure,v 1.1.1.1 2011/01/15 13:07:50 jasper Exp $
|
||||
--- configure.orig Tue Jan 11 13:44:38 2011
|
||||
+++ configure Thu Jan 13 00:29:44 2011
|
||||
@@ -3650,7 +3650,7 @@ $as_echo "#define ENABLE_JIT 1" >>confdefs.h
|
||||
$OpenBSD: patch-configure,v 1.2 2011/10/21 20:23:02 jasper Exp $
|
||||
--- configure.orig Mon Jun 20 14:11:58 2011
|
||||
+++ configure Thu Jun 30 01:40:43 2011
|
||||
@@ -3668,7 +3668,7 @@ $as_echo "#define ENABLE_JIT 1" >>confdefs.h
|
||||
;;
|
||||
esac
|
||||
case $host in
|
||||
|
||||
35
lang/obc/patches/patch-runtime_gc_c
Normal file
35
lang/obc/patches/patch-runtime_gc_c
Normal file
@ -0,0 +1,35 @@
|
||||
$OpenBSD: patch-runtime_gc_c,v 1.1 2011/10/21 20:23:02 jasper Exp $
|
||||
--- runtime/gc.c.orig Wed Mar 23 12:38:21 2011
|
||||
+++ runtime/gc.c Thu Oct 20 19:10:33 2011
|
||||
@@ -108,6 +108,12 @@ typedef unsigned word;
|
||||
#include <fcntl.h>
|
||||
#include <sys/mman.h>
|
||||
|
||||
+#ifdef USE_MPROTECT
|
||||
+#include <sys/mman.h>
|
||||
+#endif
|
||||
+
|
||||
+#include <assert.h>
|
||||
+
|
||||
static void *grab_chunk(unsigned size) {
|
||||
void *p;
|
||||
static void *last_addr = NULL;
|
||||
@@ -125,6 +131,18 @@ static void *grab_chunk(unsigned size) {
|
||||
}
|
||||
|
||||
p = mmap(last_addr, size, PROT_READ|PROT_WRITE, MAP_PRIVATE, zero_fd, 0);
|
||||
+ assert(p != MAP_FAILED);
|
||||
+#endif
|
||||
+
|
||||
+/*
|
||||
+ XXX: mprotect call moved here from vm386.check_space due to obc-2.9.2 bug
|
||||
+ (see CoordTransformTest regression test for details)
|
||||
+*/
|
||||
+#ifdef USE_MPROTECT
|
||||
+ if (mprotect(p, size, PROT_READ|PROT_WRITE|PROT_EXEC) < 0) {
|
||||
+ perror("mprotect failed");
|
||||
+ exit(2);
|
||||
+ }
|
||||
#endif
|
||||
|
||||
last_addr = p;
|
||||
23
lang/obc/patches/patch-runtime_vm386_c
Normal file
23
lang/obc/patches/patch-runtime_vm386_c
Normal file
@ -0,0 +1,23 @@
|
||||
$OpenBSD: patch-runtime_vm386_c,v 1.1 2011/10/21 20:23:02 jasper Exp $
|
||||
--- runtime/vm386.c.orig Wed Dec 15 14:39:11 2010
|
||||
+++ runtime/vm386.c Thu Oct 20 19:01:29 2011
|
||||
@@ -1137,19 +1137,9 @@ code_addr *vm_jumptable(int n) {
|
||||
return (code_addr *) limit;
|
||||
}
|
||||
|
||||
-#ifdef USE_MPROTECT
|
||||
-#include <sys/mman.h>
|
||||
-#endif
|
||||
-
|
||||
static void check_space(int space) {
|
||||
if (codebuf == NULL || pc + space > limit - MARGIN) {
|
||||
code_addr p = vm_alloc(CODEPAGE);
|
||||
-#ifdef USE_MPROTECT
|
||||
- if (mprotect(p, CODEPAGE, PROT_READ|PROT_WRITE|PROT_EXEC) < 0) {
|
||||
- perror("mprotect failed");
|
||||
- exit(2);
|
||||
- }
|
||||
-#endif
|
||||
if (codebuf != NULL) jump_i(p);
|
||||
|
||||
codebuf = p; limit = p + CODEPAGE;
|
||||
12
lang/obc/patches/patch-test_bigtest_in
Normal file
12
lang/obc/patches/patch-test_bigtest_in
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-test_bigtest_in,v 1.1 2011/10/21 20:23:02 jasper Exp $
|
||||
--- test/bigtest.in.orig Thu Jun 30 01:40:55 2011
|
||||
+++ test/bigtest.in Thu Jun 30 01:41:05 2011
|
||||
@@ -67,7 +67,7 @@ echo Fib
|
||||
&& ./fib | $fixup | cmp $srcdir/Fib.out -)
|
||||
|
||||
echo Browser
|
||||
-($browser Files | cmp $srcdir/File.out -)
|
||||
+($browser Files | cmp $srcdir/Files.out -)
|
||||
|
||||
exit
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.1.1.1 2011/01/15 13:07:50 jasper Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.2 2011/10/21 20:23:02 jasper Exp $
|
||||
bin/obb
|
||||
bin/obc
|
||||
bin/obdb
|
||||
@ -74,7 +74,3 @@ lib/obc/sober.xml
|
||||
lib/obc/stepinto.png
|
||||
lib/obc/stepout.png
|
||||
lib/obc/stepover.png
|
||||
@man man/man1/obb.1
|
||||
@man man/man1/obc.1
|
||||
@man man/man1/obdump.1
|
||||
@man man/man1/obprof.1
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user