[PATCH] MIPS: Remove GCC_IMM_ASM & GCC_REG_ACCUM macros

[PATCH] MIPS: Remove GCC_IMM_ASM & GCC_REG_ACCUM macros

[Paul Burton]

asm/compiler.h defined GCC_IMM_ASM & GCC_REG_ACCUM macros, both of which
are defined differently for GCC pre-3.4 or GCC 3.4 & higher. We only
support building with GCC 4.6 & higher since commit cafa0010cd51 ("Raise
the minimum required gcc version to 4.6"), which makes the pre-3.4
definition dead code.

Rather than leave the macro definitions around, inline the GCC 3.4 &
higher definitions into the single file that uses them & remove the
macros entirely.

Signed-off-by: Paul Burton <paul.burton@mips.com>
---

 arch/mips/include/asm/compiler.h | 8 --------
 arch/mips/kernel/cpu-bugs64.c    | 4 ++--
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/arch/mips/include/asm/compiler.h b/arch/mips/include/asm/compiler.h
index cc2eb1b06050..9196fca4335d 100644
--- a/arch/mips/include/asm/compiler.h
+++ b/arch/mips/include/asm/compiler.h
@@ -43,14 +43,6 @@
 #undef barrier_before_unreachable
 #define barrier_before_unreachable() asm volatile(".insn")
 
-#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)
-#define GCC_IMM_ASM() "n"
-#define GCC_REG_ACCUM "$0"
-#else
-#define GCC_IMM_ASM() "rn"
-#define GCC_REG_ACCUM "accum"
-#endif
-
 #ifdef CONFIG_CPU_MIPSR6
 /* All MIPS R6 toolchains support the ZC constrain */
 #define GCC_OFF_SMALL_ASM() "ZC"
diff --git a/arch/mips/kernel/cpu-bugs64.c b/arch/mips/kernel/cpu-bugs64.c
index c9e8622b5a16..bada74af7641 100644
--- a/arch/mips/kernel/cpu-bugs64.c
+++ b/arch/mips/kernel/cpu-bugs64.c
@@ -39,7 +39,7 @@ static inline void align_mod(const int align, const int mod)
 		".endr\n\t"
 		".set	pop"
 		:
-		: GCC_IMM_ASM() (align), GCC_IMM_ASM() (mod));
+		: "n"(align), "n"(mod));
 }
 
 static inline void mult_sh_align_mod(long *v1, long *v2, long *w,
@@ -92,7 +92,7 @@ static inline void mult_sh_align_mod(long *v1, long *v2, long *w,
 		".set	pop"
 		: "=&r" (lv1), "=r" (lw)
 		: "r" (m1), "r" (m2), "r" (s), "I" (0)
-		: "hi", "lo", GCC_REG_ACCUM);
+		: "hi", "lo", "$0");
 	/* We have to use single integers for m1 and m2 and a double
 	 * one for p to be sure the mulsidi3 gcc's RTL multiplication
 	 * instruction has the workaround applied.  Older versions of
-- 
2.19.1

Re: [PATCH] MIPS: Remove GCC_IMM_ASM & GCC_REG_ACCUM macros

[Paul Burton]

Hello,

Paul Burton wrote:
> asm/compiler.h defined GCC_IMM_ASM & GCC_REG_ACCUM macros, both of which
> are defined differently for GCC pre-3.4 or GCC 3.4 & higher. We only
> support building with GCC 4.6 & higher since commit cafa0010cd51 ("Raise
> the minimum required gcc version to 4.6"), which makes the pre-3.4
> definition dead code.
> 
> Rather than leave the macro definitions around, inline the GCC 3.4 &
> higher definitions into the single file that uses them & remove the
> macros entirely.
> 
> Signed-off-by: Paul Burton <paul.burton@mips.com>

Applied to mips-next.

Thanks,
    Paul

[ This message was auto-generated; if you believe anything is incorrect
  then please email paul.burton@mips.com to report it. ]

Re: [PATCH] MIPS: Remove GCC_IMM_ASM & GCC_REG_ACCUM macros

[Paul Burton]

Hello,

Paul Burton wrote:
> asm/compiler.h defined GCC_IMM_ASM & GCC_REG_ACCUM macros, both of which
> are defined differently for GCC pre-3.4 or GCC 3.4 & higher. We only
> support building with GCC 4.6 & higher since commit cafa0010cd51 ("Raise
> the minimum required gcc version to 4.6"), which makes the pre-3.4
> definition dead code.
> 
> Rather than leave the macro definitions around, inline the GCC 3.4 &
> higher definitions into the single file that uses them & remove the
> macros entirely.
> 
> Signed-off-by: Paul Burton <paul.burton@mips.com>

Applied to mips-next.

Thanks,
    Paul

[ This message was auto-generated; if you believe anything is incorrect
  then please email paul.burton@mips.com to report it. ]

Re: [PATCH] MIPS: Remove GCC_IMM_ASM & GCC_REG_ACCUM macros

[Maciej W. Rozycki]

On Wed, 7 Nov 2018, Paul Burton wrote:

> diff --git a/arch/mips/kernel/cpu-bugs64.c b/arch/mips/kernel/cpu-bugs64.c
> index c9e8622b5a16..bada74af7641 100644
> --- a/arch/mips/kernel/cpu-bugs64.c
> +++ b/arch/mips/kernel/cpu-bugs64.c
> @@ -92,7 +92,7 @@ static inline void mult_sh_align_mod(long *v1, long *v2, long *w,
>  		".set	pop"
>  		: "=&r" (lv1), "=r" (lw)
>  		: "r" (m1), "r" (m2), "r" (s), "I" (0)
> -		: "hi", "lo", GCC_REG_ACCUM);
> +		: "hi", "lo", "$0");

 You can remove GCC_REG_ACCUM altogether rather than replacing it with 
"$0" as $0 cannot be clobbered. ;)

 I chose this construct for sane syntax, so that we don't have to invent 
things to have "accum" optionally there (e.g. having GCC_REG_ACCUM defined 
to `, "accum"' would be crazy, IMHO).

  Maciej