From patchwork Thu Aug 21 10:48:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivier Martin X-Patchwork-Id: 35737 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f199.google.com (mail-qc0-f199.google.com [209.85.216.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 02FC32055F for ; Thu, 21 Aug 2014 10:48:52 +0000 (UTC) Received: by mail-qc0-f199.google.com with SMTP id x3sf28189420qcv.6 for ; Thu, 21 Aug 2014 03:48:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:cc:subject:precedence:reply-to:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=JcP12vM3Gu4OQspSHth1lZozwRtnOVxkiNeDrDllMs4=; b=T+XLeqOtJa4hNeAyT7E6mF38aYvigpPJv8XQud/NMxr55p7uXK7XeOlrJ3tZZFUumH 5tPbvHenM3JGbTCQGRtDigJa6ebpg7+HVGb3nlMaQ3toflXt0akRZayNNWdElwYWYJql fJPru51fEvH+5zwWj4NVfyhiLUnD7mzpGj7hek2y3zVChgMQu6m17AZPGD7TfNdcQstj aq4hqijZV6pblKMePZ/c1GDC3Ml1mvpHxVroxHcrovzO3XzaGUhqVgPNM2R4CTin0a10 oWREozEL1QYuWrRg+FyiKZrQco+U3gTMXFiC/WuHVm3hCj2zFiSLugYudCP681zw8mEG 8DQA== X-Gm-Message-State: ALoCoQlIez+nsYXlDyhNWsnmUM0oNSCNQcQAJPmmb4ASRdNcDkHSpNHO/6tnppr/wim1i7SNJXQt X-Received: by 10.236.11.80 with SMTP id 56mr11619802yhw.22.1408618131784; Thu, 21 Aug 2014 03:48:51 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.49.83 with SMTP id p77ls635541qga.97.gmail; Thu, 21 Aug 2014 03:48:51 -0700 (PDT) X-Received: by 10.52.190.71 with SMTP id go7mr11908112vdc.28.1408618131685; Thu, 21 Aug 2014 03:48:51 -0700 (PDT) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id ww7si12179540vdc.98.2014.08.21.03.48.51 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 21 Aug 2014 03:48:51 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.175 as permitted sender) client-ip=209.85.220.175; Received: by mail-vc0-f175.google.com with SMTP id ik5so10564408vcb.34 for ; Thu, 21 Aug 2014 03:48:51 -0700 (PDT) X-Received: by 10.220.105.142 with SMTP id t14mr41320816vco.14.1408618131506; Thu, 21 Aug 2014 03:48:51 -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.221.45.67 with SMTP id uj3csp124869vcb; Thu, 21 Aug 2014 03:48:51 -0700 (PDT) X-Received: by 10.50.50.198 with SMTP id e6mr18717133igo.1.1408618130923; Thu, 21 Aug 2014 03:48:50 -0700 (PDT) Received: from lists.sourceforge.net (lists.sourceforge.net. [216.34.181.88]) by mx.google.com with ESMTPS id c16si4873220igo.4.2014.08.21.03.48.50 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 21 Aug 2014 03:48:50 -0700 (PDT) Received-SPF: pass (google.com: domain of edk2-devel-bounces@lists.sourceforge.net designates 216.34.181.88 as permitted sender) client-ip=216.34.181.88; Received: from localhost ([127.0.0.1] helo=sfs-ml-4.v29.ch3.sourceforge.com) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1XKPv9-0004bl-EM; Thu, 21 Aug 2014 10:48:43 +0000 Received: from sog-mx-4.v43.ch3.sourceforge.com ([172.29.43.194] helo=mx.sourceforge.net) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1XKPv7-0004bf-Qq for edk2-devel@lists.sourceforge.net; Thu, 21 Aug 2014 10:48:41 +0000 Received-SPF: pass (sog-mx-4.v43.ch3.sourceforge.com: domain of arm.com designates 217.140.96.21 as permitted sender) client-ip=217.140.96.21; envelope-from=olivier.martin@arm.com; helo=cam-smtp0.cambridge.arm.com; Received: from fw-tnat.cambridge.arm.com ([217.140.96.21] helo=cam-smtp0.cambridge.arm.com) by sog-mx-4.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) id 1XKPv6-0001Jb-Li for edk2-devel@lists.sourceforge.net; Thu, 21 Aug 2014 10:48:41 +0000 Received: from e102605-lin.cambridge.arm.com (e102605-lin.cambridge.arm.com [10.1.193.159]) by cam-smtp0.cambridge.arm.com (8.13.8/8.13.8) with ESMTP id s7LAmRXP011369; Thu, 21 Aug 2014 11:48:27 +0100 From: Olivier Martin To: ting.ye@intel.com Date: Thu, 21 Aug 2014 11:48:19 +0100 Message-Id: <1408618099-10203-4-git-send-email-olivier.martin@arm.com> X-Mailer: git-send-email 1.8.5 In-Reply-To: <1408618099-10203-1-git-send-email-olivier.martin@arm.com> References: <1408618099-10203-1-git-send-email-olivier.martin@arm.com> X-Spam-Score: -2.2 (--) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain X-Headers-End: 1XKPv6-0001Jb-Li Cc: ronald.cron@arm.com, edk2-devel@lists.sourceforge.net Subject: [edk2] [PATCH 3/3] Add support of AARCH64 architecture in CryptoPkg X-BeenThere: edk2-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list Reply-To: edk2-devel@lists.sourceforge.net List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.sourceforge.net X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: olivier.martin@arm.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.175 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Ronald Cron Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ronald Cron Reviewed-By: Olivier Martin --- CryptoPkg/CryptoPkg.dsc | 7 ++++--- CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf | 5 ++++- CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf | 5 ++++- CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf | 5 ++++- CryptoPkg/Library/OpensslLib/OpensslLib.inf | 3 ++- 5 files changed, 18 insertions(+), 7 deletions(-) diff --git a/CryptoPkg/CryptoPkg.dsc b/CryptoPkg/CryptoPkg.dsc index 80e3706..2f69b72 100644 --- a/CryptoPkg/CryptoPkg.dsc +++ b/CryptoPkg/CryptoPkg.dsc @@ -23,7 +23,7 @@ PLATFORM_VERSION = 0.93 DSC_SPECIFICATION = 0x00010005 OUTPUT_DIRECTORY = Build/CryptoPkg - SUPPORTED_ARCHITECTURES = IA32|X64|IPF|ARM + SUPPORTED_ARCHITECTURES = IA32|X64|IPF|ARM|AARCH64 BUILD_TARGETS = DEBUG|RELEASE SKUID_IDENTIFIER = DEFAULT @@ -51,11 +51,12 @@ IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf -[LibraryClasses.ARM] +[LibraryClasses.ARM, LibraryClasses.AARCH64] # # It is not possible to prevent the ARM compiler for generic intrinsic functions. # This library provides the instrinsic functions generate by a given compiler. - # [LibraryClasses.ARM] and NULL mean link this library into all ARM images. + # [LibraryClasses.ARM, LibraryClasses.AARCH64] and NULL mean link this library + # into all ARM and AARCH64 images. # NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf diff --git a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf index 95a76f2..bea2e2b 100644 --- a/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf +++ b/CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf @@ -28,7 +28,7 @@ # # The following information is for reference only and not required by the build tools. # -# VALID_ARCHITECTURES = IA32 X64 IPF ARM +# VALID_ARCHITECTURES = IA32 X64 IPF ARM AARCH64 # [Sources] @@ -85,6 +85,9 @@ [Sources.ARM] Rand/CryptRand.c +[Sources.AARCH64] + Rand/CryptRand.c + [Packages] MdePkg/MdePkg.dec CryptoPkg/CryptoPkg.dec diff --git a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf index 535ad51..3cf0965 100644 --- a/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf +++ b/CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf @@ -34,7 +34,7 @@ # # The following information is for reference only and not required by the build tools. # -# VALID_ARCHITECTURES = IA32 X64 IPF ARM +# VALID_ARCHITECTURES = IA32 X64 IPF ARM AARCH64 # [Sources] @@ -90,6 +90,9 @@ [Sources.ARM] Rand/CryptRand.c +[Sources.AARCH64] + Rand/CryptRand.c + [Packages] MdePkg/MdePkg.dec CryptoPkg/CryptoPkg.dec diff --git a/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf b/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf index b966ecc..7669ff3 100644 --- a/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf +++ b/CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf @@ -34,7 +34,7 @@ # # The following information is for reference only and not required by the build tools. # -# VALID_ARCHITECTURES = IA32 X64 +# VALID_ARCHITECTURES = IA32 X64 ARM AARCH64 # [Sources] @@ -90,6 +90,9 @@ [Sources.ARM] Rand/CryptRand.c +[Sources.AARCH64] + Rand/CryptRand.c + [Packages] MdePkg/MdePkg.dec CryptoPkg/CryptoPkg.dec diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf index 5bf4282..6cfc67d 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf @@ -51,7 +51,7 @@ # # -# VALID_ARCHITECTURES = IA32 X64 IPF ARM +# VALID_ARCHITECTURES = IA32 X64 IPF ARM AARCH64 # [Sources] @@ -657,6 +657,7 @@ GCC:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w -DSIXTY_FOUR_BIT GCC:*_*_IPF_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w -DSIXTY_FOUR_BIT GCC:*_*_ARM_CC_FLAGS = $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w -DTHIRTY_TWO_BIT + GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w -DSIXTY_FOUR_BIT # suppress the following warnings in openssl so we don't break the build with warnings-as-errors: # 1295: Deprecated declaration - give arg types