summaryrefslogtreecommitdiff
path: root/lang/polyml/files
diff options
context:
space:
mode:
Diffstat (limited to 'lang/polyml/files')
-rw-r--r--lang/polyml/files/patch-driver-Makefile.in44
-rw-r--r--lang/polyml/files/patch-driver-i386_dep.c17
-rw-r--r--lang/polyml/files/patch-driver-mmap.c11
-rw-r--r--lang/polyml/files/patch-driver-mpoly.c58
-rw-r--r--lang/polyml/files/patch-driver-process_env.c13
-rw-r--r--lang/polyml/files/pkg-message.in8
6 files changed, 33 insertions, 118 deletions
diff --git a/lang/polyml/files/patch-driver-Makefile.in b/lang/polyml/files/patch-driver-Makefile.in
index 37b40f806529..e64149dea246 100644
--- a/lang/polyml/files/patch-driver-Makefile.in
+++ b/lang/polyml/files/patch-driver-Makefile.in
@@ -1,49 +1,13 @@
---- Makefile.in.orig Tue Nov 14 22:01:18 2000
-+++ Makefile.in Fri Jun 10 15:27:34 2005
-@@ -15,6 +15,7 @@
- AFLAGS = $(CPUFLAGS) $(OSFLAGS)
- ASFLAGS = $(AFLAGS)
- CFLAGS = $(CPUFLAGS) $(OSFLAGS) @OPTFLAGS@ @INCLUDES@ -DDEFAULT_POLYPATH=$(DEFAULT_POLYPATH)
-+CFLAGSO1 = $(CPUFLAGS) $(OSFLAGS) -O1 @INCLUDES@ -DDEFAULT_POLYPATH=$(DEFAULT_POLYPATH)
- LINTFLAGS = $(CPUFLAGS) $(OSFLAGS) @IFLAGS@
- XLFLAGS = @LIBS@
-
-@@ -32,7 +33,9 @@
+--- Makefile.in.orig Thu Nov 24 20:54:04 2005
++++ Makefile.in Thu Nov 24 20:56:19 2005
+@@ -32,7 +32,9 @@
all: $(TARGETS)
install: $(TARGETS)
- cp $(TARGETS) $(INSTALLDIR)
+ mkdir -p $(INSTALLDIR)
+ $(BSD_INSTALL_PROGRAM) $(TARGETS) $(INSTALLDIR)
-+ $(BSD_INSTALL_DATA) LICENCE $(INSTALLDIR)
++ $(BSD_INSTALL_DATA) COPYING $(INSTALLDIR)
POLYOBJS = \
mpoly.o \
-@@ -95,7 +98,26 @@
- rm -f powtemp.s
-
- xwindows.o: xwindows.c
-- $(CC) $(CFLAGS) -c xwindows.c -o xwindows.o
-+ $(CC) $(CFLAGSO1) -c xwindows.c -o xwindows.o
-+
-+# Use -O1 rather than -O2 to avoid:
-+# dereferencing type-punned pointer will break strict-aliasing rules
-+# warnings (and subsequent problems with Isabelle logic compilation)
-+
-+arb.o: arb.c
-+ $(CC) $(CFLAGSO1) -c $<
-+
-+processes.o: processes.c
-+ $(CC) $(CFLAGSO1) -c $<
-+
-+realconv.o: realconv.c
-+ $(CC) $(CFLAGSO1) -c $<
-+
-+run_time.o: run_time.c
-+ $(CC) $(CFLAGSO1) -c $<
-+
-+i386_dep.o: i386_dep.c
-+ $(CC) $(CFLAGSO1) -c $<
-
- # Make sure the version is updated whenever anything is recompiled.
- version.o: $(POLYOBJS) $(DISCGARBOBJS)
diff --git a/lang/polyml/files/patch-driver-i386_dep.c b/lang/polyml/files/patch-driver-i386_dep.c
deleted file mode 100644
index c906ff188768..000000000000
--- a/lang/polyml/files/patch-driver-i386_dep.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- i386_dep.c.orig Sun Jun 12 14:32:11 2005
-+++ i386_dep.c Sun Jun 12 14:45:17 2005
-@@ -473,9 +473,14 @@
- else
- {
- signal(SIGSEGV,SIG_DFL);
-+#ifdef FREEBSD
-+ fprintf(stderr,"catchSEGV; &context = %p, in_run_time_system=%i, context.trapno=%ld\n",
-+ scp, in_run_time_system, scp->sc_trapno);
-+#else
- fprintf(stderr,"catchSEGV; &context = %p, in_run_time_system=%i, context.trapno=%ld\n",
- &context, in_run_time_system, context.trapno);
- signal(SIGSEGV,catchSEGV);
-+#endif
- }
- #endif
-
diff --git a/lang/polyml/files/patch-driver-mmap.c b/lang/polyml/files/patch-driver-mmap.c
deleted file mode 100644
index 97ef361f49b2..000000000000
--- a/lang/polyml/files/patch-driver-mmap.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- mmap.c.orig Fri Jun 10 09:54:34 2005
-+++ mmap.c Fri Jun 10 09:55:57 2005
-@@ -60,7 +60,7 @@
- #include <sys/uio.h>
- #include <sys/param.h>
- #include <unistd.h>
--#ifdef MACOSX
-+#if (defined(FREEBSD) || defined(MACOSX))
- #include <limits.h>
- #else
- #include <values.h> /* FreeBSD warns about this but it's needed in Solaris. */
diff --git a/lang/polyml/files/patch-driver-mpoly.c b/lang/polyml/files/patch-driver-mpoly.c
index ce9a5cdf0165..278cd860c1c8 100644
--- a/lang/polyml/files/patch-driver-mpoly.c
+++ b/lang/polyml/files/patch-driver-mpoly.c
@@ -1,33 +1,33 @@
---- mpoly.c.orig Thu Jun 20 02:27:30 2002
-+++ mpoly.c Sat Jul 9 08:57:27 2005
-@@ -636,6 +636,30 @@
-
+--- mpoly.c.orig Thu Nov 24 20:11:47 2005
++++ mpoly.c Thu Nov 24 20:50:45 2005
+@@ -648,6 +648,30 @@
+ if (! be_silent)
+ {
proper_printf("Poly/ML RTS version %s\n",poly_runtime_system_version);
-
++
+#if defined(FREEBSD)
-+ /* FreeBSD 5.x links dynamic libraries above the user heap, rather
-+ than below the user stack. It determines the base address from
-+ the allowed process data size (ulimit -d, limit datasize), the
-+ maximum value of which is set by the kernel maxdsiz parameter.
-+ If this datasize value is too low, there will be conflicts
-+ with the Poly/ML heaps, database or IO Area. Such problems are
-+ difficult to diagnose, thus the check here.
-+ */
-+ struct rlimit rlim;
-+ if (getrlimit(RLIMIT_DATA, &rlim) != 0) {
-+ proper_fprintf(stderr, "unable to check the datasize resource limit.\n");
-+ rlim.rlim_max = 0;
-+ }
-+ if (rlim.rlim_max < ((rlim_t)IO_TOP - 0x08000000)) {
-+ proper_fprintf(stderr,
-+ "WARNING: The maximum datasize limit is too low (>= 896M recommended).\n");
-+ proper_fprintf(stderr,
-+ "WARNING: Large databases may cause problematic behaviour.\n");
-+ proper_fprintf(stderr,
-+ "WARNING: Please increase resources with limit/ulimit and/or kern.maxdsiz\n");
-+ }
++ /* FreeBSD 5.x links dynamic libraries above the user heap, rather
++ than below the user stack. It determines the base address from
++ the allowed process data size (ulimit -d, limit datasize), the
++ maximum value of which is set by the kernel maxdsiz parameter.
++ If this datasize value is too low, there will be conflicts
++ with the Poly/ML heaps, database or IO Area. Such problems are
++ difficult to diagnose, thus the check here.
++ */
++ struct rlimit rlim;
++ if (getrlimit(RLIMIT_DATA, &rlim) != 0) {
++ proper_fprintf(stderr, "unable to check the datasize resource limit.\n");
++ rlim.rlim_max = 0;
++ }
++ if (rlim.rlim_max < ((rlim_t)IO_TOP - 0x08000000)) {
++ proper_fprintf(stderr,
++ "WARNING: The maximum datasize limit is too low (>= 896M recommended).\n");
++ proper_fprintf(stderr,
++ "WARNING: Large databases may cause problematic behaviour.\n");
++ proper_fprintf(stderr,
++ "WARNING: Please increase resources with limit/ulimit and/or kern.maxdsiz\n");
++ }
+#endif
-+
+ }
+
if (A.filename == 0)
- {
- #ifdef WINDOWS_PC
diff --git a/lang/polyml/files/patch-driver-process_env.c b/lang/polyml/files/patch-driver-process_env.c
deleted file mode 100644
index 1c3b10e553cb..000000000000
--- a/lang/polyml/files/patch-driver-process_env.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- process_env.c.orig Fri Jun 10 10:10:07 2005
-+++ process_env.c Fri Jun 10 10:10:31 2005
-@@ -14,6 +14,10 @@
- #include <sys/param.h>
- #endif
-
-+#ifdef FREEBSD
-+#include <unistd.h>
-+#endif
-+
- #include "globals.h"
- #include "sys.h"
- #include "run_time.h"
diff --git a/lang/polyml/files/pkg-message.in b/lang/polyml/files/pkg-message.in
deleted file mode 100644
index eae3edda27aa..000000000000
--- a/lang/polyml/files/pkg-message.in
+++ /dev/null
@@ -1,8 +0,0 @@
-------------------------------------------------------------
- Use of Poly/ML is subject to a licence.
- Please uninstall this port if you do not agree with the
- terms outlined in:
- %%PREFIX%%/lib/polyml/LICENCE
- or at:
- http://www.polyml.org/Get.html
-------------------------------------------------------------