Description: <short summary of the patch>
 TODO: Put a short summary on the line above and replace this paragraph
 with a longer explanation of this change. Complete the meta-information
 with other relevant fields (see below for details). To make it easier, the
 information below has been extracted from the changelog. Adjust it or drop
 it.
 .
 gcl (2.6.7+dfsga-24) unstable; urgency=high
 .
   * sgc and reloc fixes
Author: Camm Maguire <camm@debian.org>

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>

--- gcl-2.6.7+dfsga.orig/configure
+++ gcl-2.6.7+dfsga/configure
@@ -7511,300 +7511,6 @@ rm -f core *.core core.conftest.* gmon.o
 fi
 
 
-#
-# The second alternative is for solaris.  This needs to be
-# a more comprehensive later, i.e. checking that the fpclass
-# test makes sense.  CM
-#
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for isnormal" >&5
-$as_echo_n "checking for isnormal... " >&6; }
-if test "$cross_compiling" = yes; then :
-  { { $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
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-	    #include <math.h>
-
-int
-main ()
-{
-
-	    float f;
-	    return isnormal(f) || !isnormal(f) ? 0 : 1;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-$as_echo "#define HAVE_ISNORMAL 1" >>confdefs.h
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fpclass in ieeefp.h" >&5
-$as_echo_n "checking for fpclass in ieeefp.h... " >&6; }
-		if test "$cross_compiling" = yes; then :
-  { { $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
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-			#include <ieeefp.h>
-
-int
-main ()
-{
-
-			float f;
-			return fpclass(f)>=FP_NZERO || fpclass(f)<FP_NZERO ? 0 : 1;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-$as_echo "#define HAVE_IEEEFP 1" >>confdefs.h
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  as_fn_error $? "no" "$LINENO" 5
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for isfinite" >&5
-$as_echo_n "checking for isfinite... " >&6; }
-if test "$cross_compiling" = yes; then :
-  { { $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
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-	#include <math.h>
-
-int
-main ()
-{
-
-	float f;
-	return isfinite(f) || !isfinite(f) ? 0 : 1;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-$as_echo "#define HAVE_ISFINITE 1" >>confdefs.h
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for finite()" >&5
-$as_echo_n "checking for finite()... " >&6; }
-	    if test "$cross_compiling" = yes; then :
-  { { $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
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-		#include <math.h>
-		#include <ieeefp.h>
-
-int
-main ()
-{
-
-		float f;
-		return finite(f) || !finite(f) ? 0 : 1;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-$as_echo "#define HAVE_FINITE 1" >>confdefs.h
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  as_fn_error $? "no" "$LINENO" 5
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for INFINITY" >&5
-$as_echo_n "checking for INFINITY... " >&6; }
-if test "$cross_compiling" = yes; then :
-  { { $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
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-	#include <math.h>
-
-int
-main ()
-{
-
-	double d=INFINITY;
-	return 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for builtin_inf()" >&5
-$as_echo_n "checking for builtin_inf()... " >&6; }
-	    if test "$cross_compiling" = yes; then :
-  { { $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
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-		#include <math.h>
-		#include <ieeefp.h>
-
-int
-main ()
-{
-
-		double d=__builtin_inf();
-		return 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-cat >>confdefs.h <<_ACEOF
-#define INFINITY __builtin_inf()
-_ACEOF
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  as_fn_error $? "no" "$LINENO" 5
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NAN" >&5
-$as_echo_n "checking for NAN... " >&6; }
-if test "$cross_compiling" = yes; then :
-  { { $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
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-	#include <math.h>
-
-int
-main ()
-{
-
-	double d=NAN;
-	return 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for builtin_nan()" >&5
-$as_echo_n "checking for builtin_nan()... " >&6; }
-	    if test "$cross_compiling" = yes; then :
-  { { $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
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-		#include <math.h>
-		#include <ieeefp.h>
-
-int
-main ()
-{
-
-		double d=__builtin_nan("0x0");
-		return 0;
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
-
-cat >>confdefs.h <<_ACEOF
-#define NAN __builtin_nan("0x0")
-_ACEOF
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
-  as_fn_error $? "no" "$LINENO" 5
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
 
 
 #--------------------------------------------------------------------
--- gcl-2.6.7+dfsga.orig/makefile
+++ gcl-2.6.7+dfsga/makefile
@@ -140,7 +140,7 @@ command:
 merge:
 	$(CC) -o merge merge.c
 
-LISP_LIB=cmpnew/gcl_collectfn.o cmpnew/gcl_collectfn.lsp xgcl-2/sysdef.lisp xgcl-2/gcl_dwtest.lsp xgcl-2/gcl_dwtestcases.lsp lsp/gcl_gprof.lsp lsp/gcl_info.o lsp/gcl_profile.lsp lsp/gcl_export.lsp lsp/gcl_autoload.lsp cmpnew/gcl_cmpmain.lsp cmpnew/gcl_cmpopt.lsp cmpnew/gcl_lfun_list.lsp lsp/gcl_auto_new.lsp h/cmpinclude.h unixport/init_$(SYSTEM).lsp unixport/lib$(SYSTEM).a unixport/libgclp.a gcl-tk/tk-package.lsp $(TK_LISP_LIB) $(RL_LIB) $(FIRST_FILE) $(LAST_FILE) $(addsuffix /sys-proclaim.lisp,lsp cmpnew pcl clcs) 
+LISP_LIB=cmpnew/gcl_collectfn.o cmpnew/gcl_collectfn.lsp xgcl-2/sysdef.lisp xgcl-2/gcl_dwtest.lsp xgcl-2/gcl_dwtestcases.lsp lsp/gcl_gprof.lsp lsp/gcl_info.o lsp/gcl_profile.lsp lsp/gcl_export.lsp lsp/gcl_autoload.lsp cmpnew/gcl_cmpmain.lsp cmpnew/gcl_cmpopt.lsp cmpnew/gcl_lfun_list.lsp lsp/gcl_auto_new.lsp h/cmpinclude.h unixport/init_$(SYSTEM).lsp unixport/lib$(SYSTEM).a unixport/libgclp.a gcl-tk/tk-package.lsp $(TK_LISP_LIB) $(RL_LIB) $(FIRST_FILE) $(LAST_FILE) $(addsuffix /sys-proclaim.lisp,lsp cmpnew pcl clcs) gcl.script
 
 install-command:
 	rm -f $(DESTDIR)$(prefix)/bin/gcl
@@ -235,7 +235,7 @@ gclclean:
 	rm -rf windows/Output
 	rm -f ansi-tests/test_results ansi-tests/gazonk*lsp
 	rm -rf autom4te.cache
-	rm -f config.log config.cache config.status tmpx $(PORTDIR)/gmon.out machine system
+	rm -f config.log config.cache config.status tmpx $(PORTDIR)/gmon.out gcl.script machine system
 
 clean: gclclean
 	-[ -z "$(GMPDIR)" ] || (cd $(GMPDIR) && $(MAKE) distclean)
--- gcl-2.6.7+dfsga.orig/configure.in
+++ gcl-2.6.7+dfsga/configure.in
@@ -2005,78 +2005,41 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([[
 		]])],[AC_DEFINE(HAVE_FINITE,1,[Have finite function]) AC_MSG_RESULT(yes)],
    		     [AC_MSG_ERROR(no)])])
 
-#
-# The second alternative is for solaris.  This needs to be
-# a more comprehensive later, i.e. checking that the fpclass
-# test makes sense.  CM
-#
-AC_MSG_CHECKING([for isnormal])
-AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-	    #include <math.h>
-	    ]],[[
-	    float f;
-	    return isnormal(f) || !isnormal(f) ? 0 : 1;
-	    ]])],
-		[AC_DEFINE(HAVE_ISNORMAL,1,[Have isnormal function]) AC_MSG_RESULT(yes)],
-		[AC_MSG_CHECKING([for fpclass in ieeefp.h])
-		AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-			#include <ieeefp.h>
-			]],[[
-			float f;
-			return fpclass(f)>=FP_NZERO || fpclass(f)<FP_NZERO ? 0 : 1;
-			]])],[AC_DEFINE(HAVE_IEEEFP,1,[Have ieeefp fpclass function]) AC_MSG_RESULT(yes)],
-			    [AC_MSG_ERROR(no)])])
+dnl AC_MSG_CHECKING([for INFINITY])
+dnl AC_RUN_IFELSE([AC_LANG_PROGRAM([[
+dnl         #define _GNU_SOURCE
+dnl 	#include <math.h>
+dnl 	]],[[
+dnl 	double d=INFINITY;
+dnl 	return 0;
+dnl 	]])],[AC_MSG_RESULT(yes)],
+dnl 	    [AC_MSG_CHECKING([for builtin_inf()])
+dnl 	    AC_RUN_IFELSE([AC_LANG_PROGRAM([[
+dnl 		#include <math.h>
+dnl 		#include <ieeefp.h>
+dnl 		]],[[
+dnl 		double d=__builtin_inf();
+dnl 		return 0;
+dnl 		]])],[AC_DEFINE_UNQUOTED(INFINITY,__builtin_inf(),[Have builtin_inf]) AC_MSG_RESULT(yes)],
+dnl 		    [AC_MSG_ERROR(no)])])
 
-AC_MSG_CHECKING([for isfinite])
-AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-	#include <math.h>
-	]],[[
-	float f;
-	return isfinite(f) || !isfinite(f) ? 0 : 1;
-	]])],[AC_DEFINE(HAVE_ISFINITE,1,[Have isfinite function]) AC_MSG_RESULT(yes)],
-	    [AC_MSG_CHECKING([for finite()])
-	    AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-		#include <math.h>
-		#include <ieeefp.h>
-		]],[[
-		float f;
-		return finite(f) || !finite(f) ? 0 : 1;
-		]])],[AC_DEFINE(HAVE_FINITE,1,[Have finite function]) AC_MSG_RESULT(yes)],
-		    [AC_MSG_ERROR(no)])])
-
-AC_MSG_CHECKING([for INFINITY])
-AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-	#include <math.h>
-	]],[[
-	double d=INFINITY;
-	return 0;
-	]])],[AC_MSG_RESULT(yes)],
-	    [AC_MSG_CHECKING([for builtin_inf()])
-	    AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-		#include <math.h>
-		#include <ieeefp.h>
-		]],[[
-		double d=__builtin_inf();
-		return 0;
-		]])],[AC_DEFINE_UNQUOTED(INFINITY,__builtin_inf(),[Have builtin_inf]) AC_MSG_RESULT(yes)],
-		    [AC_MSG_ERROR(no)])])
-
-AC_MSG_CHECKING([for NAN])
-AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-	#include <math.h>
-	]],[[
-	double d=NAN;
-	return 0;
-	]])],[AC_MSG_RESULT(yes)],
-	    [AC_MSG_CHECKING([for builtin_nan()])
-	    AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-		#include <math.h>
-		#include <ieeefp.h>
-		]],[[
-		double d=__builtin_nan("0x0");
-		return 0;
-		]])],[AC_DEFINE_UNQUOTED(NAN,__builtin_nan("0x0"),[Have builtin_nan]) AC_MSG_RESULT(yes)],
-		    [AC_MSG_ERROR(no)])])
+dnl AC_MSG_CHECKING([for NAN])
+dnl AC_RUN_IFELSE([AC_LANG_PROGRAM([[
+dnl         #define _GNU_SOURCE
+dnl 	#include <math.h>
+dnl 	]],[[
+dnl 	double d=NAN;
+dnl 	return 0;
+dnl 	]])],[AC_MSG_RESULT(yes)],
+dnl 	    [AC_MSG_CHECKING([for builtin_nan()])
+dnl 	    AC_RUN_IFELSE([AC_LANG_PROGRAM([[
+dnl 		#include <math.h>
+dnl 		#include <ieeefp.h>
+dnl 		]],[[
+dnl 		double d=__builtin_nan("0x0");
+dnl 		return 0;
+dnl 		]])],[AC_DEFINE_UNQUOTED(NAN,__builtin_nan("0x0"),[Have builtin_nan]) AC_MSG_RESULT(yes)],
+dnl 		    [AC_MSG_ERROR(no)])])
 
 #--------------------------------------------------------------------
 #	Check for the existence of the -lsocket and -lnsl libraries.
