[Pixman] [PATCH] MIPS: Use .if instead of #ifdef definition of LEAF_MIPS32R2

James Cowgill james410 at cowgill.org.uk
Tue May 5 05:13:31 PDT 2015


From: Vicente Olivert Riera <Vincent.Riera at imgtec.com>

Commit 6d2cf40166d8 ("MIPS: Fix exported symbols in public API") attempted to
add a .hidden assembly directive, conditional on the code being compiled for an
ELF target. Unfortunately the #ifdef added was already inside a macro and
wasn't expanded properly by the preprocessor.

Fix by using an assembly .if directive which is handled by the assembler later
on.

Fixes: Bug 83358 (https://bugs.freedesktop.org/83358)
Fixes: 6d2cf40166d8 ("MIPS: Fix exported symbols in public API")
Signed-off-by: Vicente Olivert Riera <Vincent.Riera at imgtec.com>
Signed-off-by: James Cowgill <james410 at cowgill.org.uk>
Cc: Nemanja Lukic <nemanja.lukic at rt-rk.com>
---
 pixman/pixman-mips-dspr2-asm.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pixman/pixman-mips-dspr2-asm.h b/pixman/pixman-mips-dspr2-asm.h
index 11849bd..b2696d0 100644
--- a/pixman/pixman-mips-dspr2-asm.h
+++ b/pixman/pixman-mips-dspr2-asm.h
@@ -72,10 +72,10 @@
 #define LEAF_MIPS32R2(symbol)                           \
                 .globl  symbol;                         \
                 .align  2;                              \
-#ifdef __ELF__
+            .if __ELF__;                                \
                 .hidden symbol;                         \
                 .type   symbol, @function;              \
-#endif
+            .endif;                                     \
                 .ent    symbol, 0;                      \
 symbol:         .frame  sp, 0, ra;                      \
                 .set    push;                           \
-- 
2.1.4



More information about the Pixman mailing list