Try to unbreak Linux sanitizers

Add fallback definition of internal_syscall_ptr and internal_syscall64
for Linux/x86_64 and Linux/aarch64.

llvm-svn: 316598

diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_syscall_linux_aarch64.inc b/compiler-rt/lib/sanitizer_common/sanitizer_syscall_linux_aarch64.inc
index 7ab1d76..1f05ed9 100644 (file)
--- a/compiler-rt/lib/sanitizer_common/sanitizer_syscall_linux_aarch64.inc
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_syscall_linux_aarch64.inc
@@ -127,6 +127,9 @@ static uptr __internal_syscall(u64 nr, u64 arg1, long arg2, long arg3,
 
 #define internal_syscall(...) __SYSCALL_DISP(__internal_syscall, __VA_ARGS__)
 
+#define internal_syscall_ptr internal_syscall
+#define internal_syscall64 internal_syscall
+
 // Helper function used to avoid cobbler errno.
 bool internal_iserror(uptr retval, int *rverrno) {
   if (retval >= (uptr)-4095) {

diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_syscall_linux_x86_64.inc b/compiler-rt/lib/sanitizer_common/sanitizer_syscall_linux_x86_64.inc
index 9853a6a..327aaa8 100644 (file)
--- a/compiler-rt/lib/sanitizer_common/sanitizer_syscall_linux_x86_64.inc
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_syscall_linux_x86_64.inc
@@ -20,6 +20,9 @@ static uptr internal_syscall(u64 nr) {
   return retval;
 }
 
+#define internal_syscall_ptr internal_syscall
+#define internal_syscall64 internal_syscall
+
 template <typename T1>
 static uptr internal_syscall(u64 nr, T1 arg1) {
   u64 retval;