From patchwork Wed Apr 12 20:48:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 97345 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp438096qgf; Wed, 12 Apr 2017 13:49:00 -0700 (PDT) X-Received: by 10.200.45.122 with SMTP id o55mr9172475qta.203.1492030139775; Wed, 12 Apr 2017 13:48:59 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id 17si3577718qki.26.2017.04.12.13.48.59; Wed, 12 Apr 2017 13:48:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 4886563521; Wed, 12 Apr 2017 20:48:59 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 3A30363667; Wed, 12 Apr 2017 20:48:57 +0000 (UTC) X-Original-To: linaro-uefi@lists.linaro.org Delivered-To: linaro-uefi@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 5E8726368B; Wed, 12 Apr 2017 20:48:55 +0000 (UTC) Received: from mail-wr0-f177.google.com (mail-wr0-f177.google.com [209.85.128.177]) by lists.linaro.org (Postfix) with ESMTPS id 294AC63521 for ; Wed, 12 Apr 2017 20:48:53 +0000 (UTC) Received: by mail-wr0-f177.google.com with SMTP id o21so24577914wrb.2 for ; Wed, 12 Apr 2017 13:48:53 -0700 (PDT) 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; bh=8Di6e0TcavQU/mJ1oA42IAVrhivPbZwGsiuKHJ8KIsg=; b=FZ0RZrKbfZ4AucKybEa+LiMT/5d/fHpnYnyf/T54l05UB3aS7r03jAShQ5CA6KK7C5 RMjzbvJQyHW2ugiNFVDmsOioW9BGCQj9RUSOmauqHNYjFrPHhRl7Rv+3zqbjmqeXWJng d9mldHOv2WTZDk9FgD8TEIIC6dyN35ogZ8lbg9HABbZjdqFExzhXOGOtudWlQ2FwY6uN LHW9L+M2qHcgxbraHS92obsQ+g51Wa8pJ/n3xVm2e0v1c9f+mo3B9PGiOqHo6OWacmV3 WgjgiIOSEh3dSD9Fin0Izt3BOjq8l2ervmlpTBtTEypDmpOulhe/zE52hGIzGHeL8hNm kVDA== X-Gm-Message-State: AN3rC/4KsJ+ljfUbSJxlDEHGdu8sHHsvgqIhWjL99X+KzSbaXVNasZlIjVvWXj+O5RlzZh30xzc= X-Received: by 10.223.128.99 with SMTP id 90mr4796013wrk.101.1492030132317; Wed, 12 Apr 2017 13:48:52 -0700 (PDT) Received: from mohikan.hemma.eciton.net ([2a01:348:6:8735:e23f:49ff:fe6d:9d26]) by smtp.gmail.com with ESMTPSA id j26sm7536119wrb.19.2017.04.12.13.48.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Apr 2017 13:48:51 -0700 (PDT) From: Leif Lindholm To: linaro-uefi@lists.linaro.org Date: Wed, 12 Apr 2017 21:48:50 +0100 Message-Id: <20170412204850.29102-1-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.11.0 Subject: [Linaro-uefi] [PATCH] Platforms/ARM/Juno: fix RELEASE build with new PciHostBridgeLib X-BeenThere: linaro-uefi@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linaro-uefi-bounces@lists.linaro.org Sender: "Linaro-uefi" An array of static strings is set up for use in printing debug messages. This makes some compilers unhappy when building in RELEASE mode. So hide the definition behind #ifndef MDE_NDEBUG. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Leif Lindholm Reviewed-by: Ard Biesheuvel --- Platforms/ARM/Juno/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Platforms/ARM/Juno/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.c b/Platforms/ARM/Juno/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.c index f5cb254465..5263a2985d 100644 --- a/Platforms/ARM/Juno/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.c +++ b/Platforms/ARM/Juno/Library/JunoPciHostBridgeLib/JunoPciHostBridgeLib.c @@ -138,9 +138,11 @@ PciHostBridgeFreeRootBridges ( } +#ifndef MDEPKG_NDEBUG STATIC CONST CHAR16 mPciHostBridgeLibAcpiAddressSpaceTypeStr[][4] = { L"Mem", L"I/O", L"Bus" }; +#endif /** Inform the platform that the resource conflict happens.