aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlavio Cruz <flaviocruz@gmail.com>2023-02-05 03:23:25 -0500
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2023-02-05 12:36:38 +0100
commita1dcc64c9b6e54ce1aabcd10785f43bf2b445ee4 (patch)
tree0261ddd22ca42910930939100d15ba4deedd93b3
parent359a0b9dbcd46475f443a33e0062a14b252e327d (diff)
downloadglibc-a1dcc64c9b6e54ce1aabcd10785f43bf2b445ee4.zip
glibc-a1dcc64c9b6e54ce1aabcd10785f43bf2b445ee4.tar.gz
glibc-a1dcc64c9b6e54ce1aabcd10785f43bf2b445ee4.tar.bz2
Move RETURN_TO to x86/sysdep.h and implement x86_64 version.
Message-Id: <Y99nfeBrTubZL9oi@jupiter.tail36e24.ts.net>
-rw-r--r--sysdeps/mach/i386/sysdep.h34
-rw-r--r--sysdeps/mach/x86/sysdep.h17
2 files changed, 17 insertions, 34 deletions
diff --git a/sysdeps/mach/i386/sysdep.h b/sysdeps/mach/i386/sysdep.h
deleted file mode 100644
index 33bd5ee..0000000
--- a/sysdeps/mach/i386/sysdep.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright (C) 1991-2023 Free Software Foundation, Inc.
-
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, see
- <https://www.gnu.org/licenses/>. */
-
-#ifndef _MACH_I386_SYSDEP_H
-#define _MACH_I386_SYSDEP_H 1
-
-#include <sysdeps/mach/x86/sysdep.h>
-
-#define RETURN_TO(sp, pc, retval) \
- asm volatile ("movl %0, %%esp; jmp %*%1 # %2" \
- : : "g" (sp), "r" (pc), "a" (retval))
-
-/* This should be rearranged, but at the moment this file provides
- the most useful definitions for assembler syntax details. */
-#undef ENTRY
-#undef ALIGN
-#include <sysdeps/unix/i386/sysdep.h>
-
-#endif /* mach/i386/sysdep.h */
diff --git a/sysdeps/mach/x86/sysdep.h b/sysdeps/mach/x86/sysdep.h
index 90f295b..7ad7852 100644
--- a/sysdeps/mach/x86/sysdep.h
+++ b/sysdeps/mach/x86/sysdep.h
@@ -44,4 +44,21 @@
/* Get the machine-independent Mach definitions. */
#include <sysdeps/mach/sysdep.h>
+#undef ENTRY
+#undef ALIGN
+
+#ifdef __x86_64__
+#define RETURN_TO(sp, pc, retval) \
+ asm volatile ("movq %0, %%rsp; jmp %*%1 # %2" \
+ : : "g" (sp), "r" (pc), "a" (retval))
+/* This should be rearranged, but at the moment this file provides
+ the most useful definitions for assembler syntax details. */
+#include <sysdeps/unix/x86_64/sysdep.h>
+#else
+#define RETURN_TO(sp, pc, retval) \
+ asm volatile ("movl %0, %%esp; jmp %*%1 # %2" \
+ : : "g" (sp), "r" (pc), "a" (retval))
+#include <sysdeps/unix/i386/sysdep.h>
+#endif
+
#endif /* mach/x86/sysdep.h */