--- gcl-2.6.7+dfsga.orig/h/protoize.h
+++ gcl-2.6.7+dfsga/h/protoize.h
@@ -1,7 +1,7 @@
 /* alloc.c:89:OF */ extern void *alloc_page (long n); /* (n) int n; */
-/* alloc.c:149:OF */ extern void add_page_to_freelist (char *p, struct typemanager *tm); /* (p, tm) char *p; struct typemanager *tm; */
+/* alloc.c:149:OF */ inline void add_page_to_freelist (char *p, struct typemanager *tm); /* (p, tm) char *p; struct typemanager *tm; */
 /* alloc.c:196:OF */ extern object type_name (int t); /* (t) int t; */
-/* alloc.c:213:OF */ extern object alloc_object (enum type t); /* (t) enum type t; */
+/* alloc.c:213:OF */ inline object alloc_object (enum type t); /* (t) enum type t; */
 /* alloc.c:213:OF */ inline void add_pages(struct typemanager *,fixnum);
 /* alloc.c:296:OF */ extern inline object make_cons (object a, object d); /* (a, d) object a; object d; */
 /* alloc.c:364:OF */ extern object on_stack_cons (object x, object y); /* (x, y) object x; object y; */
--- gcl-2.6.7+dfsga.orig/h/include.h
+++ gcl-2.6.7+dfsga/h/include.h
@@ -34,7 +34,6 @@ Foundation, 675 Mass Ave, Cambridge, MA
 
 #include "options.h"
 #include "gclincl.h"
