[Pixman] [PATCH v2] MIPS: Drop #ifdef __ELF__ in definition of LEAF_MIPS32R2

Pekka Paalanen ppaalanen at gmail.com
Thu May 7 02:54:48 PDT 2015


On Tue,  5 May 2015 16:39:38 +0100
James Cowgill <james410 at cowgill.org.uk> wrote:

> 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 removing the check. It's unlikely there are many non-ELF MIPS systems
> around anyway.
> 
> Fixes: Bug 83358 (https://bugs.freedesktop.org/83358)
> Fixes: 6d2cf40166d8 ("MIPS: Fix exported symbols in public API")
> Signed-off-by: James Cowgill <james410 at cowgill.org.uk>
> Cc: Vicente Olivert Riera <Vincent.Riera at imgtec.com>
> Cc: Nemanja Lukic <nemanja.lukic at rt-rk.com>
> ---
>  pixman/pixman-mips-dspr2-asm.h | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/pixman/pixman-mips-dspr2-asm.h b/pixman/pixman-mips-dspr2-asm.h
> index 11849bd..e44edd6 100644
> --- a/pixman/pixman-mips-dspr2-asm.h
> +++ b/pixman/pixman-mips-dspr2-asm.h
> @@ -72,10 +72,8 @@
>  #define LEAF_MIPS32R2(symbol)                           \
>                  .globl  symbol;                         \
>                  .align  2;                              \
> -#ifdef __ELF__
>                  .hidden symbol;                         \
>                  .type   symbol, @function;              \
> -#endif
>                  .ent    symbol, 0;                      \
>  symbol:         .frame  sp, 0, ra;                      \
>                  .set    push;                           \

Hi,

after Siarhai's comments, this looks good to me. Pushed with my R-b
(FWIW) and I added an Acked-by Siarhei, because this patch does exactly
what he suggested.
   6f14bae..cf086d4  master -> master


Thanks,
pq


More information about the Pixman mailing list