old
/
eterm
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Wed Apr 27 14:46:41 2005 Michael Jennings (mej) 

Disable MMX on x86_64 for now.
----------------------------------------------------------------------


SVN revision: 14416
This commit is contained in:
Michael Jennings 2005-04-27 18:48:32 +00:00
parent 250501f714
commit 32b568025f
3 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -5367,3 +5367,7 @@ Tue Apr 26 14:38:20 2005 Michael Jennings (mej)
Patch from Bryan Kadzban <bryan@kdzbn.homelinux.net> to fix unsetting
of bold/blink attribute.
----------------------------------------------------------------------
Wed Apr 27 14:46:41 2005 Michael Jennings (mej)
Disable MMX on x86_64 for now.
----------------------------------------------------------------------

31
configure.in
View File

@ -74,6 +74,9 @@ AC_DEFINE_UNQUOTED(TIMER_IDENT, "`grep '$''Id:' $srcdir/src/timer.c | sed 's/^.*
AC_DEFINE_UNQUOTED(UTMP_IDENT, "`grep '$''Id:' $srcdir/src/utmp.c | sed 's/^.*\$''Id: //;s/ \$.*$//;s/.v / /;s/ Exp//'`", [utmp.c RCS ID])
AC_DEFINE_UNQUOTED(WINDOWS_IDENT, "`grep '$''Id:' $srcdir/src/windows.c | sed 's/^.*\$''Id: //;s/ \$.*$//;s/.v / /;s/ Exp//'`", [windows.c RCS ID])
dnl# Check for build/host/target system types
AC_CANONICAL_TARGET
dnl# Supply default CFLAGS, if not specified by `CFLAGS=flags ./configure'
if test ! -z "${CFLAGS}" -o ! -z "${CCOPTS}"; then
CFLAGS_GIVEN=1
@ -149,9 +152,6 @@ CCAS=$CC
AC_SUBST(CCASFLAGS)
AC_SUBST(CCAS)
dnl# Check for host system type
AC_CANONICAL_HOST
dnl# Check the sanity of what we've done so far
AM_SANITY_CHECK
@ -502,19 +502,30 @@ AC_ARG_ENABLE(trans,
AC_MSG_CHECKING(for MMX support)
HAVE_MMX=""
HAVE_MMX_64=""
AC_ARG_ENABLE(mmx, [ --enable-mmx enable MMX assembly routines], [
test "x$enableval" = "xyes" && HAVE_MMX="yes"
test "x$enableval" = "xyes" && HAVE_MMX="yes"
], [
if test x$build_os = xlinux-gnu; then
grep mmx /proc/cpuinfo >/dev/null 2>&1 && HAVE_MMX="yes"
fi
case $target_cpu in
i*86)
grep mmx /proc/cpuinfo >/dev/null 2>&1 && HAVE_MMX="yes"
;;
x86_64)
grep mmx /proc/cpuinfo >/dev/null 2>&1 && HAVE_MMX_64="yes"
;;
esac
])
if test "x$HAVE_MMX" = "xyes"; then
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_MMX, , [Define for MMX support.])
AC_MSG_RESULT([yes (32-bit)])
AC_DEFINE(HAVE_MMX, , [Define for 32-bit MMX support.])
elif test "x$HAVE_MMX_64" = "xyes"; then
dnl# AC_MSG_RESULT([yes (64-bit)])
dnl# AC_DEFINE(HAVE_MMX_64, , [Define for 64-bit MMX support.])
AC_MSG_RESULT([no (64-bit MMX not yet supported)])
else
AC_MSG_RESULT(no)
AC_MSG_RESULT([no (no MMX detected)])
fi
dnl# AM_CONDITIONAL(HAVE_MMX, test "x$HAVE_MMX" = "xyes" -o "x$HAVE_MMX_64" = "xyes")
AM_CONDITIONAL(HAVE_MMX, test "x$HAVE_MMX" = "xyes")
dnl#

2
src/pixmap.c
View File

@ -2218,7 +2218,7 @@ set_icon_pixmap(char *filename, XWMHints * pwm_hints)
wm_hints->flags |= IconPixmapHint | IconMaskHint;
#endif
/* Set the EWMH icon hint for _NET_WM-compliant GNOME WM's. */
/* Set the EWMH icon hint for _NET_WM-compliant WM's. */
XChangeProperty(Xdisplay, TermWin.parent,
props[PROP_EWMH_ICON], XA_CARDINAL, 32, PropModeReplace,
(unsigned char *) icon_data, sizeof(icon_data) / sizeof(CARD32));