-#include "config.h"
 
 #ifdef __GNUC__
 #ifndef alloca
@@ -44,6 +43,7 @@ Foundation, 675 Mass Ave, Cambridge, MA
 
 #ifdef IN_NUM_CO
 #ifdef HAVE_ISNORMAL
+#define _GNU_SOURCE
 #define ISNORMAL(a) isnormal(a)
 #else
 #ifdef HAVE_IEEEFP
@@ -59,6 +59,7 @@ Foundation, 675 Mass Ave, Cambridge, MA
 
 #ifdef NEED_ISFINITE
 #ifdef HAVE_ISFINITE
+#define _GNU_SOURCE
 #define ISFINITE(a) isfinite(a)
 #else
 #ifdef HAVE_FINITE
@@ -70,6 +71,8 @@ Foundation, 675 Mass Ave, Cambridge, MA
 #endif
 #endif
 
+#include "config.h"
+
 #ifdef IN_NUM_CO
 #ifdef HAVE_VALUES_H
 #include <values.h>
--- gcl-2.6.7+dfsga.orig/h/mach64_i386_reloc.h
+++ gcl-2.6.7+dfsga/h/mach64_i386_reloc.h
@@ -20,7 +20,7 @@
   case X86_64_RELOC_BRANCH:		// a CALL/JMP instruction with 32-bit displacement
 
      if (ri->r_extern || !ri->r_pcrel) 	   
