2006-11-15 Humberto Ortiz Zuazaga
Gabriel Dos Reis
* configure.ac.pamphlet (<>): Split GCLOPTS in
orthogonal variables. When building GCL, disable support for
X Window system and TK. Lose --enable-custreloc for MAC OS.
* configure.in: Regenerate.
* configure" Likewse.
*** configure (revision 16871)
--- configure (local)
*************** ac_cv_lib_bfd=ac_cv_lib_bfd_main
*** 5484,5496 ****
axiom_gcl_bfd_option=
if test x"$axiom_host_has_bfd_h" = xyes \
&& test x"$axiom_host_has_libbfd" = xyes; then
! axiom_gcl_bfd_option="--enable-statsysbfd"
else
axiom_gcl_bfd_option="--disable-statsysbfd --enable-locbfd"
fi
!
! GCLOPTS="--enable-vssize=65536*2 --disable-dynsysbfd \
! $axiom_gcl_bfd_option --enable-maxpage=256*1024"
PFL=
CCF="-O2 -fno-strength-reduce -Wall -D_GNU_SOURCE -D\${PLF}"
--- 5484,5495 ----
axiom_gcl_bfd_option=
if test x"$axiom_host_has_bfd_h" = xyes \
&& test x"$axiom_host_has_libbfd" = xyes; then
! axiom_gcl_bfd_option="--enable-statsysbfd --disable-dynsysbfd"
else
axiom_gcl_bfd_option="--disable-statsysbfd --enable-locbfd"
fi
! axiom_gcl_mm_option="--enable-vssize=65536*2 --enable-maxpage=256*1024"
! axiom_gcl_x_option="--disable-tkconfig --disable-x --disable-xgcl"
PFL=
CCF="-O2 -fno-strength-reduce -Wall -D_GNU_SOURCE -D\${PLF}"
*************** case $target in
*** 5513,5528 ****
*solaris*)
PLF=SUNplatform
;;
! *darwin*)
PLF=MACOSXplatform
CCF="-O2 -fno-strength-reduce -Wall -D_GNU_SOURCE -D${PLF} \
-I/usr/include -I/usr/include/sys"
! GCLOPTS="--enable-vssize=65536*2 --enable-maxpage=256*1024 --disable-locbfd \
! --disable-statsysbfd --enable-custreloc --disable-tkconfig \
! --enable-machine=pwerpc-macosx"
;;
esac
--- 5512,5528 ----
*solaris*)
PLF=SUNplatform
;;
! powerpc*darwin*)
PLF=MACOSXplatform
CCF="-O2 -fno-strength-reduce -Wall -D_GNU_SOURCE -D${PLF} \
-I/usr/include -I/usr/include/sys"
! axiom_gcl_bfd_option="--enable-locbfd --disable-statsysbfd \
! --enable-machine=powerpc-macosx"
;;
esac
+ GCLOPTS="$axiom_gcl_bfd_option $axiom_gcl_mm_option $axiom_gcl_x_option"
+
*** configure.ac (revision 16871)
--- configure.ac (local)
*************** AC_HAVE_LIBRARY([bfd], [axiom_host_has_l
*** 191,203 ****
axiom_gcl_bfd_option=
if test x"$axiom_host_has_bfd_h" = xyes \
&& test x"$axiom_host_has_libbfd" = xyes; then
! axiom_gcl_bfd_option="--enable-statsysbfd"
else
axiom_gcl_bfd_option="--disable-statsysbfd --enable-locbfd"
fi
!
! GCLOPTS="--enable-vssize=65536*2 --disable-dynsysbfd \
! $axiom_gcl_bfd_option --enable-maxpage=256*1024"
PFL=
CCF="-O2 -fno-strength-reduce -Wall -D_GNU_SOURCE -D\${PLF}"
--- 191,202 ----
axiom_gcl_bfd_option=
if test x"$axiom_host_has_bfd_h" = xyes \
&& test x"$axiom_host_has_libbfd" = xyes; then
! axiom_gcl_bfd_option="--enable-statsysbfd --disable-dynsysbfd"
else
axiom_gcl_bfd_option="--disable-statsysbfd --enable-locbfd"
fi
! axiom_gcl_mm_option="--enable-vssize=65536*2 --enable-maxpage=256*1024"
! axiom_gcl_x_option="--disable-tkconfig --disable-x --disable-xgcl"
PFL=
CCF="-O2 -fno-strength-reduce -Wall -D_GNU_SOURCE -D\${PLF}"
*************** case $target in
*** 220,235 ****
*solaris*)
PLF=SUNplatform
;;
! *darwin*)
PLF=MACOSXplatform
CCF="-O2 -fno-strength-reduce -Wall -D_GNU_SOURCE -D${PLF} \
-I/usr/include -I/usr/include/sys"
! GCLOPTS="--enable-vssize=65536*2 --enable-maxpage=256*1024 --disable-locbfd \
! --disable-statsysbfd --enable-custreloc --disable-tkconfig \
! --enable-machine=pwerpc-macosx"
;;
esac
AC_SUBST(PLF)
AC_SUBST(CCF)
AC_SUBST(LDF)
--- 219,235 ----
*solaris*)
PLF=SUNplatform
;;
! powerpc*darwin*)
PLF=MACOSXplatform
CCF="-O2 -fno-strength-reduce -Wall -D_GNU_SOURCE -D${PLF} \
-I/usr/include -I/usr/include/sys"
! axiom_gcl_bfd_option="--enable-locbfd --disable-statsysbfd \
! --enable-machine=powerpc-macosx"
;;
esac
+ GCLOPTS="$axiom_gcl_bfd_option $axiom_gcl_mm_option $axiom_gcl_x_option"
+
AC_SUBST(PLF)
AC_SUBST(CCF)
AC_SUBST(LDF)
*** configure.ac.pamphlet (revision 16871)
--- configure.ac.pamphlet (local)
*************** AC_HAVE_LIBRARY([bfd], [axiom_host_has_l
*** 466,478 ****
axiom_gcl_bfd_option=
if test x"$axiom_host_has_bfd_h" = xyes \
&& test x"$axiom_host_has_libbfd" = xyes; then
! axiom_gcl_bfd_option="--enable-statsysbfd"
else
axiom_gcl_bfd_option="--disable-statsysbfd --enable-locbfd"
fi
! GCLOPTS="--enable-vssize=65536*2 --disable-dynsysbfd \
! $axiom_gcl_bfd_option --enable-maxpage=256*1024"
@
Other aspects depend on the platform being considered.
--- 466,488 ----
axiom_gcl_bfd_option=
if test x"$axiom_host_has_bfd_h" = xyes \
&& test x"$axiom_host_has_libbfd" = xyes; then
! axiom_gcl_bfd_option="--enable-statsysbfd --disable-dynsysbfd"
else
axiom_gcl_bfd_option="--disable-statsysbfd --enable-locbfd"
fi
+ @
+
+ GCL has an elaborate memory management system and Axiom seems to
+ put ``unusual'' pressure on it. Here we specify some values that have
+ been empirically known to work.
+ <>=
+ axiom_gcl_mm_option="--enable-vssize=65536*2 --enable-maxpage=256*1024"
+ @
! Furthermore, we don't need (at the moment) GCL to build support for
! X Window system or TK:
! <>=
! axiom_gcl_x_option="--disable-tkconfig --disable-x --disable-xgcl"
@
Other aspects depend on the platform being considered.
*************** case $target in
*** 504,519 ****
*solaris*)
PLF=SUNplatform
;;
! *darwin*)
PLF=MACOSXplatform
CCF="-O2 -fno-strength-reduce -Wall -D_GNU_SOURCE -D${PLF} \
-I/usr/include -I/usr/include/sys"
! GCLOPTS="--enable-vssize=65536*2 --enable-maxpage=256*1024 --disable-locbfd \
! --disable-statsysbfd --enable-custreloc --disable-tkconfig \
! --enable-machine=pwerpc-macosx"
;;
esac
AC_SUBST(PLF)
AC_SUBST(CCF)
AC_SUBST(LDF)
--- 514,530 ----
*solaris*)
PLF=SUNplatform
;;
! powerpc*darwin*)
PLF=MACOSXplatform
CCF="-O2 -fno-strength-reduce -Wall -D_GNU_SOURCE -D${PLF} \
-I/usr/include -I/usr/include/sys"
! axiom_gcl_bfd_option="--enable-locbfd --disable-statsysbfd \
! --enable-machine=powerpc-macosx"
;;
esac
+ GCLOPTS="$axiom_gcl_bfd_option $axiom_gcl_mm_option $axiom_gcl_x_option"
+
AC_SUBST(PLF)
AC_SUBST(CCF)
AC_SUBST(LDF)