]>
Commit | Line | Data |
---|---|---|
bc19b84e AM |
1 | diff -urN dosemu-1.1.5.org/configure.ac dosemu-1.1.5/configure.ac |
2 | --- dosemu-1.1.5.org/configure.ac 2003-09-01 23:10:03.000000000 +0200 | |
3 | +++ dosemu-1.1.5/configure.ac 2003-09-01 23:10:53.000000000 +0200 | |
4 | @@ -428,9 +428,9 @@ | |
69358013 | 5 | if test "$enable_debug" = "yes"; then |
6 | CFLAGS="$CFLAGS -g" | |
7 | AC_DEFINE(_DEBUG) | |
8 | - OPT="-O" | |
9 | + OPT="$OPTFLAGS" | |
10 | else | |
11 | - OPT="-O2" # BIG NOTE: do _not_ use -O3, | |
12 | + OPT="$OPTFLAGS" # BIG NOTE: do _not_ use -O3, | |
5a6901a1 JB |
13 | # because in forces _inline_ at places where we don't want it ! |
14 | # If we want _inline_, well then we 'code' it. | |
69358013 | 15 | OPT="$OPT -fomit-frame-pointer" # never omit the frame pointer when debugging! |
c2d636f4 | 16 | @@ -517,37 +517,6 @@ |
17 | fi | |
3a29eeef | 18 | |
19 | ||
20 | - # -m486 is usually in the specs for the compiler | |
21 | - # but gcc-3.0 wants -mcpu=i486 instead | |
22 | - # and gcc-3.4 wants -mtune=i486 instead | |
23 | - # let the compiler options be dependent of the _target_ | |
24 | - # where dosemu is compiled for, not the host | |
25 | - if test "$target_cpu" = "athlon" -a $GCC_VERSION_CODE -le 2095 ; then | |
26 | - target_cpu="i686" | |
27 | - fi | |
c2d636f4 | 28 | - if test -z "$target_cpu" ; then |
29 | - true | |
30 | - elif test "$GCC_VERSION_CODE" -ge 3004 ; then | |
3a29eeef | 31 | - OPT="$OPT -mtune=$target_cpu" |
32 | - elif test "$GCC_VERSION_CODE" -ge 2095 ; then | |
33 | - OPT="$OPT -mcpu=$target_cpu" | |
34 | - else | |
35 | - case "$target_cpu" in | |
36 | - i486) | |
37 | - OPT="$OPT -m486" | |
38 | - ;; | |
39 | - i386) | |
40 | - OPT="$OPT -m386" | |
41 | - ;; | |
42 | - *) | |
43 | - ;; | |
44 | - esac | |
45 | - fi | |
46 | - if test "$target_cpu" = "athlon"; then | |
47 | - OPT="$OPT -malign-functions=4 -fexpensive-optimizations" | |
48 | - elif test "$target_cpu" = "i486"; then | |
49 | - OPT="$OPT -malign-loops=2 -malign-jumps=2 -malign-functions=2" | |
50 | - fi | |
51 | ||
52 | AC_MSG_CHECKING(for glibc...) | |
c2d636f4 | 53 | set `printf '%b\n' '#include <features.h>\nXXAaZZ __GLIBC__ XXBbZZ __GLIBC_MINOR__'|${CC-cc} -E -|awk '/XXAaZZ/ {print $2 " " $4}'` |