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.31 by gbeauche, 2005-07-01T06:16:00Z vs.
Revision 1.56 by asvitkine, 2007-01-24T14:33:52Z

#	Line 1 | Line 1
1		dnl Process this file with autoconf to produce a configure script.
2		dnl Written in 2002 by Christian Bauer
3
4	<	AC_INIT([SheepShaver], 2.2, [Christian.Bauer@uni-mainz.de], SheepShaver)
4	>	AC_INIT([SheepShaver], 2.3, [Christian.Bauer@uni-mainz.de], SheepShaver)
5		AC_CONFIG_SRCDIR(main_unix.cpp)
6		AC_PREREQ(2.52)
7		AC_CONFIG_HEADER(config.h)
#	Line 14 | Line 14 | dnl Some systems do not put corefiles in
14		dnl cores for the configure tests since some are intended to dump core.
15		ulimit -c 0
16
17	+	dnl Invite Cygwin users to build within the Windows/ directory
18	+	case $target_os in
19	+	*cygwin* | *mingw32*)
20	+	AC_MSG_ERROR([You can only build the Windows version from its directory, Cygwin/X11 is not supported.])
21	+	;;
22	+	esac
23	+
24		dnl Options.
25		AC_ARG_ENABLE(jit,          [  --enable-jit            enable JIT compiler [default=yes]], [WANT_JIT=$enableval], [WANT_JIT=yes])
26		AC_ARG_ENABLE(ppc-emulator, [  --enable-ppc-emulator   use the selected PowerPC emulator [default=auto]], [WANT_EMULATED_PPC=$enableval], [WANT_EMULATED_PPC=auto])
#	Line 21 | Line 28 | AC_ARG_ENABLE(fbdev-dga,    [  --enable-
28		AC_ARG_ENABLE(xf86-dga,     [  --enable-xf86-dga       use the XFree86 DGA extension [default=yes]], [WANT_XF86_DGA=$enableval], [WANT_XF86_DGA=yes])
29		AC_ARG_ENABLE(xf86-vidmode, [  --enable-xf86-vidmode   use the XFree86 VidMode extension [default=yes]], [WANT_XF86_VIDMODE=$enableval], [WANT_XF86_VIDMODE=yes])
30		AC_ARG_ENABLE(vosf,         [  --enable-vosf           enable video on SEGV signals [default=yes]], [WANT_VOSF=$enableval], [WANT_VOSF=yes])
31	+	AC_ARG_ENABLE(standalone-gui,[  --enable-standalone-gui enable a standalone GUI prefs editor [default=no]], [WANT_STANDALONE_GUI=$enableval], [WANT_STANDALONE_GUI=no])
32		AC_ARG_WITH(esd,            [  --with-esd              support ESD for sound under Linux/FreeBSD [default=yes]], [WANT_ESD=$withval], [WANT_ESD=yes])
33		AC_ARG_WITH(gtk,            [  --with-gtk              use GTK user interface [default=yes]],
34		[case "$withval" in
#	Line 118 | Line 126 | AC_SUBST(MONSRCS)
126
127		dnl Checks for libraries.
128		AC_CHECK_LIB(posix4, sem_init)
129	+	AC_CHECK_LIB(m, cos)
130
131		dnl Do we need SDL?
132		WANT_SDL=no
#	Line 135 | Line 144 | fi
144		if [[ "x$WANT_SDL" = "xyes" ]]; then
145		AC_PATH_PROG(sdl_config, "sdl-config")
146		if [[ -n "$sdl_config" ]]; then
147	<	case $target_os in
148	<	# Special treatment for Cygwin so that we can still use the POSIX layer
149	<	*cygwin*)
150	<	sdl_cflags="-I`$sdl_config --prefix`/include/SDL"
151	<	sdl_libs="-L`$sdl_config --exec-prefix`/lib -lSDL"
152	<	;;
144	<	*)
145	<	sdl_cflags=`$sdl_config --cflags`
146	<	if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then
147	<	sdl_libs=`$sdl_config --static-libs`
148	<	else
149	<	sdl_libs=`$sdl_config --libs`
150	<	fi
151	<	;;
152	<	esac
147	>	sdl_cflags=`$sdl_config --cflags`
148	>	if [[ "x$WANT_SDL_STATIC" = "xyes" ]]; then
149	>	sdl_libs=`$sdl_config --static-libs`
150	>	else
151	>	sdl_libs=`$sdl_config --libs`
152	>	fi
153		CFLAGS="$CFLAGS $sdl_cflags"
154		CXXFLAGS="$CXXFLAGS $sdl_cflags"
155		LIBS="$LIBS $sdl_libs"
#	Line 192 | Line 192 | no:linux*|no:netbsd*)
192		])
193		])
194		AC_CHECK_FUNCS(pthread_cancel)
195	<	AC_CHECK_FUNCS(pthread_cond_init)
195	>	AC_CHECK_FUNCS(pthread_cond_init pthread_testcancel)
196		AC_CHECK_FUNCS(pthread_mutexattr_setprotocol)
197		AC_CHECK_FUNCS(pthread_mutexattr_settype)
198		AC_CHECK_FUNCS(pthread_mutexattr_setpshared)
#	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	+	ifdef([AM_PATH_GTK_2_0],
250		AM_PATH_GTK_2_0(1.3.15, [
251	<	AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
252	<	CFLAGS="$CFLAGS $GTK_CFLAGS"
251	<	CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
252	<	LIBS="$LIBS $GTK_LIBS"
253	<	UISRCS=prefs_editor_gtk.cpp
251	>	GUI_CFLAGS="$GTK_CFLAGS"
252	>	GUI_LIBS="$GTK_LIBS"
253		WANT_GTK=gtk2
254		], [
255		case "x${WANT_GTK}x" in
#	Line 261 | Line 260 | xgtk2*)
260		*)
261		AC_MSG_WARN([Could not find GTK+, disabling user interface.])
262		WANT_GTK=no
263	<	;;
263	>	;;
264		esac
265	<	])
267	<	;;
265	>	]))
266		esac
267		if [[ "x$WANT_GTK" = "xgtk" ]]; then
268	+	WANT_GTK=no
269	+	ifdef([AM_PATH_GTK],
270		AM_PATH_GTK(1.2.0, [
271	<	AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
272	<	CFLAGS="$CFLAGS $GTK_CFLAGS"
273	<	CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
274	<	LIBS="$LIBS $GTK_LIBS"
275	<	UISRCS=prefs_editor_gtk.cpp
271	>	GUI_CFLAGS="$GTK_CFLAGS"
272	>	GUI_LIBS="$GTK_LIBS"
273	>	WANT_GTK=gtk
274		], [
275		AC_MSG_WARN([Could not find GTK+, disabling user interface.])
276	<	WANT_GTK=no
279	<	])
276	>	]))
277		fi
278	+	if [[ "x$WANT_GTK" != "xno" -a "x$WANT_STANDALONE_GUI" = "xno" ]]; then
279	+	AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
280	+	UISRCS=prefs_editor_gtk.cpp
281	+	fi
282	+	AC_SUBST(GUI_CFLAGS)
283	+	AC_SUBST(GUI_LIBS)
284	+
285	+	dnl Build external GUI if requested.
286	+	if [[ "$WANT_STANDALONE_GUI" != "yes" ]]; then
287	+	WANT_STANDALONE_GUI=no
288	+	fi
289	+	if [[ "$WANT_GTK" = "no" ]]; then
290	+	WANT_STANDALONE_GUI=no
291	+	fi
292	+	AC_SUBST(STANDALONE_GUI, [$WANT_STANDALONE_GUI])
293
294		dnl We use ESD if possible.
295		if [[ "x$WANT_ESD" = "xyes" ]]; then
296	+	WANT_ESD=no
297	+	ifdef([AM_PATH_ESD],
298		AM_PATH_ESD(0.2.8, [
299		AC_DEFINE(ENABLE_ESD, 1, [Define is using ESD.])
300		CFLAGS="$CFLAGS $ESD_CFLAGS"
301		CXXFLAGS="$CXXFLAGS $ESD_CFLAGS"
302		LIBS="$LIBS $ESD_LIBS"
303	+	WANT_ESD=yes
304		], [
305		AC_MSG_WARN([Could not find ESD, disabling ESD support.])
306	<	WANT_ESD=no
292	<	])
306	>	]))
307		fi
308
309		dnl We use 64-bit file size support if possible.
#	Line 300 | Line 314 | AC_HEADER_STDC
314		AC_HEADER_SYS_WAIT
315		AC_CHECK_HEADERS(malloc.h stdint.h)
316		AC_CHECK_HEADERS(mach/vm_map.h mach/mach_init.h sys/mman.h)
303	–	AC_CHECK_HEADERS(sys/time.h sys/times.h sys/socket.h)
317		AC_CHECK_HEADERS(unistd.h fcntl.h byteswap.h dirent.h)
318	<	AC_CHECK_HEADERS(linux/if.h, [], [], [
319	<	#if HAVE_SYS_SOCKET_H
320	<	# include <sys/socket.h>
318	>	AC_CHECK_HEADERS(sys/socket.h sys/ioctl.h sys/filio.h sys/bitypes.h sys/wait.h)
319	>	AC_CHECK_HEADERS(sys/time.h sys/poll.h sys/select.h arpa/inet.h)
320	>	AC_CHECK_HEADERS(linux/if.h linux/if_tun.h net/if.h net/if_tun.h, [], [], [
321	>	#ifdef HAVE_SYS_TYPES_H
322	>	#include <sys/types.h>
323	>	#endif
324	>	#ifdef HAVE_SYS_SOCKET_H
325	>	#include <sys/socket.h>
326		#endif
327		])
328	<	AC_CHECK_HEADERS(linux/if_tun.h net/if.h net/if_tun.h)
328	>	AC_CHECK_HEADERS(AvailabilityMacros.h)
329	>	AC_CHECK_HEADERS(IOKit/storage/IOBlockStorageDevice.h)
330		AC_CHECK_HEADERS(fenv.h)
331
332		dnl Checks for typedefs, structures, and compiler characteristics.
#	Line 328 | Line 347 | AC_TYPE_SIGNAL
347		AC_HEADER_TIME
348		AC_STRUCT_TM
349
350	+	dnl Check whether sys/socket.h defines type socklen_t.
351	+	dnl (extracted from ac-archive/Miscellaneous)
352	+	AC_CACHE_CHECK([for socklen_t],
353	+	ac_cv_type_socklen_t, [
354	+	AC_TRY_COMPILE([
355	+	#include <sys/types.h>
356	+	#include <sys/socket.h>
357	+	], [socklen_t len = 42; return 0;],
358	+	ac_cv_type_socklen_t=yes, ac_cv_type_socklen_t=no,
359	+	dnl When cross-compiling, do not assume anything.
360	+	ac_cv_type_socklen_t="guessing no"
361	+	)
362	+	])
363	+	if [[ "x$ac_cv_type_socklen_t" != "xyes" ]]; then
364	+	AC_DEFINE(socklen_t, int, [Define to 'int' if <sys/types.h> doesn't define.])
365	+	fi
366	+
367		dnl Check whether struct sigaction has sa_restorer member.
368		AC_CACHE_CHECK([whether struct sigaction has sa_restorer],
369		ac_cv_signal_sa_restorer, [
#	Line 344 | Line 380 | if [[ "x$ac_cv_signal_sa_restorer" = "xy
380		fi
381
382		dnl Checks for library functions.
383	<	AC_CHECK_FUNCS(strdup strlcpy cfmakeraw)
383	>	AC_CHECK_FUNCS(strdup strerror strlcpy cfmakeraw)
384		AC_CHECK_FUNCS(nanosleep)
385		AC_CHECK_FUNCS(sigaction signal)
386		AC_CHECK_FUNCS(mmap mprotect munmap)
387		AC_CHECK_FUNCS(vm_allocate vm_deallocate vm_protect)
388		AC_CHECK_FUNCS(exp2f log2f exp2 log2)
389		AC_CHECK_FUNCS(floorf roundf ceilf truncf floor round ceil trunc)
390	+	AC_CHECK_FUNCS(poll inet_aton)
391
392		dnl Darwin seems to define mach_task_self() instead of task_self().
393		AC_CHECK_FUNCS(mach_task_self task_self)
#	Line 410 | Line 447 | AC_CHECK_FILE([/dev/ptc],
447		)
448		dnl (end of code from openssh-3.2.2p1 configure.ac)
449
450	+	dnl Check for systems where POSIX-style non-blocking I/O (O_NONBLOCK)
451	+	dnl doesn't work or is unimplemented. On these systems (mostly older
452	+	dnl ones), use the old BSD-style FIONBIO approach instead. [tcl.m4]
453	+	AC_CACHE_CHECK([FIONBIO vs. O_NONBLOCK for non-blocking I/O],
454	+	ac_cv_nonblocking_io, [
455	+	case "$host" in
456	+	*-*-osf*)
457	+	ac_cv_nonblocking_io=FIONBIO
458	+	;;
459	+	*-*-sunos4*)
460	+	ac_cv_nonblocking_io=FIONBIO
461	+	;;
462	+	*-*-ultrix*)
463	+	ac_cv_nonblocking_io=FIONBIO
464	+	;;
465	+	*)
466	+	ac_cv_nonblocking_io=O_NONBLOCK
467	+	;;
468	+	esac
469	+	])
470	+	if [[ "$ac_cv_nonblocking_io" = "FIONBIO" ]]; then
471	+	AC_DEFINE(USE_FIONBIO, 1, [Define if BSD-style non-blocking I/O is to be used])
472	+	fi
473	+
474	+	dnl Check whether compiler supports byte bit-fields
475	+	AC_CACHE_CHECK([whether compiler supports byte bit-fields],
476	+	ac_cv_have_byte_bitfields, [
477	+	AC_LANG_SAVE
478	+	AC_LANG_CPLUSPLUS
479	+	AC_TRY_RUN([
480	+	struct A {
481	+	unsigned char b1:4;
482	+	unsigned char b2:4;
483	+	unsigned char c;
484	+	unsigned short s;
485	+	unsigned char a[4];
486	+	};
487	+
488	+	int main(void) {
489	+	A a;
490	+	return ! (sizeof(A) == 8 && &a.c == ((unsigned char *)&a + 1));
491	+	}],
492	+	[ac_cv_have_byte_bitfields=yes],
493	+	[ac_cv_have_byte_bitfields=no],
494	+	dnl When cross-compiling, assume only GCC supports this
495	+	[if [[ "$GCC" = "yes" ]]; then
496	+	ac_cv_have_byte_bitfields="guessing yes"
497	+	else
498	+	ac_cv_have_byte_bitfields="guessing no"
499	+	fi]
500	+	)
501	+	AC_LANG_RESTORE
502	+	])
503	+
504		dnl AC_CHECK_FRAMEWORK($1=NAME, $2=INCLUDES)
505	<	AC_DEFUN(AC_CHECK_FRAMEWORK, [
505	>	AC_DEFUN([AC_CHECK_FRAMEWORK], [
506		AS_VAR_PUSHDEF([ac_Framework], [ac_cv_framework_$1])dnl
507		AC_CACHE_CHECK([whether compiler supports framework $1],
508		ac_Framework, [
509		saved_LIBS="$LIBS"
510		LIBS="$LIBS -framework $1"
511		AC_TRY_LINK(
512	<	[$2], [int main(void) { return 0; }],
512	>	[$2], [],
513		[AS_VAR_SET(ac_Framework, yes)], [AS_VAR_SET(ac_Framework, no); LIBS="$saved_LIBS"]
514		)
515		])
#	Line 431 | Line 522 | AC_DEFUN(AC_CHECK_FRAMEWORK, [
522		dnl Check for some MacOS X frameworks
523		AC_CHECK_FRAMEWORK(Carbon, [#include <Carbon/Carbon.h>])
524		AC_CHECK_FRAMEWORK(IOKit, [#include <IOKit/IOKitLib.h>])
525	+	AC_CHECK_FRAMEWORK(CoreFoundation, [#include <CoreFoundation/CoreFoundation.h>])
526
527		dnl Select system-dependant sources.
528		SERIALSRC=serial_unix.cpp
#	Line 441 | Line 533 | EXTFSSRC=extfs_unix.cpp
533		EXTRASYSSRCS=
534		case "$target_os" in
535		linux*)
536	<	ETHERSRC=Linux/ether_linux.cpp
536	>	ETHERSRC=ether_unix.cpp
537		AUDIOSRC=audio_oss_esd.cpp
538		SCSISRC=Linux/scsi_linux.cpp
539		if [[ "x$EMULATED_PPC" = "xno" ]]; then
540	<	EXTRASYSSRCS="Linux/paranoia.cpp Linux/sheepthreads.c ppc_asm.S"
540	>	EXTRASYSSRCS="paranoia.cpp Linux/sheepthreads.c ppc_asm.S"
541		fi
542		;;
543	+	freebsd*)
544	+	ETHERSRC=ether_unix.cpp
545	+	;;
546		netbsd*)
547	+	ETHERSRC=ether_unix.cpp
548		if [[ "x$EMULATED_PPC" = "xno" ]]; then
549	<	EXTRASYSSRCS="NetBSD/paranoia.cpp NetBSD/sheepthreads.c ppc_asm.S"
549	>	EXTRASYSSRCS="paranoia.cpp NetBSD/sheepthreads.c ppc_asm.S"
550		fi
551		;;
552		darwin*)
553	+	ETHERSRC=ether_unix.cpp
554		if [[ "x$EMULATED_PPC" = "xno" ]]; then
555	<	EXTRASYSSRCS="Darwin/paranoia.cpp ppc_asm.S"
555	>	EXTRASYSSRCS="paranoia.cpp ppc_asm.S"
556		fi
557	<	if [[ "x$ac_cv_framework_IOKit" = "xyes" ]]; then
557	>	if [[ "x$ac_cv_framework_IOKit" = "xyes" -a "x$ac_cv_framework_CoreFoundation" = "xyes" ]]; then
558		EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/sys_darwin.cpp"
559		fi
560		if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
561		EXTFSSRC=../MacOSX/extfs_macosx.mm
562		fi
563		;;
564	<	cygwin*)
565	<	SERIALSRC="../dummy/serial_dummy.cpp"
564	>	irix*)
565	>	AUDIOSRC=Irix/audio_irix.cpp
566	>	LIBS="$LIBS -laudio"
567	>	WANT_ESD=no
568	>
569	>	dnl Check if our compiler supports -IPA (MIPSPro)
570	>	HAVE_IPA=no
571	>	ocflags="$CFLAGS"
572	>	CFLAGS=`echo " $CFLAGS -IPA" | sed -e "s/ -g //g"`
573	>	AC_MSG_CHECKING(if "-IPA" works)
574	>	dnl Do a test compile of an empty function
575	>	AC_TRY_COMPILE([#if defined __GNUC__
576	>	# error GCC does not support IPA yet
577	>	#endif],, [AC_MSG_RESULT(yes); HAVE_IPA=yes], AC_MSG_RESULT(no))
578	>	CFLAGS="$ocflags"
579		;;
580		esac
581
582	+	dnl Is the slirp library supported?
583	+	case "$ac_cv_have_byte_bitfields" in
584	+	yes|"guessing yes")
585	+	CAN_SLIRP=yes
586	+	ETHERSRC=ether_unix.cpp
587	+	;;
588	+	esac
589	+	if [[ -n "$CAN_SLIRP" ]]; then
590	+	AC_DEFINE(HAVE_SLIRP, 1, [Define if slirp library is supported])
591	+	SLIRP_SRCS="\
592	+	../slirp/bootp.c     ../slirp/ip_output.c  ../slirp/tcp_input.c  \
593	+	../slirp/cksum.c     ../slirp/mbuf.c       ../slirp/tcp_output.c \
594	+	../slirp/debug.c     ../slirp/misc.c       ../slirp/tcp_subr.c   \
595	+	../slirp/if.c        ../slirp/sbuf.c       ../slirp/tcp_timer.c  \
596	+	../slirp/ip_icmp.c   ../slirp/slirp.c      ../slirp/tftp.c       \
597	+	../slirp/ip_input.c  ../slirp/socket.c     ../slirp/udp.c"
598	+	fi
599	+	AC_SUBST(SLIRP_SRCS)
600	+
601		dnl SDL overrides
602		if [[ "x$WANT_SDL" = "xyes" ]]; then
603		AC_DEFINE(USE_SDL, 1, [Define to enble SDL support.])
#	Line 480 | Line 609 | if [[ "x$WANT_SDL_VIDEO" = "xyes" ]]; th
609		if [[ "x$ac_cv_framework_Carbon" = "xyes" ]]; then
610		EXTRASYSSRCS="$EXTRASYSSRCS ../MacOSX/clip_macosx.cpp"
611		else
612	<	case "$target_os" in
484	<	cygwin*)
485	<	EXTRASYSSRCS="$EXTRASYSSRCS ../Windows/clip_windows.cpp"
486	<	;;
487	<	*)
488	<	EXTRASYSSRCS="$EXTRASYSSRCS ../dummy/clip_dummy.cpp"
489	<	;;
490	<	esac
612	>	EXTRASYSSRCS="$EXTRASYSSRCS ../dummy/clip_dummy.cpp"
613		fi
614		else
615		VIDEOSRCS="video_x.cpp"
#	Line 506 | Line 628 | dnl to be put into the config.h file
628		dnl $1 -- the macro to define
629		dnl $2 -- the value to translate
630		dnl $3 -- template name
631	<	AC_DEFUN(AC_TRANSLATE_DEFINE, [
631	>	AC_DEFUN([AC_TRANSLATE_DEFINE], [
632		if [[ "x$2" = "xyes" -o "x$2" = "xguessing yes" ]]; then
633		AC_DEFINE($1, 1, $3)
634		fi
#	Line 915 | Line 1037 | fi
1037
1038		dnl Check addressing mode to use
1039		AC_MSG_CHECKING([for addressing mode to use])
918	–	case "$os_target" in
919	–	cygwin*)
920	–	WANT_ADDRESSING_MODE="direct,cygwin-hack"
921	–	NATMEM_OFFSET=
922	–	;;
923	–	esac
1040		if [[ "$EMULATED_PPC" != "yes" ]]; then
1041		if [[ "$WANT_ADDRESSING_MODE" != "real" ]]; then
1042		AC_MSG_WARN([Running in native PowerPC mode, force use of Real Addressing.])
#	Line 1152 | Line 1268 | fi
1268		dnl Check for GCC 2.7 or higher.
1269		HAVE_GCC27=no
1270		AC_MSG_CHECKING(for GCC 2.7 or higher)
1271	<	AC_EGREP_CPP(xyes,
1272	<	[#if __GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5
1273	<	xyes
1274	<	#endif
1275	<	], [AC_MSG_RESULT(yes); HAVE_GCC27=yes], AC_MSG_RESULT(no))
1271	>	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if ! (__GNUC__ - 1 > 1 || __GNUC_MINOR__ - 1 > 5)
1272	>	# error gcc < 2.7
1273	>	typedef syntax error;
1274	>	#endif
1275	>	]])],
1276	>	[AC_MSG_RESULT(yes); HAVE_GCC27=yes],
1277	>	[AC_MSG_RESULT(no)])
1278
1279		dnl Check for GCC 3.0 or higher.
1280		HAVE_GCC30=no
1281		AC_MSG_CHECKING(for GCC 3.0 or higher)
1282	<	AC_EGREP_CPP(xyes,
1283	<	[#if __GNUC__ >= 3
1284	<	xyes
1285	<	#endif
1286	<	], [AC_MSG_RESULT(yes); HAVE_GCC30=yes], AC_MSG_RESULT(no))
1282	>	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#if ! (__GNUC__ >= 3)
1283	>	# error gcc < 3
1284	>	typedef syntax error;
1285	>	#endif
1286	>	]])],
1287	>	[AC_MSG_RESULT(yes); HAVE_GCC30=yes],
1288	>	[AC_MSG_RESULT(no)])
1289
1290		dnl Check for ICC.
1291		AC_MSG_CHECKING(for ICC)
#	Line 1196 | Line 1316 | AC_CACHE_CHECK([the format of compiler g
1316		rm -rf conftest*
1317		])
1318
1319	<	dnl Add -mdynamic-no-pic for MacOS X
1319	>	dnl Add -fno-strict-aliasing for slirp sources
1320		if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1321		SAVED_CFLAGS="$CFLAGS"
1322	+	CFLAGS="$CFLAGS -fno-strict-aliasing"
1323	+	AC_CACHE_CHECK([whether the compiler supports -fno-strict-aliasing],
1324	+	ac_cv_gcc_no_strict_aliasing, [
1325	+	AC_TRY_COMPILE([],[],
1326	+	[ac_cv_gcc_no_strict_aliasing=yes; AC_SUBST(SLIRP_CFLAGS, "-fno-strict-aliasing")],
1327	+	[ac_cv_gcc_no_strict_aliasing=no])
1328	+	])
1329	+	CFLAGS="$SAVED_CFLAGS"
1330	+	fi
1331	+
1332	+	dnl Add -mdynamic-no-pic for MacOS X (XXX icc10 will support MacOS X)
1333	+	if [[ "x$HAVE_GCC30" = "xyes" -a "x$HAVE_ICC" = "xno" ]]; then
1334	+	SAVED_CFLAGS="$CFLAGS"
1335		CFLAGS="$CFLAGS -mdynamic-no-pic"
1336		AC_CACHE_CHECK([whether the compiler supports -mdynamic-no-pic],
1337		ac_cv_gcc_mdynamic_no_pic, [
#	Line 1219 | Line 1352 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1352		../kpx_cpu/src/cpu/ppc/ppc-cpu.cpp \
1353		../kpx_cpu/src/cpu/ppc/ppc-decode.cpp \
1354		../kpx_cpu/src/cpu/ppc/ppc-execute.cpp \
1355	<	../kpx_cpu/src/cpu/ppc/ppc-translate.cpp"
1355	>	../kpx_cpu/src/cpu/ppc/ppc-translate.cpp \
1356	>	../kpx_cpu/src/utils/utils-cpuinfo.cpp"
1357		CPPFLAGS="$CPPFLAGS -I../kpx_cpu/include -I../kpx_cpu/src"
1358
1359		dnl Enable JIT compiler, if possible
#	Line 1236 | Line 1370 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1370		i?86:elf)
1371		ac_cv_use_dyngen=yes
1372		;;
1373	+	mips:elf)
1374	+	ac_cv_use_dyngen=yes
1375	+	;;
1376		powerpc:mach)
1377		ac_cv_use_dyngen=yes
1378		;;
1379	+	i?86:mach)
1380	+	ac_cv_use_dyngen=yes
1381	+	;;
1382		*:*)
1383		ac_cv_use_dyngen=no
1384		;;
#	Line 1248 | Line 1388 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1388		if [[ "x$HAVE_GCC27" = "xyes" -a "x$HAVE_ICC" = "xno" ]]; then
1389		DYNGEN_CC=$CXX
1390		else
1391	<	for p in /usr/bin /usr/local/bin; do
1391	>	for p in /usr/bin /usr/local/bin /usr/freeware/bin; do
1392		gxx="$p/g++"
1393		if [[ -x "$gxx" ]]; then
1394		DYNGEN_CC="$gxx"
#	Line 1263 | Line 1403 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1403		if [[ "x$ac_cv_use_dyngen" = "xyes" ]]; then
1404		case $host_cpu in
1405		i?86)
1406	<	DYNGEN_OP_FLAGS="-fomit-frame-pointer -mpreferred-stack-boundary=2"
1406	>	DYNGEN_OP_FLAGS="-fomit-frame-pointer"
1407	>	;;
1408	>	mips)
1409	>	DYNGEN_OP_FLAGS="-fno-delayed-branch -mno-abicalls"
1410		;;
1411		powerpc)
1412		if [[ "x$ac_cv_object_format" = "xmach" ]]; then
#	Line 1271 | Line 1414 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1414		fi
1415		;;
1416		esac
1417	<	if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1418	<	DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -falign-functions=0"
1417	>	have_dyngen_gcc3=no
1418	>	case "x`$DYNGEN_CC -dumpversion`" in
1419	>	x[12].*) ;;
1420	>	x*) have_dyngen_gcc3=yes ;;
1421	>	esac
1422	>	if [[ "x$have_dyngen_gcc3" = "xyes" ]]; then
1423	>	DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -fno-align-functions"
1424		else
1425		DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -malign-functions=0"
1426		fi
1427	<	DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -finline-limit=10000 -fno-exceptions -g0"
1428	<	if [[ "x$HAVE_GCC30" = "xyes" ]]; then
1427	>	DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -finline-functions -finline-limit=10000 -fno-exceptions -g0"
1428	>	if [[ "x$have_dyngen_gcc3" = "xyes" ]]; then
1429		DYNGEN_OP_FLAGS="$DYNGEN_OP_FLAGS -fno-reorder-blocks -fno-optimize-sibling-calls"
1430		fi
1431	+	if [[ "x$DYNGEN_CC" != "x$CXX" ]]; then
1432	+	DYNGEN_CFLAGS="-O2 $CFLAGS"
1433	+	DYNGEN_CXXFLAGS="-O2 $CXXFLAGS"
1434	+	else
1435	+	DYNGEN_CFLAGS="\$(CFLAGS)"
1436	+	DYNGEN_CXXFLAGS="\$(CXXFLAGS)"
1437	+	fi
1438		else
1439		WANT_JIT=no
1440		fi
#	Line 1291 | Line 1446 | if [[ "x$EMULATED_PPC" = "xyes" ]]; then
1446		CPUSRCS="\
1447		../kpx_cpu/src/cpu/jit/jit-cache.cpp \
1448		../kpx_cpu/src/cpu/jit/basic-dyngen.cpp \
1449	<	../kpx_cpu/src/cpu/ppc/ppc-dyngen.cpp $CPUSRCS"
1449	>	../kpx_cpu/src/cpu/ppc/ppc-dyngen.cpp \
1450	>	../kpx_cpu/src/cpu/ppc/ppc-jit.cpp $CPUSRCS"
1451		fi
1452		fi
1453		CPUSRCS="$CPUSRCS ../kpx_cpu/sheepshaver_glue.cpp"
1454		else
1455		WANT_JIT=no
1456		fi
1301	–	if [[ "x$ac_cv_use_dyngen" = "xyes" ]]; then
1302	–	AC_CACHE_CHECK([whether static data regions are executable],
1303	–	ac_cv_have_static_data_exec, [
1304	–	AC_TRY_RUN([int main(void) {
1305	–	#if defined(__powerpc__) || defined(__ppc__)
1306	–	static unsigned int p[8] = {0x4e800020,};
1307	–	asm volatile("dcbst 0,%0" : : "r" (p) : "memory");
1308	–	asm volatile("sync" : : : "memory");
1309	–	asm volatile("icbi 0,%0" : : "r" (p) : "memory");
1310	–	asm volatile("sync" : : : "memory");
1311	–	asm volatile("isync" : : : "memory");
1312	–	((void (*)(void))p)();
1313	–	return 0;
1314	–	#endif
1315	–	return 1;
1316	–	}], ac_cv_have_static_data_exec=yes, ac_cv_have_static_data_exec=no,
1317	–	dnl When cross-compiling, do not assume anything.
1318	–	ac_cv_have_static_data_exec=no
1319	–	)
1320	–	])
1321	–	else
1322	–	ac_cv_use_dyngen=no
1323	–	fi
1324	–	AC_TRANSLATE_DEFINE(HAVE_STATIC_DATA_EXEC, "$ac_cv_have_static_data_exec",
1325	–	[Define if your system marks static data pages as executable.])
1326	–
1457		if [[ "x$WANT_JIT" = "xyes" ]]; then
1458		CPPFLAGS="$CPPFLAGS -DUSE_JIT"
1459		fi
1460
1461	+	dnl Higher level optimizations with MIPSPro compilers are possible
1462	+	if [[ "x$HAVE_IPA" = "xyes" ]]; then
1463	+	CFLAGS="`echo $CFLAGS | sed -e 's/-g//g'` -O3 -OPT:Olimit=0 -IPA"
1464	+	CXXFLAGS="`echo $CXXFLAGS | sed -e 's/-g//g'` -O3 -OPT:Olimit=0 -IPA"
1465	+	CXXFLAGS="-LANG:std $CXXFLAGS"
1466	+	LDFLAGS="$LDFLAGS -O3 -OPT:Olimit=0 -IPA"
1467	+	fi
1468	+
1469	+	dnl Check for linker script support
1470	+	case $target_os:$target_cpu in
1471	+	linux*:i?86)    LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-i386.ld";;
1472	+	linux*:x86_64)  LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-x86_64.ld";;
1473	+	linux*:powerpc) LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-ppc.ld";;
1474	+	netbsd*:i?86)   LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/linux-i386.ld";;
1475	+	freebsd*:i?86)  LINKER_SCRIPT_FLAGS="-Wl,-T,ldscripts/freebsd-i386.ld";;
1476	+	darwin*:*)      LINKER_SCRIPT_FLAGS="-Wl,-seg1addr,0x78048000";;
1477	+	esac
1478	+	if [[ -n "$LINKER_SCRIPT_FLAGS" ]]; then
1479	+	AC_CACHE_CHECK([whether linker script is usable],
1480	+	ac_cv_linker_script_works, [
1481	+	AC_LANG_SAVE
1482	+	AC_LANG_CPLUSPLUS
1483	+	saved_LDFLAGS="$LDFLAGS"
1484	+	LDFLAGS="$LDFLAGS $LINKER_SCRIPT_FLAGS"
1485	+	AC_TRY_RUN(
1486	+	[int main() {if ((char *)&main < (char *)0x70000000) return 1;}],
1487	+	[ac_cv_linker_script_works=yes],
1488	+	[ac_cv_linker_script_works=no],
1489	+	dnl When cross-compiling, assume it works
1490	+	[ac_cv_linker_script_works="guessing yes"]
1491	+	)
1492	+	AC_LANG_RESTORE
1493	+	if [[ "$ac_cv_linker_script_works" = "no" ]]; then
1494	+	LDFLAGS="$saved_LDFLAGS"
1495	+	LINKER_SCRIPT_FLAGS=""
1496	+	fi
1497	+	])
1498	+	fi
1499	+	AC_TRANSLATE_DEFINE(HAVE_LINKER_SCRIPT, "$ac_cv_linker_script_works",
1500	+	[Define if there is a linker script to relocate the executable above 0x70000000.])
1501	+
1502		dnl Generate Makefile.
1503		AC_SUBST(PERL)
1504		AC_SUBST(USE_DYNGEN, [$ac_cv_use_dyngen])
1505		AC_SUBST(DYNGENSRCS)
1506		AC_SUBST(DYNGEN_CC)
1507	+	AC_SUBST(DYNGEN_CFLAGS)
1508	+	AC_SUBST(DYNGEN_CXXFLAGS)
1509		AC_SUBST(DYNGEN_OP_FLAGS)
1510		AC_SUBST(SYSSRCS)
1511		AC_SUBST(CPUSRCS)

Diff Legend

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