-      add_val(q,MASK(32),ri->r_pcrel ? a-((ul)q+4) : a);
+       store_val(q,MASK(32),(ri->r_pcrel ? a-((ul)q+4) : a)+(signed)(*q&MASK(32)));
 
     break;
 
--- gcl-2.6.7+dfsga.orig/o/alloc.c
+++ gcl-2.6.7+dfsga/o/alloc.c
@@ -672,6 +672,7 @@ alloc_after_reclaiming_pages(struct type
 
 inline void *alloc_mem(struct typemanager *,fixnum);
 
+#ifdef SGC
 inline void *
 alloc_after_turning_off_sgc(struct typemanager *tm,fixnum n) {
 
@@ -680,6 +681,7 @@ alloc_after_turning_off_sgc(struct typem
   return alloc_mem(tm,n);
 
 }
+#endif
 
 inline void *
 alloc_mem(struct typemanager *tm,fixnum n) {
@@ -694,8 +696,10 @@ alloc_mem(struct typemanager *tm,fixnum
     return p;
   if ((p=alloc_after_adding_pages(tm,n)))
     return p;
+#ifdef SGC
   if ((p=alloc_after_turning_off_sgc(tm,n)))
     return p;
+#endif
   if ((p=alloc_after_reclaiming_pages(tm,n)))
     return p;
   return exhausted_report(tm->tm_type,tm);
--- gcl-2.6.7+dfsga.orig/o/unexmacosx.c
+++ gcl-2.6.7+dfsga/o/unexmacosx.c
@@ -1049,7 +1049,7 @@ unexec (char *outfile, char *infile, voi
 
 /* Replacement for broken sbrk(2).  */
 
-void *my_sbrk (int incr)
+void *my_sbrk (long incr)
 {
   char               *temp, *ptr;
   kern_return_t       rtn;
--- gcl-2.6.7+dfsga.orig/unixport/sys.c
+++ gcl-2.6.7+dfsga/unixport/sys.c
@@ -4,6 +4,7 @@
 #include <sys/stat.h>
 #include "../h/include.h"
 
+#ifdef FLAVOR
 static void
 ar_init_fn(void (fn)(void),const char *s) {
 
@@ -43,6 +44,7 @@ ar_check_init_fn(void (fn)(void),char *s
      ar_init_fn(fn,o);
 
 }
+#endif
 
 #define proc(init,fn,args...) {extern void init(void);fn(init,##args);}
 
--- gcl-2.6.7+dfsga.orig/unixport/sys_pre_gcl.c
+++ gcl-2.6.7+dfsga/unixport/sys_pre_gcl.c
@@ -1,5 +1,3 @@
-#define FLAVOR ""
-
 #include "sys.c"
 
 void
