From patchwork Thu Nov 1 15:36:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 149973 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp937811ljp; Thu, 1 Nov 2018 08:37:02 -0700 (PDT) X-Google-Smtp-Source: AJdET5e1T80IKOTmh7xgxDKL1pAUIa0HpHXqD53lTmwcgLSZE6+2QEjGVhd+FftpwP+crhoa6mD5 X-Received: by 2002:a62:507:: with SMTP id 7-v6mr8216182pff.80.1541086622574; Thu, 01 Nov 2018 08:37:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1541086622; cv=none; d=google.com; s=arc-20160816; b=wYMNhN1Rd1r+WxaLq7a1icYBWyu67si0G0jJBpTzE5NbDFt+p891s42/Gk1+3eORXI w4tpTrtTgvAQ0X0Ca40uycbRPD7lxmt7kTP8PPr5OBwkxNCXr7aZ8k60Rb/BK8XuxDIY 3cxx9m4VCtNzpQdgVaj3DTIUgxHt1j5+FS9nvN816vf9Y+vlsZ4FNr0jgvMlUQBf6XSl 0aHltVwRPtnv38d429WCVXElwh525Q+QDuExQSn8tbhGuK3Av/nzdgh2rm7FL1V4Tpwu vvjvhqQRzsL4mCUIET1AP9HKP1DWSY1w+4v4eZffdi0In2v1jUIlvCasnl/isdfgGGWd F6/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=/gOBsOeULkKbffvcFWOdKBePQlV2a/t3//ODFbk2AGM=; b=GVyp2CnR4HEDKo24ZX9sETYfcbrVHFkdg0TsMAnzwVP30COYG26Xnz8h3JQuWkv6FO RxLGzU+TxmQlR0PEcLV84BCLJthR6Kcd7CxqoF9YNCJzOStKyuy0jTYTrI9nMv1MuDDB TaU6ZTNLozO6veUEcOfAMP1w4Mkxk5j8ISTJEtBtTQhBfW5NosEK0s09BfsPvLydtBJ0 T6NabIq5r734tfVMz/ntCxdgJ4/GB4qL6SNOEqqrHaDO+v78o/sFyYAOmnABiTse42+y DVgZLHMwt8WyG7Y+eEl0RppcIDq7chQPpQAkw+VVQxilQnZuB/19gr095dKOcaTmUe2l 3GVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=QtDtoZ+C; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id g11-v6si20644368pgd.26.2018.11.01.08.36.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Nov 2018 08:37:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=QtDtoZ+C; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 9A89321189FB3; Thu, 1 Nov 2018 08:36:52 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::342; helo=mail-wm1-x342.google.com; envelope-from=leif.lindholm@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 7DFA521189FB0 for ; Thu, 1 Nov 2018 08:36:50 -0700 (PDT) Received: by mail-wm1-x342.google.com with SMTP id v24-v6so1767797wmh.3 for ; Thu, 01 Nov 2018 08:36:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=IMo8YeUb1HdxjVnj0/qliYz6k+ZdeFIB1r+kSkUWGkc=; b=QtDtoZ+CBA5d5VPidcveno5StU8XEy2mhPtWqkCCAw32a7d/v1SZrpwDAwub1K041u M8M+f4xTHv0AGaryWEQ+3VkMWrKFzKTIyjmdyCVvlqpKDoyhs4sYJhR/Psza5W0BufGc lcZA1Q3NvQid3APHcaGW19ct0p6f2hQegcQk0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IMo8YeUb1HdxjVnj0/qliYz6k+ZdeFIB1r+kSkUWGkc=; b=YKTH5BnjamrwYjtLZoDx6F8VtL+AofPXO9e6m7qDV1o24078vVExr6F4HCsdW/tzIA EwNvfruxn919VZkpRe/9qG9/+A9k6BOa2tucAI3oFGTR07EjTycdFY4GrKkG7exzx2/C OG81aVcy6yc2cStx0cinczvFgKuOHUbcbfXcB9WTG+llEGDnpODb5/VrE+L5J9f+fRA3 bw8Zdx4iKcmhqA0Nbz3HplDeDYUl1iFpvvhku9TEF/h67b7WwfKGY0v8XR0k/QP1sQN+ /zCD/2s9Wkbo87RAVDf/UJEo6fXQAwwSqcZBlEODn9jxG6yQX5WrBX/zMEC6pFFWk4T+ A7aQ== X-Gm-Message-State: AGRZ1gKxex65KOiS2CCrR5iPIV2F1Gfojdaf27XeG2th53zl4lVLwnHC DxrnA71ozy+NU6hKHiOiiLqdgCttRm0= X-Received: by 2002:a7b:c153:: with SMTP id z19-v6mr6158982wmi.132.1541086608642; Thu, 01 Nov 2018 08:36:48 -0700 (PDT) Received: from vanye.hemma.eciton.net (cpc92302-cmbg19-2-0-cust304.5-4.cable.virginm.net. [82.1.209.49]) by smtp.gmail.com with ESMTPSA id 195-v6sm29669157wmx.21.2018.11.01.08.36.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Nov 2018 08:36:47 -0700 (PDT) From: Leif Lindholm To: edk2-devel@lists.01.org Date: Thu, 1 Nov 2018 15:36:38 +0000 Message-Id: <20181101153642.11315-3-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20181101153642.11315-1-leif.lindholm@linaro.org> References: <20181101153642.11315-1-leif.lindholm@linaro.org> Subject: [edk2] [PATCH 2/6] IntelFrameworkModulePkg: fix build for AARCH64/ARM X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Liming Gao MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Contrary to what the name suggests, some modules in this package are used on other architecture. ARM is already listed in SUPPORTED_ARCHITECTURES in the .dsc, but AARCH64 was never added. Add that, and force inclusion of CompilerIntrinsicsLib and BaseStackCheckLib for AARCH64/ARM to make the build successful. Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Leif Lindholm --- IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc index 894c5340a0..14bef5356e 100644 --- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc +++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dsc @@ -25,7 +25,7 @@ [Defines] PLATFORM_VERSION = 0.96 DSC_SPECIFICATION = 0x00010005 OUTPUT_DIRECTORY = Build/IntelFrameworkModuleAll - SUPPORTED_ARCHITECTURES = IA32|X64|EBC|ARM + SUPPORTED_ARCHITECTURES = IA32|X64|EBC|ARM|AARCH64 BUILD_TARGETS = DEBUG|RELEASE|NOOPT SKUID_IDENTIFIER = DEFAULT @@ -76,6 +76,17 @@ [LibraryClasses] UefiRuntimeLib|MdePkg/Library/UefiRuntimeLib/UefiRuntimeLib.inf PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf +[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. + # And NULL mean link this library into all ARM images. + #^M + NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf + + # Add support for GCC stack protector + NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf + [LibraryClasses.common.PEIM] HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf