[gcl] New upstream release. Drop upstreamed patches. Help the debuginfo generator find more sources.
Jerry James
jjames at fedoraproject.org
Fri Nov 15 18:25:54 UTC 2013
commit e078710c341366ee9e69db810fb2ead3cafb3e9d
Author: Jerry James <jamesjer at betterlinux.com>
Date: Fri Nov 15 11:25:49 2013 -0700
New upstream release.
Drop upstreamed patches.
Help the debuginfo generator find more sources.
.gitignore | 2 +-
...signal-h.patch => gcl-2.6.10-asm-signal-h.patch | 16 +-
gcl-2.6.10-debuginfo.patch | 21 +
...8-extension.patch => gcl-2.6.10-extension.patch | 97 +--
...2.6.8-fd-leak.patch => gcl-2.6.10-fd-leak.patch | 14 +-
...ucture.patch => gcl-2.6.10-infrastructure.patch | 1069 +++++---------------
...8-largefile.patch => gcl-2.6.10-largefile.patch | 177 ++--
gcl-2.6.8-man.patch => gcl-2.6.10-man.patch | 8 +-
gcl-2.6.10-unrandomize.patch | 419 ++++++++
gcl-2.6.8-alloca.patch | 415 --------
gcl-2.6.8-debuginfo.patch | 10 -
gcl-2.6.8-print-double.patch | 13 -
gcl-2.6.8-unrandomize.patch | 231 -----
gcl.spec | 45 +-
sources | 2 +-
15 files changed, 863 insertions(+), 1676 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0460ed2..cfea849 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
/gcl-2.6.8-info.tar.xz
-/gcl-2.6.8.tar.gz
+/gcl-2.6.10.tar.gz
diff --git a/gcl-2.6.8-asm-signal-h.patch b/gcl-2.6.10-asm-signal-h.patch
similarity index 77%
rename from gcl-2.6.8-asm-signal-h.patch
rename to gcl-2.6.10-asm-signal-h.patch
index 3f980ad..cfa68d9 100644
--- a/gcl-2.6.8-asm-signal-h.patch
+++ b/gcl-2.6.10-asm-signal-h.patch
@@ -1,6 +1,6 @@
---- configure.in.orig 2013-08-26 14:14:39.000000000 -0600
-+++ configure.in 2013-08-26 14:17:25.000000000 -0600
-@@ -1649,7 +1649,7 @@
+--- configure.in.orig 2013-11-14 11:59:55.346373542 -0700
++++ configure.in 2013-11-14 20:15:00.000000000 -0700
+@@ -2400,7 +2400,7 @@
#if test $use = "386-linux" ; then
AC_CHECK_HEADERS(asm/sigcontext.h)
@@ -9,7 +9,7 @@
AC_MSG_CHECKING([for sigcontext])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <signal.h>
-@@ -1674,6 +1674,7 @@
+@@ -2425,6 +2425,7 @@
#include <asm/sigcontext.h>
#endif
#ifdef HAVE_ASM_SIGNAL_H
@@ -17,9 +17,9 @@
#include <asm/signal.h>
#endif
]],
---- configure.orig 2013-08-26 14:14:55.000000000 -0600
-+++ configure 2013-08-26 14:17:35.000000000 -0600
-@@ -8365,7 +8365,8 @@
+--- configure.orig 2013-11-14 12:05:32.160240617 -0700
++++ configure 2013-11-14 20:15:00.000000000 -0700
+@@ -9246,7 +9246,8 @@
for ac_header in asm/signal.h
do :
@@ -29,7 +29,7 @@
if test "x$ac_cv_header_asm_signal_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_ASM_SIGNAL_H 1
-@@ -8418,6 +8419,7 @@
+@@ -9300,6 +9301,7 @@
#include <asm/sigcontext.h>
#endif
#ifdef HAVE_ASM_SIGNAL_H
diff --git a/gcl-2.6.10-debuginfo.patch b/gcl-2.6.10-debuginfo.patch
new file mode 100644
index 0000000..7971a5a
--- /dev/null
+++ b/gcl-2.6.10-debuginfo.patch
@@ -0,0 +1,21 @@
+--- ./o/makefile.orig 2013-11-11 07:55:48.000000000 -0700
++++ ./o/makefile 2013-11-14 21:00:00.000000000 -0700
+@@ -27,7 +27,6 @@ DECL := $(HDIR)/new_decl.h
+ %.o: %.d $(DECL)
+ $(DPP) $*
+ $(CC) -c $(CFLAGS) $(DEFS) $*.c $(AUX_INFO)
+- rm $*.c
+
+ CPP=
+
+--- ./xgcl-2/sysdef.lisp.orig 2013-11-11 07:55:48.000000000 -0700
++++ ./xgcl-2/sysdef.lisp 2013-11-14 21:00:00.000000000 -0700
+@@ -48,7 +48,7 @@
+ (error "compile failure: ~s~%" x))))
+ (directory "*.c"))
+ (mapc (lambda (x)
+- (compile-file (format nil "~a.lsp" x) :system-p t)) *files*))
++ (compile-file (format nil "~a.lsp" x) :c-file t :h-file t :system-p t)) *files*))
+
+
+ (defun load-xgcl()
diff --git a/gcl-2.6.8-extension.patch b/gcl-2.6.10-extension.patch
similarity index 95%
rename from gcl-2.6.8-extension.patch
rename to gcl-2.6.10-extension.patch
index a0ac7a3..3b08ff5 100644
--- a/gcl-2.6.8-extension.patch
+++ b/gcl-2.6.10-extension.patch
@@ -1,6 +1,6 @@
---- configure.in.orig 2013-08-26 13:59:07.000000000 -0600
-+++ configure.in 2013-08-26 14:11:33.000000000 -0600
-@@ -421,6 +421,7 @@
+--- configure.in.orig 2013-11-14 19:30:00.000000000 -0700
++++ configure.in 2013-11-14 19:45:00.000000000 -0700
+@@ -460,6 +460,7 @@
LDFLAGS=" "
fi
@@ -8,7 +8,7 @@
AC_PROG_CC
AC_PROG_CPP
AC_SUBST(CC)
-@@ -1439,7 +1440,6 @@
+@@ -2158,7 +2159,6 @@
#
AC_MSG_CHECKING([for isnormal])
AC_RUN_IFELSE([AC_LANG_PROGRAM([[
@@ -16,7 +16,7 @@
#include <math.h>
]],[[
float f;
-@@ -1457,7 +1457,6 @@
+@@ -2176,7 +2176,6 @@
AC_MSG_CHECKING([for isfinite])
AC_RUN_IFELSE([AC_LANG_PROGRAM([[
@@ -24,8 +24,8 @@
#include <math.h>
]],[[
float f;
---- configure.orig 2013-08-26 14:00:00.000000000 -0600
-+++ configure 2013-08-26 14:12:01.000000000 -0600
+--- configure.orig 2013-11-14 19:30:00.000000000 -0700
++++ configure 2013-11-14 19:45:00.000000000 -0700
@@ -674,9 +674,9 @@
GMP
MAKEINFO
@@ -37,7 +37,7 @@
CPP
OBJEXT
EXEEXT
-@@ -1603,48 +1603,6 @@
+@@ -1612,48 +1612,6 @@
} # ac_fn_c_try_cpp
@@ -86,7 +86,7 @@
# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
# -------------------------------------------------------
# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-@@ -1732,6 +1690,48 @@
+@@ -1741,6 +1699,48 @@
} # ac_fn_c_check_header_mongrel
@@ -135,7 +135,7 @@
# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
# -------------------------------------------------------
# Tests whether HEADER exists and can be compiled using the include files in
-@@ -3931,6 +3931,1004 @@
+@@ -4004,6 +4004,1004 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -1140,7 +1140,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4091,8 +5089,7 @@
+@@ -4164,8 +5162,7 @@
$as_echo_n "checking for CFLAG $TMPF... " >&6; }
CFLAGS_ORI=$CFLAGS
CFLAGS="$CFLAGS $TMPF"
@@ -1150,7 +1150,7 @@
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot run test program while cross compiling
-@@ -4378,267 +5375,7 @@
+@@ -4460,267 +5457,7 @@
case $use in
*macosx)
@@ -1419,7 +1419,7 @@
do :
ac_fn_c_check_header_mongrel "$LINENO" "malloc/malloc.h" "ac_cv_header_malloc_malloc_h" "$ac_includes_default"
if test "x$ac_cv_header_malloc_malloc_h" = xyes; then :
-@@ -6996,7 +7733,6 @@
+@@ -7882,7 +8619,6 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -1427,7 +1427,7 @@
#include <math.h>
int
-@@ -7070,7 +7806,6 @@
+@@ -7956,7 +8692,6 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -1435,35 +1435,11 @@
#include <math.h>
int
---- h/gclincl.h.in.orig 2013-08-26 13:59:07.000000000 -0600
-+++ h/gclincl.h.in 2013-08-26 14:11:33.000000000 -0600
-@@ -1,4 +1,7 @@
- /* h/gclincl.h.in. Generated from configure.in by autoheader. */
-+/* Whether compiling on a glibc-based system */
-+#undef _GNU_SOURCE
-+
- /* define where the heap could begin. Normally should
- be the smallest value returned by sbrk(). Underestimating
- by 10-20 megabytes is not a problem. */
-@@ -159,7 +162,6 @@
-
- #ifdef IN_NUM_CO
- #ifdef HAVE_ISNORMAL
--#define _GNU_SOURCE
- #include <math.h>
- #define ISNORMAL(a) isnormal(a)
- #else
-@@ -180,7 +182,6 @@
-
- #ifdef NEED_ISFINITE
- #ifdef HAVE_ISFINITE
--#define _GNU_SOURCE
- #include <math.h>
- #define ISFINITE(a) isfinite(a)
- #else
-@@ -401,5 +402,37 @@
- /* Define to 1 if you have the ANSI C header files. */
- #undef STDC_HEADERS
+--- h/gclincl.h.in.orig 2013-11-11 07:55:48.000000000 -0700
++++ h/gclincl.h.in 2013-11-14 19:45:00.000000000 -0700
+@@ -347,6 +347,28 @@
+ /* protect cdr from immfix and speed up type processing */
+ #undef USE_SAFE_CDR
+/* Enable extensions on AIX 3, Interix. */
+#ifndef _ALL_SOURCE
@@ -1487,6 +1463,13 @@
+#endif
+
+
+ /* value stack size */
+ #undef VSSIZE
+
+@@ -356,6 +378,16 @@
+ /* big endian byte order */
+ #undef WORDS_BIGENDIAN
+
+/* Define to 1 if on MINIX. */
+#undef _MINIX
+
@@ -1497,30 +1480,6 @@
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#undef _POSIX_SOURCE
+
- /* Define to `unsigned int' if <sys/types.h> does not define. */
- #undef size_t
---- acconfig.h.orig 2013-08-26 13:59:07.000000000 -0600
-+++ acconfig.h 2013-08-26 14:11:33.000000000 -0600
-@@ -1,3 +1,6 @@
-+/* Whether compiling on a glibc-based system */
-+#undef _GNU_SOURCE
-+
- /* define where the heap could begin. Normally should
- be the smallest value returned by sbrk(). Underestimating
- by 10-20 megabytes is not a problem. */
-@@ -158,7 +161,6 @@
-
- #ifdef IN_NUM_CO
- #ifdef HAVE_ISNORMAL
--#define _GNU_SOURCE
- #include <math.h>
- #define ISNORMAL(a) isnormal(a)
- #else
-@@ -179,7 +181,6 @@
+ /* long gmp3 limbs */
+ #undef __LONG_LONG_LIMB
- #ifdef NEED_ISFINITE
- #ifdef HAVE_ISFINITE
--#define _GNU_SOURCE
- #include <math.h>
- #define ISFINITE(a) isfinite(a)
- #else
diff --git a/gcl-2.6.8-fd-leak.patch b/gcl-2.6.10-fd-leak.patch
similarity index 53%
rename from gcl-2.6.8-fd-leak.patch
rename to gcl-2.6.10-fd-leak.patch
index bf8cf67..fc3b42b 100644
--- a/gcl-2.6.8-fd-leak.patch
+++ b/gcl-2.6.10-fd-leak.patch
@@ -1,15 +1,15 @@
---- o/run_process.c.orig 2010-08-04 15:44:27.000000000 -0600
-+++ o/run_process.c 2010-12-29 11:33:45.670403342 -0700
-@@ -528,10 +528,10 @@ char **argv;
+--- o/run_process.c.orig 2013-11-14 10:26:15.981608069 -0700
++++ o/run_process.c 2013-11-14 19:00:00.000000000 -0700
+@@ -533,10 +533,10 @@
fdout = ostream->sm.sm_int0;
if (fork() == 0)
{ /* the child --- replace standard in and out with descriptors given */
- close(0);
-- dup(fdin);
+- massert(dup(fdin)>=0);
- close(1);
-- dup(fdout);
-+ dup2(fdin, 0);
-+ dup2(fdout, 1);
+- massert(dup(fdout)>=0);
++ massert(dup2(fdin, 0)>=0);
++ massert(dup2(fdout, 1)>=0);
+ close(fdin);
+ close(fdout);
fprintf(stderr, "\n***** Spawning process %s ", pname);
diff --git a/gcl-2.6.8-infrastructure.patch b/gcl-2.6.10-infrastructure.patch
similarity index 95%
rename from gcl-2.6.8-infrastructure.patch
rename to gcl-2.6.10-infrastructure.patch
index 48c8833..e4bc7ee 100644
--- a/gcl-2.6.8-infrastructure.patch
+++ b/gcl-2.6.10-infrastructure.patch
@@ -1,5 +1,5 @@
---- config.guess.orig 2013-07-11 09:28:16.000000000 -0600
-+++ config.guess 2013-06-17 03:16:35.000000000 -0600
+--- config.guess.orig 2013-11-11 07:55:48.000000000 -0700
++++ config.guess 2013-11-14 19:30:00.000000000 -0700
@@ -1,14 +1,12 @@
#! /bin/sh
# Attempt to guess a canonical system name.
@@ -771,8 +771,8 @@
#endif
#endif
---- config.sub.orig 2013-07-11 09:28:16.000000000 -0600
-+++ config.sub 2013-06-17 03:16:35.000000000 -0600
+--- config.sub.orig 2013-11-11 07:55:48.000000000 -0700
++++ config.sub 2013-11-14 19:30:00.000000000 -0700
@@ -1,38 +1,31 @@
#! /bin/sh
# Configuration validation subroutine script.
@@ -1414,15 +1414,15 @@
os=-mmixware
;;
*-wec)
---- configure.in.orig 2013-07-11 09:28:16.000000000 -0600
-+++ configure.in 2013-08-26 13:47:45.000000000 -0600
+--- configure.in.orig 2013-11-11 07:55:48.000000000 -0700
++++ configure.in 2013-11-14 19:30:00.000000000 -0700
@@ -1,4 +1,4 @@
-AC_INIT()
+AC_INIT
AC_PREREQ([2.61])
AC_CONFIG_HEADER(h/gclincl.h)
-@@ -445,7 +445,7 @@
+@@ -484,7 +484,7 @@
AC_MSG_CHECKING([for CFLAG $TMPF])
CFLAGS_ORI=$CFLAGS
CFLAGS="$CFLAGS $TMPF"
@@ -1431,7 +1431,7 @@
CFLAGS=$CFLAGS_ORI
else
-@@ -629,9 +629,6 @@
+@@ -675,9 +675,6 @@
AC_MSG_CHECKING([system version (for dynamic loading)])
if machine=`uname -m` ; then true; else machine=unknown ; fi
@@ -1441,29 +1441,37 @@
if test -f /usr/lib/NextStep/software_version; then
system=NEXTSTEP-`${AWK} '/3/,/3/' /usr/lib/NextStep/software_version`
else
-@@ -672,21 +669,24 @@
+@@ -718,21 +715,21 @@
AC_CHECK_HEADERS(unistd.h,
AC_CHECK_LIB(c,sysconf,
-- AC_MSG_CHECKING("for _SC_CLK_TCK")
+- AC_MSG_CHECKING(_SC_CLK_TCK)
- AC_TRY_RUN([#include <unistd.h>
-+ AC_MSG_CHECKING([for _SC_CLK_TCK])
-+ AC_RUN_IFELSE([AC_LANG_PROGRAM([[
++ AC_MSG_CHECKING([_SC_CLK_TCK])
++ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <unistd.h>
#include <stdio.h>
- int
- main() {
-+ ]],[[
++ int main() {
FILE *fp=fopen("conftest1","w");
fprintf(fp,"%lu\n",sysconf(_SC_CLK_TCK));
fclose(fp);
return 0;
- }],
-+ ]])],
++ }]])],
hz=`cat conftest1`
- AC_DEFINE_UNQUOTED(HZ,$hz)
+ AC_DEFINE_UNQUOTED(HZ,$hz,[time system constant])
,hz=0,hz=0)
- [AC_MSG_RESULT($hz)]))
+ [AC_MSG_RESULT($hz)]
+- AC_MSG_CHECKING(_SC_PHYS_PAGES)
++ AC_MSG_CHECKING([_SC_PHYS_PAGES])
+ AC_RUN_IFELSE([
+ AC_LANG_SOURCE([[
+ #include <stdio.h>
+@@ -748,6 +745,9 @@
+ AC_DEFINE(HAVE_SYSCONF_PHYS_PAGES,$phys,[probe runtime phys pages for gc performance])],
+ [AC_MSG_RESULT(no)])))
+AC_PROG_EGREP
+AC_CHECK_PROGS(MAKEINFO,makeinfo,"false")
@@ -1471,7 +1479,7 @@
#MY_SUBDIRS=
-@@ -703,17 +703,19 @@
+@@ -764,17 +764,19 @@
if test "$enable_dynsysgmp" = "yes" ; then
AC_CHECK_HEADERS(gmp.h,
AC_CHECK_LIB(gmp,__gmpz_init,
@@ -1495,7 +1503,7 @@
MPFILES=
PATCHED_SYMBOLS=
# if test "$use" = "m68k-linux" ; then
-@@ -725,7 +727,8 @@
+@@ -786,7 +788,8 @@
echo "int main() {return 0;}" >>foo.c
MP_INCLUDE=`cpp foo.c | grep /gmp.h | head -n 1 | $AWK '{print $3}' | tr -d '"'`
rm -f foo.c,
@@ -1505,7 +1513,7 @@
echo "Cannot use dynamic gmp lib" ,),
echo "Cannot use dynamic gmp lib" ,)
fi
-@@ -772,7 +775,7 @@
+@@ -833,7 +836,7 @@
fi
@@ -1514,10 +1522,10 @@
cat>foo.c <<EOFF
#include <math.h>
#include <stdio.h>
-@@ -782,60 +785,62 @@
+@@ -843,22 +846,22 @@
if nm foo.o |grep " U " | grep "_cos" >/dev/null || nm foo.o |grep " U " | grep " _getc" >/dev/null ; then
LEADING_UNDERSCORE=1
- AC_DEFINE(LEADING_UNDERSCORE)
+ AC_DEFINE(LEADING_UNDERSCORE,1,[symbol name mangling convention])
- AC_MSG_RESULT("yes")
+ AC_MSG_RESULT([yes])
else
@@ -1525,6 +1533,8 @@
- AC_MSG_RESULT("no")
+ AC_MSG_RESULT([no])
fi
+
+
-AC_MSG_CHECKING("for GNU ld option -Map")
+AC_MSG_CHECKING([for GNU ld option -Map])
touch map
@@ -1532,7 +1542,7 @@
if test `cat map | wc -l` != "0" ; then
- AC_MSG_RESULT("yes")
+ AC_MSG_RESULT([yes])
- AC_DEFINE(HAVE_GNU_LD)
+ AC_DEFINE(HAVE_GNU_LD,1,[gnu linker present])
GNU_LD=1
else
- AC_MSG_RESULT("no")
@@ -1540,63 +1550,7 @@
GNU_LD=
fi
rm -f foo.c foo.o foo map
-
-- AC_MSG_CHECKING("for size of gmp limbs")
-- AC_TRY_RUN([#include <stdio.h>
-+ AC_MSG_CHECKING([for size of gmp limbs])
-+ AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-+ #include <stdio.h>
- #include "$MP_INCLUDE"
-- int main() {
-+ ]],[[
- FILE *fp=fopen("conftest1","w");
- fprintf(fp,"%u",sizeof(mp_limb_t));
- fclose(fp);
- return 0;
-- }],mpsize=`cat conftest1`,mpsize=0,mpsize=0)
-+ ]])],mpsize=`cat conftest1`,mpsize=0,mpsize=0)
- if test "$mpsize" = "0" ; then
-- echo "Cannot determine mpsize"
-- exit 1
-+ AC_MSG_ERROR([Cannot determine mpsize], 1)
- fi
- AC_DEFINE_UNQUOTED(MP_LIMB_BYTES,$mpsize)
- AC_MSG_RESULT($mpsize)
-
-- AC_MSG_CHECKING("_SHORT_LIMB")
-- AC_TRY_RUN([#include <stdio.h>
-+ AC_MSG_CHECKING([_SHORT_LIMB])
-+ AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-+ #include <stdio.h>
- #include "$MP_INCLUDE"
-- int main() {
-+ ]],[[
- #ifdef _SHORT_LIMB
- return 0;
- #else
- return 1;
- #endif
-- }],AC_DEFINE(__SHORT_LIMB) AC_MSG_RESULT(yes),AC_MSG_RESULT(no),AC_MSG_RESULT(no))
-- AC_MSG_CHECKING("_LONG_LONG_LIMB")
-- AC_TRY_RUN([#include <stdio.h>
-+ ]])],AC_DEFINE(__SHORT_LIMB) AC_MSG_RESULT(yes),AC_MSG_RESULT(no),AC_MSG_RESULT(no))
-+ AC_MSG_CHECKING([_LONG_LONG_LIMB])
-+ AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-+ #include <stdio.h>
- #include "$MP_INCLUDE"
-- int main() {
-+ ]],[[
- #ifdef _LONG_LONG_LIMB
- return 0;
- #else
- return 1;
- #endif
-- }],AC_DEFINE(__LONG_LONG_LIMB) AC_MSG_RESULT(yes),AC_MSG_RESULT(no),AC_MSG_RESULT(no))
-+ ]])],AC_DEFINE(__LONG_LONG_LIMB) AC_MSG_RESULT(yes),AC_MSG_RESULT(no),AC_MSG_RESULT(no))
-
- GMP=1
- AC_DEFINE(GMP)
-@@ -891,10 +896,9 @@
+@@ -954,10 +957,9 @@
AC_CHECK_LIB(dl,dlopen,have_dl=1,have_dl=0)
if test "$have_dl" = "0" ; then
@@ -1609,7 +1563,7 @@
dnl LIBS and TLIBS - why not merged from the beginning?
TLIBS="$TLIBS -ldl -rdynamic"
-@@ -908,15 +912,17 @@
+@@ -971,15 +973,17 @@
#
# Old binutils appear to need CONST defined to const
#
@@ -1630,61 +1584,41 @@
- int main() {symbol_info t; return 0;}],
+ ]],[[symbol_info t; return 0;]])],
AC_MSG_RESULT(yes)
- AC_DEFINE(NEED_CONST),
+ AC_DEFINE(NEED_CONST,1,[binutils requires CONST definition]),
AC_MSG_ERROR([cannot use bfd]),
-@@ -930,11 +936,12 @@
+@@ -993,7 +997,7 @@
# BFD boolean syntax
#
- AC_MSG_CHECKING(for useable bfd_boolean)
-- AC_TRY_RUN([#define IN_GCC
+ AC_MSG_CHECKING([for usable bfd_boolean])
-+ AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-+ #define IN_GCC
- #include <bfd.h>
- bfd_boolean foo() {return FALSE;}
-- int main() {return 0;}],
-+ ]],[[return 0;]])],
- AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_BFD_BOOLEAN),
- AC_MSG_RESULT(no),
-@@ -945,10 +952,11 @@
- # bfd_link_info.output_bfd minimal configure change check
- #
-
-- AC_MSG_CHECKING(for bfd_link_info.output_bfd)
-- AC_TRY_RUN([#include <bfd.h>
-+ AC_MSG_CHECKING([for bfd_link_info.output_bfd])
-+ AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-+ #include <bfd.h>
- #include <bfdlink.h>
-- int main() {struct bfd_link_info i;i.output_bfd=0;return 0;}],
-+ ]],[[struct bfd_link_info i;i.output_bfd=0;return 0;]])],
- AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_OUTPUT_BFD),
- AC_MSG_RESULT(no),
-@@ -1061,10 +1069,10 @@
+ AC_RUN_IFELSE([AC_LANG_PROGRAM([[
+ #define IN_GCC
+ #include <bfd.h>
+@@ -1158,10 +1162,10 @@
ia64*) ;; #FIXME
*)
AC_MSG_CHECKING(__builtin___clear_cache)
- AC_TRY_COMPILE([],
- [void *v,*ve;
-- __builtin___clear_cache(v,ve);
++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
++ [[void *v,*ve;
+ __builtin___clear_cache(v,ve);
- ],
-+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
-+ [[void *v,*ve;
-+ __builtin___clear_cache(v,ve);
+ ]])],
- [AC_DEFINE(HAVE_BUILTIN_CLEAR_CACHE)
+ [AC_DEFINE(HAVE_BUILTIN_CLEAR_CACHE,1,[have __builtin__clear_cache instruction])
AC_MSG_RESULT(yes)],
AC_MSG_RESULT(no));;
-@@ -1076,45 +1084,47 @@
+@@ -1173,7 +1177,7 @@
# mechanism, in the PAGE macro. This offset is subtracted from
# addresses, in calculating a page for an address in the heap.
-AC_CHECK_SIZEOF(long,0)
+AC_CHECK_SIZEOF(long)
- AC_MSG_CHECKING(sizeof struct contblock)
+
+ #### Memory areas and alignment
+
+@@ -1265,50 +1269,53 @@
# work around MSYS pwd result incompatibility
if test "$use" = "mingw" ; then
@@ -1694,6 +1628,7 @@
#define EXTER
#include "$MP_INCLUDE"
#include "h/enum.h"
+ #include "h/bits.h"
#include "h/object.h"
- int main(int argc,char **argv,char **envp) {
+ ]],[[
@@ -1714,6 +1649,7 @@
#define EXTER
#include "$MP_INCLUDE"
#include "`pwd`/h/enum.h"
+ #include "`pwd`/h/bits.h"
#include "`pwd`/h/object.h"
- int main(int argc,char **argv,char **envp) {
+ ]],[[
@@ -1729,26 +1665,7 @@
+ AC_MSG_ERROR([Cannot find sizeof struct contblock], 1))
fi
AC_MSG_RESULT($sizeof_contblock)
- AC_DEFINE_UNQUOTED(SIZEOF_CONTBLOCK,$sizeof_contblock)
-
-
--AC_MSG_CHECKING(for word order)
--AC_TRY_RUN([int main () {
-+AC_MSG_CHECKING([for word order])
-+AC_RUN_IFELSE([AC_LANG_PROGRAM([],[[
- /* Are we little or big endian? Adapted from Harbison&Steele. */
- union
- {
-@@ -1123,7 +1133,7 @@
- } u;
- u.d = 1.0;
- return u.l[sizeof(double)/sizeof(int)-1] ? 0 : 1;
--}],AC_MSG_RESULT(little)
-+]])],AC_MSG_RESULT(little)
- AC_DEFINE(LITTLE_END),
- AC_MSG_RESULT(big),
- AC_MSG_RESULT([WARNING: ASSUMING LITTLE ENDIAN FOR CROSS COMPILING !!!]
-@@ -1136,15 +1146,16 @@
+ AC_DEFINE_UNQUOTED(SIZEOF_CONTBLOCK,$sizeof_contblock,[sizeof linked list for contiguous pages])
AC_MSG_CHECKING([for sbrk])
HAVE_SBRK=""
@@ -1769,53 +1686,29 @@
HAVE_SBRK=1
AC_MSG_RESULT(yes),
AC_MSG_RESULT([no: WARNING you must be able to emulate sbrk: as on mingw or macosx]),
-@@ -1161,14 +1172,15 @@
- # AC_MSG_RESULT(sys/personality.h not found))
-
- AC_MSG_CHECKING([for ADDR_NO_RANDOMIZE constant])
-- AC_TRY_RUN([#include <sys/personality.h>
-- #include <stdio.h>
-- int main(int argc,char *argv[],char *envp[]) {
-+ AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-+ #include <sys/personality.h>
-+ #include <stdio.h>
-+ ]],[[
- FILE *f;
- if (!(f=fopen("conftest1","w"))) return -1;
- fprintf(f,"%x",ADDR_NO_RANDOMIZE);
- return 0;
-- }],
-+ ]])],
- ADDR_NO_RANDOMIZE=`cat conftest1`,ADDR_NO_RANDOMIZE=0,ADDR_NO_RANDOMIZE=0)
- if test "$ADDR_NO_RANDOMIZE" = "0" ; then
- AC_MSG_RESULT([no, assuming 0x40000])
-@@ -1178,10 +1190,11 @@
- fi
-
- AC_MSG_CHECKING([for personality(ADDR_NO_RANDOMIZE) support])
-- AC_TRY_RUN([void gprof_cleanup() {};
-+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
-+ void gprof_cleanup() {}
- int main(int argc,char *argv[],char *envp[]) {
- #include "h/unrandomize.h"
-- return 0;}],CAN_UNRANDOMIZE_SBRK=1,CAN_UNRANDOMIZE_SBRK=0,CAN_UNRANDOMIZE_SBRK=0)
-+ return 0;}]])],CAN_UNRANDOMIZE_SBRK=1,CAN_UNRANDOMIZE_SBRK=0,CAN_UNRANDOMIZE_SBRK=0)
-
- if test "$CAN_UNRANDOMIZE_SBRK" != 0 ; then
- AC_MSG_RESULT(yes)
-@@ -1191,8 +1204,9 @@
- fi
+@@ -1377,7 +1384,7 @@
+ AC_LANG_SOURCE([[
+ #include <stdio.h>
+ #include <stdlib.h>
+- void gprof_cleanup() {};
++ void gprof_cleanup() {}
+ int main(int argc,char **argv,char **envp) {
+ #include "h/unrandomize.h"
+ return 0;}]])],
+@@ -1386,9 +1393,10 @@
+ [AC_MSG_RESULT(no)])
AC_MSG_CHECKING([that sbrk is (now) non-random])
- AC_TRY_RUN([#include <stdio.h>
-- void gprof_cleanup() {};
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
-+ #include <stdio.h>
-+ void gprof_cleanup() {}
++ #include <stdio.h>
+ #include <stdlib.h>
+- void gprof_cleanup() {};
++ void gprof_cleanup() {}
int main(int argc,char * argv[],char * envp[]) {
FILE *f;
#ifdef CAN_UNRANDOMIZE_SBRK
-@@ -1200,13 +1214,13 @@
+@@ -1396,14 +1404,14 @@
#endif
if (!(f=fopen("conftest1","w"))) return -1;
fprintf(f,"%u",sbrk(0));
@@ -1827,14 +1720,15 @@
+ AC_MSG_ERROR([cannot trap sbrk], 1)
fi
- AC_TRY_RUN([#include <stdio.h>
-- void gprof_cleanup() {};
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
-+ #include <stdio.h>
-+ void gprof_cleanup() {}
++ #include <stdio.h>
+ #include <stdlib.h>
+- void gprof_cleanup() {};
++ void gprof_cleanup() {}
int main(int argc,char * argv[],char * envp[]) {
FILE *f;
#ifdef CAN_UNRANDOMIZE_SBRK
-@@ -1214,10 +1228,9 @@
+@@ -1411,10 +1419,9 @@
#endif
if (!(f=fopen("conftest1","w"))) return -1;
fprintf(f,"%u",sbrk(0));
@@ -1847,94 +1741,52 @@
fi
if test "$SBRK" = "$SBRK1" ; then
AC_MSG_RESULT(yes)
-@@ -1232,15 +1245,17 @@
- fi
-
- # pagewidth
--AC_MSG_CHECKING(for pagewidth)
--AC_TRY_RUN([#include <stdio.h>
-+AC_MSG_CHECKING([for pagewidth])
-+AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-+ #include <stdio.h>
- #include <unistd.h>
--int main() {size_t i=getpagesize(),j;
-+ ]],[[
-+ size_t i=getpagesize(),j;
- FILE *fp=fopen("conftest1","w");
- for (j=0;i>>=1;j++);
- if (j<12) {printf("pagewidth %u is too small\n",j);return -1;}
- fprintf(fp,"%u",j);
-- return 0;}],PAGEWIDTH=`cat conftest1`,PAGEWIDTH=0,PAGEWIDTH=0)
-+ return 0;]])],PAGEWIDTH=`cat conftest1`,PAGEWIDTH=0,PAGEWIDTH=0)
- AC_MSG_RESULT($PAGEWIDTH)
- AC_DEFINE_UNQUOTED(PAGEWIDTH,$PAGEWIDTH)
- AC_SUBST(PAGEWIDTH)
-@@ -1248,11 +1263,12 @@
-
- old_LDFLAGS="$LDFLAGS"
- LDFLAGS="$TLDFLAGS"
--AC_MSG_CHECKING("finding DBEGIN")
--AC_TRY_RUN([#include <stdio.h>
-- #include <stdlib.h>
-+AC_MSG_CHECKING([finding DBEGIN])
-+AC_RUN_IFELSE([AC_LANG_SOURCE([[
-+#include <stdio.h>
-+#include <stdlib.h>
-
--void gprof_cleanup() {};
-+void gprof_cleanup() {}
- int
- main(int argc,char * argv[],char *envp[])
- {
-@@ -1277,36 +1293,35 @@
- #endif
- fclose(fp);
- return 0;
--}],dbegin=`cat conftest1`,dbegin=0,dbegin=0)
-+}]])],dbegin=`cat conftest1`,dbegin=0,dbegin=0)
- AC_DEFINE_UNQUOTED(DBEGIN,$dbegin /* where data begins */)
- AC_MSG_RESULT(got $dbegin)
- LDFLAGS="$old_LDFLAGS"
-
-
--AC_MSG_CHECKING("finding CSTACK_ADDRESS")
--AC_TRY_RUN([#include <stdio.h>
--main()
--{
-+AC_MSG_CHECKING([finding CSTACK_ADDRESS])
-+AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-+#include <stdio.h>
-+]],[[
- char *b ;
- FILE *fp = fopen("conftest1","w");
- fprintf(fp,"%ld",((long) &b));
- fclose(fp);
- return 0;
--}],cstack_address=`cat conftest1`,cstack_address=0,cstack_address=0)
-+]])],cstack_address=`cat conftest1`,cstack_address=0,cstack_address=0)
- AC_DEFINE_UNQUOTED(CSTACK_ADDRESS,$cstack_address \
- )
- AC_MSG_RESULT(got $cstack_address)
-
-
-
--AC_MSG_CHECKING("sizeof long long int")
--AC_TRY_RUN([#include <stdio.h>
--main()
--{
-+AC_MSG_CHECKING([sizeof long long int])
-+AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-+#include <stdio.h>
-+]],[[
- if (sizeof(long long int) == 2*sizeof(long)) return 0;
- return 1;
--}
--],[AC_DEFINE(HAVE_LONG_LONG)
-+]])],[AC_DEFINE(HAVE_LONG_LONG)
- AC_MSG_RESULT(yes)],
- AC_MSG_RESULT(no),
- AC_MSG_RESULT(no)
-@@ -1475,7 +1490,6 @@
+@@ -1487,7 +1494,7 @@
+ return (void *)&i;
+ }
+
+- void gprof_cleanup() {};
++ void gprof_cleanup() {}
+ int main(int argc,char **argv,char **envp) {
+ void *v ;
+ FILE *fp = fopen("conftest1","w");
+@@ -1521,7 +1528,7 @@
+ return (void *)&i;
+ }
+
+- void gprof_cleanup() {};
++ void gprof_cleanup() {}
+ int main(int argc,char **argv,char **envp) {
+ void *v ;
+ FILE *fp = fopen("conftest1","w");
+@@ -1550,7 +1557,7 @@
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <stdio.h>
+ #include <stdlib.h>
+- void gprof_cleanup() {};
++ void gprof_cleanup() {}
+ int main(int argc,char **argv,char **envp) {
+ #ifdef CAN_UNRANDOMIZE_SBRK
+ #include "h/unrandomize.h"
+@@ -1567,7 +1574,7 @@
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <stdio.h>
+ #include <stdlib.h>
+- void gprof_cleanup() {};
++ void gprof_cleanup() {}
+ int main(int argc,char **argv,char **envp) {
+ void *b,*c;
+ FILE *fp = fopen("conftest1","w");
+@@ -1596,7 +1603,7 @@
+ return (void *)&i;
+ }
+
+- void gprof_cleanup() {};
++ void gprof_cleanup() {}
+ int main(int argc,char **argv,char **envp) {
+ char *b;
+ FILE *fp = fopen("conftest1","w");
+@@ -2238,7 +2245,6 @@
# To get around this problem, check for both libraries together
# if -lsocket doesn't work by itself.
#--------------------------------------------------------------------
@@ -1942,7 +1794,7 @@
tcl_checkBoth=0
AC_CHECK_FUNC(connect, tcl_checkSocket=0, tcl_checkSocket=1)
if test "$tcl_checkSocket" = 1; then
-@@ -1512,8 +1526,8 @@
+@@ -2275,8 +2281,8 @@
AC_SUBST(RL_OBJS)
AC_SUBST(RL_LIB)
@@ -1953,7 +1805,7 @@
#include <sys/time.h>
#include <sys/types.h>
#include <unistd.h>
-@@ -1530,24 +1544,25 @@
+@@ -2293,24 +2299,25 @@
#include <netinet/in.h> /* struct in_addr, struct sockaddr_in */
#include <arpa/inet.h> /* inet_ntoa() */
#include <netdb.h> /* gethostbyname() */
@@ -1963,7 +1815,7 @@
socket(AF_INET, SOCK_STREAM, 0);
- ],
+ ]])],
- [AC_DEFINE(HAVE_NSOCKET)
+ [AC_DEFINE(HAVE_NSOCKET,1,[can use nsocket library])
AC_MSG_RESULT(yes)],
AC_MSG_RESULT(no))
@@ -1983,19 +1835,10 @@
if (! (orig & O_NONBLOCK )) return 0;
-],
+]])],
- [AC_DEFINE(LISTEN_USE_FCNTL)
+ [AC_DEFINE(LISTEN_USE_FCNTL,1,[can use fcntl for listen function])
AC_MSG_RESULT(yes)],
AC_MSG_RESULT(no))
-@@ -1568,7 +1583,7 @@
- AC_SUBST(USE_CLEANUP)
- gcl_ok=no
-
--AC_HEADER_EGREP(LITTLE_ENDIAN, ctype.h, gcl_ok=yes, gcl_ok=noo)
-+AC_EGREP_HEADER(LITTLE_ENDIAN, ctype.h, gcl_ok=yes, gcl_ok=no)
- if test $gcl_ok = yes ; then
- AC_DEFINE(ENDIAN_ALREADY_DEFINED)
- fi
-@@ -1600,32 +1615,32 @@
+@@ -2363,32 +2370,32 @@
esac
@@ -2009,7 +1852,7 @@
+#include <signal.h>
+]],
+[[return SV_ONSTACK;]])],
- [AC_DEFINE(HAVE_SV_ONSTACK)
+ [AC_DEFINE(HAVE_SV_ONSTACK,1,[have sv_onstack])
AC_SUBST(HAVE_SV_ONSTACK)
AC_MSG_RESULT(yes)],
AC_MSG_RESULT(no))
@@ -2024,7 +1867,7 @@
+#include <signal.h>
+]],
+[[return SIGSYS;]])],
- [AC_DEFINE(HAVE_SIGSYS)
+ [AC_DEFINE(HAVE_SIGSYS,1,[have SIGSYS signal])
AC_SUBST(HAVE_SIGSYS)
AC_MSG_RESULT(yes)],
AC_MSG_RESULT(no))
@@ -2040,10 +1883,10 @@
+#include <signal.h>
+]],
+[[return SIGEMT;]])],
- [AC_DEFINE(HAVE_SIGEMT)
+ [AC_DEFINE(HAVE_SIGEMT,1,[have SIGEMT signal])
AC_SUBST(HAVE_SIGEMT)
AC_MSG_RESULT(yes)],
-@@ -1637,12 +1652,13 @@
+@@ -2400,12 +2407,13 @@
#if test $use = "386-linux" ; then
AC_CHECK_HEADERS(asm/sigcontext.h)
AC_CHECK_HEADERS(asm/signal.h)
@@ -2061,8 +1904,8 @@
+ ]])],
[
sigcontext_works=1;
- AC_DEFINE(SIGNAL_H_HAS_SIGCONTEXT)
-@@ -1653,18 +1669,19 @@
+ AC_DEFINE(SIGNAL_H_HAS_SIGCONTEXT,1,[have sigcontext in signal.h])
+@@ -2416,18 +2424,19 @@
AC_MSG_RESULT(sigcontext NOT in signal.h)]
)
if test "$sigcontext_works" = 0 ; then
@@ -2085,9 +1928,9 @@
- ],
+ ]])],
[
- AC_DEFINE(HAVE_SIGCONTEXT)
+ AC_DEFINE(HAVE_SIGCONTEXT,1,[have sigcontext])
AC_MSG_RESULT(sigcontext in asm files)
-@@ -1774,6 +1791,8 @@
+@@ -2537,6 +2546,8 @@
if test "$enable_tcltk" = "yes" ; then
@@ -2096,7 +1939,7 @@
AC_MSG_CHECKING([for tcl/tk])
-@@ -1794,9 +1813,6 @@
+@@ -2557,9 +2568,6 @@
EOF
#cp conftest.tcl foo.tcl
@@ -2106,7 +1949,7 @@
if test "${TCLSH}" = "" ; then true ; else
TCL_CONFIG_PREFIX=`${TCLSH} < conftest.tcl`
fi
-@@ -1870,7 +1886,6 @@
+@@ -2633,7 +2641,6 @@
fi
@@ -2114,48 +1957,16 @@
if test "$have_ieee" = "0" ; then
TCL_LIBS=`echo ${TCL_LIBS} | sed -e "s:-lieee::g" `
fi
-@@ -1914,15 +1929,18 @@
-
- # the time handling for unixtime, add timezone
-
--AC_MSG_CHECKING([alloca])
--AC_TRY_RUN([int main() { exit(alloca(500) != NULL ? 0 : 1);}],
-+# alloca
-+
-+AC_MSG_CHECKING([for alloca])
-+AC_RUN_IFELSE([AC_LANG_PROGRAM([],[[exit(alloca(500) != NULL ? 0 : 1);]])],
- ,gcl_ok=yes, gcl_ok=no,gcl_ok=no)
- if test $gcl_ok = yes ; then
- AC_MSG_RESULT(yes)
- AC_DEFINE(HAVE_ALLOCA)
- else
-- AC_TRY_RUN([#include <alloca.h>
-- int main() { exit(alloca(500) != NULL ? 0 : 1);}],
-+ AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-+ #include <alloca.h>
-+ ]],[[exit(alloca(500) != NULL ? 0 : 1);]])],
- ,gcl_ok=yes, gcl_ok=no,gcl_ok=no)
- if test $gcl_ok = yes ; then
- AC_MSG_RESULT(yes)
-@@ -1941,8 +1959,6 @@
-
+@@ -2679,8 +2686,6 @@
+ AC_FUNC_ALLOCA
-# alloca
-
# dlopen etc
# idea make it so you do something dlopen(libX.so,RTLD_GLOBAL)
# then dlload("foo.o") a lisp file can refer to things in libX.so
-@@ -1966,7 +1982,7 @@
-
- # redhat/cygnus released for some reason a buggy version of gcc,
- # which no one else released. Catch that here.
--AC_MSG_CHECKING([Checking for buggy gcc version from redhat])
-+AC_MSG_CHECKING([for buggy gcc version from redhat])
- if 2>&1 $CC -v | fgrep "gcc version 2.96" > /dev/null
- then
- BROKEN_O4_OPT=1
-@@ -2001,7 +2017,8 @@
+@@ -2739,7 +2744,8 @@
if test -f h/$use.defs ; then
AC_SUBST(use)
@@ -2165,9 +1976,9 @@
echo makedefc
cat makedefc
---- configure.orig 2013-07-11 09:28:16.000000000 -0600
-+++ configure 2013-08-26 13:49:54.000000000 -0600
-@@ -671,10 +671,10 @@
+--- configure.orig 2013-11-11 07:55:48.000000000 -0700
++++ configure 2013-11-14 19:30:00.000000000 -0700
+@@ -672,10 +672,10 @@
XMKMF
GMPDIR
GMP
@@ -2179,7 +1990,7 @@
AWK
CPP
OBJEXT
-@@ -4045,7 +4045,14 @@
+@@ -4173,7 +4173,14 @@
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -2195,7 +2006,7 @@
_ACEOF
if ac_fn_c_try_run "$LINENO"; then :
TCFLAGS="$TCFLAGS $TMPF";{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-@@ -4291,51 +4298,6 @@
+@@ -4428,51 +4435,6 @@
$as_echo_n "checking system version (for dynamic loading)... " >&6; }
if machine=`uname -m` ; then true; else machine=unknown ; fi
@@ -2247,16 +2058,7 @@
if test -f /usr/lib/NextStep/software_version; then
system=NEXTSTEP-`${AWK} '/3/,/3/' /usr/lib/NextStep/software_version`
else
-@@ -4744,22 +4706,29 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_sysconf" >&5
- $as_echo "$ac_cv_lib_c_sysconf" >&6; }
- if test "x$ac_cv_lib_c_sysconf" = xyes; then :
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking \"for _SC_CLK_TCK\"" >&5
--$as_echo_n "checking \"for _SC_CLK_TCK\"... " >&6; }
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _SC_CLK_TCK" >&5
-+$as_echo_n "checking for _SC_CLK_TCK... " >&6; }
- if test "$cross_compiling" = yes; then :
- hz=0
+@@ -4888,10 +4850,10 @@
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -2266,24 +2068,11 @@
#include <stdio.h>
- int
- main() {
-+
-+int
-+main ()
-+{
-+
++ int main() {
FILE *fp=fopen("conftest1","w");
fprintf(fp,"%lu\n",sysconf(_SC_CLK_TCK));
fclose(fp);
- return 0;
-- }
-+
-+ ;
-+ return 0;
-+}
- _ACEOF
- if ac_fn_c_try_run "$LINENO"; then :
- hz=`cat conftest1`
-@@ -4784,6 +4753,117 @@
+@@ -4958,6 +4920,117 @@
done
@@ -2401,7 +2190,7 @@
#MY_SUBDIRS=
-@@ -4842,25 +4922,36 @@
+@@ -5016,25 +5089,36 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gmp___gmpz_init" >&5
$as_echo "$ac_cv_lib_gmp___gmpz_init" >&6; }
if test "x$ac_cv_lib_gmp___gmpz_init" = xyes; then :
@@ -2444,7 +2233,7 @@
MPFILES=
PATCHED_SYMBOLS=
# if test "$use" = "m68k-linux" ; then
-@@ -4873,7 +4964,8 @@
+@@ -5047,7 +5131,8 @@
MP_INCLUDE=`cpp foo.c | grep /gmp.h | head -n 1 | $AWK '{print $3}' | tr -d '"'`
rm -f foo.c
else
@@ -2454,7 +2243,7 @@
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
-@@ -4934,8 +5026,8 @@
+@@ -5108,8 +5193,8 @@
fi
@@ -2465,9 +2254,9 @@
cat>foo.c <<EOFF
#include <math.h>
#include <stdio.h>
-@@ -4946,45 +5038,53 @@
- LEADING_UNDERSCORE=1
- $as_echo "#define LEADING_UNDERSCORE 1" >>confdefs.h
+@@ -5121,29 +5206,29 @@
+
+ $as_echo "#define LEADING_UNDERSCORE 1" >>confdefs.h
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: \"yes\"" >&5
-$as_echo "\"yes\"" >&6; }
@@ -2480,6 +2269,8 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
fi
+
+
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking \"for GNU ld option -Map\"" >&5
-$as_echo_n "checking \"for GNU ld option -Map\"... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld option -Map" >&5
@@ -2491,7 +2282,8 @@
-$as_echo "\"yes\"" >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
- $as_echo "#define HAVE_GNU_LD 1" >>confdefs.h
+
+ $as_echo "#define HAVE_GNU_LD 1" >>confdefs.h
GNU_LD=1
else
@@ -2502,123 +2294,7 @@
GNU_LD=
fi
rm -f foo.c foo.o foo map
-
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking \"for size of gmp limbs\"" >&5
--$as_echo_n "checking \"for size of gmp limbs\"... " >&6; }
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for size of gmp limbs" >&5
-+$as_echo_n "checking for size of gmp limbs... " >&6; }
- if test "$cross_compiling" = yes; then :
- mpsize=0
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--#include <stdio.h>
-+
-+ #include <stdio.h>
- #include "$MP_INCLUDE"
-- int main() {
-+
-+int
-+main ()
-+{
-+
- FILE *fp=fopen("conftest1","w");
- fprintf(fp,"%u",sizeof(mp_limb_t));
- fclose(fp);
- return 0;
-- }
-+
-+ ;
-+ return 0;
-+}
- _ACEOF
- if ac_fn_c_try_run "$LINENO"; then :
- mpsize=`cat conftest1`
-@@ -4996,8 +5096,7 @@
- fi
-
- if test "$mpsize" = "0" ; then
-- echo "Cannot determine mpsize"
-- exit 1
-+ as_fn_error 1 "Cannot determine mpsize" "$LINENO" 5
- fi
- cat >>confdefs.h <<_ACEOF
- #define MP_LIMB_BYTES $mpsize
-@@ -5006,23 +5105,31 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $mpsize" >&5
- $as_echo "$mpsize" >&6; }
-
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking \"_SHORT_LIMB\"" >&5
--$as_echo_n "checking \"_SHORT_LIMB\"... " >&6; }
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking _SHORT_LIMB" >&5
-+$as_echo_n "checking _SHORT_LIMB... " >&6; }
- if test "$cross_compiling" = yes; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--#include <stdio.h>
-+
-+ #include <stdio.h>
- #include "$MP_INCLUDE"
-- int main() {
-+
-+int
-+main ()
-+{
-+
- #ifdef _SHORT_LIMB
- return 0;
- #else
- return 1;
- #endif
-- }
-+
-+ ;
-+ return 0;
-+}
- _ACEOF
- if ac_fn_c_try_run "$LINENO"; then :
- $as_echo "#define __SHORT_LIMB 1" >>confdefs.h
-@@ -5036,23 +5143,31 @@
- conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
-
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking \"_LONG_LONG_LIMB\"" >&5
--$as_echo_n "checking \"_LONG_LONG_LIMB\"... " >&6; }
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking _LONG_LONG_LIMB" >&5
-+$as_echo_n "checking _LONG_LONG_LIMB... " >&6; }
- if test "$cross_compiling" = yes; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--#include <stdio.h>
-+
-+ #include <stdio.h>
- #include "$MP_INCLUDE"
-- int main() {
-+
-+int
-+main ()
-+{
-+
- #ifdef _LONG_LONG_LIMB
- return 0;
- #else
- return 1;
- #endif
-- }
-+
-+ ;
-+ return 0;
-+}
- _ACEOF
- if ac_fn_c_try_run "$LINENO"; then :
- $as_echo "#define __LONG_LONG_LIMB 1" >>confdefs.h
-@@ -5391,8 +5506,7 @@
+@@ -5602,8 +5687,7 @@
fi
if test "$have_dl" = "0" ; then
@@ -2628,7 +2304,7 @@
fi
TLIBS="$TLIBS -ldl -rdynamic"
-@@ -5455,9 +5569,17 @@
+@@ -5667,9 +5751,17 @@
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -2648,7 +2324,7 @@
_ACEOF
if ac_fn_c_try_run "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-@@ -5468,10 +5590,18 @@
+@@ -5680,10 +5772,18 @@
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -2669,7 +2345,7 @@
_ACEOF
if ac_fn_c_try_run "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-@@ -5505,18 +5635,26 @@
+@@ -5719,8 +5819,8 @@
# BFD boolean syntax
#
@@ -2678,66 +2354,18 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for usable bfd_boolean" >&5
+$as_echo_n "checking for usable bfd_boolean... " >&6; }
if test "$cross_compiling" = yes; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--#define IN_GCC
-+
-+ #define IN_GCC
- #include <bfd.h>
- bfd_boolean foo() {return FALSE;}
-- int main() {return 0;}
-+
-+int
-+main ()
-+{
-+return 0;
-+ ;
-+ return 0;
-+}
- _ACEOF
- if ac_fn_c_try_run "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-@@ -5545,9 +5683,17 @@
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--#include <bfd.h>
-+
-+ #include <bfd.h>
- #include <bfdlink.h>
-- int main() {struct bfd_link_info i;i.output_bfd=0;return 0;}
-+
-+int
-+main ()
-+{
-+struct bfd_link_info i;i.output_bfd=0;return 0;
-+ ;
-+ return 0;
-+}
- _ACEOF
- if ac_fn_c_try_run "$LINENO"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-@@ -5878,14 +6024,14 @@
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+@@ -6174,7 +6274,7 @@
*)
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking __builtin___clear_cache" >&5
$as_echo_n "checking __builtin___clear_cache... " >&6; }
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
int
- main ()
- {
- void *v,*ve;
-- __builtin___clear_cache(v,ve);
-+ __builtin___clear_cache(v,ve);
-
- ;
- return 0;
-@@ -5948,26 +6094,34 @@
+@@ -6478,27 +6578,35 @@
# work around MSYS pwd result incompatibility
if test "$use" = "mingw" ; then
if test "$cross_compiling" = yes; then :
@@ -2752,6 +2380,7 @@
#define EXTER
#include "$MP_INCLUDE"
#include "h/enum.h"
+ #include "h/bits.h"
#include "h/object.h"
- int main(int argc,char **argv,char **envp) {
+
@@ -2777,7 +2406,7 @@
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
-@@ -5975,26 +6129,34 @@
+@@ -6506,27 +6614,35 @@
else
if test "$cross_compiling" = yes; then :
@@ -2792,6 +2421,7 @@
#define EXTER
#include "$MP_INCLUDE"
#include "`pwd`/h/enum.h"
+ #include "`pwd`/h/bits.h"
#include "`pwd`/h/object.h"
- int main(int argc,char **argv,char **envp) {
+
@@ -2817,30 +2447,7 @@
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
conftest.$ac_objext conftest.beam conftest.$ac_ext
-@@ -6021,7 +6183,11 @@
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--int main () {
-+
-+int
-+main ()
-+{
-+
- /* Are we little or big endian? Adapted from Harbison&Steele. */
- union
- {
-@@ -6030,6 +6196,9 @@
- } u;
- u.d = 1.0;
- return u.l[sizeof(double)/sizeof(int)-1] ? 0 : 1;
-+
-+ ;
-+ return 0;
- }
- _ACEOF
- if ac_fn_c_try_run "$LINENO"; then :
-@@ -6060,15 +6229,23 @@
+@@ -6550,15 +6666,23 @@
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -2868,56 +2475,29 @@
_ACEOF
if ac_fn_c_try_run "$LINENO"; then :
HAVE_SBRK=1
-@@ -6101,14 +6278,22 @@
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--#include <sys/personality.h>
-- #include <stdio.h>
-- int main(int argc,char *argv[],char *envp[]) {
-+
-+ #include <sys/personality.h>
-+ #include <stdio.h>
-+
-+int
-+main ()
-+{
-+
- FILE *f;
- if (!(f=fopen("conftest1","w"))) return -1;
- fprintf(f,"%x",ADDR_NO_RANDOMIZE);
- return 0;
-- }
-+
-+ ;
-+ return 0;
-+}
- _ACEOF
- if ac_fn_c_try_run "$LINENO"; then :
- ADDR_NO_RANDOMIZE=`cat conftest1`
-@@ -6138,7 +6323,8 @@
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--void gprof_cleanup() {};
-+
-+ void gprof_cleanup() {}
- int main(int argc,char *argv[],char *envp[]) {
- #include "h/unrandomize.h"
- return 0;}
-@@ -6170,8 +6356,9 @@
+@@ -6736,7 +6860,7 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
+- void gprof_cleanup() {};
++ void gprof_cleanup() {}
+ int main(int argc,char **argv,char **envp) {
+ #include "h/unrandomize.h"
+ return 0;}
+@@ -6763,9 +6887,10 @@
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <stdio.h>
-- void gprof_cleanup() {};
+
-+ #include <stdio.h>
-+ void gprof_cleanup() {}
++ #include <stdio.h>
+ #include <stdlib.h>
+- void gprof_cleanup() {};
++ void gprof_cleanup() {}
int main(int argc,char * argv[],char * envp[]) {
FILE *f;
#ifdef CAN_UNRANDOMIZE_SBRK
-@@ -6191,17 +6378,16 @@
+@@ -6785,18 +6910,17 @@
fi
if test "$SBRK" = "0" ; then
@@ -2932,14 +2512,15 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <stdio.h>
-- void gprof_cleanup() {};
+
-+ #include <stdio.h>
-+ void gprof_cleanup() {}
++ #include <stdio.h>
+ #include <stdlib.h>
+- void gprof_cleanup() {};
++ void gprof_cleanup() {}
int main(int argc,char * argv[],char * envp[]) {
FILE *f;
#ifdef CAN_UNRANDOMIZE_SBRK
-@@ -6221,9 +6407,7 @@
+@@ -6816,9 +6940,7 @@
fi
if test "$SBRK1" = "0" ; then
@@ -2950,122 +2531,52 @@
fi
if test "$SBRK" = "$SBRK1" ; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-@@ -6247,14 +6431,23 @@
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--#include <stdio.h>
-+
-+ #include <stdio.h>
- #include <unistd.h>
--int main() {size_t i=getpagesize(),j;
-+
-+int
-+main ()
-+{
-+
-+ size_t i=getpagesize(),j;
- FILE *fp=fopen("conftest1","w");
- for (j=0;i>>=1;j++);
- if (j<12) {printf("pagewidth %u is too small\n",j);return -1;}
- fprintf(fp,"%u",j);
-- return 0;}
-+ return 0;
-+ ;
-+ return 0;
-+}
- _ACEOF
- if ac_fn_c_try_run "$LINENO"; then :
- PAGEWIDTH=`cat conftest1`
-@@ -6276,17 +6469,18 @@
-
- old_LDFLAGS="$LDFLAGS"
- LDFLAGS="$TLDFLAGS"
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking \"finding DBEGIN\"" >&5
--$as_echo_n "checking \"finding DBEGIN\"... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking finding DBEGIN" >&5
-+$as_echo_n "checking finding DBEGIN... " >&6; }
- if test "$cross_compiling" = yes; then :
- dbegin=0
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-+
- #include <stdio.h>
-- #include <stdlib.h>
-+#include <stdlib.h>
-
--void gprof_cleanup() {};
-+void gprof_cleanup() {}
- int
- main(int argc,char * argv[],char *envp[])
- {
-@@ -6331,21 +6525,28 @@
- LDFLAGS="$old_LDFLAGS"
-
-
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking \"finding CSTACK_ADDRESS\"" >&5
--$as_echo_n "checking \"finding CSTACK_ADDRESS\"... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking finding CSTACK_ADDRESS" >&5
-+$as_echo_n "checking finding CSTACK_ADDRESS... " >&6; }
- if test "$cross_compiling" = yes; then :
- cstack_address=0
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-+
- #include <stdio.h>
--main()
-+
-+int
-+main ()
- {
-+
- char *b ;
- FILE *fp = fopen("conftest1","w");
- fprintf(fp,"%ld",((long) &b));
- fclose(fp);
- return 0;
-+
-+ ;
-+ return 0;
- }
- _ACEOF
- if ac_fn_c_try_run "$LINENO"; then :
-@@ -6367,8 +6568,8 @@
-
-
-
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking \"sizeof long long int\"" >&5
--$as_echo_n "checking \"sizeof long long int\"... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking sizeof long long int" >&5
-+$as_echo_n "checking sizeof long long int... " >&6; }
- if test "$cross_compiling" = yes; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-@@ -6376,13 +6577,19 @@
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-+
- #include <stdio.h>
--main()
-+
-+int
-+main ()
- {
-+
- if (sizeof(long long int) == 2*sizeof(long)) return 0;
- return 1;
--}
-
-+ ;
-+ return 0;
-+}
- _ACEOF
- if ac_fn_c_try_run "$LINENO"; then :
- $as_echo "#define HAVE_LONG_LONG 1" >>confdefs.h
-@@ -6888,8 +7095,6 @@
+@@ -6863,7 +6985,7 @@
+ return (void *)&i;
+ }
+
+- void gprof_cleanup() {};
++ void gprof_cleanup() {}
+ int main(int argc,char **argv,char **envp) {
+ void *v ;
+ FILE *fp = fopen("conftest1","w");
+@@ -6921,7 +7043,7 @@
+ return (void *)&i;
+ }
+
+- void gprof_cleanup() {};
++ void gprof_cleanup() {}
+ int main(int argc,char **argv,char **envp) {
+ void *v ;
+ FILE *fp = fopen("conftest1","w");
+@@ -6974,7 +7096,7 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
+- void gprof_cleanup() {};
++ void gprof_cleanup() {}
+ int main(int argc,char **argv,char **envp) {
+ #ifdef CAN_UNRANDOMIZE_SBRK
+ #include "h/unrandomize.h"
+@@ -7013,7 +7135,7 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
+- void gprof_cleanup() {};
++ void gprof_cleanup() {}
+ int main(int argc,char **argv,char **envp) {
+ void *b,*c;
+ FILE *fp = fopen("conftest1","w");
+@@ -7066,7 +7188,7 @@
+ return (void *)&i;
+ }
+
+- void gprof_cleanup() {};
++ void gprof_cleanup() {}
+ int main(int argc,char **argv,char **envp) {
+ char *b;
+ FILE *fp = fopen("conftest1","w");
+@@ -7916,8 +8038,6 @@
# To get around this problem, check for both libraries together
# if -lsocket doesn't work by itself.
#--------------------------------------------------------------------
@@ -3074,7 +2585,7 @@
tcl_checkBoth=0
ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
if test "x$ac_cv_func_connect" = xyes; then :
-@@ -7101,8 +7306,8 @@
+@@ -8132,8 +8252,8 @@
@@ -3085,7 +2596,7 @@
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-@@ -7126,7 +7331,7 @@
+@@ -8157,7 +8277,7 @@
int
main ()
{
@@ -3094,7 +2605,7 @@
gethostbyname("jil");
socket(AF_INET, SOCK_STREAM, 0);
-@@ -7147,10 +7352,11 @@
+@@ -8179,10 +8299,11 @@
conftest$ac_exeext conftest.$ac_ext
@@ -3108,16 +2619,7 @@
#include <stdio.h>
#include <fcntl.h>
-@@ -7226,7 +7432,7 @@
- $EGREP "LITTLE_ENDIAN" >/dev/null 2>&1; then :
- gcl_ok=yes
- else
-- gcl_ok=noo
-+ gcl_ok=no
- fi
- rm -f conftest*
-
-@@ -7270,17 +7476,17 @@
+@@ -8292,17 +8413,17 @@
esac
@@ -3139,7 +2641,7 @@
;
return 0;
}
-@@ -7297,17 +7503,17 @@
+@@ -8320,17 +8441,17 @@
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -3161,7 +2663,7 @@
;
return 0;
}
-@@ -7325,17 +7531,17 @@
+@@ -8349,17 +8470,17 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -3183,7 +2685,7 @@
;
return 0;
}
-@@ -7380,11 +7586,12 @@
+@@ -8405,11 +8526,12 @@
done
@@ -3200,7 +2702,7 @@
int
main ()
-@@ -7412,11 +7619,12 @@
+@@ -8438,11 +8560,12 @@
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
if test "$sigcontext_works" = 0 ; then
@@ -3216,17 +2718,13 @@
#ifdef HAVE_ASM_SIGCONTEXT_H
#include <asm/sigcontext.h>
#endif
-@@ -7595,26 +7803,41 @@
+@@ -8622,26 +8745,41 @@
if test "$enable_tcltk" = "yes" ; then
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tcl/tk" >&5
-$as_echo_n "checking for tcl/tk... " >&6; }
-
--
--if test -d "${TCL_CONFIG_PREFIX}" ; then true ; else
--rm -f conftest.tcl
--cat >> conftest.tcl <<EOF
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lieee" >&5
+$as_echo_n "checking for main in -lieee... " >&6; }
+if ${ac_cv_lib_ieee_main+:} false; then :
@@ -3237,6 +2735,10 @@
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+-if test -d "${TCL_CONFIG_PREFIX}" ; then true ; else
+-rm -f conftest.tcl
+-cat >> conftest.tcl <<EOF
+
-set dir [set tcl_library]
-if { [file exists [file join [set dir] tclConfig.sh]] } {
- puts [set dir]
@@ -3246,7 +2748,7 @@
-if { [file exists [file join [set dir] tclConfig.sh]] } {
- puts [set dir]
- }
-
+-
-EOF
-#cp conftest.tcl foo.tcl
+int
@@ -3276,7 +2778,7 @@
# Extract the first word of "tclsh", so it can be a program name with args.
set dummy tclsh; ac_word=$2
-@@ -7654,7 +7877,26 @@
+@@ -8681,7 +8819,26 @@
fi
@@ -3304,7 +2806,7 @@
if test "${TCLSH}" = "" ; then true ; else
TCL_CONFIG_PREFIX=`${TCLSH} < conftest.tcl`
-@@ -7729,42 +7971,6 @@
+@@ -8756,42 +8913,6 @@
fi
@@ -3347,54 +2849,8 @@
if test "$have_ieee" = "0" ; then
TCL_LIBS=`echo ${TCL_LIBS} | sed -e "s:-lieee::g" `
fi
-@@ -7810,14 +8016,23 @@
-
- # the time handling for unixtime, add timezone
-
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking alloca" >&5
--$as_echo_n "checking alloca... " >&6; }
-+# alloca
-+
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
-+$as_echo_n "checking for alloca... " >&6; }
- if test "$cross_compiling" = yes; then :
- gcl_ok=no
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--int main() { exit(alloca(500) != NULL ? 0 : 1);}
-+
-+int
-+main ()
-+{
-+exit(alloca(500) != NULL ? 0 : 1);
-+ ;
-+ return 0;
-+}
- _ACEOF
- if ac_fn_c_try_run "$LINENO"; then :
-
-@@ -7839,8 +8054,16 @@
- else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--#include <alloca.h>
-- int main() { exit(alloca(500) != NULL ? 0 : 1);}
-+
-+ #include <alloca.h>
-+
-+int
-+main ()
-+{
-+exit(alloca(500) != NULL ? 0 : 1);
-+ ;
-+ return 0;
-+}
- _ACEOF
- if ac_fn_c_try_run "$LINENO"; then :
-
-@@ -7872,8 +8095,6 @@
-
+@@ -9035,8 +9156,6 @@
+ fi
-# alloca
@@ -3402,18 +2858,7 @@
# dlopen etc
# idea make it so you do something dlopen(libX.so,RTLD_GLOBAL)
# then dlload("foo.o") a lisp file can refer to things in libX.so
-@@ -7897,8 +8118,8 @@
-
- # redhat/cygnus released for some reason a buggy version of gcc,
- # which no one else released. Catch that here.
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Checking for buggy gcc version from redhat" >&5
--$as_echo_n "checking Checking for buggy gcc version from redhat... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for buggy gcc version from redhat" >&5
-+$as_echo_n "checking for buggy gcc version from redhat... " >&6; }
- if 2>&1 $CC -v | fgrep "gcc version 2.96" > /dev/null
- then
- BROKEN_O4_OPT=1
-@@ -7938,7 +8159,7 @@
+@@ -9085,7 +9204,7 @@
ac_config_files="$ac_config_files makedefc windows/gcl.iss windows/sysdir.bat windows/install.lsp"
@@ -3422,8 +2867,8 @@
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
# scripts and configure runs, see configure's option --config-cache.
---- install.sh.orig 2013-07-11 09:28:16.000000000 -0600
-+++ install.sh 2013-06-17 03:16:35.000000000 -0600
+--- install.sh.orig 2013-11-11 07:55:48.000000000 -0700
++++ install.sh 2013-11-14 19:30:00.000000000 -0700
@@ -1,250 +1,527 @@
-#! /bin/sh
-#
@@ -4135,8 +3580,8 @@
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
---- ltmain.sh.orig 2013-07-11 09:28:16.000000000 -0600
-+++ ltmain.sh 2013-06-04 01:27:29.000000000 -0600
+--- ltmain.sh.orig 2013-11-11 07:55:48.000000000 -0700
++++ ltmain.sh 2013-11-14 19:30:00.000000000 -0700
@@ -1,199 +1,924 @@
-# ltmain.sh - Provide generalized library-building support services.
-# NOTE: Changing this file will not affect anything until you rerun ltconfig.
diff --git a/gcl-2.6.8-largefile.patch b/gcl-2.6.10-largefile.patch
similarity index 87%
rename from gcl-2.6.8-largefile.patch
rename to gcl-2.6.10-largefile.patch
index 7098fd6..26b1069 100644
--- a/gcl-2.6.8-largefile.patch
+++ b/gcl-2.6.10-largefile.patch
@@ -1,6 +1,6 @@
---- ./h/protoize.h.orig 2013-05-11 14:42:29.000000000 -0600
-+++ ./h/protoize.h 2013-05-13 14:46:33.925671152 -0600
-@@ -508,7 +508,7 @@ typedef void (*funcvoid)(void);
+--- ./h/protoize.h.orig 2013-11-11 07:55:48.000000000 -0700
++++ ./h/protoize.h 2013-11-14 20:30:00.000000000 -0700
+@@ -513,7 +513,7 @@ typedef void (*funcvoid)(void);
/* unixfsys.c:329:OF */ extern bool file_exists (object file); /* (file) object file; */
/* unixfsys.c:359:OF */ extern FILE *backup_fopen (char *filename, char *option); /* (filename, option) char *filename; char *option; */
/* unixfsys.c:359:OF */ extern FILE *fopen_not_dir (char *filename, char *option); /* (filename, option) char *filename; char *option; */
@@ -9,7 +9,7 @@
/* unixfsys.c:382:OF */ extern object truename (object); /* () */
/* unixfsys.c:382:OF */ extern void Ltruename (void); /* () */
/* unixfsys.c:418:OF */ extern object fSsetenv (object variable, object value); /* (variable, value) object variable; object value; */
-@@ -731,11 +731,11 @@ edit_double(int, double, int *, char *,
+@@ -736,11 +736,11 @@ edit_double(int, double, int *, char *,
void
sethash(object,object,object);
@@ -23,8 +23,8 @@
void
princ_str(char *s, object);
---- ./h/linux.h.orig 2012-01-17 18:29:27.000000000 -0700
-+++ ./h/linux.h 2013-05-13 14:46:33.926671150 -0600
+--- ./h/linux.h.orig 2013-11-11 07:55:48.000000000 -0700
++++ ./h/linux.h 2013-11-14 20:30:00.000000000 -0700
@@ -12,13 +12,13 @@
#include <link.h>
#define SEEK_TO_END_OFILE(fp)\
@@ -34,7 +34,7 @@
ElfW(Ehdr) eheader; ElfW(Shdr) shdr; \
- fseek(fp, 0, SEEK_SET); \
+ fseeko(fp, 0, SEEK_SET); \
- fread(&eheader, sizeof(eheader), 1, fp); \
+ massert(1==fread(&eheader, sizeof(eheader), 1, fp)); \
/* in case the headers themselves come AFTER the actual sections */ \
endofelf=offset = eheader.e_shoff+ eheader.e_shentsize *eheader.e_shnum;\
- fseek(fp, eheader.e_shoff, SEEK_SET); \
@@ -51,15 +51,15 @@
FEerror("Bad ELF file",0); \
} while(0)
---- ./h/mp.h.orig 2005-01-15 09:27:36.000000000 -0700
-+++ ./h/mp.h 2013-05-13 14:46:33.926671150 -0600
-@@ -35,6 +35,22 @@ typedef struct
+--- ./h/mp.h.orig 2013-11-11 07:55:48.000000000 -0700
++++ ./h/mp.h 2013-11-14 20:30:00.000000000 -0700
+@@ -33,6 +33,22 @@ typedef struct
#define SI_TO_MP(x, temp) (mpz_set_si(MP(temp),(x)), MP(temp))
+#define C_INT_TO_OBJ(x) ({ \
+ object temp = big_fixnum1; \
-+ if (x >= MOST_NEG_FIXNUM && x <= MOST_POSITIVE_FIXNUM) \
++ if (x >= MOST_NEGATIVE_FIX && x <= MOST_POSITIVE_FIX) \
+ temp = make_fixnum(x); \
+ else if (sizeof(x) <= sizeof(long)) \
+ mpz_set_si(MP(big_fixnum1), x); \
@@ -76,13 +76,13 @@
#define INTEGER_TO_MP(x, temp ) \
(type_of(x) == t_bignum ? MP(x) : SI_TO_MP(fix(x), temp))
-@@ -110,6 +126,20 @@ GEN subss();
+@@ -108,6 +124,20 @@ GEN subss();
#define SI_TO_MP(x,ignore) stoi(x)
+#define C_INT_TO_OBJ(x) ({ \
+ object temp = big_fixnum1; \
-+ if (x >= MOST_NEG_FIXNUM && x <= MOST_POSITIVE_FIXNUM) \
++ if (x >= MOST_NEGATIVE_FIX && x <= MOST_POSITIVE_FIX) \
+ temp = make_fixnum(x); \
+ else if (sizeof(x) <= sizeof(long)) \
+ MP(big_fixnum1) = stoi(x); \
@@ -97,8 +97,8 @@
#define INT_FLAG 0x1010000
#define MP_ALLOCATED(x) (x)->big.big_length
---- ./o/unixfasl.c.orig 2004-05-03 15:35:58.000000000 -0600
-+++ ./o/unixfasl.c 2013-05-13 14:46:33.927671148 -0600
+--- ./o/unixfasl.c.orig 2013-11-11 07:55:48.000000000 -0700
++++ ./o/unixfasl.c 2013-11-14 20:30:00.000000000 -0700
@@ -90,8 +90,8 @@ object faslfile;
#ifdef ATT
struct filehdr fileheader;
@@ -185,8 +185,8 @@
error("file seek error");
fread(memory->cfd.cfd_start, textsize + datasize, 1, fp);
---- ./o/sfasl.c.orig 2010-08-04 15:44:27.000000000 -0600
-+++ ./o/sfasl.c 2013-05-13 14:46:33.927671148 -0600
+--- ./o/sfasl.c.orig 2013-11-11 07:55:48.000000000 -0700
++++ ./o/sfasl.c 2013-11-14 20:30:00.000000000 -0700
@@ -133,7 +133,7 @@ void set_symbol_address ( struct syment
int
fasload(faslfile)
@@ -293,9 +293,17 @@
if (feof(fp))
{data=0;}
else{
---- ./o/file.d.orig 2013-05-11 14:29:11.000000000 -0600
-+++ ./o/file.d 2013-05-31 16:44:36.727101429 -0600
-@@ -410,7 +410,7 @@ object if_exists, if_does_not_exist;
+--- ./o/file.d.orig 2013-11-11 07:55:48.000000000 -0700
++++ ./o/file.d 2013-11-14 20:30:00.000000000 -0700
+@@ -37,6 +37,7 @@ Foundation, 675 Mass Ave, Cambridge, MA
+
+ #define IN_FILE
+ #include "include.h"
++#include "num_include.h"
+
+ #ifdef HAVE_READLINE
+ #include <readline/readline.h>
+@@ -406,7 +407,7 @@ object if_exists, if_does_not_exist;
FEerror("Cannot write pipe output to temporary file",0);
if (pclose(pp)<0)
FEerror("Cannot close zcat pipe",0);
@@ -304,7 +312,7 @@
FEerror("Cannot rewind temporary file\n",0);
goto AGAIN;
}
-@@ -1321,7 +1321,7 @@ BEGIN:
+@@ -1320,7 +1321,7 @@ BEGIN:
}
}
@@ -313,7 +321,7 @@
file_position(strm)
object strm;
{
-@@ -1333,7 +1333,7 @@ BEGIN:
+@@ -1332,7 +1333,7 @@ BEGIN:
/* return(strm->sm.sm_int0); */
if (strm->sm.sm_fp == NULL)
closed_stream(strm);
@@ -322,7 +330,7 @@
case smm_socket:
return -1;
-@@ -1364,7 +1364,7 @@ BEGIN:
+@@ -1363,7 +1364,7 @@ BEGIN:
int
file_position_set(strm, disp)
object strm;
@@ -331,7 +339,7 @@
{
BEGIN:
switch (strm->sm.sm_mode) {
-@@ -1374,7 +1374,7 @@ BEGIN:
+@@ -1373,7 +1374,7 @@ BEGIN:
case smm_output:
case smm_io:
@@ -340,7 +348,7 @@
return(-1);
/* strm->sm.sm_int0 = disp; */
return(0);
-@@ -1410,7 +1410,7 @@ BEGIN:
+@@ -1409,7 +1410,7 @@ BEGIN:
}
}
@@ -349,7 +357,7 @@
file_length(strm)
object strm;
{
-@@ -1773,14 +1773,14 @@ LFD(Lstream_element_type)()
+@@ -1775,14 +1776,14 @@ LFD(Lstream_element_type)()
@)
@(defun file_position (file_stream &o position)
@@ -366,7 +374,7 @@
} else {
if (position == sKstart)
i = 0;
-@@ -1807,7 +1807,7 @@ LFD(Lfile_length)()
+@@ -1809,7 +1810,7 @@ LFD(Lfile_length)()
if (i < 0)
vs_base[0] = Cnil;
else
@@ -375,7 +383,7 @@
}
object sSAload_pathnameA;
-@@ -2706,22 +2706,22 @@ read_fasl_data(const char *str) {
+@@ -2712,22 +2713,22 @@ read_fasl_data(const char *str) {
#ifdef BSD
fp = faslfile->sm.sm_fp;
fread(&header, sizeof(header), 1, fp);
@@ -402,7 +410,7 @@
while ((i = getc(fp)) == 0)
;
ungetc(i, fp);
-@@ -2730,7 +2730,7 @@ read_fasl_data(const char *str) {
+@@ -2736,7 +2737,7 @@ read_fasl_data(const char *str) {
#ifdef E15
fp = faslfile->sm.sm_fp;
fread(&header, sizeof(header), 1, fp);
@@ -411,8 +419,8 @@
header.a_text+header.a_data+
header.a_syms+header.a_trsize+header.a_drsize,
1);
---- ./o/unexelf.c.orig 2004-05-03 15:35:58.000000000 -0600
-+++ ./o/unexelf.c 2013-05-13 14:46:33.928671146 -0600
+--- ./o/unexelf.c.orig 2013-11-11 07:55:48.000000000 -0700
++++ ./o/unexelf.c 2013-11-14 20:30:00.000000000 -0700
@@ -634,7 +634,8 @@ find_section (char *name, char *section_
static void
unexec (char *new_name, char *old_name, unsigned int data_start, unsigned int bss_start, unsigned int entry_address)
@@ -432,41 +440,26 @@
/* Open the old file, allocate a buffer of the right size, and read
in the file contents. */
-@@ -687,13 +688,13 @@ unexec (char *new_name, char *old_name,
+@@ -687,7 +688,7 @@ unexec (char *new_name, char *old_name,
we'd dump our temporary buffers with Emacs, and we'd have to be
extra careful to use the correct value of sbrk(0) after
allocating all buffers in the code below, which we aren't. */
- old_file_size = stat_buf.st_size;
+ old_file_size = (size_t) stat_buf.st_size;
- old_base = mmap (NULL, old_file_size, PROT_READ | PROT_WRITE,
- MAP_ANON | MAP_PRIVATE, mmap_fd, 0);
+ old_base = mmap (NULL, old_file_size, PROT_READ,MAP_SHARED, old_file, 0);
if (old_base == MAP_FAILED)
fatal ("Can't allocate buffer for %s\n", old_name);
-
-- if (read (old_file, old_base, stat_buf.st_size) != stat_buf.st_size)
-+ if (read (old_file, old_base, old_file_size) != stat_buf.st_size)
- fatal ("Didn't read all of %s: errno %d\n", old_name, errno);
-
- /* Get pointers to headers & section names */
@@ -778,7 +779,7 @@ unexec (char *new_name, char *old_name,
if (ftruncate (new_file, new_file_size))
fatal ("Can't ftruncate (%s): errno %d\n", new_name, errno);
-- new_base = mmap (NULL, new_file_size, PROT_READ | PROT_WRITE,
-+ new_base = mmap (NULL, (size_t) new_file_size, PROT_READ | PROT_WRITE,
- MAP_ANON | MAP_PRIVATE, mmap_fd, 0);
+- new_base = mmap (NULL, new_file_size, PROT_READ | PROT_WRITE,MAP_SHARED, new_file, 0);
++ new_base = mmap (NULL, (size_t) new_file_size, PROT_READ | PROT_WRITE,MAP_SHARED, new_file, 0);
if (new_base == MAP_FAILED)
fatal ("Can't allocate buffer for %s\n", old_name);
-@@ -1208,12 +1209,12 @@ unexec (char *new_name, char *old_name,
-
- /* Write out new_file, and free the buffers. */
-- if (write (new_file, new_base, new_file_size) != new_file_size)
-- fatal ("Didn't write %d bytes to %s: errno %d\n",
-- new_file_size, new_base, errno);
-+ if (write (new_file, new_base, (size_t) new_file_size) != new_file_size)
-+ fatal ("Didn't write %zu bytes to %s: errno %d\n",
-+ (size_t) new_file_size, new_base, errno);
+@@ -1212,7 +1213,7 @@ unexec (char *new_name, char *old_name,
+ /* new_file_size, new_base, errno); */
munmap (old_base, old_file_size);
- munmap (new_base, new_file_size);
@@ -474,9 +467,17 @@
/* Close the files and make the new file executable. */
---- ./o/fasdump.c.orig 2005-10-05 12:51:55.000000000 -0600
-+++ ./o/fasdump.c 2013-05-13 14:46:33.929671144 -0600
-@@ -605,7 +605,7 @@ FFN(open_fasd)(object stream, object dir
+--- ./o/fasdump.c.orig 2013-11-11 07:55:48.000000000 -0700
++++ ./o/fasdump.c 2013-11-14 20:30:00.000000000 -0700
+@@ -23,6 +23,7 @@
+ #ifndef FAT_STRING
+ #include "include.h"
+ #endif
++#include "num_include.h"
+
+ static void
+ clrhash(object);
+@@ -605,7 +606,7 @@ FFN(open_fasd)(object stream, object dir
fd->eof=eof;
fd->index=small_fixnum(0);
fd->package=symbol_value(sLApackageA);
@@ -485,7 +486,7 @@
SETUP_FASD_IN(fd);
if (direction==sKoutput){
-@@ -645,7 +645,7 @@ FFN(close_fasd)(object ar)
+@@ -645,7 +646,7 @@ FFN(close_fasd)(object ar)
{clrhash(fd->table);
SETUP_FASD_IN(fd);
PUT_OP(d_end_of_file);
@@ -494,8 +495,8 @@
if(type_of(fd->filepos) == t_fixnum)
{ file_position_set(fd->stream,fix(fd->filepos) +2);
/* record the length of array needed to read the indices */
---- ./o/unixsave.c.orig 2005-05-06 15:56:56.000000000 -0600
-+++ ./o/unixsave.c 2013-05-13 14:46:33.929671144 -0600
+--- ./o/unixsave.c.orig 2013-11-11 07:55:48.000000000 -0700
++++ ./o/unixsave.c 2013-11-14 20:30:00.000000000 -0700
@@ -93,7 +93,7 @@ memory_save(original_file, save_file)
char *original_file, *save_file;
{ MEM_SAVE_LOCALS;
@@ -514,9 +515,17 @@
COPY_TO_SAVE;
---- ./o/unixfsys.c.orig 2013-01-21 14:18:53.000000000 -0700
-+++ ./o/unixfsys.c 2013-05-13 14:46:33.929671144 -0600
-@@ -414,7 +414,7 @@ backup_fopen(char *filename, char *optio
+--- ./o/unixfsys.c.orig 2013-11-14 16:07:34.699617383 -0700
++++ ./o/unixfsys.c 2013-11-14 20:30:00.000000000 -0700
+@@ -26,6 +26,7 @@ Foundation, 675 Mass Ave, Cambridge, MA
+
+ #define IN_UNIXFSYS
+ #include "include.h"
++#include "num_include.h"
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #ifndef NO_PWD_H
+@@ -414,7 +415,7 @@ backup_fopen(char *filename, char *optio
return(fopen(filename, option));
}
@@ -525,7 +534,7 @@
file_len(FILE *fp)
{
struct stat filestatus;
-@@ -486,7 +486,7 @@ DEFUN_NEW("STAT",object,fSstat,SI,1,1,NO
+@@ -493,7 +494,7 @@ DEFUN_NEW("STAT",object,fSstat,SI,1,1,NO
filename[j-1]=0;*/
RETURN1(list(3,S_ISDIR(ss.st_mode) ? sKdirectory :
(S_ISLNK(ss.st_mode) ? sKlink : sKfile),
@@ -534,8 +543,19 @@
}
}
---- ./unixport/bsd_rsym.c.orig 1999-12-06 15:44:15.000000000 -0700
-+++ ./unixport/bsd_rsym.c 2013-05-13 14:46:33.930671142 -0600
+--- ./configure.in.orig 2013-11-14 20:15:00.000000000 -0700
++++ ./configure.in 2013-11-14 20:30:00.000000000 -0700
+@@ -464,7 +464,7 @@ AC_USE_SYSTEM_EXTENSIONS
+ AC_PROG_CC
+ AC_PROG_CPP
+ AC_SUBST(CC)
+-
++AC_SYS_LARGEFILE
+
+ # can only test for numbers -- CM
+ # if test "${GCC}" -eq "yes" ; then
+--- ./unixport/bsd_rsym.c.orig 2013-11-11 07:55:48.000000000 -0700
++++ ./unixport/bsd_rsym.c 2013-11-14 20:30:00.000000000 -0700
@@ -121,7 +121,7 @@ tab.n_symbols=0;tab.tot_leng=0;
symout=fopen(outfile,"w");
if (!symout)
@@ -554,8 +574,8 @@
fwrite(&tab,sizeof(tab),1,symout);
fclose(symout);
return 0;
---- ./unixport/rsym.c.orig 2002-07-25 15:49:47.000000000 -0600
-+++ ./unixport/rsym.c 2013-05-13 14:46:33.930671142 -0600
+--- ./unixport/rsym.c.orig 2013-11-11 07:55:48.000000000 -0700
++++ ./unixport/rsym.c 2013-11-14 20:30:00.000000000 -0700
@@ -102,7 +102,7 @@ char *filename;
sizeof(struct syment) and SYMESZ are not always the same.
*/
@@ -633,8 +653,8 @@
{int i,j;
unsigned short k;
for (i=0 ; i < tab.n_symbols ; i++)
---- ./unixport/rsym_elf.c.orig 2004-05-03 15:35:59.000000000 -0600
-+++ ./unixport/rsym_elf.c 2013-05-13 14:46:33.930671142 -0600
+--- ./unixport/rsym_elf.c.orig 2013-11-11 07:55:48.000000000 -0700
++++ ./unixport/rsym_elf.c 2013-11-14 20:30:00.000000000 -0700
@@ -147,7 +147,7 @@ get_section(fp,name)
else
shndx = get_section_number(name);
@@ -689,20 +709,9 @@
fwrite(&tab,sizeof(tab),1,symout);
fclose(symout);
#ifdef AIX3
---- ./configure.in.orig 2013-05-10 08:26:52.000000000 -0600
-+++ ./configure.in 2013-05-13 14:46:51.387638090 -0600
-@@ -425,7 +425,7 @@ AC_USE_SYSTEM_EXTENSIONS
- AC_PROG_CC
- AC_PROG_CPP
- AC_SUBST(CC)
--
-+AC_SYS_LARGEFILE
-
- # can only test for numbers -- CM
- # if test "${GCC}" -eq "yes" ; then
---- ./configure.orig 2013-05-10 10:23:17.000000000 -0600
-+++ ./configure 2013-05-13 14:46:55.322630640 -0600
-@@ -763,6 +763,7 @@ enable_static
+--- ./configure.orig 2013-11-14 20:15:00.000000000 -0700
++++ ./configure 2013-11-14 20:30:00.000000000 -0700
+@@ -767,6 +767,7 @@ enable_static
enable_pic
enable_oldgmp
enable_dynsysgmp
@@ -710,7 +719,7 @@
with_x
enable_readline
enable_ansi
-@@ -1428,6 +1429,7 @@ Optional Features:
+@@ -1437,6 +1438,7 @@ debug safecdr code
--enable-dynsysgmp will link against the system libgmp3 overriding certain functions with patched versions from the local source
@@ -718,7 +727,7 @@
--enable-readline enables command line completion via the readline library
--enable-ansi builds a large gcl aiming for ansi compliance,
--disable-ansi builds the smaller traditional CLtL1 image
-@@ -5067,6 +5069,205 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
+@@ -5140,6 +5142,205 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
ac_compiler_gnu=$ac_cv_c_compiler_gnu
diff --git a/gcl-2.6.8-man.patch b/gcl-2.6.10-man.patch
similarity index 75%
rename from gcl-2.6.8-man.patch
rename to gcl-2.6.10-man.patch
index a6ad0ec..acddc61 100644
--- a/gcl-2.6.8-man.patch
+++ b/gcl-2.6.10-man.patch
@@ -1,6 +1,6 @@
---- man/man1/gcl.1.orig 2002-02-03 11:44:07.000000000 -0700
-+++ man/man1/gcl.1 2010-12-30 14:09:50.834355544 -0700
-@@ -149,8 +149,7 @@
+--- man/man1/gcl.1.orig 2013-11-11 07:55:48.000000000 -0700
++++ man/man1/gcl.1 2013-11-14 20:30:00.000000000 -0700
+@@ -158,8 +158,7 @@
.B \-compile
.RB
Invoke the compiler on the filename following
@@ -10,7 +10,7 @@
flags affect compilation.
.TP
-@@ -205,8 +204,6 @@
+@@ -214,8 +213,6 @@
This GNU package should not be confused with the proprietary program
distributed by FRANZ, Inc.
diff --git a/gcl-2.6.10-unrandomize.patch b/gcl-2.6.10-unrandomize.patch
new file mode 100644
index 0000000..e96289f
--- /dev/null
+++ b/gcl-2.6.10-unrandomize.patch
@@ -0,0 +1,419 @@
+--- configure.in.orig 2013-11-14 19:45:00.000000000 -0700
++++ configure.in 2013-11-14 20:00:00.000000000 -0700
+@@ -1385,9 +1385,11 @@
+ AC_LANG_SOURCE([[
+ #include <stdio.h>
+ #include <stdlib.h>
++ #define CAN_UNRANDOMIZE_SBRK 1
++ #include "h/unrandomize.h"
+ void gprof_cleanup() {}
+ int main(int argc,char **argv,char **envp) {
+- #include "h/unrandomize.h"
++ UNRANDOMIZE_SBRK;
+ return 0;}]])],
+ [AC_MSG_RESULT(yes)
+ AC_DEFINE(CAN_UNRANDOMIZE_SBRK,1,[can prevent sbrk from returning random values])],
+@@ -1397,12 +1399,11 @@
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <stdio.h>
+ #include <stdlib.h>
++ #include "h/unrandomize.h"
+ void gprof_cleanup() {}
+ int main(int argc,char * argv[],char * envp[]) {
+ FILE *f;
+- #ifdef CAN_UNRANDOMIZE_SBRK
+- #include "h/unrandomize.h"
+- #endif
++ UNRANDOMIZE_SBRK;
+ if (!(f=fopen("conftest1","w"))) return -1;
+ fprintf(f,"%u",sbrk(0));
+ return 0;}]])],SBRK=`cat conftest1`,SBRK=0,SBRK=0)
+@@ -1412,12 +1413,11 @@
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <stdio.h>
+ #include <stdlib.h>
++ #include "h/unrandomize.h"
+ void gprof_cleanup() {}
+ int main(int argc,char * argv[],char * envp[]) {
+ FILE *f;
+- #ifdef CAN_UNRANDOMIZE_SBRK
+- #include "h/unrandomize.h"
+- #endif
++ UNRANDOMIZE_SBRK;
+ if (!(f=fopen("conftest1","w"))) return -1;
+ fprintf(f,"%u",sbrk(0));
+ return 0;}]])],SBRK1=`cat conftest1`,SBRK1=0,SBRK1=0)
+@@ -1489,6 +1489,7 @@
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <stdio.h>
+ #include <stdlib.h>
++ #include "h/unrandomize.h"
+ void *
+ foo() {
+ int i;
+@@ -1501,9 +1502,7 @@
+ FILE *fp = fopen("conftest1","w");
+ unsigned long i,j;
+
+- #ifdef CAN_UNRANDOMIZE_SBRK
+- #include "h/unrandomize.h"
+- #endif
++ UNRANDOMIZE_SBRK;
+ j=1;
+ j<<=$PAGEWIDTH;
+ j<<=16;
+@@ -1523,6 +1522,7 @@
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <stdio.h>
+ #include <stdlib.h>
++ #include "h/unrandomize.h"
+ void *
+ foo() {
+ int i;
+@@ -1535,9 +1535,7 @@
+ FILE *fp = fopen("conftest1","w");
+ unsigned long i,j;
+
+- #ifdef CAN_UNRANDOMIZE_SBRK
+- #include "h/unrandomize.h"
+- #endif
++ UNRANDOMIZE_SBRK;
+ j=1;
+ j<<=$PAGEWIDTH;
+ j<<=16;
+@@ -1558,11 +1556,10 @@
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <stdio.h>
+ #include <stdlib.h>
++ #include "h/unrandomize.h"
+ void gprof_cleanup() {}
+ int main(int argc,char **argv,char **envp) {
+- #ifdef CAN_UNRANDOMIZE_SBRK
+- #include "h/unrandomize.h"
+- #endif
++ UNRANDOMIZE_SBRK;
+ return (long)$cstack_address<0 ? 0 : -1;
+ }]])],[AC_MSG_RESULT(yes)
+ neg_cstack_address=1
+@@ -1575,14 +1572,13 @@
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <stdio.h>
+ #include <stdlib.h>
++ #include "h/unrandomize.h"
+ void gprof_cleanup() {}
+ int main(int argc,char **argv,char **envp) {
+ void *b,*c;
+ FILE *fp = fopen("conftest1","w");
+ long n;
+- #ifdef CAN_UNRANDOMIZE_SBRK
+- #include "h/unrandomize.h"
+- #endif
++ UNRANDOMIZE_SBRK;
+ b=alloca(sizeof(b));
+ c=alloca(sizeof(c));
+ n=b>c ? b-c : c-b;
+@@ -1598,6 +1594,7 @@
+ AC_RUN_IFELSE([AC_LANG_SOURCE([[
+ #include <stdio.h>
+ #include <stdlib.h>
++ #include "h/unrandomize.h"
+ void *
+ foo(void) {
+ int i;
+@@ -1608,9 +1605,7 @@
+ int main(int argc,char **argv,char **envp) {
+ char *b;
+ FILE *fp = fopen("conftest1","w");
+- #ifdef CAN_UNRANDOMIZE_SBRK
+- #include "h/unrandomize.h"
+- #endif
++ UNRANDOMIZE_SBRK;
+ fprintf(fp,"%d",((long) &b) > ((long) foo()) ? -1 : 1);
+ fclose(fp);
+ return 0;
+--- configure.orig 2013-11-14 19:45:00.000000000 -0700
++++ configure 2013-11-14 20:00:00.000000000 -0700
+@@ -7597,9 +7597,11 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
++ #define CAN_UNRANDOMIZE_SBRK 1
++ #include "h/unrandomize.h"
+ void gprof_cleanup() {}
+ int main(int argc,char **argv,char **envp) {
+- #include "h/unrandomize.h"
++ UNRANDOMIZE_SBRK;
+ return 0;}
+ _ACEOF
+ if ac_fn_c_try_run "$LINENO"; then :
+@@ -7627,12 +7629,11 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
++ #include "h/unrandomize.h"
+ void gprof_cleanup() {}
+ int main(int argc,char * argv[],char * envp[]) {
+ FILE *f;
+- #ifdef CAN_UNRANDOMIZE_SBRK
+- #include "h/unrandomize.h"
+- #endif
++ UNRANDOMIZE_SBRK;
+ if (!(f=fopen("conftest1","w"))) return -1;
+ fprintf(f,"%u",sbrk(0));
+ return 0;}
+@@ -7657,12 +7658,11 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
++ #include "h/unrandomize.h"
+ void gprof_cleanup() {}
+ int main(int argc,char * argv[],char * envp[]) {
+ FILE *f;
+- #ifdef CAN_UNRANDOMIZE_SBRK
+- #include "h/unrandomize.h"
+- #endif
++ UNRANDOMIZE_SBRK;
+ if (!(f=fopen("conftest1","w"))) return -1;
+ fprintf(f,"%u",sbrk(0));
+ return 0;}
+@@ -7716,6 +7716,7 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
++ #include "h/unrandomize.h"
+ void *
+ foo() {
+ int i;
+@@ -7728,9 +7729,7 @@
+ FILE *fp = fopen("conftest1","w");
+ unsigned long i,j;
+
+- #ifdef CAN_UNRANDOMIZE_SBRK
+- #include "h/unrandomize.h"
+- #endif
++ UNRANDOMIZE_SBRK;
+ j=1;
+ j<<=$PAGEWIDTH;
+ j<<=16;
+@@ -7774,6 +7773,7 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
++ #include "h/unrandomize.h"
+ void *
+ foo() {
+ int i;
+@@ -7786,9 +7786,7 @@
+ FILE *fp = fopen("conftest1","w");
+ unsigned long i,j;
+
+- #ifdef CAN_UNRANDOMIZE_SBRK
+- #include "h/unrandomize.h"
+- #endif
++ UNRANDOMIZE_SBRK;
+ j=1;
+ j<<=$PAGEWIDTH;
+ j<<=16;
+@@ -7833,11 +7831,10 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
++ #include "h/unrandomize.h"
+ void gprof_cleanup() {}
+ int main(int argc,char **argv,char **envp) {
+- #ifdef CAN_UNRANDOMIZE_SBRK
+- #include "h/unrandomize.h"
+- #endif
++ UNRANDOMIZE_SBRK;
+ return (long)$cstack_address<0 ? 0 : -1;
+ }
+ _ACEOF
+@@ -7872,14 +7869,13 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
++ #include "h/unrandomize.h"
+ void gprof_cleanup() {}
+ int main(int argc,char **argv,char **envp) {
+ void *b,*c;
+ FILE *fp = fopen("conftest1","w");
+ long n;
+- #ifdef CAN_UNRANDOMIZE_SBRK
+- #include "h/unrandomize.h"
+- #endif
++ UNRANDOMIZE_SBRK;
+ b=alloca(sizeof(b));
+ c=alloca(sizeof(c));
+ n=b>c ? b-c : c-b;
+@@ -7919,6 +7915,7 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
++ #include "h/unrandomize.h"
+ void *
+ foo(void) {
+ int i;
+@@ -7929,9 +7926,7 @@
+ int main(int argc,char **argv,char **envp) {
+ char *b;
+ FILE *fp = fopen("conftest1","w");
+- #ifdef CAN_UNRANDOMIZE_SBRK
+- #include "h/unrandomize.h"
+- #endif
++ UNRANDOMIZE_SBRK;
+ fprintf(fp,"%d",((long) &b) > ((long) foo()) ? -1 : 1);
+ fclose(fp);
+ return 0;
+--- o/main.c.orig 2013-11-11 07:55:48.000000000 -0700
++++ o/main.c 2013-11-14 20:00:00.000000000 -0700
+@@ -51,6 +51,7 @@
+ #include <signal.h>
+ #endif
+ #include "page.h"
++#include "unrandomize.h"
+
+ bool saving_system ;
+
+@@ -288,11 +289,7 @@
+ #endif
+ *argv=kcl_self;
+
+-#ifdef CAN_UNRANDOMIZE_SBRK
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include "unrandomize.h"
+-#endif
++ UNRANDOMIZE_SBRK;
+
+ #ifdef LD_BIND_NOW
+ #include <stdio.h>
+--- h/unrandomize.h.orig 2013-11-14 19:45:00.000000000 -0700
++++ h/unrandomize.h 2013-11-14 20:00:00.000000000 -0700
+@@ -1,3 +1,5 @@
++#include <stdio.h>
++#include <stdlib.h>
+ #include <sys/personality.h>
+ #include <syscall.h>
+ #include <unistd.h>
+@@ -5,60 +7,65 @@
+ #include <alloca.h>
+ #include <errno.h>
+
+-{
+- errno=0;
+-
+- {
+-
+- long pers = personality(0xffffffffUL);
+- long flag = ADDR_NO_RANDOMIZE;
+-
+- if (sizeof(long)==4) flag|=ADDR_LIMIT_3GB|ADDR_COMPAT_LAYOUT;
+-
+- if (pers==-1) {printf("personality failure %d\n",errno);exit(-1);}
+- if ((pers & flag)!=flag && !getenv("GCL_UNRANDOMIZE")) {
+- errno=0;
+- if (personality(pers | flag) != -1 && (personality(0xffffffffUL) & flag)==flag) {
+- int i,j,k;
+- char **n,**a;
+- void *v;
+- for (i=j=0;argv[i];i++)
+- j+=strlen(argv[i])+1;
+- for (k=0;envp[k];k++)
+- j+=strlen(envp[k])+1;
+- j+=(i+k+3)*sizeof(char *);
+- if ((v=sbrk(j))==(void *)-1) {
+- printf("Cannot brk environment space\n");
+- exit(-1);
+- }
+- a=v;
+- v=a+i+1;
+- n=v;
+- v=n+k+2;
+- for (i=0;argv[i];i++) {
+- a[i]=v;
+- strcpy(v,argv[i]);
+- v+=strlen(v)+1;
+- }
+- a[i]=0;
+- for (k=0;envp[k];k++) {
+- n[k]=v;
+- strcpy(v,envp[k]);
+- v+=strlen(v)+1;
+- }
+- n[k]="GCL_UNRANDOMIZE=t";
+- n[k+1]=0;
+-#ifdef GCL_GPROF
+- gprof_cleanup();
++#ifdef CAN_UNRANDOMIZE_SBRK
++# ifdef GCL_GPROF
++# define GPROF_CLEANUP gprof_cleanup()
++# else
++# define GPROF_CLEANUP
++# endif
++# define UNRANDOMIZE_SBRK do { \
++ errno=0; \
++ { \
++ long pers = personality(0xffffffffUL); \
++ long flag = ADDR_NO_RANDOMIZE; \
++ \
++ if (sizeof(long)==4) flag|=ADDR_LIMIT_3GB|ADDR_COMPAT_LAYOUT; \
++ \
++ if (pers==-1) {printf("personality failure %d\n",errno);exit(-1);} \
++ if ((pers & flag)!=flag && !getenv("GCL_UNRANDOMIZE")) { \
++ errno=0; \
++ if (personality(pers | flag) != -1 && (personality(0xffffffffUL) & flag)==flag) { \
++ int i,j,k; \
++ char **n,**a; \
++ void *v; \
++ for (i=j=0;argv[i];i++) \
++ j+=strlen(argv[i])+1; \
++ for (k=0;envp[k];k++) \
++ j+=strlen(envp[k])+1; \
++ j+=(i+k+3)*sizeof(char *); \
++ if ((v=sbrk(j))==(void *)-1) { \
++ printf("Cannot brk environment space\n"); \
++ exit(-1); \
++ } \
++ a=v; \
++ v=a+i+1; \
++ n=v; \
++ v=n+k+2; \
++ for (i=0;argv[i];i++) { \
++ a[i]=v; \
++ strcpy(v,argv[i]); \
++ v+=strlen(v)+1; \
++ } \
++ a[i]=0; \
++ for (k=0;envp[k];k++) { \
++ n[k]=v; \
++ strcpy(v,envp[k]); \
++ v+=strlen(v)+1; \
++ } \
++ n[k]="GCL_UNRANDOMIZE=t"; \
++ n[k+1]=0; \
++ GPROF_CLEANUP; \
++ errno=0; \
++ execve(*a,a,n); \
++ printf("execve failure %d\n",errno); \
++ exit(-1); \
++ } else { \
++ printf("personality change failure %d\n",errno); \
++ exit(-1); \
++ } \
++ } \
++ } \
++} while (0)
++#else
++# define UNRANDOMIZE_SBRK
+ #endif
+- errno=0;
+- execve(*a,a,n);
+- printf("execve failure %d\n",errno);
+- exit(-1);
+- } else {
+- printf("personality change failure %d\n",errno);
+- exit(-1);
+- }
+- }
+- }
+-}
diff --git a/gcl.spec b/gcl.spec
index ca9829c..313ebe8 100644
--- a/gcl.spec
+++ b/gcl.spec
@@ -6,8 +6,8 @@
%global __global_cflags %(printf %%s '%__global_cflags' | sed -r 's/ -fstack-protector(-strong)?( --param=ssp-buffer-size=[[:digit:]]+)?//')
Name: gcl
-Version: 2.6.8
-Release: 3%{?dist}
+Version: 2.6.10
+Release: 1%{?dist}
Summary: GNU Common Lisp
Group: Development/Languages
@@ -21,7 +21,7 @@ Source1: gcl.el
Source2: %{name}-2.6.8-info.tar.xz
# This patch was last sent upstream on 29 Dec 2008. It fixes a file descriptor
# leak, as well as combining 4 system calls into only 2 on an exec().
-Patch0: %{name}-2.6.8-fd-leak.patch
+Patch0: %{name}-2.6.10-fd-leak.patch
# This patch was last sent upstream on 29 Dec 2008. It updates one source file
# from LaTeX 2.09 to LaTeX 2e, thereby eliminating LaTeX warnings about running
# in compatibility mode.
@@ -47,44 +47,39 @@ Patch6: %{name}-2.6.8-getcwd.patch
# little of interest. However, some of the later patches change configure.in.
# Without this patch, autoconf appears to run successfully, but generates a
# configure script that contains invalid shell script syntax.
-Patch7: %{name}-2.6.8-infrastructure.patch
-# This patch was last sent upstream on 29 Dec 2008. It simplifies the handling
-# of alloca() detection in the configure script.
-Patch8: %{name}-2.6.8-alloca.patch
+Patch7: %{name}-2.6.10-infrastructure.patch
# This patch was last sent upstream on 29 Dec 2008. It rationalizes the
# handling of system extensions. For example, on glibc-based systems, some
# functionality is available only when _GNU_SOURCE is defined.
-Patch9: %{name}-2.6.8-extension.patch
+Patch8: %{name}-2.6.10-extension.patch
# This patch was last sent upstream on 29 Dec 2008. It fixes a compilation
# error on newer GCC systems due to an include inside a function. This affects
# the "unrandomize" sbrk() functionality, hence the name of the patch.
-Patch10: %{name}-2.6.8-unrandomize.patch
+Patch9: %{name}-2.6.10-unrandomize.patch
# This is a Fedora-specific patch. Do not delete C files produced from D files
# so they can be pulled into the debuginfo package.
-Patch11: %{name}-2.6.8-debuginfo.patch
+Patch10: %{name}-2.6.10-debuginfo.patch
# The need for this patch was last communicated to upstream on 21 May 2009.
# Without this patch, compilation fails due to conflicting type definitions
# between glibc and Linux kernel headers. This patch prevents the kernel
# headers from being used.
-Patch12: %{name}-2.6.8-asm-signal-h.patch
+Patch11: %{name}-2.6.10-asm-signal-h.patch
# This patch was last sent upstream on 13 Oct 2009. It fixes two bugs in the
# reading of PLT information.
-Patch13: %{name}-2.6.8-plt.patch
+Patch12: %{name}-2.6.8-plt.patch
# This patch was last sent upstream on 13 Oct 2009. It fixes several malformed
# function prototypes involving an ellipsis.
-Patch14: %{name}-2.6.8-ellipsis.patch
+Patch13: %{name}-2.6.8-ellipsis.patch
# This patch was last sent upstream on 30 Dec 2010. It fixes some malformed
# man page constructions.
-Patch15: %{name}-2.6.8-man.patch
+Patch14: %{name}-2.6.10-man.patch
# This patch was last sent upstream on 30 Oct 2012. It provides more
# information when an unknown reloc type is encountered.
-Patch16: %{name}-2.6.8-reloc-type.patch
+Patch15: %{name}-2.6.8-reloc-type.patch
# This patch is still experimental. Enable large file support.
-Patch17: %{name}-2.6.8-largefile.patch
+Patch16: %{name}-2.6.10-largefile.patch
# Applied upstream. This patch fixes a broken sprintf call in the TCL code.
-Patch18: %{name}-2.6.8-tcl.patch
-# Patch provided by upstream. Fix printing 1d-6.
-Patch19: %{name}-2.6.8-print-double.patch
+Patch17: %{name}-2.6.8-tcl.patch
BuildRequires: libXaw-devel
BuildRequires: readline-devel
@@ -188,8 +183,6 @@ gcl_exec_t.
%patch15
%patch16
%patch17
-%patch18
-%patch19
# Ensure the frame pointer doesn't get added back
sed -i 's/"-fomit-frame-pointer"/""/' configure
@@ -269,6 +262,11 @@ popd
mkdir -p $RPM_BUILD_ROOT%{_datadir}/selinux/packages/gcl
cp -p selinux/gcl.pp $RPM_BUILD_ROOT%{_datadir}/selinux/packages/gcl
+# Help the debuginfo generator
+ln -s ../h/cmpinclude.h cmpnew/cmpinclude.h
+ln -s ../h/cmpinclude.h lsp/cmpinclude.h
+ln -s ../h/cmpinclude.h xgcl-2/cmpinclude.h
+
# The image has garbage strings containing RPM_BUILD_ROOT
export QA_SKIP_BUILD_ROOT=1
@@ -342,6 +340,11 @@ fi
%changelog
+* Fri Nov 15 2013 Jerry James <loganjerry at gmail.com> - 2.6.10-1
+- New upstream release
+- Drop upstreamed patches
+- Help the debuginfo generator find more sources
+
* Wed Nov 13 2013 Jerry James <loganjerry at gmail.com> - 2.6.8-3
- Rebuild to fix SELinux policy breakage
diff --git a/sources b/sources
index a0742ca..a4569d2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-780a782648b3c9dd479f707768c7c2ea gcl-2.6.8.tar.gz
+7cb9c388e9e77696f4e27e7a1d118524 gcl-2.6.10.tar.gz
b965d4ea561a9c3e019c65be69fcfb1e gcl-2.6.8-info.tar.xz
More information about the scm-commits
mailing list