From patchwork Mon Oct 27 07:59:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Pinski X-Patchwork-Id: 39585 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f69.google.com (mail-ee0-f69.google.com [74.125.83.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 97DF32118A for ; Mon, 27 Oct 2014 08:04:12 +0000 (UTC) Received: by mail-ee0-f69.google.com with SMTP id c13sf921073eek.0 for ; Mon, 27 Oct 2014 01:04:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:mailing-list :precedence:list-id:list-unsubscribe:list-subscribe:list-archive :list-post:list-help:sender:delivered-to:from:to:cc:subject:date :message-id:in-reply-to:references:x-original-sender :x-original-authentication-results; bh=Yu4MwoY3hBg/d6VC+XflJXBR5QQCBe5ZGWbtYehKPiY=; b=FEK9ghHdYqGnd7TWbVVboHzLe0S7ZLORtw5XkL00b1l3uajZYOyE1rNcb9NmMQz7Aq eWzoGcb7V6z9DAg8/Orjkwq4AjMkR52taieVYqZfzP/oX1sfAFKSu0OON5xUrXQ2Rbao 3Q35HZE3hSM3VyOLmphPvOzIAB3sR68kRyBCJPN3V+N56grNp5eDknYyLyWCvoYb0YbV iJ4fizNWLlQT2DbV9F/TsEsYZ4gF2J7jRxSFCla4GrdjdaPXSadB6Wtd+p56lqAXt7wm Gf9CSX6+nGfxBQFmYlyrRFs5IJVQGN00ja/IKY9UEV1dJXqWvL2xk9X/oIaSBTG2ja+J iFOQ== X-Gm-Message-State: ALoCoQnWnTq7EFRQMfrj14SW6eqGNGNa6FBvc2WSt7ifqxmAXZglQcEfYXSRPan0vwVtEhW304Mc X-Received: by 10.181.11.130 with SMTP id ei2mr3589060wid.3.1414397051681; Mon, 27 Oct 2014 01:04:11 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.19.5 with SMTP id a5ls674230lae.19.gmail; Mon, 27 Oct 2014 01:04:11 -0700 (PDT) X-Received: by 10.112.16.101 with SMTP id f5mr21824920lbd.25.1414397051191; Mon, 27 Oct 2014 01:04:11 -0700 (PDT) Received: from mail-lb0-x22e.google.com (mail-lb0-x22e.google.com. [2a00:1450:4010:c04::22e]) by mx.google.com with ESMTPS id mj1si18707806lbc.40.2014.10.27.01.04.11 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 27 Oct 2014 01:04:11 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c04::22e as permitted sender) client-ip=2a00:1450:4010:c04::22e; Received: by mail-lb0-f174.google.com with SMTP id p9so5319073lbv.33 for ; Mon, 27 Oct 2014 01:04:11 -0700 (PDT) X-Received: by 10.112.97.135 with SMTP id ea7mr21864160lbb.46.1414397050872; Mon, 27 Oct 2014 01:04:10 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.84.229 with SMTP id c5csp247664lbz; Mon, 27 Oct 2014 01:04:10 -0700 (PDT) X-Received: by 10.70.22.195 with SMTP id g3mr22026599pdf.37.1414397049335; Mon, 27 Oct 2014 01:04:09 -0700 (PDT) Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id ak10si9832334pbd.169.2014.10.27.01.04.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Oct 2014 01:04:09 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-53817-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Received: (qmail 16540 invoked by alias); 27 Oct 2014 08:00:21 -0000 Mailing-List: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org Precedence: list List-Id: List-Unsubscribe: , List-Subscribe: List-Archive: List-Post: , List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 15620 invoked by uid 89); 27 Oct 2014 08:00:04 -0000 X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.5 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 X-HELO: mail-ig0-f170.google.com X-Received: by 10.107.160.208 with SMTP id j199mr21300119ioe.6.1414396800413; Mon, 27 Oct 2014 01:00:00 -0700 (PDT) From: Andrew Pinski To: libc-alpha@sourceware.org Cc: Andrew Pinski Subject: [PATCH 27/29] [AARCH64] Fix up ucontext for ILP32 Date: Mon, 27 Oct 2014 00:59:51 -0700 Message-Id: <1414396793-9005-28-git-send-email-apinski@cavium.com> In-Reply-To: <1414396793-9005-1-git-send-email-apinski@cavium.com> References: <1414396793-9005-1-git-send-email-apinski@cavium.com> X-Original-Sender: apinski@cavium.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c04::22e as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=pass header.i=@sourceware.org X-Google-Group-Id: 836684582541 In ILP32 we want to use the same layout of the structure ucontext as LP64 so we need to add a padding for uc_link and change the type of uc_flags to be the kernel unsigned long type. * sysdeps/unix/sysv/linux/aarch64/sys/ucontext.h (struct ucontext): Change the type of uc_flags to __SYSCALL_ULONG_TYPE. Add padding for uc_link if ILP32. --- sysdeps/unix/sysv/linux/aarch64/sys/ucontext.h | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sysdeps/unix/sysv/linux/aarch64/sys/ucontext.h b/sysdeps/unix/sysv/linux/aarch64/sys/ucontext.h index 476f5de..5d224fb 100644 --- a/sysdeps/unix/sysv/linux/aarch64/sys/ucontext.h +++ b/sysdeps/unix/sysv/linux/aarch64/sys/ucontext.h @@ -46,8 +46,14 @@ typedef struct sigcontext mcontext_t; /* Userlevel context. */ typedef struct ucontext { - unsigned long uc_flags; - struct ucontext *uc_link; + __SYSCALL_ULONG_TYPE uc_flags; +#if defined(__ILP32__) && defined(__AARCH64EB__) + int __pad_uc_link; +#endif + struct ucontext *uc_link; +#if defined(__ILP32__) && !defined(__AARCH64EB__) + int __pad_uc_link; +#endif stack_t uc_stack; __sigset_t uc_sigmask; mcontext_t uc_mcontext;