91 lines
3.9 KiB
Diff
91 lines
3.9 KiB
Diff
diff -upr flac-1.2.0.orig/src/libFLAC/ia32/bitreader_asm.nasm flac-1.2.0/src/libFLAC/ia32/bitreader_asm.nasm
|
|
--- flac-1.2.0.orig/src/libFLAC/ia32/bitreader_asm.nasm 2007-03-30 01:54:17.000000000 +0100
|
|
+++ flac-1.2.0/src/libFLAC/ia32/bitreader_asm.nasm 2007-09-11 15:21:48.000000000 +0100
|
|
@@ -563,6 +563,4 @@ cident FLAC__bitreader_read_rice_signed_
|
|
|
|
end
|
|
|
|
-%ifdef OBJ_FORMAT_elf
|
|
- section .note.GNU-stack noalloc
|
|
-%endif
|
|
+section .note.GNU-stack progbits noalloc noexec nowrite align=1
|
|
diff -upr flac-1.2.0.orig/src/libFLAC/ia32/cpu_asm.nasm flac-1.2.0/src/libFLAC/ia32/cpu_asm.nasm
|
|
--- flac-1.2.0.orig/src/libFLAC/ia32/cpu_asm.nasm 2007-03-22 03:13:11.000000000 +0000
|
|
+++ flac-1.2.0/src/libFLAC/ia32/cpu_asm.nasm 2007-09-11 15:21:59.000000000 +0100
|
|
@@ -116,6 +116,4 @@ cident FLAC__cpu_info_extended_amd_asm_i
|
|
|
|
end
|
|
|
|
-%ifdef OBJ_FORMAT_elf
|
|
- section .note.GNU-stack noalloc
|
|
-%endif
|
|
+section .note.GNU-stack progbits noalloc noexec nowrite align=1
|
|
diff -upr flac-1.2.0.orig/src/libFLAC/ia32/fixed_asm.nasm flac-1.2.0/src/libFLAC/ia32/fixed_asm.nasm
|
|
--- flac-1.2.0.orig/src/libFLAC/ia32/fixed_asm.nasm 2007-03-22 03:13:11.000000000 +0000
|
|
+++ flac-1.2.0/src/libFLAC/ia32/fixed_asm.nasm 2007-09-11 15:22:06.000000000 +0100
|
|
@@ -307,6 +307,4 @@ cident FLAC__fixed_compute_best_predicto
|
|
|
|
end
|
|
|
|
-%ifdef OBJ_FORMAT_elf
|
|
- section .note.GNU-stack noalloc
|
|
-%endif
|
|
+section .note.GNU-stack progbits noalloc noexec nowrite align=1
|
|
diff -upr flac-1.2.0.orig/src/libFLAC/ia32/lpc_asm.nasm flac-1.2.0/src/libFLAC/ia32/lpc_asm.nasm
|
|
--- flac-1.2.0.orig/src/libFLAC/ia32/lpc_asm.nasm 2007-03-22 03:13:11.000000000 +0000
|
|
+++ flac-1.2.0/src/libFLAC/ia32/lpc_asm.nasm 2007-09-11 15:22:13.000000000 +0100
|
|
@@ -1506,6 +1506,4 @@ cident FLAC__lpc_restore_signal_asm_ia32
|
|
|
|
end
|
|
|
|
-%ifdef OBJ_FORMAT_elf
|
|
- section .note.GNU-stack noalloc
|
|
-%endif
|
|
+section .note.GNU-stack progbits noalloc noexec nowrite align=1
|
|
diff -upr flac-1.2.0.orig/src/libFLAC/ia32/stream_encoder_asm.nasm flac-1.2.0/src/libFLAC/ia32/stream_encoder_asm.nasm
|
|
--- flac-1.2.0.orig/src/libFLAC/ia32/stream_encoder_asm.nasm 2007-06-20 02:23:49.000000000 +0100
|
|
+++ flac-1.2.0/src/libFLAC/ia32/stream_encoder_asm.nasm 2007-09-11 15:22:21.000000000 +0100
|
|
@@ -154,6 +154,4 @@ cident precompute_partition_info_sums_32
|
|
|
|
end
|
|
|
|
-%ifdef OBJ_FORMAT_elf
|
|
- section .note.GNU-stack noalloc
|
|
-%endif
|
|
+section .note.GNU-stack progbits noalloc noexec nowrite align=1
|
|
diff -upr flac-1.2.0/src/libFLAC/bitreader.c flac-1.2.0.new/src/libFLAC/bitreader.c
|
|
--- flac-1.2.0/src/libFLAC/bitreader.c 2007-07-23 17:14:35.000000000 +0100
|
|
+++ flac-1.2.0.new/src/libFLAC/bitreader.c 2007-09-12 18:15:30.000000000 +0100
|
|
@@ -203,6 +203,7 @@ static FLaC__INLINE void crc16_update_wo
|
|
}
|
|
|
|
/* would be static except it needs to be called by asm routines */
|
|
+ __attribute__((__visibility__("hidden")))
|
|
FLAC__bool bitreader_read_from_client_(FLAC__BitReader *br)
|
|
{
|
|
unsigned start, end;
|
|
diff -upr flac-1.2.0/src/libFLAC/crc.c flac-1.2.0.new/src/libFLAC/crc.c
|
|
--- flac-1.2.0/src/libFLAC/crc.c 2007-02-02 06:58:22.000000000 +0000
|
|
+++ flac-1.2.0.new/src/libFLAC/crc.c 2007-09-12 18:13:44.000000000 +0100
|
|
@@ -73,7 +73,7 @@ FLAC__byte const FLAC__crc8_table[256] =
|
|
};
|
|
|
|
/* CRC-16, poly = x^16 + x^15 + x^2 + x^0, init = 0 */
|
|
-
|
|
+__attribute__((__visibility__("hidden")))
|
|
unsigned FLAC__crc16_table[256] = {
|
|
0x0000, 0x8005, 0x800f, 0x000a, 0x801b, 0x001e, 0x0014, 0x8011,
|
|
0x8033, 0x0036, 0x003c, 0x8039, 0x0028, 0x802d, 0x8027, 0x0022,
|
|
diff -upr flac-1.2.0/src/libFLAC/bitreader.c flac-1.2.0.new/src/libFLAC/bitreader.c
|
|
--- flac-1.2.0/src/libFLAC/bitreader.c 2007-09-12 18:17:56.000000000 +0100
|
|
+++ flac-1.2.0.new/src/libFLAC/bitreader.c 2007-09-12 19:09:00.000000000 +0100
|
|
@@ -774,6 +774,7 @@ FLaC__INLINE FLAC__bool FLAC__bitreader_
|
|
}
|
|
#endif
|
|
|
|
+ __attribute__((__visibility__("hidden")))
|
|
FLAC__bool FLAC__bitreader_read_rice_signed(FLAC__BitReader *br, int *val, unsigned parameter)
|
|
{
|
|
FLAC__uint32 lsbs = 0, msbs = 0;
|
|
|