diff options
| author | unknown <ndbdev@dl145b.mysql.com> | 2005-05-10 00:45:27 +0200 |
|---|---|---|
| committer | unknown <ndbdev@dl145b.mysql.com> | 2005-05-10 00:45:27 +0200 |
| commit | beaedea1eebc8c76450752642c150b1ee58961eb (patch) | |
| tree | ff7139c50308363e4fc6c3b89f0bb1ccf15f542c /BUILD | |
| parent | df96db6318701e702d930938d877060b04d71913 (diff) | |
| parent | 3db2d3d895dce92501875335ff35c005e34ad5a0 (diff) | |
| download | mariadb-git-beaedea1eebc8c76450752642c150b1ee58961eb.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
sql/mysql_priv.h:
Auto merged
storage/ndb/src/cw/cpcd/APIService.cpp:
Auto merged
storage/ndb/src/cw/cpcd/CPCD.hpp:
Auto merged
storage/ndb/src/cw/cpcd/Process.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
storage/ndb/src/kernel/error/ErrorReporter.cpp:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/ndbapi/ClusterMgr.cpp:
Auto merged
storage/ndb/src/ndbapi/ClusterMgr.hpp:
Auto merged
storage/ndb/src/ndbapi/NdbIndexOperation.cpp:
Auto merged
storage/ndb/src/ndbapi/ndberror.c:
Auto merged
storage/ndb/test/include/CpcClient.hpp:
Auto merged
storage/ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
storage/ndb/test/run-test/Makefile.am:
Auto merged
storage/ndb/test/run-test/main.cpp:
Auto merged
storage/ndb/test/run-test/make-config.sh:
Auto merged
storage/ndb/test/run-test/ndb-autotest.sh:
Auto merged
storage/ndb/test/run-test/run-test.hpp:
Auto merged
storage/ndb/test/src/CpcClient.cpp:
Auto merged
Diffstat (limited to 'BUILD')
| -rwxr-xr-x | BUILD/check-cpu | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/BUILD/check-cpu b/BUILD/check-cpu index ce106e5a603..dfdf96d6b29 100755 --- a/BUILD/check-cpu +++ b/BUILD/check-cpu @@ -33,6 +33,9 @@ else esac fi +cpu_flag="" +cpu_flag_old="" + case "$cpu_family--$model_name" in Alpha*EV6*) cpu_flag="ev6"; @@ -40,11 +43,21 @@ case "$cpu_family--$model_name" in *Xeon*) cpu_flag="nocona"; ;; + *Pentium*4*Mobile*CPU*) + cpu_flag="pentium4m"; + ;; *Pentium*4*CPU*) cpu_flag="pentium4"; ;; + *Pentium*III*Mobile*CPU*) + cpu_flag="pentium3m"; + ;; + *Pentium*III*CPU*) + cpu_flag="pentium3"; + ;; *Athlon*64*) cpu_flag="athlon64"; + cpu_flag_old="athlon"; ;; *Athlon*) cpu_flag="athlon"; @@ -84,6 +97,10 @@ case "$cc_ver--$cc_verno" in check_cpu_cflags="-mtune=$cpu_flag -march=$cpu_flag" ;; *GCC*) + # Fix for older compiler versions + if test -n "$cpu_flag_old"; then + cpu_flag="$cpu_flag_old" + fi check_cpu_cflags="-mcpu=$cpu_flag -march=$cpu_flag" ;; *) |