tweak usage of cident macro

diff --git a/src/libFLAC/i386/cpu_asm.s b/src/libFLAC/i386/cpu_asm.s
index b674c4d..2869fda 100644 (file)
--- a/src/libFLAC/i386/cpu_asm.s
+++ b/src/libFLAC/i386/cpu_asm.s
@@ -27,7 +27,7 @@ cglobal FLAC__cpu_info_asm_i386
 ; **********************************************************************
 ;
        ALIGN 16
-cident FLAC__cpu_info_asm_i386:
+cident FLAC__cpu_info_asm_i386
 
        push    ebx
 

diff --git a/src/libFLAC/i386/fixed_asm.s b/src/libFLAC/i386/fixed_asm.s
index 9e72a8f..b0aba2e 100644 (file)
--- a/src/libFLAC/i386/fixed_asm.s
+++ b/src/libFLAC/i386/fixed_asm.s
@@ -64,7 +64,7 @@ cglobal FLAC__fixed_compute_best_predictor_asm_i386_mmx_cmov
 ;      return order;
 ; }
        ALIGN 16
-cident FLAC__fixed_compute_best_predictor_asm_i386_mmx_cmov:
+cident FLAC__fixed_compute_best_predictor_asm_i386_mmx_cmov
 
        ; esp + 36 == data[]
        ; esp + 40 == data_len

diff --git a/src/libFLAC/i386/lpc_asm.s b/src/libFLAC/i386/lpc_asm.s
index 2353bc1..0bf4617 100644 (file)
--- a/src/libFLAC/i386/lpc_asm.s
+++ b/src/libFLAC/i386/lpc_asm.s
@@ -55,7 +55,7 @@ cglobal FLAC__lpc_restore_signal_asm_i386_mmx
 ; }
 ;
        ALIGN 16
-cident FLAC__lpc_compute_autocorrelation_asm_i386:
+cident FLAC__lpc_compute_autocorrelation_asm_i386
 
        ; esp + 32 == autoc[]
        ; esp + 28 == lag
@@ -206,7 +206,7 @@ cident FLAC__lpc_compute_autocorrelation_asm_i386:
 
 ;@@@ NOTE: this SSE version is not even tested yet and only works for lag == 8
        ALIGN 16
-cident FLAC__lpc_compute_autocorrelation_asm_i386_sse:
+cident FLAC__lpc_compute_autocorrelation_asm_i386_sse
 
        ; esp + 16 == autoc[]
        ; esp + 12 == lag
@@ -280,7 +280,7 @@ cident FLAC__lpc_compute_autocorrelation_asm_i386_sse:
 ;      }
 ;
        ALIGN   16
-cident FLAC__lpc_compute_residual_from_qlp_coefficients_asm_i386:
+cident FLAC__lpc_compute_residual_from_qlp_coefficients_asm_i386
        ;[esp + 40]     residual[]
        ;[esp + 36]     lp_quantization
        ;[esp + 32]     order
@@ -488,7 +488,7 @@ cident FLAC__lpc_compute_residual_from_qlp_coefficients_asm_i386:
 ; the channel must be <= 16.  Especially note that this routine cannot be used
 ; for side-channel coded 16bps channels since the effective bps is 17.
        ALIGN   16
-cident FLAC__lpc_compute_residual_from_qlp_coefficients_asm_i386_mmx:
+cident FLAC__lpc_compute_residual_from_qlp_coefficients_asm_i386_mmx
        ;[esp + 40]     residual[]
        ;[esp + 36]     lp_quantization
        ;[esp + 32]     order
@@ -677,7 +677,7 @@ cident FLAC__lpc_compute_residual_from_qlp_coefficients_asm_i386_mmx:
 ;      }
 ; }
        ALIGN   16
-cident FLAC__lpc_restore_signal_asm_i386:
+cident FLAC__lpc_restore_signal_asm_i386
        ;[esp + 40]     data[]
        ;[esp + 36]     lp_quantization
        ;[esp + 32]     order
@@ -882,7 +882,7 @@ cident FLAC__lpc_restore_signal_asm_i386:
 ; the channel must be <= 16.  Especially note that this routine cannot be used
 ; for side-channel coded 16bps channels since the effective bps is 17.
        ALIGN   16
-cident FLAC__lpc_restore_signal_asm_i386_mmx:
+cident FLAC__lpc_restore_signal_asm_i386_mmx
        ;[esp + 40]     data[]
        ;[esp + 36]     lp_quantization
        ;[esp + 32]     order

diff --git a/src/libFLAC/i386/nasm.h b/src/libFLAC/i386/nasm.h
index dc184cb..316955f 100644 (file)
--- a/src/libFLAC/i386/nasm.h
+++ b/src/libFLAC/i386/nasm.h
@@ -53,9 +53,6 @@
 %endmacro
 
 %imacro cident 1
-       %ifdef FLAC__PUBLIC_NEEDS_UNDERSCORE
-               _%1
-       %else
-               %1
-       %endif
+_%1:
+%1:
 %endmacro