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: 3423 Received: (qmail 30366 invoked by alias); 27 Oct 2014 08:03:13 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk 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 Authentication-Results: sourceware.org; auth=none 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-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tjkfkT55nXwTeCA468JXO9uA+DWMVgt6eR7N29JZBSc=; b=MFoblV/g1w1uUtC0Q+OxGzi5cDhWeJ1zc8LDYEWI6Q6KAVrbMZ0Zw/b0aw+4o5x4ea DqOMbiSzeSsBAlNqh/oPE64qv1iEI74BXnlC6SXmNwfo23oYQ8EhHZKlj4YXsPjsHEvO NE+Txy8NDjyyV+AiXUrl5RZUUsGEYKvCZKZ44PEOTh0e9X8ojkqxI8Yazf48zkS+iBwX pMdyMvubYMlFq0qMMg4Vlt/wul2QvNOx8C2jD9NSvRWBL88Hf5mzJJQJwFGWiEH6pxU+ mzvH0gEAhD3YYg7TcscBuXPKvdbARdHjCVW20s16fuZdXzqQWJtON5yIDiI1e/Sn6hnJ slSQ== X-Gm-Message-State: ALoCoQmg6/BUEjNY8z92wa1trQRo0Kpgat69dYg24ElnxkN59j/Ho3YP4ScWIo797UxG5rkc3yjy 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> 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__