[SCM] libav/experimental: ARM: cleaner selection of ELF-spefic assembler directives

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 341f394f0dc3e0469022000a363ca49bea8807e6
Author: Måns Rullgård <mans at mansr.com>
Date:   Mon Jul 27 22:55:55 2009 +0000

    ARM: cleaner selection of ELF-spefic assembler directives
    
    Originally committed as revision 19522 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/arm/asm.S b/libavcodec/arm/asm.S
index e2a86c8..02f9015 100644
--- a/libavcodec/arm/asm.S
+++ b/libavcodec/arm/asm.S
@@ -20,25 +20,25 @@
 
 #include "config.h"
 
-        .macro require8, val=1
 #ifdef __ELF__
-        .eabi_attribute 24, \val
+#   define ELF
+#else
+#   define ELF @
 #endif
+
+        .macro require8, val=1
+ELF     .eabi_attribute 24, \val
         .endm
 
         .macro preserve8, val=1
-#ifdef __ELF__
-        .eabi_attribute 25, \val
-#endif
+ELF     .eabi_attribute 25, \val
         .endm
 
         .macro function name, export=0
 .if \export
         .global \name
 .endif
-#ifdef __ELF__
-        .type   \name, %function
-#endif
+ELF     .type   \name, %function
         .func   \name
 \name:
         .endm

-- 
Libav/FFmpeg packaging