diff mbox series

[v1,3/7] tests/tcg: remove extraneous pasting macros

Message ID 20200327094945.23768-4-alex.bennee@linaro.org
State Superseded
Headers show
Series A selection of sanitiser fixes | expand

Commit Message

Alex Bennée March 27, 2020, 9:49 a.m. UTC
We are not using them and they just get in the way.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

---
 tests/tcg/x86_64/system/boot.S | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

-- 
2.20.1

Comments

Philippe Mathieu-Daudé March 27, 2020, 10:54 a.m. UTC | #1
On 3/27/20 10:49 AM, Alex Bennée wrote:
> We are not using them and they just get in the way.

> 

> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

> ---

>   tests/tcg/x86_64/system/boot.S | 5 +----

>   1 file changed, 1 insertion(+), 4 deletions(-)

> 

> diff --git a/tests/tcg/x86_64/system/boot.S b/tests/tcg/x86_64/system/boot.S

> index 205cfbd3982..73b19a2bda6 100644

> --- a/tests/tcg/x86_64/system/boot.S

> +++ b/tests/tcg/x86_64/system/boot.S

> @@ -41,10 +41,7 @@

>   #define XEN_ELFNOTE_PHYS32_ENTRY  18

>   

>   #define __ASM_FORM(x)	x

> -#define __ASM_FORM_RAW(x)     x

> -#define __ASM_FORM_COMMA(x) x,

> -#define __ASM_SEL(a,b)           __ASM_FORM(b)

> -#define __ASM_SEL_RAW(a,b)      __ASM_FORM_RAW(b)

> +#define __ASM_SEL(a,b)  __ASM_FORM(b)

>   #define _ASM_PTR	__ASM_SEL(.long, .quad)

>   

>   	ELFNOTE(Xen, XEN_ELFNOTE_VIRT_BASE,      _ASM_PTR 0x100000)

> 


Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Richard Henderson March 27, 2020, 10:11 p.m. UTC | #2
On 3/27/20 2:49 AM, Alex Bennée wrote:
> We are not using them and they just get in the way.

> 

> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

> ---

>  tests/tcg/x86_64/system/boot.S | 5 +----

>  1 file changed, 1 insertion(+), 4 deletions(-)


Reviewed-by: Richard Henderson <richard.henderson@linaro.org>


r~
diff mbox series

Patch

diff --git a/tests/tcg/x86_64/system/boot.S b/tests/tcg/x86_64/system/boot.S
index 205cfbd3982..73b19a2bda6 100644
--- a/tests/tcg/x86_64/system/boot.S
+++ b/tests/tcg/x86_64/system/boot.S
@@ -41,10 +41,7 @@ 
 #define XEN_ELFNOTE_PHYS32_ENTRY  18
 
 #define __ASM_FORM(x)	x
-#define __ASM_FORM_RAW(x)     x
-#define __ASM_FORM_COMMA(x) x,
-#define __ASM_SEL(a,b)           __ASM_FORM(b)
-#define __ASM_SEL_RAW(a,b)      __ASM_FORM_RAW(b)
+#define __ASM_SEL(a,b)  __ASM_FORM(b)
 #define _ASM_PTR	__ASM_SEL(.long, .quad)
 
 	ELFNOTE(Xen, XEN_ELFNOTE_VIRT_BASE,      _ASM_PTR 0x100000)