From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1792) id 358463858284; Sun, 5 Feb 2023 11:36:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 358463858284 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1675597011; bh=tBm5IgYSZfrC/z77VrtGhxh49vX4hcqvI2YMozsddYQ=; h=From:To:Subject:Date:From; b=KEzIq4pRJwf/hpcVNolXukLO3KyIWmng3ZY5YvutUBDzBggZaZ5dR7CfjH1XLCkba L7Uug4dbtCAsFc+yJDWPeRdB7RffbX1DTr4WQtUAC0hp3qS9+JZrY3wXiG2tPjX9KY minyXPqkOTbnb82gV0/9eHTUA/RLCdQvTmduykxw= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Samuel Thibault To: glibc-cvs@sourceware.org Subject: [glibc] Move RETURN_TO to x86/sysdep.h and implement x86_64 version. X-Act-Checkin: glibc X-Git-Author: Flavio Cruz X-Git-Refname: refs/heads/master X-Git-Oldrev: 359a0b9dbcd46475f443a33e0062a14b252e327d X-Git-Newrev: a1dcc64c9b6e54ce1aabcd10785f43bf2b445ee4 Message-Id: <20230205113651.358463858284@sourceware.org> Date: Sun, 5 Feb 2023 11:36:51 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=a1dcc64c9b6e54ce1aabcd10785f43bf2b445ee4 commit a1dcc64c9b6e54ce1aabcd10785f43bf2b445ee4 Author: Flavio Cruz Date: Sun Feb 5 03:23:25 2023 -0500 Move RETURN_TO to x86/sysdep.h and implement x86_64 version. Message-Id: Diff: --- sysdeps/mach/i386/sysdep.h | 34 ---------------------------------- sysdeps/mach/x86/sysdep.h | 17 +++++++++++++++++ 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 33bd5ee402..0000000000 --- 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 - . */ - -#ifndef _MACH_I386_SYSDEP_H -#define _MACH_I386_SYSDEP_H 1 - -#include - -#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 - -#endif /* mach/i386/sysdep.h */ diff --git a/sysdeps/mach/x86/sysdep.h b/sysdeps/mach/x86/sysdep.h index 90f295b27d..7ad785234f 100644 --- a/sysdeps/mach/x86/sysdep.h +++ b/sysdeps/mach/x86/sysdep.h @@ -44,4 +44,21 @@ /* Get the machine-independent Mach definitions. */ #include +#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 +#else +#define RETURN_TO(sp, pc, retval) \ + asm volatile ("movl %0, %%esp; jmp %*%1 # %2" \ + : : "g" (sp), "r" (pc), "a" (retval)) +#include +#endif + #endif /* mach/x86/sysdep.h */