[21.5] NEWGC on Intel Macs
PATCH 21.5
This patch enables the incremental garbage collector on Apple's
Intel-based Macs that now can work with a POSIX-compliant write
barrier. Configure uses $machine to determine if it runs on an Intel
Mac and then enables the POSIX write barrier.
I'll commit tomorrow, if nobody objects.
ChangeLog addition:
2006-07-18 Marcus Crestani <crestani(a)xemacs.org>
* configure.ac: Intel-based Macs can use POSIX-style write
barrier. Use $machine to determine this.
macos-intel-xemacs-21.5 source patch:
Diff command: cvs -q diff -u
Files affected: configure.ac configure
Index: configure
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v
retrieving revision 1.283
diff -u -r1.283 configure
--- configure 7 Jul 2006 20:07:45 -0000 1.283
+++ configure 18 Jul 2006 15:44:57 -0000
＠＠ -4761,10 +4761,13 ＠＠
if test "$enable_newgc" = "yes"; then
if test "$enable_vdb" = "auto"; then
case "$opsys" in
- darwin ) cat >>confdefs.h <<\_ACEOF
+ darwin ) case "$machine" in
+ i686 ) check_vdb_posix=yes ;;
+ * ) cat >>confdefs.h <<\_ACEOF
#define VDB_MACH 1
_ACEOF
have_vdb_mach=yes ;;
+ esac ;;
cygwin* ) cat >>confdefs.h <<\_ACEOF
#define VDB_WIN32 1
_ACEOF
＠＠ -16478,7 +16481,7 ＠＠
/usr/openwin/share/include'
if test "$ac_x_includes" = no; then
- # Guess where to find include files, by looking for Xlib.h.
+ # Guess where to find include files, by looking for Intrinsic.h.
# First, try using that file with no special directory specified.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
＠＠ -16486,7 +16489,7 ＠＠
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Xlib.h>
+#include <X11/Intrinsic.h>
_ACEOF
if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"")
>&5
(eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
＠＠ -16513,7 +16516,7 ＠＠
sed 's/^/| /' conftest.$ac_ext >&5
for ac_dir in $ac_x_header_dirs; do
- if test -r "$ac_dir/X11/Xlib.h"; then
+ if test -r "$ac_dir/X11/Intrinsic.h"; then
ac_x_includes=$ac_dir
break
fi
＠＠ -16534,11 +16537,11 ＠＠
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-#include <X11/Xlib.h>
+#include <X11/Intrinsic.h>
int
main ()
{
-XrmInitialize ()
+XtMalloc (0)
;
return 0;
}
Index: configure.ac
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v
retrieving revision 1.45
diff -u -r1.45 configure.ac
--- configure.ac 7 Jul 2006 20:07:45 -0000 1.45
+++ configure.ac 18 Jul 2006 15:45:01 -0000
＠＠ -1767,7 +1767,10 ＠＠
if test "$enable_newgc" = "yes"; then
if test "$enable_vdb" = "auto"; then
case "$opsys" in
- darwin ) AC_DEFINE(VDB_MACH) have_vdb_mach=yes ;;
+ darwin ) case "$machine" in
+ i686 ) check_vdb_posix=yes ;;
+ * ) AC_DEFINE(VDB_MACH) have_vdb_mach=yes ;;
+ esac ;;
cygwin* ) AC_DEFINE(VDB_WIN32) have_vdb_win32=yes ;;
linux* ) check_vdb_posix=yes ;;
freebsd ) check_vdb_posix=yes ;;
--
Marcus