From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: None (no SPF record) identity=mailfrom; client-ip=2a00:1450:400c:c09::242; helo=mail-wm0-x242.google.com; envelope-from=pete@akeo.ie; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) (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 BAE8F2215238A for ; Mon, 4 Dec 2017 05:07:49 -0800 (PST) Received: by mail-wm0-x242.google.com with SMTP id g75so5741673wme.0 for ; Mon, 04 Dec 2017 05:12:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=akeo-ie.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=UvItuepFHYPMFRwEPnhfTqFJmTLjCEo15zE8PJijpGo=; b=s9FtnsBI65IPOF2S1RoowClrzrefmARFlHeexp1wXMR9ZyG4Dteq04G3q7vAUN//jT sCedDhGr2iJHQCBDW5NfSeTjYky5NraU+cVbJV+hULO7mmZTR45TGJvTUd6o1PtC8kuI ZeztqHHdoYgBy4OtLOatEgIw5+xT/EUyyZNszRYRNWi/08VW6Fq+dm9ks33pmLWIEe8r jIqT8TSUfOqdJOKlQ4ZDo1DBPvwSqjM/t61ELT7le6FCtdo6RSWsgGw1On9rmN0dYdtu SJ2w9ZkSxj+dAc82vWFaUyTmSqeo7QSOmCJ/Q3uDJKd/P6aVdgyWsxgjYrnoiSRZyqu8 fFAQ== 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=UvItuepFHYPMFRwEPnhfTqFJmTLjCEo15zE8PJijpGo=; b=kJqDC/FLNOZV0FJHmFPy9+6ewzKlJIx52CCDvfzSJaCYfJDYeVceyZ9UezSzkPWIeH P13uJMr/Bg9mPNcAXezYp/7BQnfFTfMDuM2yUuvuAnWVN60A/OTgECNNU2Py58l6TOhr XW9eYOAelsFugNWqZF7nFa6+2lxOB7KSvS9fP+jj1OHnYcWZ7CEDQM48VUsgI6WCre05 I+WuiGIMW+5hFHppQw5CosBM8GpOo5f5wHOeZngfqaGsqnUYvhFcSjvz1P1VLqr+FAsz WAkRrAzQWjB32nTOjoEtxcfJvq5kl4gFFCFkNpOo3HoGXbYnRWpPu2a5g7qPugDA9omC PHPQ== X-Gm-Message-State: AKGB3mL8P2hITnMg+qoE+AikFWgb8RFAB1fFyuzoOVsq/6fTG9qWX/0a wvwcz0KnQ60z7g3SYj3fClJxM9jZgp8= X-Google-Smtp-Source: AGs4zMZ5EDy5nGxT8EyKhEy2a61S20mQXcEo9urmTPjWrYFuB4c4bKnDiHcAu+iQSJ4x/KDX/Osw8g== X-Received: by 10.80.206.26 with SMTP id y26mr8681edi.117.1512393137951; Mon, 04 Dec 2017 05:12:17 -0800 (PST) Received: from localhost.localdomain ([84.203.42.156]) by smtp.gmail.com with ESMTPSA id y3sm7936797edb.37.2017.12.04.05.12.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 04 Dec 2017 05:12:17 -0800 (PST) From: Pete Batard To: edk2-devel@lists.01.org Cc: liming.gao@intel.com Date: Mon, 4 Dec 2017 13:12:02 +0000 Message-Id: <20171204131205.11304-4-pete@akeo.ie> X-Mailer: git-send-email 2.9.3.windows.2 In-Reply-To: <20171204131205.11304-1-pete@akeo.ie> References: <20171204131205.11304-1-pete@akeo.ie> Subject: [PATCH 3/6] MdePkg/Library/BaseLib: Enable VS2017/ARM builds 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: Mon, 04 Dec 2017 13:07:50 -0000 Most of the RVCT assembly can be reused as is for MSFT except for CpuBreakpoint.asm, which we need to force to Arm mode. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Pete Batard --- MdePkg/Library/BaseLib/Arm/CpuBreakpoint.asm | 5 ++++- MdePkg/Library/BaseLib/BaseLib.inf | 19 ++++++++++++++++--- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/MdePkg/Library/BaseLib/Arm/CpuBreakpoint.asm b/MdePkg/Library/BaseLib/Arm/CpuBreakpoint.asm index 8a8065159bf2..2e508d6f1ad8 100644 --- a/MdePkg/Library/BaseLib/Arm/CpuBreakpoint.asm +++ b/MdePkg/Library/BaseLib/Arm/CpuBreakpoint.asm @@ -16,7 +16,10 @@ EXPORT CpuBreakpoint - AREA Cpu_Breakpoint, CODE, READONLY +; Force ARM mode for this section, as MSFT assembler defaults to THUMB + AREA Cpu_Breakpoint, CODE, READONLY, ARM + + ARM ;/** ; Generates a breakpoint on the CPU. diff --git a/MdePkg/Library/BaseLib/BaseLib.inf b/MdePkg/Library/BaseLib/BaseLib.inf index 320ac457ea3d..4337a125d516 100644 --- a/MdePkg/Library/BaseLib/BaseLib.inf +++ b/MdePkg/Library/BaseLib/BaseLib.inf @@ -821,8 +821,9 @@ [Sources.EBC] [Sources.ARM] Arm/InternalSwitchStack.c Arm/Unaligned.c - Math64.c | RVCT - + Math64.c | RVCT + Math64.c | MSFT + Arm/SwitchStack.asm | RVCT Arm/SetJumpLongJump.asm | RVCT Arm/DisableInterrupts.asm | RVCT @@ -831,7 +832,16 @@ [Sources.ARM] Arm/CpuPause.asm | RVCT Arm/CpuBreakpoint.asm | RVCT Arm/MemoryFence.asm | RVCT - + + Arm/SwitchStack.asm | MSFT + Arm/SetJumpLongJump.asm | MSFT + Arm/DisableInterrupts.asm | MSFT + Arm/EnableInterrupts.asm | MSFT + Arm/GetInterruptsState.asm | MSFT + Arm/CpuPause.asm | MSFT + Arm/CpuBreakpoint.asm | MSFT + Arm/MemoryFence.asm | MSFT + Arm/Math64.S | GCC Arm/SwitchStack.S | GCC Arm/EnableInterrupts.S | GCC @@ -870,3 +880,6 @@ [Pcd] [FeaturePcd] gEfiMdePkgTokenSpaceGuid.PcdVerifyNodeInList ## CONSUMES + +[BuildOptions] + MSFT:*_*_ARM_CC_FLAGS = /GL- -- 2.9.3.windows.2