From patchwork Thu Sep 18 18:55:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olivier Martin X-Patchwork-Id: 37599 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E12002054E for ; Thu, 18 Sep 2014 18:58:34 +0000 (UTC) Received: by mail-wi0-f197.google.com with SMTP id ex7sf988452wid.0 for ; Thu, 18 Sep 2014 11:58:34 -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:thread-topic :thread-index:message-id:references:in-reply-to:accept-language :acceptlanguage:mime-version:subject:precedence:reply-to:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-language:content-type :content-transfer-encoding; bh=47sS91vrF4dZkQ2hqj++QpJmck4AT7EMenyw4daHdoI=; b=VYJaMfwqTR9l03ENOpH/XNPQ24EaHkaMkhkF8BXqO2X+QTNvrBcvv0QFA94Iguwik+ uvTrTu5reliwBJyUXqzCPCjr12eD/50UVDdyf+75Rkaa1V4qdvWQxfCpxdvJnEwQLMVN 104JjZHNOn2ZUGK8FadOL/yfO71DUFIQZ6ipHCskTP9kiOpii1/QAB/b0X4Wm8tSIBOm XmYOabs5pGBCJ+ytn4G+FDOpv7Nnd0BvMeAJfgCIvy2h3cbfR8pTxQBvk6zI27T0gF1j Qlxt1gwI5GAItn4YChEdZUidspDifO0wvWz53iOUC93TyYIk8r67xULx1IXt1+fIrEby FbEw== X-Gm-Message-State: ALoCoQkLwNpLmDlk3auPLBU/N91V+9CeNKfcYpfw6FBGG60mz4BWAxL4ezfpzahcVDQZt6Gowih2 X-Received: by 10.180.221.169 with SMTP id qf9mr1218050wic.5.1411066714129; Thu, 18 Sep 2014 11:58:34 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.4.74 with SMTP id i10ls35754lai.54.gmail; Thu, 18 Sep 2014 11:58:34 -0700 (PDT) X-Received: by 10.112.13.10 with SMTP id d10mr1822670lbc.10.1411066713974; Thu, 18 Sep 2014 11:58:33 -0700 (PDT) Received: from mail-lb0-f177.google.com (mail-lb0-f177.google.com [209.85.217.177]) by mx.google.com with ESMTPS id m1si34086146lbs.55.2014.09.18.11.58.33 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 18 Sep 2014 11:58:33 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) client-ip=209.85.217.177; Received: by mail-lb0-f177.google.com with SMTP id z12so1743758lbi.8 for ; Thu, 18 Sep 2014 11:58:33 -0700 (PDT) X-Received: by 10.152.42.136 with SMTP id o8mr1587330lal.71.1411066713821; Thu, 18 Sep 2014 11:58:33 -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 of9csp815099lbb; Thu, 18 Sep 2014 11:58:33 -0700 (PDT) X-Received: by 10.42.230.144 with SMTP id jm16mr4008489icb.68.1411066712527; Thu, 18 Sep 2014 11:58:32 -0700 (PDT) Received: from lists.sourceforge.net (lists.sourceforge.net. [216.34.181.88]) by mx.google.com with ESMTPS id e12si1147icm.89.2014.09.18.11.58.31 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 18 Sep 2014 11:58:32 -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-3.v29.ch3.sourceforge.com) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1XUguJ-0001v1-4n; Thu, 18 Sep 2014 18:58:19 +0000 Received: from sog-mx-3.v43.ch3.sourceforge.com ([172.29.43.193] helo=mx.sourceforge.net) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1XUguH-0001uo-5W for edk2-devel@lists.sourceforge.net; Thu, 18 Sep 2014 18:58:17 +0000 Received-SPF: pass (sog-mx-3.v43.ch3.sourceforge.com: domain of arm.com designates 195.130.217.12 as permitted sender) client-ip=195.130.217.12; envelope-from=olivier.martin@arm.com; helo=service88.mimecast.com; Received: from service88.mimecast.com ([195.130.217.12]) by sog-mx-3.v43.ch3.sourceforge.com with esmtp (Exim 4.76) id 1XUguG-0000O3-4Y for edk2-devel@lists.sourceforge.net; Thu, 18 Sep 2014 18:58:17 +0000 Received: from emea-cam-gw2.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.21]) (Using TLS) by service88.mimecast.com; Thu, 18 Sep 2014 19:58:09 +0100 Received: from george.Emea.Arm.com ([fe80::4c19:a8f:5c9a:76df]) by emea-cam-gw2.Emea.Arm.com ([::1]) with mapi; Thu, 18 Sep 2014 19:58:08 +0100 From: Olivier Martin To: Ard Biesheuvel , "edk2-devel@lists.sourceforge.net" Date: Thu, 18 Sep 2014 19:55:14 +0100 Thread-Topic: [PATCH] CryptoPkg: use correct OpenSSL #define for LP64 data model Thread-Index: Ac/TaGfFEcjg4Zl4RbqVE9OJrTG4zwACaz0/ Message-ID: <0877601216922E4B83A7129715B5DA2BBE7474DF27@GEORGE.Emea.Arm.com> References: <1411062335-25715-1-git-send-email-ard.biesheuvel@linaro.org> In-Reply-To: <1411062335-25715-1-git-send-email-ard.biesheuvel@linaro.org> Accept-Language: en-US, en-GB X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US, en-GB MIME-Version: 1.0 X-MC-Unique: 114091819581000102 X-Spam-Score: -1.5 (-) 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 X-Headers-End: 1XUguG-0000O3-4Y Subject: Re: [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: , 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.217.177 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 Content-Language: en-GB Reviewed-By: Olivier Martin Maybe it would be safer to add '-m64' to the command line to be consistent. In case '-m32' has been specified earlier in the command line. 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