From patchwork Mon Oct 27 07:59:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Pinski X-Patchwork-Id: 39588 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f198.google.com (mail-lb0-f198.google.com [209.85.217.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id AD8802118A for ; Mon, 27 Oct 2014 08:04:46 +0000 (UTC) Received: by mail-lb0-f198.google.com with SMTP id l4sf142364lbv.1 for ; Mon, 27 Oct 2014 01:04:45 -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=tjkfkT55nXwTeCA468JXO9uA+DWMVgt6eR7N29JZBSc=; b=BQIUGVX9/n1g75HNE19tkXT6vRW3L5EHYaRpmeDXSN8lxONhyVgdJtHeTQ1DAhH3m5 IRWzWPGwk9O1ERr/u9GLsZ+XUsVUnlDl5L5NLlAfjFXi5bJkiIKkykXNmassO8Z59o3j W59L6o0/Z4Bs4638CBAZyeq3WRTqsT9sRl2necB8a2UnoXmR5vczsp6lPEW2vJB0h81o xNxabxcoIdGpj/5ZIiEOZXYhANfXloSbOc/4xo0EWgqpP3mdePq+HxUQ4OBB1j5Y5Grm FKn75sgevR11QDFYAK0eZ1kZgG6Xd+kMf2+pR3F96RSXbp++blrgJxc5dF0H5bdt/73M 8ywg== X-Gm-Message-State: ALoCoQnZPtozTedRcXYRnrzLQJlTlAKXwtMOZTN3HM4C+3ZxruMKzBWH4egkUh3idHOepetrbe02 X-Received: by 10.112.97.35 with SMTP id dx3mr69025lbb.20.1414397085306; Mon, 27 Oct 2014 01:04:45 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.199.38 with SMTP id jh6ls659047lac.9.gmail; Mon, 27 Oct 2014 01:04:44 -0700 (PDT) X-Received: by 10.112.54.162 with SMTP id k2mr21580780lbp.63.1414397084857; Mon, 27 Oct 2014 01:04:44 -0700 (PDT) Received: from mail-lb0-x231.google.com (mail-lb0-x231.google.com. [2a00:1450:4010:c04::231]) by mx.google.com with ESMTPS id ay3si18749410lbc.4.2014.10.27.01.04.44 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 27 Oct 2014 01:04:44 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c04::231 as permitted sender) client-ip=2a00:1450:4010:c04::231; Received: by mail-lb0-f177.google.com with SMTP id b6so1356128lbj.22 for ; Mon, 27 Oct 2014 01:04:44 -0700 (PDT) X-Received: by 10.152.6.228 with SMTP id e4mr21639153laa.71.1414397084429; Mon, 27 Oct 2014 01:04:44 -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 c5csp247723lbz; Mon, 27 Oct 2014 01:04:43 -0700 (PDT) X-Received: by 10.70.118.105 with SMTP id kl9mr537579pdb.150.1414397082876; Mon, 27 Oct 2014 01:04:42 -0700 (PDT) Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id ye5si9854409pbc.141.2014.10.27.01.04.42 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Oct 2014 01:04:42 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-53820-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Received: (qmail 30366 invoked by alias); 27 Oct 2014 08:03:13 -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 30296 invoked by uid 89); 27 Oct 2014 08:03:13 -0000 X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 X-HELO: mail-ig0-f172.google.com X-Received: by 10.107.16.19 with SMTP id y19mr261142ioi.77.1414396989956; Mon, 27 Oct 2014 01:03:09 -0700 (PDT) From: Andrew Pinski To: libc-alpha@sourceware.org Cc: Andrew Pinski Subject: [PATCH 21/29] [AARCH64] Add ILP32 to makefiles Date: Mon, 27 Oct 2014 00:59:45 -0700 Message-Id: <1414396793-9005-22-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::231 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=pass header.i=@sourceware.org X-Google-Group-Id: 836684582541 This patch adds ilp32 and ilp32_be as abi variants to the aarch64 linux makefile. * sysdeps/unix/sysv/linux/aarch64/Makefile (abi-variants): Add ilp32 and ilp32_be. (abi-lp64-options): Add defining of LP64 and undef of ILP32 macros. (abi-lp64-condition): Check word size macro also. (abi-lp64_be-options): Add defining of LP64 and undef of ILP32 macros. (abi-lp64_be-condition): Check word size macro also. (abi-ilp32-options): Define. (abi-ilp32-condition): Likewise. (abi-ilp32_be-options): Define. (abi-ilp32_be-condition): Likewise. --- sysdeps/unix/sysv/linux/aarch64/Makefile | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/sysdeps/unix/sysv/linux/aarch64/Makefile b/sysdeps/unix/sysv/linux/aarch64/Makefile index f2f28ee..dfb5cce 100644 --- a/sysdeps/unix/sysv/linux/aarch64/Makefile +++ b/sysdeps/unix/sysv/linux/aarch64/Makefile @@ -25,13 +25,21 @@ endif abi-variants := lp64 abi-variants += lp64_be +abi-variants += ilp32 +abi-variants += ilp32_be ifeq (,$(filter $(default-abi),$(abi-variants))) Unknown ABI, must be one of $(abi-variants) endif -abi-lp64-options := -U__AARCH64EB__ -abi-lp64-condition := !defined __AARCH64EB__ +abi-lp64-options := -U__AARCH64EB__ -D__LP64__ -U__ILP32__ +abi-lp64-condition := __WORDSIZE == 64 && !defined __AARCH64EB__ -abi-lp64_be-options := -D__AARCH64EB__ -abi-lp64_be-condition := defined __AARCH64EB__ +abi-lp64_be-options := -D__AARCH64EB__ -D__LP64__ -U__ILP32__ +abi-lp64_be-condition := __WORDSIZE == 64 && defined __AARCH64EB__ + +abi-ilp32-options := -U__AARCH64EB__ -U__LP64__ -D__ILP32__ +abi-ilp32-condition := __WORDSIZE == 32 && !defined __AARCH64EB__ + +abi-ilp32_be-options := -D__AARCH64EB__ -U__LP64__ -D__ILP32__ +abi-ilp32_be-condition := __WORDSIZE == 32 && defined __AARCH64EB__