diff options
| author | Ganesh Ajjanagadde <gajjanagadde@gmail.com> | 2015-08-21 14:17:46 -0400 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-08-22 02:56:53 +0200 |
| commit | 531b0a316b24f00965cd8a88efdbea2c6d63147f (patch) | |
| tree | d1d119079692e791df958fd2cea8865443adccf9 | |
| parent | 670dfda143fc7d4d1d7620fed4a4eb5b2e0b1688 (diff) | |
| download | ffmpeg-531b0a316b24f00965cd8a88efdbea2c6d63147f.tar.gz | |
avutil/x86/asm: rename REG_SP to REG_sp
REG_SP is defined by Solaris system headers.
This fixes a sea of warnings while building on Solaris:
http://fate.ffmpeg.org/report.cgi?time=20150820233505&slot=x86-opensolaris-gcc4.3
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavutil/x86/asm.h | 5 | ||||
| -rw-r--r-- | libpostproc/postprocess_template.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libavutil/x86/asm.h b/libavutil/x86/asm.h index 616ad6c96f..109b65e542 100644 --- a/libavutil/x86/asm.h +++ b/libavutil/x86/asm.h @@ -38,7 +38,8 @@ typedef struct ymm_reg { uint64_t a, b, c, d; } ymm_reg; # define PTR_SIZE "8" typedef int64_t x86_reg; -# define REG_SP "rsp" +/* REG_SP is defined in Solaris sys headers, so use REG_sp */ +# define REG_sp "rsp" # define REG_BP "rbp" # define REGBP rbp # define REGa rax @@ -59,7 +60,7 @@ typedef int64_t x86_reg; # define PTR_SIZE "4" typedef int32_t x86_reg; -# define REG_SP "esp" +# define REG_sp "esp" # define REG_BP "ebp" # define REGBP ebp # define REGa eax diff --git a/libpostproc/postprocess_template.c b/libpostproc/postprocess_template.c index 5694cc5c28..b01be58de6 100644 --- a/libpostproc/postprocess_template.c +++ b/libpostproc/postprocess_template.c @@ -1317,7 +1317,7 @@ DERING_CORE((%0, %1, 8) ,(%%REGd, %1, 4),%%mm2,%%mm4,%%mm0,%%mm3,%%mm5,%%mm1, "1: \n\t" : : "r" (src), "r" ((x86_reg)stride), "m" (c->pQPb), "m"(c->pQPb2), "q"(tmp) NAMED_CONSTRAINTS_ADD(deringThreshold,b00,b02,b08) - : "%"REG_a, "%"REG_d, "%"REG_SP + : "%"REG_a, "%"REG_d, "%"REG_sp ); #else // HAVE_7REGS && (TEMPLATE_PP_MMXEXT || TEMPLATE_PP_3DNOW) int y; |