Mercurial > mplayer.hg
comparison configure @ 21339:4556f7c82535
support Intel Core 2 and AMD Geode in the processor detection routines
patch from Zuxy Meng, zuxy.meng gmail com
| author | diego |
|---|---|
| date | Tue, 28 Nov 2006 12:04:59 +0000 |
| parents | dceeec121837 |
| children | dc98645820b7 |
comparison
equal
deleted
inserted
replaced
| 21338:c74dbfe68bb3 | 21339:4556f7c82535 |
|---|---|
| 875 4) proc=i486 iproc=486 ;; | 875 4) proc=i486 iproc=486 ;; |
| 876 5) iproc=586 # LGB: models are: K5/SSA5 K5 K5 K5 ? ? K6 K6 K6-2 K6-3 | 876 5) iproc=586 # LGB: models are: K5/SSA5 K5 K5 K5 ? ? K6 K6 K6-2 K6-3 |
| 877 # K6 model 13 are the K6-2+ and K6-III+, only differing in cache size. | 877 # K6 model 13 are the K6-2+ and K6-III+, only differing in cache size. |
| 878 if test "$pmodel" -eq 9 -o "$pmodel" -eq 13; then | 878 if test "$pmodel" -eq 9 -o "$pmodel" -eq 13; then |
| 879 proc=k6-3 | 879 proc=k6-3 |
| 880 elif test "$pmodel" -eq 5 -o "$pmodel" -eq 10; then | |
| 881 proc=geode | |
| 880 elif test "$pmodel" -ge 8; then | 882 elif test "$pmodel" -ge 8; then |
| 881 proc=k6-2 | 883 proc=k6-2 |
| 882 elif test "$pmodel" -ge 6; then | 884 elif test "$pmodel" -ge 6; then |
| 883 proc=k6 | 885 proc=k6 |
| 884 else | 886 else |
| 916 else | 918 else |
| 917 proc=i586 | 919 proc=i586 |
| 918 fi | 920 fi |
| 919 ;; | 921 ;; |
| 920 6) iproc=686 | 922 6) iproc=686 |
| 921 if test "$pmodel" -eq 9 -o "$pmodel" -ge 13; then | 923 if test "$pmodel" -eq 15; then |
| 924 proc=core2 | |
| 925 elif test "$pmodel" -eq 9 -o "$pmodel" -ge 13; then | |
| 922 proc=pentium-m | 926 proc=pentium-m |
| 923 elif test "$pmodel" -ge 7; then | 927 elif test "$pmodel" -ge 7; then |
| 924 proc=pentium3 | 928 proc=pentium3 |
| 925 elif test "$pmodel" -ge 3; then | 929 elif test "$pmodel" -ge 3; then |
| 926 proc=pentium2 | 930 proc=pentium2 |
| 1008 fi | 1012 fi |
| 1009 fi | 1013 fi |
| 1010 if test "$proc" = "prescott" ; then | 1014 if test "$proc" = "prescott" ; then |
| 1011 cc_check -march=$proc $cpuopt=$proc || proc=pentium4 | 1015 cc_check -march=$proc $cpuopt=$proc || proc=pentium4 |
| 1012 fi | 1016 fi |
| 1013 if test "$proc" = "pentium4" || test "$proc" = "pentium-m" || test "$proc" = "pentium3" || test "$proc" = "pentium2" || test "$proc" = "athlon" || test "$proc" = "c3-2"; then | 1017 if test "$proc" = "core2" ; then |
| 1018 cc_check -march=$proc $cpuopt=$proc || proc=pentium-m | |
| 1019 fi | |
| 1020 if test "$proc" = "pentium4" || test "$proc" = "pentium-m" || test "$proc" = "pentium3" || test "$proc" = "pentium2" || test "$proc" = "athlon" || test "$proc" = "c3-2" || test "$proc" = "geode"; then | |
| 1014 cc_check -march=$proc $cpuopt=$proc || proc=i686 | 1021 cc_check -march=$proc $cpuopt=$proc || proc=i686 |
| 1015 fi | 1022 fi |
| 1016 if test "$proc" = "i686" || test "$proc" = "pentium-mmx" || test "$proc" = "winchip-c6" || test "$proc" = "winchip2"; then | 1023 if test "$proc" = "i686" || test "$proc" = "pentium-mmx" || test "$proc" = "winchip-c6" || test "$proc" = "winchip2"; then |
| 1017 cc_check -march=$proc $cpuopt=$proc || proc=i586 | 1024 cc_check -march=$proc $cpuopt=$proc || proc=i586 |
| 1018 fi | 1025 fi |
| 1099 fi | 1106 fi |
| 1100 case "$pvendor" in | 1107 case "$pvendor" in |
| 1101 AuthenticAMD) | 1108 AuthenticAMD) |
| 1102 proc=k8;; | 1109 proc=k8;; |
| 1103 GenuineIntel) | 1110 GenuineIntel) |
| 1104 # 64-bit prescotts exist, but as far as GCC is concerned they have the | 1111 case "$pmodel" in |
| 1105 # same capabilities as a nocona. | 1112 6) proc=core2;; |
| 1106 proc=nocona;; | 1113 *) |
| 1114 # 64-bit prescotts exist, but as far as GCC is concerned they have the | |
| 1115 # same capabilities as a nocona. | |
| 1116 proc=nocona;; | |
| 1117 esac | |
| 1118 ;; | |
| 1107 *) | 1119 *) |
| 1108 proc=error;; | 1120 proc=error;; |
| 1109 esac | 1121 esac |
| 1110 | 1122 |
| 1111 echocheck "GCC & CPU optimization abilities" | 1123 echocheck "GCC & CPU optimization abilities" |
| 1123 # Is this a valid assumption? -Corey | 1135 # Is this a valid assumption? -Corey |
| 1124 if test "$proc" = "athlon-xp"; then | 1136 if test "$proc" = "athlon-xp"; then |
| 1125 cc_check -march=$proc $cpuopt=$proc || proc=error | 1137 cc_check -march=$proc $cpuopt=$proc || proc=error |
| 1126 fi | 1138 fi |
| 1127 # --- Intel processors --- | 1139 # --- Intel processors --- |
| 1140 if test "$proc" = "core2"; then | |
| 1141 cc_check -march=$proc $cpuopt=$proc || proc=nocona | |
| 1142 fi | |
| 1128 if test "$proc" = "nocona"; then | 1143 if test "$proc" = "nocona"; then |
| 1129 cc_check -march=$proc $cpuopt=$proc || proc=pentium4 | 1144 cc_check -march=$proc $cpuopt=$proc || proc=pentium4 |
| 1130 fi | 1145 fi |
| 1131 if test "$proc" = "pentium4"; then | 1146 if test "$proc" = "pentium4"; then |
| 1132 cc_check -march=$proc $cpuopt=$proc || proc=error | 1147 cc_check -march=$proc $cpuopt=$proc || proc=error |