1 diff -up flac-1.2.1/src/libFLAC/stream_decoder.c.asm flac-1.2.1/src/libFLAC/stream_decoder.c
2 --- flac-1.2.1/src/libFLAC/stream_decoder.c.asm 2007-09-13 17:38:05.000000000 +0200
3 +++ flac-1.2.1/src/libFLAC/stream_decoder.c 2008-01-29 10:32:17.000000000 +0100
4 @@ -421,7 +421,7 @@ static FLAC__StreamDecoderInitStatus ini
6 FLAC__ASSERT(decoder->private_->cpuinfo.type == FLAC__CPUINFO_TYPE_IA32);
8 -#if 1 /*@@@@@@ OPT: not clearly faster, needs more testing */
9 +#if 0 /*@@@@@@ OPT: not clearly faster, needs more testing */
10 if(decoder->private_->cpuinfo.data.ia32.bswap)
11 decoder->private_->local_bitreader_read_rice_signed_block = FLAC__bitreader_read_rice_signed_block_asm_ia32_bswap;
13 diff -up flac-1.2.1/src/libFLAC/ia32/lpc_asm.nasm.asm flac-1.2.1/src/libFLAC/ia32/lpc_asm.nasm
14 --- flac-1.2.1/src/libFLAC/ia32/lpc_asm.nasm.asm 2007-03-22 05:13:05.000000000 +0100
15 +++ flac-1.2.1/src/libFLAC/ia32/lpc_asm.nasm 2008-01-29 10:34:09.000000000 +0100
16 @@ -1507,5 +1507,5 @@ cident FLAC__lpc_restore_signal_asm_ia32
20 - section .note.GNU-stack noalloc
21 + section .note.GNU-stack progbits noalloc noexec nowrite align=1
23 diff -up flac-1.2.1/src/libFLAC/ia32/Makefile.am.asm flac-1.2.1/src/libFLAC/ia32/Makefile.am
24 --- flac-1.2.1/src/libFLAC/ia32/Makefile.am.asm 2007-04-04 02:01:13.000000000 +0200
25 +++ flac-1.2.1/src/libFLAC/ia32/Makefile.am 2008-03-17 14:04:37.000000000 +0100
26 @@ -37,7 +37,6 @@ STRIP_NON_ASM = sh $(top_srcdir)/strip_n
28 noinst_LTLIBRARIES = libFLAC-asm.la
29 libFLAC_asm_la_SOURCES = \
30 - bitreader_asm.nasm \
34 diff -up flac-1.2.1/src/libFLAC/ia32/bitreader_asm.nasm.asm flac-1.2.1/src/libFLAC/ia32/bitreader_asm.nasm
35 --- flac-1.2.1/src/libFLAC/ia32/bitreader_asm.nasm.asm 2007-03-30 02:54:53.000000000 +0200
36 +++ flac-1.2.1/src/libFLAC/ia32/bitreader_asm.nasm 2008-01-29 10:32:57.000000000 +0100
37 @@ -564,5 +564,5 @@ cident FLAC__bitreader_read_rice_signed_
41 - section .note.GNU-stack noalloc
42 + section .note.GNU-stack progbits noalloc noexec nowrite align=1
44 diff -up flac-1.2.1/src/libFLAC/ia32/fixed_asm.nasm.asm flac-1.2.1/src/libFLAC/ia32/fixed_asm.nasm
45 --- flac-1.2.1/src/libFLAC/ia32/fixed_asm.nasm.asm 2007-03-22 05:13:05.000000000 +0100
46 +++ flac-1.2.1/src/libFLAC/ia32/fixed_asm.nasm 2008-01-29 10:33:52.000000000 +0100
47 @@ -308,5 +308,5 @@ cident FLAC__fixed_compute_best_predicto
51 - section .note.GNU-stack noalloc
52 + section .note.GNU-stack progbits noalloc noexec nowrite align=1
54 diff -up flac-1.2.1/src/libFLAC/ia32/cpu_asm.nasm.asm flac-1.2.1/src/libFLAC/ia32/cpu_asm.nasm
55 --- flac-1.2.1/src/libFLAC/ia32/cpu_asm.nasm.asm 2007-03-22 05:13:05.000000000 +0100
56 +++ flac-1.2.1/src/libFLAC/ia32/cpu_asm.nasm 2008-01-29 10:33:24.000000000 +0100
57 @@ -117,5 +117,5 @@ cident FLAC__cpu_info_extended_amd_asm_i
61 - section .note.GNU-stack noalloc
62 + section .note.GNU-stack progbits noalloc noexec nowrite align=1
64 diff -up flac-1.2.1/src/libFLAC/ia32/stream_encoder_asm.nasm.asm flac-1.2.1/src/libFLAC/ia32/stream_encoder_asm.nasm
65 --- flac-1.2.1/src/libFLAC/ia32/stream_encoder_asm.nasm.asm 2007-06-19 22:01:27.000000000 +0200
66 +++ flac-1.2.1/src/libFLAC/ia32/stream_encoder_asm.nasm 2008-01-29 10:34:40.000000000 +0100
67 @@ -155,5 +155,5 @@ cident precompute_partition_info_sums_32
71 - section .note.GNU-stack noalloc
72 + section .note.GNU-stack progbits noalloc noexec nowrite align=1