]>
Commit | Line | Data |
---|---|---|
1460a801 JB |
1 | --- ardour-0.9beta18/libs/pbd/aclocal.m4.orig 2004-07-06 00:29:18.000000000 +0200 |
2 | +++ ardour-0.9beta18/libs/pbd/aclocal.m4 2004-07-09 00:08:45.500025552 +0200 | |
3 | @@ -866,49 +866,16 @@ | |
4 | ||
5 | if test "$target_cpu" = "powerpc"; then | |
6 | AC_DEFINE(POWERPC, 1, "Are we running a ppc CPU?") | |
7 | - altivecLinux= | |
8 | - if test "$?" = "0"; then | |
9 | - AC_DEFINE(HAVE_ALTIVEC_LINUX, 1, "Is there Altivec Support ?") | |
10 | - if test "$gcc_major_version" = "3"; then | |
11 | -dnl -mcpu=7450 does not reliably work with gcc 3.* | |
12 | - OPT_FLAGS="-D_REENTRANT -O2 -mcpu=7400 -maltivec -mabi=altivec" | |
13 | - else | |
14 | - OPT_FLAGS="-D_REENTRANT -O3 -mcpu=7400" | |
15 | - fi | |
16 | - else | |
17 | - OPT_FLAGS="-D_REENTRANT -O3 -mcpu=750 -mmultiple" | |
18 | - fi | |
19 | - OPT_FLAGS="$OPTIM_FLAGS -mhard-float -mpowerpc-gfxopt" | |
20 | + OPT_FLAGS="$CXXFLAGS -D_REENTRANT" | |
21 | elif echo $target_cpu | grep "i*86" >/dev/null; then | |
22 | - cat /proc/cpuinfo | grep mmx >/dev/null | |
23 | - if test $? = 0; then | |
24 | - mmx="-mmmx" | |
25 | - fi | |
26 | - cat /proc/cpuinfo | grep sse >/dev/null | |
27 | - if test $? = 0; then | |
28 | - sse="-msse -mfpmath=sse" | |
29 | - fi | |
30 | - cat /proc/cpuinfo | grep 3dnow >/dev/null | |
31 | - if test $? = 0; then | |
32 | - dreidnow="-m3dnow" | |
33 | - fi | |
34 | AC_DEFINE(x86, 1, "Nope its intel") | |
35 | - if test "$target_cpu" = "i586"; then | |
36 | - OPT_FLAGS="-DREENTRANT -O3 -march=i586 -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables" | |
37 | - elif test "$target_cpu" = "i686"; then | |
38 | - OPT_FLAGS="-D_REENTRANT -O3 -march=i686 -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables" | |
39 | - if test "$gcc_major_version" = "3"; then | |
40 | - OPT_FLAGS="$OPTIM_FLAGS $mmx $sse $dreidnow" | |
41 | - fi | |
42 | - else | |
43 | - OPT_FLAGS="-D_REENTRANT -O3 -fomit-frame-pointer -ffast-math -fstrength-reduce -fmove-all-movables" | |
44 | - fi | |
45 | + OPT_FLAGS="$CXXFLAGS -D_REENTRANT -ffast-math -fstrength-reduce -fmove-all-movables" | |
46 | fi | |
47 | ||
48 | # LARGEFILE_FLAGS="`getconf LFS_CFLAGS`" | |
49 | LARGEFILE_FLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE" | |
50 | ||
51 | -CXXFLAGS="-g -D_REENTRANT $LARGEFILE_FLAGS" | |
52 | +CXXFLAGS="$CXXFLAGS -D_REENTRANT $LARGEFILE_FLAGS" | |
78e3632a JB |
53 | if test x"$GXX" = xyes ; then |
54 | CXXFLAGS="$CXXFLAGS -Wall" | |
55 | fi |