Commit 37d62758 authored by Ammar Faizi's avatar Ammar Faizi Committed by Paul E. McKenney
Browse files

tools/nolibc: Replace `asm` with `__asm__` 

Replace `asm` with `__asm__` to support compilation with -std flag.
Using `asm` with -std flag makes GCC think `asm()` is a function call
instead of an inline assembly.

GCC doc says:

  For the C language, the `asm` keyword is a GNU extension. When
  writing C code that can be compiled with `-ansi` and the `-std`
  options that select C dialects without GNU extensions, use
  `__asm__` instead of `asm`.

Link: https://gcc.gnu.org/onlinedocs/gcc/Basic-Asm.html


Reported-by: default avatarAlviro Iskandar Setiawan <alviro.iskandar@gnuweeb.org>
Acked-by: default avatarWilly Tarreau <w@1wt.eu>
Signed-off-by: default avatarAmmar Faizi <ammarfaizi2@gnuweeb.org>
Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
parent 5312aaa5

tools/include/nolibc/arch-aarch64.h

+37 −37
Original line number Diff line number Diff line
@@ -64,10 +64,10 @@ struct sys_stat_struct { 


#define my_syscall0(num)                                                      \

({                                                                            \

	register long _num  asm("x8") = (num);                                \

	register long _arg1 asm("x0");                                        \

	register long _num  __asm__ ("x8") = (num);                           \

	register long _arg1 __asm__ ("x0");                                   \

	                                                                      \

	asm volatile (                                                        \

	__asm__  volatile (                                                   \

		"svc #0\n"                                                    \

		: "=r"(_arg1)                                                 \

		: "r"(_num)                                                   \
@@ -78,10 +78,10 @@ struct sys_stat_struct { 


#define my_syscall1(num, arg1)                                                \

({                                                                            \

	register long _num  asm("x8") = (num);                                \

	register long _arg1 asm("x0") = (long)(arg1);                         \

	register long _num  __asm__ ("x8") = (num);                           \

	register long _arg1 __asm__ ("x0") = (long)(arg1);                    \

	                                                                      \

	asm volatile (                                                        \

	__asm__  volatile (                                                   \

		"svc #0\n"                                                    \

		: "=r"(_arg1)                                                 \

		: "r"(_arg1),                                                 \
@@ -93,11 +93,11 @@ struct sys_stat_struct { 


#define my_syscall2(num, arg1, arg2)                                          \

({                                                                            \

	register long _num  asm("x8") = (num);                                \

	register long _arg1 asm("x0") = (long)(arg1);                         \

	register long _arg2 asm("x1") = (long)(arg2);                         \

	register long _num  __asm__ ("x8") = (num);                           \

	register long _arg1 __asm__ ("x0") = (long)(arg1);                    \

	register long _arg2 __asm__ ("x1") = (long)(arg2);                    \

	                                                                      \

	asm volatile (                                                        \

	__asm__  volatile (                                                   \

		"svc #0\n"                                                    \

		: "=r"(_arg1)                                                 \

		: "r"(_arg1), "r"(_arg2),                                     \
@@ -109,12 +109,12 @@ struct sys_stat_struct { 


#define my_syscall3(num, arg1, arg2, arg3)                                    \

({                                                                            \

	register long _num  asm("x8") = (num);                                \

	register long _arg1 asm("x0") = (long)(arg1);                         \

	register long _arg2 asm("x1") = (long)(arg2);                         \

	register long _arg3 asm("x2") = (long)(arg3);                         \

	register long _num  __asm__ ("x8") = (num);                           \

	register long _arg1 __asm__ ("x0") = (long)(arg1);                    \

	register long _arg2 __asm__ ("x1") = (long)(arg2);                    \

	register long _arg3 __asm__ ("x2") = (long)(arg3);                    \

	                                                                      \

	asm volatile (                                                        \

	__asm__  volatile (                                                   \

		"svc #0\n"                                                    \

		: "=r"(_arg1)                                                 \

		: "r"(_arg1), "r"(_arg2), "r"(_arg3),                         \
@@ -126,13 +126,13 @@ struct sys_stat_struct { 


#define my_syscall4(num, arg1, arg2, arg3, arg4)                              \

({                                                                            \

	register long _num  asm("x8") = (num);                                \

	register long _arg1 asm("x0") = (long)(arg1);                         \

	register long _arg2 asm("x1") = (long)(arg2);                         \

	register long _arg3 asm("x2") = (long)(arg3);                         \

	register long _arg4 asm("x3") = (long)(arg4);                         \

	register long _num  __asm__ ("x8") = (num);                           \

	register long _arg1 __asm__ ("x0") = (long)(arg1);                    \

	register long _arg2 __asm__ ("x1") = (long)(arg2);                    \

	register long _arg3 __asm__ ("x2") = (long)(arg3);                    \

	register long _arg4 __asm__ ("x3") = (long)(arg4);                    \

	                                                                      \

	asm volatile (                                                        \

	__asm__  volatile (                                                   \

		"svc #0\n"                                                    \

		: "=r"(_arg1)                                                 \

		: "r"(_arg1), "r"(_arg2), "r"(_arg3), "r"(_arg4),             \
@@ -144,14 +144,14 @@ struct sys_stat_struct { 


#define my_syscall5(num, arg1, arg2, arg3, arg4, arg5)                        \

({                                                                            \

	register long _num  asm("x8") = (num);                                \

	register long _arg1 asm("x0") = (long)(arg1);                         \

	register long _arg2 asm("x1") = (long)(arg2);                         \

	register long _arg3 asm("x2") = (long)(arg3);                         \

	register long _arg4 asm("x3") = (long)(arg4);                         \

	register long _arg5 asm("x4") = (long)(arg5);                         \

	register long _num  __asm__ ("x8") = (num);                           \

	register long _arg1 __asm__ ("x0") = (long)(arg1);                    \

	register long _arg2 __asm__ ("x1") = (long)(arg2);                    \

	register long _arg3 __asm__ ("x2") = (long)(arg3);                    \

	register long _arg4 __asm__ ("x3") = (long)(arg4);                    \

	register long _arg5 __asm__ ("x4") = (long)(arg5);                    \

	                                                                      \

	asm volatile (                                                        \

	__asm__  volatile (                                                   \

		"svc #0\n"                                                    \

		: "=r" (_arg1)                                                \

		: "r"(_arg1), "r"(_arg2), "r"(_arg3), "r"(_arg4), "r"(_arg5), \
@@ -163,15 +163,15 @@ struct sys_stat_struct { 


#define my_syscall6(num, arg1, arg2, arg3, arg4, arg5, arg6)                  \

({                                                                            \

	register long _num  asm("x8") = (num);                                \

	register long _arg1 asm("x0") = (long)(arg1);                         \

	register long _arg2 asm("x1") = (long)(arg2);                         \

	register long _arg3 asm("x2") = (long)(arg3);                         \

	register long _arg4 asm("x3") = (long)(arg4);                         \

	register long _arg5 asm("x4") = (long)(arg5);                         \

	register long _arg6 asm("x5") = (long)(arg6);                         \

	register long _num  __asm__ ("x8") = (num);                           \

	register long _arg1 __asm__ ("x0") = (long)(arg1);                    \

	register long _arg2 __asm__ ("x1") = (long)(arg2);                    \

	register long _arg3 __asm__ ("x2") = (long)(arg3);                    \

	register long _arg4 __asm__ ("x3") = (long)(arg4);                    \

	register long _arg5 __asm__ ("x4") = (long)(arg5);                    \

	register long _arg6 __asm__ ("x5") = (long)(arg6);                    \

	                                                                      \

	asm volatile (                                                        \

	__asm__  volatile (                                                   \

		"svc #0\n"                                                    \

		: "=r" (_arg1)                                                \

		: "r"(_arg1), "r"(_arg2), "r"(_arg3), "r"(_arg4), "r"(_arg5), \
@@ -182,7 +182,7 @@ struct sys_stat_struct { 
})



/* startup code */

asm(".section .text\n"

__asm__ (".section .text\n"

    ".weak _start\n"

    ".global _start\n"

    "_start:\n"

tools/include/nolibc/arch-arm.h

+29 −29
Original line number Diff line number Diff line
@@ -77,10 +77,10 @@ struct sys_stat_struct { 


#define my_syscall0(num)                                                      \

({                                                                            \

	register long _num asm("r7") = (num);                                 \

	register long _arg1 asm("r0");                                        \

	register long _num __asm__ ("r7") = (num);                            \

	register long _arg1 __asm__ ("r0");                                   \

	                                                                      \

	asm volatile (                                                        \

	__asm__  volatile (                                                   \

		"svc #0\n"                                                    \

		: "=r"(_arg1)                                                 \

		: "r"(_num)                                                   \
@@ -91,10 +91,10 @@ struct sys_stat_struct { 


#define my_syscall1(num, arg1)                                                \

({                                                                            \

	register long _num asm("r7") = (num);                                 \

	register long _arg1 asm("r0") = (long)(arg1);                         \

	register long _num __asm__ ("r7") = (num);                            \

	register long _arg1 __asm__ ("r0") = (long)(arg1);                    \

	                                                                      \

	asm volatile (                                                        \

	__asm__  volatile (                                                   \

		"svc #0\n"                                                    \

		: "=r"(_arg1)                                                 \

		: "r"(_arg1),                                                 \
@@ -106,11 +106,11 @@ struct sys_stat_struct { 


#define my_syscall2(num, arg1, arg2)                                          \

({                                                                            \

	register long _num asm("r7") = (num);                                 \

	register long _arg1 asm("r0") = (long)(arg1);                         \

	register long _arg2 asm("r1") = (long)(arg2);                         \

	register long _num __asm__ ("r7") = (num);                            \

	register long _arg1 __asm__ ("r0") = (long)(arg1);                    \

	register long _arg2 __asm__ ("r1") = (long)(arg2);                    \

	                                                                      \

	asm volatile (                                                        \

	__asm__  volatile (                                                   \

		"svc #0\n"                                                    \

		: "=r"(_arg1)                                                 \

		: "r"(_arg1), "r"(_arg2),                                     \
@@ -122,12 +122,12 @@ struct sys_stat_struct { 


#define my_syscall3(num, arg1, arg2, arg3)                                    \

({                                                                            \

	register long _num asm("r7") = (num);                                 \

	register long _arg1 asm("r0") = (long)(arg1);                         \

	register long _arg2 asm("r1") = (long)(arg2);                         \

	register long _arg3 asm("r2") = (long)(arg3);                         \

	register long _num __asm__ ("r7") = (num);                            \

	register long _arg1 __asm__ ("r0") = (long)(arg1);                    \

	register long _arg2 __asm__ ("r1") = (long)(arg2);                    \

	register long _arg3 __asm__ ("r2") = (long)(arg3);                    \

	                                                                      \

	asm volatile (                                                        \

	__asm__  volatile (                                                   \

		"svc #0\n"                                                    \

		: "=r"(_arg1)                                                 \

		: "r"(_arg1), "r"(_arg2), "r"(_arg3),                         \
@@ -139,13 +139,13 @@ struct sys_stat_struct { 


#define my_syscall4(num, arg1, arg2, arg3, arg4)                              \

({                                                                            \

	register long _num asm("r7") = (num);                                 \

	register long _arg1 asm("r0") = (long)(arg1);                         \

	register long _arg2 asm("r1") = (long)(arg2);                         \

	register long _arg3 asm("r2") = (long)(arg3);                         \

	register long _arg4 asm("r3") = (long)(arg4);                         \

	register long _num __asm__ ("r7") = (num);                            \

	register long _arg1 __asm__ ("r0") = (long)(arg1);                    \

	register long _arg2 __asm__ ("r1") = (long)(arg2);                    \

	register long _arg3 __asm__ ("r2") = (long)(arg3);                    \

	register long _arg4 __asm__ ("r3") = (long)(arg4);                    \

	                                                                      \

	asm volatile (                                                        \

	__asm__  volatile (                                                   \

		"svc #0\n"                                                    \

		: "=r"(_arg1)                                                 \

		: "r"(_arg1), "r"(_arg2), "r"(_arg3), "r"(_arg4),             \
@@ -157,14 +157,14 @@ struct sys_stat_struct { 


#define my_syscall5(num, arg1, arg2, arg3, arg4, arg5)                        \

({                                                                            \

	register long _num asm("r7") = (num);                                 \

	register long _arg1 asm("r0") = (long)(arg1);                         \

	register long _arg2 asm("r1") = (long)(arg2);                         \

	register long _arg3 asm("r2") = (long)(arg3);                         \

	register long _arg4 asm("r3") = (long)(arg4);                         \

	register long _arg5 asm("r4") = (long)(arg5);                         \

	register long _num __asm__ ("r7") = (num);                            \

	register long _arg1 __asm__ ("r0") = (long)(arg1);                    \

	register long _arg2 __asm__ ("r1") = (long)(arg2);                    \

	register long _arg3 __asm__ ("r2") = (long)(arg3);                    \

	register long _arg4 __asm__ ("r3") = (long)(arg4);                    \

	register long _arg5 __asm__ ("r4") = (long)(arg5);                    \

	                                                                      \

	asm volatile (                                                        \

	__asm__  volatile (                                                   \

		"svc #0\n"                                                    \

		: "=r" (_arg1)                                                \

		: "r"(_arg1), "r"(_arg2), "r"(_arg3), "r"(_arg4), "r"(_arg5), \
@@ -175,7 +175,7 @@ struct sys_stat_struct { 
})



/* startup code */

asm(".section .text\n"

__asm__ (".section .text\n"

    ".weak _start\n"

    ".global _start\n"

    "_start:\n"

tools/include/nolibc/arch-i386.h

+28 −28
Original line number Diff line number Diff line
@@ -66,9 +66,9 @@ struct sys_stat_struct { 
#define my_syscall0(num)                                                      \

({                                                                            \

	long _ret;                                                            \

	register long _num asm("eax") = (num);                                \

	register long _num __asm__ ("eax") = (num);                           \

	                                                                      \

	asm volatile (                                                        \

	__asm__  volatile (                                                   \

		"int $0x80\n"                                                 \

		: "=a" (_ret)                                                 \

		: "0"(_num)                                                   \
@@ -80,10 +80,10 @@ struct sys_stat_struct { 
#define my_syscall1(num, arg1)                                                \

({                                                                            \

	long _ret;                                                            \

	register long _num asm("eax") = (num);                                \

	register long _arg1 asm("ebx") = (long)(arg1);                        \

	register long _num __asm__ ("eax") = (num);                           \

	register long _arg1 __asm__ ("ebx") = (long)(arg1);                   \

	                                                                      \

	asm volatile (                                                        \

	__asm__  volatile (                                                   \

		"int $0x80\n"                                                 \

		: "=a" (_ret)                                                 \

		: "r"(_arg1),                                                 \
@@ -96,11 +96,11 @@ struct sys_stat_struct { 
#define my_syscall2(num, arg1, arg2)                                          \

({                                                                            \

	long _ret;                                                            \

	register long _num asm("eax") = (num);                                \

	register long _arg1 asm("ebx") = (long)(arg1);                        \

	register long _arg2 asm("ecx") = (long)(arg2);                        \

	register long _num __asm__ ("eax") = (num);                           \

	register long _arg1 __asm__ ("ebx") = (long)(arg1);                   \

	register long _arg2 __asm__ ("ecx") = (long)(arg2);                   \

	                                                                      \

	asm volatile (                                                        \

	__asm__  volatile (                                                   \

		"int $0x80\n"                                                 \

		: "=a" (_ret)                                                 \

		: "r"(_arg1), "r"(_arg2),                                     \
@@ -113,12 +113,12 @@ struct sys_stat_struct { 
#define my_syscall3(num, arg1, arg2, arg3)                                    \

({                                                                            \

	long _ret;                                                            \

	register long _num asm("eax") = (num);                                \

	register long _arg1 asm("ebx") = (long)(arg1);                        \

	register long _arg2 asm("ecx") = (long)(arg2);                        \

	register long _arg3 asm("edx") = (long)(arg3);                        \

	register long _num __asm__ ("eax") = (num);                           \

	register long _arg1 __asm__ ("ebx") = (long)(arg1);                   \

	register long _arg2 __asm__ ("ecx") = (long)(arg2);                   \

	register long _arg3 __asm__ ("edx") = (long)(arg3);                   \

	                                                                      \

	asm volatile (                                                        \

	__asm__  volatile (                                                   \

		"int $0x80\n"                                                 \

		: "=a" (_ret)                                                 \

		: "r"(_arg1), "r"(_arg2), "r"(_arg3),                         \
@@ -131,13 +131,13 @@ struct sys_stat_struct { 
#define my_syscall4(num, arg1, arg2, arg3, arg4)                              \

({                                                                            \

	long _ret;                                                            \

	register long _num asm("eax") = (num);                                \

	register long _arg1 asm("ebx") = (long)(arg1);                        \

	register long _arg2 asm("ecx") = (long)(arg2);                        \

	register long _arg3 asm("edx") = (long)(arg3);                        \

	register long _arg4 asm("esi") = (long)(arg4);                        \

	register long _num __asm__ ("eax") = (num);                           \

	register long _arg1 __asm__ ("ebx") = (long)(arg1);                   \

	register long _arg2 __asm__ ("ecx") = (long)(arg2);                   \

	register long _arg3 __asm__ ("edx") = (long)(arg3);                   \

	register long _arg4 __asm__ ("esi") = (long)(arg4);                   \

	                                                                      \

	asm volatile (                                                        \

	__asm__  volatile (                                                   \

		"int $0x80\n"                                                 \

		: "=a" (_ret)                                                 \

		: "r"(_arg1), "r"(_arg2), "r"(_arg3), "r"(_arg4),             \
@@ -150,14 +150,14 @@ struct sys_stat_struct { 
#define my_syscall5(num, arg1, arg2, arg3, arg4, arg5)                        \

({                                                                            \

	long _ret;                                                            \

	register long _num asm("eax") = (num);                                \

	register long _arg1 asm("ebx") = (long)(arg1);                        \

	register long _arg2 asm("ecx") = (long)(arg2);                        \

	register long _arg3 asm("edx") = (long)(arg3);                        \

	register long _arg4 asm("esi") = (long)(arg4);                        \

	register long _arg5 asm("edi") = (long)(arg5);                        \

	register long _num __asm__ ("eax") = (num);                           \

	register long _arg1 __asm__ ("ebx") = (long)(arg1);                   \

	register long _arg2 __asm__ ("ecx") = (long)(arg2);                   \

	register long _arg3 __asm__ ("edx") = (long)(arg3);                   \

	register long _arg4 __asm__ ("esi") = (long)(arg4);                   \

	register long _arg5 __asm__ ("edi") = (long)(arg5);                   \

	                                                                      \

	asm volatile (                                                        \

	__asm__  volatile (                                                   \

		"int $0x80\n"                                                 \

		: "=a" (_ret)                                                 \

		: "r"(_arg1), "r"(_arg2), "r"(_arg3), "r"(_arg4), "r"(_arg5), \
@@ -174,7 +174,7 @@ struct sys_stat_struct { 
 * 2) The deepest stack frame should be set to zero

 *

 */

asm(".section .text\n"

__asm__ (".section .text\n"

    ".weak _start\n"

    ".global _start\n"

    "_start:\n"

tools/include/nolibc/arch-mips.h

+31 −31

File changed.

Preview size limit exceeded, changes collapsed.

tools/include/nolibc/arch-riscv.h

+37 −37

File changed.

Preview size limit exceeded, changes collapsed.