From 6f2dd67c116583926fda76552c93b08e0d4afaf9 Mon Sep 17 00:00:00 2001
From: Zhuowei Zhang <zhuoweizhang@yahoo.com>
Date: Mon, 25 Feb 2019 20:59:18 -0800
Subject: [PATCH] Fix build in CI: GCC5 doesn't accept lr as alias of x30

---
 Pixel3XL/Library/Pixel3XLLib/Pixel3XLHelper.S | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Pixel3XL/Library/Pixel3XLLib/Pixel3XLHelper.S b/Pixel3XL/Library/Pixel3XLLib/Pixel3XLHelper.S
index f75d3b3..b85223b 100644
--- a/Pixel3XL/Library/Pixel3XLLib/Pixel3XLHelper.S
+++ b/Pixel3XL/Library/Pixel3XLLib/Pixel3XLHelper.S
@@ -31,8 +31,9 @@ docopy:
   sub	x5, x5, x6 // x5 now holds offset of ArmPlatformPeiBootAction from start of FD base
   sub	x4, x4, x5 // x4 now holds address of actual FD base
   // tweak the return address
-  sub	lr, lr, x4
-  add	lr, lr, x6
+  // note: x30 is lr; gcc5 doesn't have the alias
+  sub	x30, x30, x4
+  add	x30, x30, x6
   ldr	x5, =FixedPcdGet64 (PcdFdSize)
   // crap memcpy
 loop: