powerpc: Use Linux kABI for syscall return
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>
Sun, 2 Feb 2020 23:45:58 +0000 (20:45 -0300)
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>
Sat, 15 Feb 2020 00:09:12 +0000 (21:09 -0300)
It changes the powerpc INTERNAL_VSYSCALL_CALL and INTERNAL_SYSCALL_NCS
to return a negative value instead of the returning the CR value in
the 'err' macro argument.

The macro INTERNAL_SYSCALL_DECL is no longer required, and the
INTERNAL_SYSCALL_ERROR_P macro follows the other Linux kABIs.

Checked on powerpc64-linux-gnu, powerpc64le-linux-gnu, and
powerpc-linux-gnu-power4.

sysdeps/unix/sysv/linux/powerpc/sysdep.h

index 0f067db..aab4901 100644 (file)
@@ -57,9 +57,8 @@
        : "+r" (r0), "+r" (r3), "+r" (r4), "+r" (r5),  "+r" (r6),        \
          "+r" (r7), "+r" (r8)                                          \
        : : "r9", "r10", "r11", "r12", "cr0", "ctr", "lr", "memory");   \
-    err = (long int) r0;                                               \
     __asm__ __volatile__ ("" : "=r" (rval) : "r" (r3));                        \
-    rval;                                                              \
+    (long int) r0 & (1 << 28) ? -rval : rval;                          \
   })
 
 #define INTERNAL_VSYSCALL_CALL(funcptr, err, nr, args...)              \
        : ASM_INPUT_##nr                                                        \
        : "r9", "r10", "r11", "r12",                                    \
          "cr0", "ctr", "memory");                                      \
-         err = r0;  \
-    r3;  \
+    r0 & (1 << 28) ? -r3 : r3;                                         \
   })
 #define INTERNAL_SYSCALL(name, err, nr, args...)                       \
   INTERNAL_SYSCALL_NCS (__NR_##name, err, nr, args)
 
 #undef INTERNAL_SYSCALL_DECL
-#define INTERNAL_SYSCALL_DECL(err) long int err __attribute__ ((unused))
+#define INTERNAL_SYSCALL_DECL(err) do { } while (0)
 
 #undef INTERNAL_SYSCALL_ERROR_P
 #define INTERNAL_SYSCALL_ERROR_P(val, err) \
-  ((void) (val), __builtin_expect ((err) & (1 << 28), 0))
+  ((unsigned long int) (val) > -4096UL)
 
 #undef INTERNAL_SYSCALL_ERRNO
-#define INTERNAL_SYSCALL_ERRNO(val, err)     (val)
+#define INTERNAL_SYSCALL_ERRNO(val, err)     (-(val))
 
 #if defined(__PPC64__) || defined(__powerpc64__)
 # define SYSCALL_ARG_SIZE 8