From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4001:c0b::236; helo=mail-it0-x236.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-it0-x236.google.com (mail-it0-x236.google.com [IPv6:2607:f8b0:4001:c0b::236]) (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 ABA7821B02822 for ; Thu, 7 Dec 2017 00:42:08 -0800 (PST) Received: by mail-it0-x236.google.com with SMTP id d137so12703266itc.2 for ; Thu, 07 Dec 2017 00:46:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=J4W4N0P82Ae6ArUwGOjpQMxn+4yeappqxAo+GsdBE98=; b=E6T+QTN/NQYXb/4bJ62rOlaqmubYUhbBjSUUGvoxIbMt+1mEoCCOUjpS+k7LsJoJFC g6FzNVQ9JmkrEmOk5T1A7G5IJ6vShY7V+bZ0IlK8tPegtaymUphAJMK2KXl4QlnzHpJw ciPTN40zELccfNA4NY5EL2o3RJi7Q1EzMs+es= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=J4W4N0P82Ae6ArUwGOjpQMxn+4yeappqxAo+GsdBE98=; b=UbDUanWaUmMo1T9SM8kbCBHtI1q4Pyv0VL3qbfx2W4AKn4muQci7+xrgKpMlsYpV3W nkkCdZG+1c5XwZk4/HOqxD9rvwRHw7WNLfEVtoG57kdPlUj5s83ceJjfB/XqYI7co7f0 6FtQu/1DPOly94Wryk6cyOH2LUgC1SjvxZLguMNh5mk54KP3JUr0RRA0rhAFs/jfm4Xj JToWNXIJqlN+NHnqtIdGd0Fc7FRYo2alfUkjcj0oEFs6odBSqptLvcBRGflbKx3+1vWM K9Xsk3xxwQwV33X23HTjF6xBFcr52HLenbDz8onReskNaVPkqHt3WGtnEb45znEVIDEF J7hg== X-Gm-Message-State: AKGB3mKpuXk902Im5o9B5FVH5sz7RAmXR0PUdBg5DVdpJJv+8PPpzsNq JUOAvCkq/kMUeSKzam35bC70hcgvfv/eKI+drBBlxQ== X-Google-Smtp-Source: AGs4zMYL6AesT4cA1jpDilRg+jSNE24e26R3ZuKGCXpbs74BTTdsUiKVggR+iEUlSvDQtFNOFAjVpuxGuibPsaQBQQA= X-Received: by 10.36.145.203 with SMTP id i194mr459895ite.73.1512636400574; Thu, 07 Dec 2017 00:46:40 -0800 (PST) MIME-Version: 1.0 Received: by 10.107.104.16 with HTTP; Thu, 7 Dec 2017 00:46:40 -0800 (PST) In-Reply-To: <1512632891-5236-1-git-send-email-liming.gao@intel.com> References: <1512632891-5236-1-git-send-email-liming.gao@intel.com> From: Ard Biesheuvel Date: Thu, 7 Dec 2017 08:46:40 +0000 Message-ID: To: Liming Gao Cc: "edk2-devel@lists.01.org" , Michael Kinney , Hao Wu , Laszlo Ersek , Andrew Fish , Jeff Fan Subject: Re: [Patch] SourceLevelDebugPkg/SecPeiDebugAgentLib: Fix duplicate symbol X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Dec 2017 08:42:08 -0000 Content-Type: text/plain; charset="UTF-8" On 7 December 2017 at 07:48, Liming Gao wrote: > From: Michael Kinney > > https://bugzilla.tianocore.org/show_bug.cgi?id=573 > https://bugzilla.tianocore.org/show_bug.cgi?id=796 > > The same issue is reported again by GCC. Resend this patch again. > This patch renames the duplicated function name to fix it. > > The SecPeiDebugAgentLib uses the global variable > mMemoryDiscoveredNotifyList for a PPI notification on > the Memory Discovered PPI. This same variable name is > used in the DxeIplPeim for the same PPI notification. > > The XCODE5 tool chain detects this duplicate symbol > when the OVMF platform is built with the flag > -D SOURCE_DEBUG_ENABLE. > > The fix is to rename this global variable in the > SecPeiDebugAgentLib library. > No, the fix is to make it STATIC unless it *needs* to be a global. Is that the case here? > Cc: Andrew Fish > Cc: Jeff Fan > Cc: Hao Wu > Cc: Laszlo Ersek > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Michael D Kinney > Reviewed-by: Jeff Fan > --- > .../Library/DebugAgent/SecPeiDebugAgent/SecPeiDebugAgentLib.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgent/SecPeiDebugAgentLib.c b/SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgent/SecPeiDebugAgentLib.c > index b717e33..9f5223a 100644 > --- a/SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgent/SecPeiDebugAgentLib.c > +++ b/SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgent/SecPeiDebugAgentLib.c > @@ -32,7 +32,7 @@ GLOBAL_REMOVE_IF_UNREFERENCED EFI_PEI_PPI_DESCRIPTOR mVectorHandoffInf > } > }; > > -GLOBAL_REMOVE_IF_UNREFERENCED EFI_PEI_NOTIFY_DESCRIPTOR mMemoryDiscoveredNotifyList[1] = { > +GLOBAL_REMOVE_IF_UNREFERENCED EFI_PEI_NOTIFY_DESCRIPTOR mDebugAgentMemoryDiscoveredNotifyList[1] = { > { > (EFI_PEI_PPI_DESCRIPTOR_NOTIFY_CALLBACK | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST), > &gEfiPeiMemoryDiscoveredPpiGuid, > @@ -554,7 +554,7 @@ InitializeDebugAgent ( > // Register for a callback once memory has been initialized. > // If memery has been ready, the callback funtion will be invoked immediately > // > - Status = PeiServicesNotifyPpi (&mMemoryDiscoveredNotifyList[0]); > + Status = PeiServicesNotifyPpi (&mDebugAgentMemoryDiscoveredNotifyList[0]); > if (EFI_ERROR (Status)) { > DEBUG ((EFI_D_ERROR, "DebugAgent: Failed to register memory discovered callback function!\n")); > CpuDeadLoop (); > -- > 2.6.3.windows.1 > > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel > GitPatchExtractor 1.1 > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel