]>
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 @@ | |
5 | if test "$enable_debug" = "yes"; then | |
41f91c77 JB |
6 | CFLAGS="$CFLAGS -gstabs+" |
7 | AC_DEFINE(_DEBUG) | |
5a6901a1 | 8 | - OPT="-O" |
bc19b84e | 9 | + OPT="$OPTFLAGS" |
5a6901a1 | 10 | else |
5a6901a1 | 11 | - OPT="-O2" # BIG NOTE: do _not_ use -O3, |
bc19b84e | 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. | |
bc19b84e AM |
15 | OPT="$OPT -fomit-frame-pointer" # never omit the frame pointer when debugging! |
16 | @@ -517,33 +517,6 @@ | |
5a6901a1 JB |
17 | fi |
18 | ||
19 | ||
20 | - # -m486 is usually in the specs for the compiler | |
21 | - # but gcc-3.0 wants -mcpu=i486 instead | |
22 | - # let the compiler options be dependent of the _target_ | |
23 | - # where dosemu is compiled for, not the host | |
24 | - if test "$target_cpu" = "athlon" -a $GCC_VERSION_CODE -le 2095 ; then | |
25 | - target_cpu="i686" | |
26 | - fi | |
27 | - if test "$GCC_VERSION_CODE" -ge 2095 ; then | |
28 | - OPT="$OPT -mcpu=$target_cpu" | |
29 | - else | |
30 | - case "$target_cpu" in | |
31 | - i486) | |
32 | - OPT="$OPT -m486" | |
33 | - ;; | |
34 | - i386) | |
35 | - OPT="$OPT -m386" | |
36 | - ;; | |
37 | - *) | |
38 | - ;; | |
39 | - esac | |
40 | - fi | |
41 | - if test "$target_cpu" = "athlon"; then | |
42 | - OPT="$OPT -malign-functions=4 -fexpensive-optimizations" | |
43 | - elif test "$target_cpu" = "i486"; then | |
44 | - OPT="$OPT -malign-loops=2 -malign-jumps=2 -malign-functions=2" | |
45 | - fi | |
41f91c77 | 46 | - |
c02feb1a | 47 | AC_MSG_CHECKING(for glibc...) |
bc19b84e | 48 | set `printf '%b\n' '#include <features.h>\nXXAaZZ __GLIBC__ XXBbZZ __GLIBC_MINOR__'|gcc -E -|awk '/XXAaZZ/ {print $2 " " $4}'` |
41f91c77 | 49 | major=$1; minor=$2 |
bc19b84e AM |
50 | diff -urN dosemu-1.1.5.org/src/arch/linux/dosext/sound/midid/Makefile dosemu-1.1.5/src/arch/linux/dosext/sound/midid/Makefile |
51 | --- dosemu-1.1.5.org/src/arch/linux/dosext/sound/midid/Makefile 2003-09-01 23:10:03.000000000 +0200 | |
52 | +++ dosemu-1.1.5/src/arch/linux/dosext/sound/midid/Makefile 2003-09-01 23:10:19.000000000 +0200 | |
53 | @@ -19,7 +19,7 @@ | |
5a6901a1 JB |
54 | # No servicable parts below |
55 | ||
56 | CC=gcc | |
57 | -CFLAGS=-Wall -pipe -O -g | |
58 | +CFLAGS=-Wall -pipe $(OPTFLAGS) | |
59 | LDFLAGS += -Wall | |
60 | OBJECTS=midid.o events.o io.o stats.o emulation.o device.o \ | |
61 | oss.o midout.o timid.o null.o |