From patchwork Thu Sep 18 17:45:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 37595 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f70.google.com (mail-ee0-f70.google.com [74.125.83.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 68B1C2054D for ; Thu, 18 Sep 2014 17:46:16 +0000 (UTC) Received: by mail-ee0-f70.google.com with SMTP id c41sf931149eek.5 for ; Thu, 18 Sep 2014 10:46:15 -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=RfdaFmmm7jnnQ4mTUhK4IBa6IBiPdWGqJvtwxB78lnI=; b=O4eGf2yoarN6MuAWs3elpLP4z5syyrqpJn1sCAUEKr+qAKPAOlTssrVrET4Cj/+nm2 ALn7jKWEybwrZFaImnCAKkilX+2Rv46VYuJsBNANarhoih95C/sDVJ7/slwaU2WMbnSX KeTMo1aji5+hL3IKaTXu0rl9/YkaclJx3/t4IwGLmtTEEJ/x9mpRN1IA05QSI8AGg5jV eP4UuTVpJxepl494kUFGiPB013kdQMIik/N4zkhKtVHVl5lDIw3sMVUsMzEsPyAvwy0M an7slcYaM2Ew19No5KadOuFEtv7HnbEbrlHbXbieLdN0pn2WuRL8vD7tL4jawEXDmzQD vx7w== X-Gm-Message-State: ALoCoQnUgeKQwLKN8J4ckC3X+2HPdxR22c8kClDS70ZRjugMazAgPZwvJ5rXCbpQJUez3Y/YlAIw X-Received: by 10.152.2.97 with SMTP id 1mr1088472lat.6.1411062375499; Thu, 18 Sep 2014 10:46:15 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.87.132 with SMTP id ay4ls244586lab.46.gmail; Thu, 18 Sep 2014 10:46:15 -0700 (PDT) X-Received: by 10.112.210.197 with SMTP id mw5mr1410315lbc.20.1411062375265; Thu, 18 Sep 2014 10:46:15 -0700 (PDT) Received: from mail-lb0-f176.google.com (mail-lb0-f176.google.com [209.85.217.176]) by mx.google.com with ESMTPS id b8si33805622lbv.65.2014.09.18.10.46.15 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 18 Sep 2014 10:46:15 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) client-ip=209.85.217.176; Received: by mail-lb0-f176.google.com with SMTP id z11so1670177lbi.35 for ; Thu, 18 Sep 2014 10:46:15 -0700 (PDT) X-Received: by 10.112.53.230 with SMTP id e6mr1247567lbp.100.1411062374945; Thu, 18 Sep 2014 10:46:14 -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 of9csp805208lbb; Thu, 18 Sep 2014 10:46:14 -0700 (PDT) X-Received: by 10.50.136.167 with SMTP id qb7mr1236062igb.31.1411062373592; Thu, 18 Sep 2014 10:46:13 -0700 (PDT) Received: from lists.sourceforge.net (lists.sourceforge.net. [216.34.181.88]) by mx.google.com with ESMTPS id qk2si5298003icb.1.2014.09.18.10.46.12 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 18 Sep 2014 10:46:13 -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 1XUfmK-0000wM-Jo; Thu, 18 Sep 2014 17:46:00 +0000 Received: from sog-mx-2.v43.ch3.sourceforge.com ([172.29.43.192] helo=mx.sourceforge.net) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1XUfmJ-0000wG-63 for edk2-devel@lists.sourceforge.net; Thu, 18 Sep 2014 17:45:59 +0000 Received-SPF: pass (sog-mx-2.v43.ch3.sourceforge.com: domain of linaro.org designates 209.85.192.174 as permitted sender) client-ip=209.85.192.174; envelope-from=ard.biesheuvel@linaro.org; helo=mail-pd0-f174.google.com; Received: from mail-pd0-f174.google.com ([209.85.192.174]) by sog-mx-2.v43.ch3.sourceforge.com with esmtps (TLSv1:RC4-SHA:128) (Exim 4.76) id 1XUfmI-00030z-07 for edk2-devel@lists.sourceforge.net; Thu, 18 Sep 2014 17:45:59 +0000 Received: by mail-pd0-f174.google.com with SMTP id v10so1858757pde.19 for ; Thu, 18 Sep 2014 10:45:52 -0700 (PDT) X-Received: by 10.70.128.165 with SMTP id np5mr8485493pdb.133.1411062352057; Thu, 18 Sep 2014 10:45:52 -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 om6sm20265506pdb.89.2014.09.18.10.45.48 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 18 Sep 2014 10:45:50 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.sourceforge.net Date: Thu, 18 Sep 2014 10:45:35 -0700 Message-Id: <1411062335-25715-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: 1XUfmI-00030z-07 Subject: [edk2] [PATCH] 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.176 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 Signed-off-by: Ard Biesheuvel Reviewed-by: Andrew Fish --- CryptoPkg/Library/OpensslLib/OpensslLib.inf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CryptoPkg/Library/OpensslLib/OpensslLib.inf b/CryptoPkg/Library/OpensslLib/OpensslLib.inf index d380158a4339..20991529b1c4 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