This is the mail archive of the
libc-ports@sources.redhat.com
mailing list for the libc-ports project.
[PATCH] MIPS: Correct formatting of syscall wrapper `asm' specifiers
- From: "Maciej W. Rozycki" <macro at codesourcery dot com>
- To: "Joseph S. Myers" <joseph at codesourcery dot com>
- Cc: <libc-ports at sourceware dot org>
- Date: Tue, 29 Jan 2013 19:25:50 +0000
- Subject: [PATCH] MIPS: Correct formatting of syscall wrapper `asm' specifiers
Hi,
As promised here's the change to add the missing space in `asm' register
specifiers across the MIPS syscall wrappers. No functional changes.
Tested by rebuilding the sources involved. OK to apply?
2013-01-29 Maciej W. Rozycki <macro@codesourcery.com>
* sysdeps/unix/sysv/linux/mips/mips32/sysdep.h: Add a missing
space in asm register specifiers throughout.
* sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h: Likewise.
* sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h: Likewise.
Maciej
glibc-mips-sysdep-asm-format.diff
Index: glibc-fsf-trunk-quilt/ports/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h
===================================================================
--- glibc-fsf-trunk-quilt.orig/ports/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h 2013-01-29 17:12:56.000000000 +0000
+++ glibc-fsf-trunk-quilt/ports/sysdeps/unix/sysv/linux/mips/mips32/sysdep.h 2013-01-29 17:15:05.137023898 +0000
@@ -100,10 +100,10 @@
long _sys_result; \
\
{ \
- register long __s0 asm("$16") __attribute__ ((unused)) \
+ register long __s0 asm ("$16") __attribute__ ((unused)) \
= (number); \
- register long __v0 asm("$2"); \
- register long __a3 asm("$7"); \
+ register long __v0 asm ("$2"); \
+ register long __a3 asm ("$7"); \
__asm__ volatile ( \
".set\tnoreorder\n\t" \
v0_init \
@@ -123,11 +123,11 @@
long _sys_result; \
\
{ \
- register long __s0 asm("$16") __attribute__ ((unused)) \
+ register long __s0 asm ("$16") __attribute__ ((unused)) \
= (number); \
- register long __v0 asm("$2"); \
- register long __a0 asm("$4") = (long) (arg1); \
- register long __a3 asm("$7"); \
+ register long __v0 asm ("$2"); \
+ register long __a0 asm ("$4") = (long) (arg1); \
+ register long __a3 asm ("$7"); \
__asm__ volatile ( \
".set\tnoreorder\n\t" \
v0_init \
@@ -147,12 +147,12 @@
long _sys_result; \
\
{ \
- register long __s0 asm("$16") __attribute__ ((unused)) \
+ register long __s0 asm ("$16") __attribute__ ((unused)) \
= (number); \
- register long __v0 asm("$2"); \
- register long __a0 asm("$4") = (long) (arg1); \
- register long __a1 asm("$5") = (long) (arg2); \
- register long __a3 asm("$7"); \
+ register long __v0 asm ("$2"); \
+ register long __a0 asm ("$4") = (long) (arg1); \
+ register long __a1 asm ("$5") = (long) (arg2); \
+ register long __a3 asm ("$7"); \
__asm__ volatile ( \
".set\tnoreorder\n\t" \
v0_init \
@@ -173,13 +173,13 @@
long _sys_result; \
\
{ \
- register long __s0 asm("$16") __attribute__ ((unused)) \
+ register long __s0 asm ("$16") __attribute__ ((unused)) \
= (number); \
- register long __v0 asm("$2"); \
- register long __a0 asm("$4") = (long) (arg1); \
- register long __a1 asm("$5") = (long) (arg2); \
- register long __a2 asm("$6") = (long) (arg3); \
- register long __a3 asm("$7"); \
+ register long __v0 asm ("$2"); \
+ register long __a0 asm ("$4") = (long) (arg1); \
+ register long __a1 asm ("$5") = (long) (arg2); \
+ register long __a2 asm ("$6") = (long) (arg3); \
+ register long __a3 asm ("$7"); \
__asm__ volatile ( \
".set\tnoreorder\n\t" \
v0_init \
@@ -200,13 +200,13 @@
long _sys_result; \
\
{ \
- register long __s0 asm("$16") __attribute__ ((unused)) \
+ register long __s0 asm ("$16") __attribute__ ((unused)) \
= (number); \
- register long __v0 asm("$2"); \
- register long __a0 asm("$4") = (long) (arg1); \
- register long __a1 asm("$5") = (long) (arg2); \
- register long __a2 asm("$6") = (long) (arg3); \
- register long __a3 asm("$7") = (long) (arg4); \
+ register long __v0 asm ("$2"); \
+ register long __a0 asm ("$4") = (long) (arg1); \
+ register long __a1 asm ("$5") = (long) (arg2); \
+ register long __a2 asm ("$6") = (long) (arg3); \
+ register long __a3 asm ("$7") = (long) (arg4); \
__asm__ volatile ( \
".set\tnoreorder\n\t" \
v0_init \
@@ -235,13 +235,13 @@
\
FORCE_FRAME_POINTER; \
{ \
- register long __s0 asm("$16") __attribute__ ((unused)) \
+ register long __s0 asm ("$16") __attribute__ ((unused)) \
= (number); \
- register long __v0 asm("$2"); \
- register long __a0 asm("$4") = (long) (arg1); \
- register long __a1 asm("$5") = (long) (arg2); \
- register long __a2 asm("$6") = (long) (arg3); \
- register long __a3 asm("$7") = (long) (arg4); \
+ register long __v0 asm ("$2"); \
+ register long __a0 asm ("$4") = (long) (arg1); \
+ register long __a1 asm ("$5") = (long) (arg2); \
+ register long __a2 asm ("$6") = (long) (arg3); \
+ register long __a3 asm ("$7") = (long) (arg4); \
__asm__ volatile ( \
".set\tnoreorder\n\t" \
"subu\t$29, 32\n\t" \
@@ -267,13 +267,13 @@
\
FORCE_FRAME_POINTER; \
{ \
- register long __s0 asm("$16") __attribute__ ((unused)) \
+ register long __s0 asm ("$16") __attribute__ ((unused)) \
= (number); \
- register long __v0 asm("$2"); \
- register long __a0 asm("$4") = (long) (arg1); \
- register long __a1 asm("$5") = (long) (arg2); \
- register long __a2 asm("$6") = (long) (arg3); \
- register long __a3 asm("$7") = (long) (arg4); \
+ register long __v0 asm ("$2"); \
+ register long __a0 asm ("$4") = (long) (arg1); \
+ register long __a1 asm ("$5") = (long) (arg2); \
+ register long __a2 asm ("$6") = (long) (arg3); \
+ register long __a3 asm ("$7") = (long) (arg4); \
__asm__ volatile ( \
".set\tnoreorder\n\t" \
"subu\t$29, 32\n\t" \
@@ -300,13 +300,13 @@
\
FORCE_FRAME_POINTER; \
{ \
- register long __s0 asm("$16") __attribute__ ((unused)) \
+ register long __s0 asm ("$16") __attribute__ ((unused)) \
= (number); \
- register long __v0 asm("$2"); \
- register long __a0 asm("$4") = (long) (arg1); \
- register long __a1 asm("$5") = (long) (arg2); \
- register long __a2 asm("$6") = (long) (arg3); \
- register long __a3 asm("$7") = (long) (arg4); \
+ register long __v0 asm ("$2"); \
+ register long __a0 asm ("$4") = (long) (arg1); \
+ register long __a1 asm ("$5") = (long) (arg2); \
+ register long __a2 asm ("$6") = (long) (arg3); \
+ register long __a3 asm ("$7") = (long) (arg4); \
__asm__ volatile ( \
".set\tnoreorder\n\t" \
"subu\t$29, 32\n\t" \
Index: glibc-fsf-trunk-quilt/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h
===================================================================
--- glibc-fsf-trunk-quilt.orig/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h 2013-01-29 17:12:56.000000000 +0000
+++ glibc-fsf-trunk-quilt/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h 2013-01-29 17:15:26.057181534 +0000
@@ -104,10 +104,10 @@
long _sys_result; \
\
{ \
- register long long __s0 asm("$16") __attribute__((unused)) \
+ register long long __s0 asm ("$16") __attribute__((unused)) \
= (number); \
- register long long __v0 asm("$2"); \
- register long long __a3 asm("$7"); \
+ register long long __v0 asm ("$2"); \
+ register long long __a3 asm ("$7"); \
__asm__ volatile ( \
".set\tnoreorder\n\t" \
v0_init \
@@ -127,11 +127,11 @@
long _sys_result; \
\
{ \
- register long long __s0 asm("$16") __attribute__((unused)) \
+ register long long __s0 asm ("$16") __attribute__((unused)) \
= (number); \
- register long long __v0 asm("$2"); \
- register long long __a0 asm("$4") = ARGIFY (arg1); \
- register long long __a3 asm("$7"); \
+ register long long __v0 asm ("$2"); \
+ register long long __a0 asm ("$4") = ARGIFY (arg1); \
+ register long long __a3 asm ("$7"); \
__asm__ volatile ( \
".set\tnoreorder\n\t" \
v0_init \
@@ -151,12 +151,12 @@
long _sys_result; \
\
{ \
- register long long __s0 asm("$16") __attribute__((unused)) \
+ register long long __s0 asm ("$16") __attribute__((unused)) \
= (number); \
- register long long __v0 asm("$2"); \
- register long long __a0 asm("$4") = ARGIFY (arg1); \
- register long long __a1 asm("$5") = ARGIFY (arg2); \
- register long long __a3 asm("$7"); \
+ register long long __v0 asm ("$2"); \
+ register long long __a0 asm ("$4") = ARGIFY (arg1); \
+ register long long __a1 asm ("$5") = ARGIFY (arg2); \
+ register long long __a3 asm ("$7"); \
__asm__ volatile ( \
".set\tnoreorder\n\t" \
v0_init \
@@ -177,13 +177,13 @@
long _sys_result; \
\
{ \
- register long long __s0 asm("$16") __attribute__((unused)) \
+ register long long __s0 asm ("$16") __attribute__((unused)) \
= (number); \
- register long long __v0 asm("$2"); \
- register long long __a0 asm("$4") = ARGIFY (arg1); \
- register long long __a1 asm("$5") = ARGIFY (arg2); \
- register long long __a2 asm("$6") = ARGIFY (arg3); \
- register long long __a3 asm("$7"); \
+ register long long __v0 asm ("$2"); \
+ register long long __a0 asm ("$4") = ARGIFY (arg1); \
+ register long long __a1 asm ("$5") = ARGIFY (arg2); \
+ register long long __a2 asm ("$6") = ARGIFY (arg3); \
+ register long long __a3 asm ("$7"); \
__asm__ volatile ( \
".set\tnoreorder\n\t" \
v0_init \
@@ -204,13 +204,13 @@
long _sys_result; \
\
{ \
- register long long __s0 asm("$16") __attribute__((unused)) \
+ register long long __s0 asm ("$16") __attribute__((unused)) \
= (number); \
- register long long __v0 asm("$2"); \
- register long long __a0 asm("$4") = ARGIFY (arg1); \
- register long long __a1 asm("$5") = ARGIFY (arg2); \
- register long long __a2 asm("$6") = ARGIFY (arg3); \
- register long long __a3 asm("$7") = ARGIFY (arg4); \
+ register long long __v0 asm ("$2"); \
+ register long long __a0 asm ("$4") = ARGIFY (arg1); \
+ register long long __a1 asm ("$5") = ARGIFY (arg2); \
+ register long long __a2 asm ("$6") = ARGIFY (arg3); \
+ register long long __a3 asm ("$7") = ARGIFY (arg4); \
__asm__ volatile ( \
".set\tnoreorder\n\t" \
v0_init \
@@ -231,14 +231,14 @@
long _sys_result; \
\
{ \
- register long long __s0 asm("$16") __attribute__((unused)) \
+ register long long __s0 asm ("$16") __attribute__((unused)) \
= (number); \
- register long long __v0 asm("$2"); \
- register long long __a0 asm("$4") = ARGIFY (arg1); \
- register long long __a1 asm("$5") = ARGIFY (arg2); \
- register long long __a2 asm("$6") = ARGIFY (arg3); \
- register long long __a3 asm("$7") = ARGIFY (arg4); \
- register long long __a4 asm("$8") = ARGIFY (arg5); \
+ register long long __v0 asm ("$2"); \
+ register long long __a0 asm ("$4") = ARGIFY (arg1); \
+ register long long __a1 asm ("$5") = ARGIFY (arg2); \
+ register long long __a2 asm ("$6") = ARGIFY (arg3); \
+ register long long __a3 asm ("$7") = ARGIFY (arg4); \
+ register long long __a4 asm ("$8") = ARGIFY (arg5); \
__asm__ volatile ( \
".set\tnoreorder\n\t" \
v0_init \
@@ -259,15 +259,15 @@
long _sys_result; \
\
{ \
- register long long __s0 asm("$16") __attribute__((unused)) \
+ register long long __s0 asm ("$16") __attribute__((unused)) \
= (number); \
- register long long __v0 asm("$2"); \
- register long long __a0 asm("$4") = ARGIFY (arg1); \
- register long long __a1 asm("$5") = ARGIFY (arg2); \
- register long long __a2 asm("$6") = ARGIFY (arg3); \
- register long long __a3 asm("$7") = ARGIFY (arg4); \
- register long long __a4 asm("$8") = ARGIFY (arg5); \
- register long long __a5 asm("$9") = ARGIFY (arg6); \
+ register long long __v0 asm ("$2"); \
+ register long long __a0 asm ("$4") = ARGIFY (arg1); \
+ register long long __a1 asm ("$5") = ARGIFY (arg2); \
+ register long long __a2 asm ("$6") = ARGIFY (arg3); \
+ register long long __a3 asm ("$7") = ARGIFY (arg4); \
+ register long long __a4 asm ("$8") = ARGIFY (arg5); \
+ register long long __a5 asm ("$9") = ARGIFY (arg6); \
__asm__ volatile ( \
".set\tnoreorder\n\t" \
v0_init \
Index: glibc-fsf-trunk-quilt/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h
===================================================================
--- glibc-fsf-trunk-quilt.orig/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h 2013-01-29 17:12:56.000000000 +0000
+++ glibc-fsf-trunk-quilt/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h 2013-01-29 17:16:02.667181465 +0000
@@ -100,10 +100,10 @@
long _sys_result; \
\
{ \
- register long __s0 asm("$16") __attribute__ ((unused)) \
+ register long __s0 asm ("$16") __attribute__ ((unused)) \
= (number); \
- register long __v0 asm("$2"); \
- register long __a3 asm("$7"); \
+ register long __v0 asm ("$2"); \
+ register long __a3 asm ("$7"); \
__asm__ volatile ( \
".set\tnoreorder\n\t" \
v0_init \
@@ -123,11 +123,11 @@
long _sys_result; \
\
{ \
- register long __s0 asm("$16") __attribute__ ((unused)) \
+ register long __s0 asm ("$16") __attribute__ ((unused)) \
= (number); \
- register long __v0 asm("$2"); \
- register long __a0 asm("$4") = (long) (arg1); \
- register long __a3 asm("$7"); \
+ register long __v0 asm ("$2"); \
+ register long __a0 asm ("$4") = (long) (arg1); \
+ register long __a3 asm ("$7"); \
__asm__ volatile ( \
".set\tnoreorder\n\t" \
v0_init \
@@ -147,12 +147,12 @@
long _sys_result; \
\
{ \
- register long __s0 asm("$16") __attribute__ ((unused)) \
+ register long __s0 asm ("$16") __attribute__ ((unused)) \
= (number); \
- register long __v0 asm("$2"); \
- register long __a0 asm("$4") = (long) (arg1); \
- register long __a1 asm("$5") = (long) (arg2); \
- register long __a3 asm("$7"); \
+ register long __v0 asm ("$2"); \
+ register long __a0 asm ("$4") = (long) (arg1); \
+ register long __a1 asm ("$5") = (long) (arg2); \
+ register long __a3 asm ("$7"); \
__asm__ volatile ( \
".set\tnoreorder\n\t" \
v0_init \
@@ -173,13 +173,13 @@
long _sys_result; \
\
{ \
- register long __s0 asm("$16") __attribute__ ((unused)) \
+ register long __s0 asm ("$16") __attribute__ ((unused)) \
= (number); \
- register long __v0 asm("$2"); \
- register long __a0 asm("$4") = (long) (arg1); \
- register long __a1 asm("$5") = (long) (arg2); \
- register long __a2 asm("$6") = (long) (arg3); \
- register long __a3 asm("$7"); \
+ register long __v0 asm ("$2"); \
+ register long __a0 asm ("$4") = (long) (arg1); \
+ register long __a1 asm ("$5") = (long) (arg2); \
+ register long __a2 asm ("$6") = (long) (arg3); \
+ register long __a3 asm ("$7"); \
__asm__ volatile ( \
".set\tnoreorder\n\t" \
v0_init \
@@ -200,13 +200,13 @@
long _sys_result; \
\
{ \
- register long __s0 asm("$16") __attribute__ ((unused)) \
+ register long __s0 asm ("$16") __attribute__ ((unused)) \
= (number); \
- register long __v0 asm("$2"); \
- register long __a0 asm("$4") = (long) (arg1); \
- register long __a1 asm("$5") = (long) (arg2); \
- register long __a2 asm("$6") = (long) (arg3); \
- register long __a3 asm("$7") = (long) (arg4); \
+ register long __v0 asm ("$2"); \
+ register long __a0 asm ("$4") = (long) (arg1); \
+ register long __a1 asm ("$5") = (long) (arg2); \
+ register long __a2 asm ("$6") = (long) (arg3); \
+ register long __a3 asm ("$7") = (long) (arg4); \
__asm__ volatile ( \
".set\tnoreorder\n\t" \
v0_init \
@@ -227,14 +227,14 @@
long _sys_result; \
\
{ \
- register long __s0 asm("$16") __attribute__ ((unused)) \
+ register long __s0 asm ("$16") __attribute__ ((unused)) \
= (number); \
- register long __v0 asm("$2"); \
- register long __a0 asm("$4") = (long) (arg1); \
- register long __a1 asm("$5") = (long) (arg2); \
- register long __a2 asm("$6") = (long) (arg3); \
- register long __a3 asm("$7") = (long) (arg4); \
- register long __a4 asm("$8") = (long) (arg5); \
+ register long __v0 asm ("$2"); \
+ register long __a0 asm ("$4") = (long) (arg1); \
+ register long __a1 asm ("$5") = (long) (arg2); \
+ register long __a2 asm ("$6") = (long) (arg3); \
+ register long __a3 asm ("$7") = (long) (arg4); \
+ register long __a4 asm ("$8") = (long) (arg5); \
__asm__ volatile ( \
".set\tnoreorder\n\t" \
v0_init \
@@ -255,15 +255,15 @@
long _sys_result; \
\
{ \
- register long __s0 asm("$16") __attribute__ ((unused)) \
+ register long __s0 asm ("$16") __attribute__ ((unused)) \
= (number); \
- register long __v0 asm("$2"); \
- register long __a0 asm("$4") = (long) (arg1); \
- register long __a1 asm("$5") = (long) (arg2); \
- register long __a2 asm("$6") = (long) (arg3); \
- register long __a3 asm("$7") = (long) (arg4); \
- register long __a4 asm("$8") = (long) (arg5); \
- register long __a5 asm("$9") = (long) (arg6); \
+ register long __v0 asm ("$2"); \
+ register long __a0 asm ("$4") = (long) (arg1); \
+ register long __a1 asm ("$5") = (long) (arg2); \
+ register long __a2 asm ("$6") = (long) (arg3); \
+ register long __a3 asm ("$7") = (long) (arg4); \
+ register long __a4 asm ("$8") = (long) (arg5); \
+ register long __a5 asm ("$9") = (long) (arg6); \
__asm__ volatile ( \
".set\tnoreorder\n\t" \
v0_init \