ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/cebix/SheepShaver/src/Unix/configure.ac

Comparing SheepShaver/src/Unix/configure.ac (file contents):
Revision 1.51 by gbeauche, 2006-05-02T05:50:38Z vs.
Revision 1.58 by gbeauche, 2007-06-13T12:11:55Z

#	Line 106 | Line 106 | if [[ "x$WANT_MON" = "xyes" ]]; then
106		if grep mon_init $mon_srcdir/mon.h >/dev/null 2>/dev/null; then
107		AC_MSG_RESULT(yes)
108		AC_DEFINE(ENABLE_MON, 1, [Define if using "mon".])
109	<	MONSRCS="$mon_srcdir/mon.cpp $mon_srcdir/mon_6502.cpp $mon_srcdir/mon_z80.cpp $mon_srcdir/mon_cmd.cpp $mon_srcdir/mon_lowmem.cpp $mon_srcdir/mon_disass.cpp $mon_srcdir/mon_ppc.cpp $mon_srcdir/disass/floatformat.c $mon_srcdir/disass/i386-dis.c $mon_srcdir/disass/m68k-dis.c $mon_srcdir/disass/m68k-opc.c"
109	>	MONSRCS="$mon_srcdir/mon.cpp $mon_srcdir/mon_6502.cpp $mon_srcdir/mon_z80.cpp $mon_srcdir/mon_cmd.cpp $mon_srcdir/mon_lowmem.cpp $mon_srcdir/mon_disass.cpp $mon_srcdir/mon_ppc.cpp $mon_srcdir/disass/floatformat.c $mon_srcdir/disass/i386-dis.c $mon_srcdir/disass/m68k-dis.c $mon_srcdir/disass/m68k-opc.c $mon_srcdir/disass/mips-dis.c $mon_srcdir/disass/mips-opc.c $mon_srcdir/disass/mips16-opc.c"
110		CXXFLAGS="$CXXFLAGS -I$mon_srcdir -I$mon_srcdir/disass"
111		AC_CHECK_LIB(ncurses, tgetent, ,
112		AC_CHECK_LIB(termcap, tgetent, ,
#	Line 245 | Line 245 | dnl We use GTK+ if possible.
245		UISRCS=../dummy/prefs_editor_dummy.cpp
246		case "x$WANT_GTK" in
247		xgtk2*)
248	+	WANT_GTK=no
249		AM_PATH_GTK_2_0(1.3.15, [
250		GUI_CFLAGS="$GTK_CFLAGS"
251		GUI_LIBS="$GTK_LIBS"
#	Line 258 | Line 259 | xgtk2*)
259		*)
260		AC_MSG_WARN([Could not find GTK+, disabling user interface.])
261		WANT_GTK=no
262	<	;;
262	>	;;
263		esac
264		])
265		;;
266		esac
267		if [[ "x$WANT_GTK" = "xgtk" ]]; then
268	+	WANT_GTK=no
269		AM_PATH_GTK(1.2.0, [
270		GUI_CFLAGS="$GTK_CFLAGS"
271		GUI_LIBS="$GTK_LIBS"
272	+	WANT_GTK=gtk
273		], [
274		AC_MSG_WARN([Could not find GTK+, disabling user interface.])
272	–	WANT_GTK=no
275		])
276		fi
277		if [[ "x$WANT_GTK" != "xno" -a "x$WANT_STANDALONE_GUI" = "xno" ]]; then
#	Line 290 | Line 292 | AC_SUBST(STANDALONE_GUI, [$WANT_STANDALO
292
293		dnl We use ESD if possible.
294		if [[ "x$WANT_ESD" = "xyes" ]]; then
295	+	WANT_ESD=no
296		AM_PATH_ESD(0.2.8, [
297		AC_DEFINE(ENABLE_ESD, 1, [Define is using ESD.])
298		CFLAGS="$CFLAGS $ESD_CFLAGS"
299		CXXFLAGS="$CXXFLAGS $ESD_CFLAGS"
300		LIBS="$LIBS $ESD_LIBS"
301	+	WANT_ESD=yes
302		], [
303		AC_MSG_WARN([Could not find ESD, disabling ESD support.])
300	–	WANT_ESD=no
304		])
305		fi
306
#	Line 1347 | Line 1350 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1350		../kpx_cpu/src/cpu/ppc/ppc-cpu.cpp \
1351		../kpx_cpu/src/cpu/ppc/ppc-decode.cpp \
1352		../kpx_cpu/src/cpu/ppc/ppc-execute.cpp \
1353	<	../kpx_cpu/src/cpu/ppc/ppc-translate.cpp"
1353	>	../kpx_cpu/src/cpu/ppc/ppc-translate.cpp \
1354	>	../kpx_cpu/src/utils/utils-cpuinfo.cpp"
1355		CPPFLAGS="$CPPFLAGS -I../kpx_cpu/include -I../kpx_cpu/src"
1356
1357		dnl Enable JIT compiler, if possible
#	Line 1414 | Line 1418 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1418		x*) have_dyngen_gcc3=yes ;;
1419		esac
1420		if [[ "x$have_dyngen_gcc3" = "xyes" ]]; then
1421	<	DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -falign-functions=0"
1421	>	DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -fno-align-functions"
1422		else
1423		DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -malign-functions=0"
1424		fi
#	Line 1440 | Line 1444 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1444		CPUSRCS="\
1445		../kpx_cpu/src/cpu/jit/jit-cache.cpp \
1446		../kpx_cpu/src/cpu/jit/basic-dyngen.cpp \
1447	<	../kpx_cpu/src/cpu/ppc/ppc-dyngen.cpp $CPUSRCS"
1447	>	../kpx_cpu/src/cpu/ppc/ppc-dyngen.cpp \
1448	>	../kpx_cpu/src/cpu/ppc/ppc-jit.cpp $CPUSRCS"
1449		fi
1450		fi
1451		CPUSRCS="$CPUSRCS ../kpx_cpu/sheepshaver_glue.cpp"
1452		else
1453		WANT_JIT=no
1454		fi
1450	–	if [[ "x$ac_cv_use_dyngen" = "xyes" ]]; then
1451	–	AC_CACHE_CHECK([whether static data regions are executable],
1452	–	ac_cv_have_static_data_exec, [
1453	–	AC_TRY_RUN([int main(void) {
1454	–	#if defined(__powerpc__) || defined(__ppc__)
1455	–	static unsigned int p[8] = {0x4e800020,};
1456	–	asm volatile("dcbst 0,%0" : : "r" (p) : "memory");
1457	–	asm volatile("sync" : : : "memory");
1458	–	asm volatile("icbi 0,%0" : : "r" (p) : "memory");
1459	–	asm volatile("sync" : : : "memory");
1460	–	asm volatile("isync" : : : "memory");
1461	–	((void (*)(void))p)();
1462	–	return 0;
1463	–	#endif
1464	–	return 1;
1465	–	}], ac_cv_have_static_data_exec=yes, ac_cv_have_static_data_exec=no,
1466	–	dnl When cross-compiling, do not assume anything.
1467	–	ac_cv_have_static_data_exec=no
1468	–	)
1469	–	])
1470	–	else
1471	–	ac_cv_use_dyngen=no
1472	–	fi
1473	–	AC_TRANSLATE_DEFINE(HAVE_STATIC_DATA_EXEC, "$ac_cv_have_static_data_exec",
1474	–	[Define if your system marks static data pages as executable.])
1475	–
1455		if [[ "x$WANT_JIT" = "xyes" ]]; then
1456		CPPFLAGS="$CPPFLAGS -DUSE_JIT"
1457		fi
#	Line 1485 | Line 1464 | if [[ "x$HAVE_IPA" = "xyes" ]]; then
1464		LDFLAGS="$LDFLAGS -O3 -OPT:Olimit=0 -IPA"
1465		fi
1466
1467	+	dnl Check for linker script support
1468	+	case $target_os:$target_cpu in
1469	+	linux*:i?86)    LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-i386.ld";;
1470	+	linux*:x86_64)  LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-x86_64.ld";;
1471	+	linux*:powerpc) LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-ppc.ld";;
1472	+	netbsd*:i?86)   LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-i386.ld";;
1473	+	freebsd*:i?86)  LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/freebsd-i386.ld";;
1474	+	darwin*:*)      LINKER_SCRIPT_FLAGS="-Wl,-seg1addr,0x78048000";;
1475	+	esac
1476	+	if [[ -n "$LINKER_SCRIPT_FLAGS" ]]; then
1477	+	AC_CACHE_CHECK([whether linker script is usable],
1478	+	ac_cv_linker_script_works, [
1479	+	AC_LANG_SAVE
1480	+	AC_LANG_CPLUSPLUS
1481	+	saved_LDFLAGS="$LDFLAGS"
1482	+	LDFLAGS="$LDFLAGS $LINKER_SCRIPT_FLAGS"
1483	+	AC_TRY_RUN(
1484	+	[int main() {if ((char *)&main < (char *)0x70000000) return 1;}],
1485	+	[ac_cv_linker_script_works=yes],
1486	+	[ac_cv_linker_script_works=no],
1487	+	dnl When cross-compiling, assume it works
1488	+	[ac_cv_linker_script_works="guessing yes"]
1489	+	)
1490	+	AC_LANG_RESTORE
1491	+	if [[ "$ac_cv_linker_script_works" = "no" ]]; then
1492	+	LDFLAGS="$saved_LDFLAGS"
1493	+	LINKER_SCRIPT_FLAGS=""
1494	+	fi
1495	+	])
1496	+	fi
1497	+	AC_TRANSLATE_DEFINE(HAVE_LINKER_SCRIPT, "$ac_cv_linker_script_works",
1498	+	[Define if there is a linker script to relocate the executable above 0x70000000.])
1499	+
1500		dnl Generate Makefile.
1501		AC_SUBST(PERL)
1502		AC_SUBST(USE_DYNGEN, [$ac_cv_use_dyngen])

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines