From patchwork Thu Sep 18 21:33:12 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 37609 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 76E7A2054D for ; Thu, 18 Sep 2014 21:33:51 +0000 (UTC) Received: by mail-wi0-f198.google.com with SMTP id hi2sf1081725wib.9 for ; Thu, 18 Sep 2014 14:33:50 -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: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=dESru4+LmuSFH/liIa5nOHhZS+SzlUnSX+M0s88gAIQ=; b=bHo2Z9e6rv6ykQOYJnpv5OC4RceQU+G6/M+h5VkOWjE0qxN9ymTzj+6yR1Z/rF6eq4 3xVWqBSfNRaq9Wg1oxKZ+7vKwF0ZQYoYdyEqUp+xgMVO4uMXoiHqAhCO5LuZYtPYstSl UjLKKVxkrpSXq0ERJeAXgCdxpl+OFKHFqGD2LjEQs+4ocyiMEznhzaiEsIg8tZgH+YVz fslmSjFNEiidqH4vB6tolTZ6Y79sXPAg3+YYDemI4yau21bd7qaZx/8INlU436kuoAf8 TLSA/UIchDB32oJ33OH2rO/xNPYkbBBUTiVKwhnsGuqEW3UF5YK+eoocvN/x1kesfs94 25Eg== X-Gm-Message-State: ALoCoQl25flVVumwxFbL3gq7bRlR/Yt6yXgC+FGvTgsy1i6DVFEnVhhf4kweql5p7T4fOnCW/Elm X-Received: by 10.112.64.35 with SMTP id l3mr867994lbs.12.1411076030608; Thu, 18 Sep 2014 14:33:50 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.20.134 with SMTP id n6ls260397lae.45.gmail; Thu, 18 Sep 2014 14:33:50 -0700 (PDT) X-Received: by 10.152.7.193 with SMTP id l1mr50003laa.62.1411076030252; Thu, 18 Sep 2014 14:33:50 -0700 (PDT) Received: from mail-lb0-f171.google.com (mail-lb0-f171.google.com [209.85.217.171]) by mx.google.com with ESMTPS id r1si31603828lar.58.2014.09.18.14.33.50 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 18 Sep 2014 14:33:50 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.171 as permitted sender) client-ip=209.85.217.171; Received: by mail-lb0-f171.google.com with SMTP id l4so2029613lbv.16 for ; Thu, 18 Sep 2014 14:33:50 -0700 (PDT) X-Received: by 10.152.179.226 with SMTP id dj2mr2571929lac.40.1411076030091; Thu, 18 Sep 2014 14:33:50 -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.130.169 with SMTP id of9csp834631lbb; Thu, 18 Sep 2014 14:33:43 -0700 (PDT) X-Received: by 10.50.103.106 with SMTP id fv10mr51872282igb.40.1411076022608; Thu, 18 Sep 2014 14:33:42 -0700 (PDT) Received: from lists.sourceforge.net (lists.sourceforge.net. [216.34.181.88]) by mx.google.com with ESMTPS id j13si3431352igh.61.2014.09.18.14.33.41 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 18 Sep 2014 14:33:42 -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-2.v29.ch3.sourceforge.com) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1XUjKW-0002Nv-GJ; Thu, 18 Sep 2014 21:33:32 +0000 Received: from sog-mx-2.v43.ch3.sourceforge.com ([172.29.43.192] helo=mx.sourceforge.net) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1XUjKV-0002Nh-3b for edk2-devel@lists.sourceforge.net; Thu, 18 Sep 2014 21:33:31 +0000 Received-SPF: pass (sog-mx-2.v43.ch3.sourceforge.com: domain of linaro.org designates 209.85.220.49 as permitted sender) client-ip=209.85.220.49; envelope-from=ard.biesheuvel@linaro.org; helo=mail-pa0-f49.google.com; Received: from mail-pa0-f49.google.com ([209.85.220.49]) by sog-mx-2.v43.ch3.sourceforge.com with esmtps (TLSv1:RC4-SHA:128) (Exim 4.76) id 1XUjKU-000262-6z for edk2-devel@lists.sourceforge.net; Thu, 18 Sep 2014 21:33:31 +0000 Received: by mail-pa0-f49.google.com with SMTP id lf10so2380816pab.36 for ; Thu, 18 Sep 2014 14:33:24 -0700 (PDT) X-Received: by 10.68.133.199 with SMTP id pe7mr10044408pbb.132.1411076004312; Thu, 18 Sep 2014 14:33:24 -0700 (PDT) Received: from ards-macbook-pro.swisscom.com (70-35-38-154.static.wiline.com. [70.35.38.154]) by mx.google.com with ESMTPSA id fa16sm21114321pac.43.2014.09.18.14.33.22 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 18 Sep 2014 14:33:23 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.sourceforge.net Date: Thu, 18 Sep 2014 14:33:12 -0700 Message-Id: <1411075992-17220-1-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.8.3.2 X-Spam-Score: -0.7 (/) 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.8 UPPERCASE_50_75 message body is 50-75% uppercase X-Headers-End: 1XUjKU-000262-6z Subject: [edk2] [PATCH v2] CryptoPkg: use correct OpenSSL #define for LP64 data model 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: ard.biesheuvel@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.171 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 Users of the LP64 data model should declare SIXTY_FOUR_BIT_LONG, not SIXTY_FOUR_BIT when building OpenSSL. Contributed-under: TianoCore Contribution Agreement 1.0 Reviewed-By: Olivier Martin Reviewed-by: Andrew Fish Signed-off-by: Ard Biesheuvel --- CryptoPkg/Library/OpensslLib/OpensslLib.inf | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf index d380158a4339..f32afb9b65ff 100644 --- a/CryptoPkg/Library/OpensslLib/OpensslLib.inf +++ b/CryptoPkg/Library/OpensslLib/OpensslLib.inf @@ -655,10 +655,10 @@ INTEL:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER -U__ICC $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) /w -DSIXTY_FOUR_BIT INTEL:*_*_IPF_CC_FLAGS = -U_WIN32 -U_WIN64 -U_MSC_VER -U__ICC $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) /w -DSIXTY_FOUR_BIT GCC:*_*_IA32_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w -DTHIRTY_TWO_BIT - 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:*_*_X64_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w -DSIXTY_FOUR_BIT_LONG + GCC:*_*_IPF_CC_FLAGS = -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w -DSIXTY_FOUR_BIT_LONG GCC:*_*_ARM_CC_FLAGS = $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w -DTHIRTY_TWO_BIT - GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w -DSIXTY_FOUR_BIT + GCC:*_*_AARCH64_CC_FLAGS = $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w -DSIXTY_FOUR_BIT_LONG # suppress the following warnings in openssl so we don't break the build with warnings-as-errors: # 1295: Deprecated declaration - give arg types @@ -674,4 +674,4 @@ # 1296: Extended constant initialiser used RVCT:*_*_ARM_CC_FLAGS = $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) --library_interface=aeabi_clib99 --fpu=vfpv3 -DTHIRTY_TWO_BIT --diag_suppress=1296,1295,550,1293,111,68,177,223,144,513,188 XCODE:*_*_IA32_CC_FLAGS = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w -DTHIRTY_TWO_BIT - XCODE:*_*_X64_CC_FLAGS = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w -DSIXTY_FOUR_BIT + XCODE:*_*_X64_CC_FLAGS = -mmmx -msse -U_WIN32 -U_WIN64 $(OPENSSL_FLAGS) $(OPENSSL_EXFLAGS) -w -DSIXTY_FOUR_BIT_LONG