a_dinosaur/ZSNES
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Semantic fix. Should prevent people from whining that their Turion 64 are 'incorrectly' detected as k8. >:|

Browse Source
This commit is contained in:
grinvader
2005-10-27 23:00:15 +00:00
parent 69cb866762
commit a81505b672
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
zsnes/src/acinclude.m4
View File

@@ -237,21 +237,21 @@ dnl -- End libpng autoconf macro
dnl ---- dnl ----
dnl -- Begin custom cpu detection autoconf macro dnl -- Begin custom arch detection autoconf macro
dnl Copyright (c) 2005 Nach, grinvader dnl Copyright (c) 2005 Nach, grinvader
dnl Under the GPL License dnl Under the GPL License
dnl When copying, include from Begin to End custom cpu detection autoconf macro, dnl When copying, include from Begin to End custom arch detection autoconf macro,
dnl including those tags, so others can easily copy it too. dnl including those tags, so others can easily copy it too.
dnl dnl
dnl AM_CPU_DETECT([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) dnl AM_ARCH_DETECT([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
dnl Reads the first entry in /proc/cpuinfo or uses cpuid to grab what is needed, dnl Reads the first entry in /proc/cpuinfo or uses cpuid to grab what is needed,
dnl outputs CPU_INFO dnl outputs ARCH_INFO
AC_DEFUN([AM_CPU_DETECT], AC_DEFUN([AM_ARCH_DETECT],
[ [
CPU_INFO="" ARCH_INFO=""
AC_MSG_CHECKING(for cpu info) AC_MSG_CHECKING(for cpu info)
AC_ARG_ENABLE(cpucheck, [ --disable-cpucheck Do not try to autodetect cpu ],,enable_cpucheck=yes) AC_ARG_ENABLE(cpucheck, [ --disable-cpucheck Do not try to autodetect cpu architecture ],,enable_cpucheck=yes)
if test x$enable_cpucheck != xno; then if test x$enable_cpucheck != xno; then
AC_TRY_RUN([ AC_TRY_RUN([
@@ -544,7 +544,7 @@ if test x$enable_cpucheck != xno; then
else { cpu = "i386"; } else { cpu = "i386"; }
} }
if ((fp = fopen("conf.cpuchk", "a"))) if ((fp = fopen("conf.archchk", "a")))
{ {
fprintf(fp, "%s", cpu); fprintf(fp, "%s", cpu);
fclose(fp); fclose(fp);
@@ -558,18 +558,18 @@ if test x$enable_cpucheck != xno; then
if test x$cpu_found = xyes; then if test x$cpu_found = xyes; then
AC_MSG_RESULT(found) AC_MSG_RESULT(found)
CPU_INFO=$(<conf.cpuchk) ARCH_INFO=$(<conf.archchk)
ifelse([$1], , :, [$1]) ifelse([$1], , :, [$1])
rm conf.cpuchk rm conf.archchk
else else
AC_MSG_RESULT(not found) AC_MSG_RESULT(not found)
ifelse([$2], , :, [$2]) ifelse([$2], , :, [$2])
fi fi
AC_SUBST(CPU_INFO) AC_SUBST(ARCH_INFO)
else else
AC_MSG_RESULT(disabled by user) AC_MSG_RESULT(disabled by user)
fi fi
]) ])
dnl -- End custom cpu detection autoconf macro dnl -- End custom arch detection autoconf macro

10
zsnes/src/configure.in
View File

@@ -132,10 +132,10 @@ else
NFLAGS="$NFLAGS -O1" NFLAGS="$NFLAGS -O1"
fi fi
AM_CPU_DETECT() AM_ARCH_DETECT()
AC_MSG_CHECKING(which processor arch to optimize for) AC_MSG_CHECKING(which cpu architecture to optimize for)
if test x$CPU_INFO = x ; then if test x$ARCH_INFO = x ; then
case "$target" in case "$target" in
x86_64-*-* | x86_64-*-*-*) x86_64-*-* | x86_64-*-*-*)
AC_MSG_RESULT(guessing x86-64) AC_MSG_RESULT(guessing x86-64)
@@ -161,8 +161,8 @@ else
;; ;;
esac esac
else else
AC_MSG_RESULT($CPU_INFO) AC_MSG_RESULT($ARCH_INFO)
CFLAGS="$CFLAGS -march=$CPU_INFO" CFLAGS="$CFLAGS -march=$ARCH_INFO"
fi fi
fi fi
CXXFLAGS="$CFLAGS -fno-rtti" CXXFLAGS="$CFLAGS -fno-rtti"