mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
077840fa23
into a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 include/thr_alarm.h: Auto merged mysys/my_pthread.c: Auto merged BUILD/SETUP.sh: Merged from 4.0 configure.in: Merged from 4.0 include/my_global.h: Merged from 4.0 include/my_pthread.h: Merged from 4.0 mysys/thr_alarm.c: Merged from 4.0 sql/mysqld.cc: Merged from 4.0 BUILD/SETUP.sh.rej: Merged from 4.0 configure.in.rej: Merged from 4.0 include/my_global.h.rej: Merged from 4.0 include/my_pthread.h.rej: Merged from 4.0 mysys/thr_alarm.c.rej: Merged from 4.0 sql/mysqld.cc.rej: Merged from 4.0
19 lines
724 B
Text
19 lines
724 B
Text
***************
|
|
*** 39,46 ****
|
|
c_warnings="$global_warnings -Wunused"
|
|
cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"
|
|
|
|
! alpha_cflags="-mcpu=ev6 -Wa,-mev6" # Not used yet
|
|
! pentium_cflags="-mcpu=pentiumpro"
|
|
sparc_cflags=""
|
|
|
|
# be as fast as we can be without losing our ability to backtrace
|
|
--- 39,46 ----
|
|
c_warnings="$global_warnings -Wunused"
|
|
cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"
|
|
|
|
! #alpha_cflags="-mcpu=ev6 -Wa,-mev6" # Not used yet
|
|
! #pentium_cflags="-mcpu=pentiumpro"
|
|
sparc_cflags=""
|
|
|
|
# be as fast as we can be without losing our ability to backtrace
|