Fix build in CI: GCC5 doesn't accept lr as alias of x30

2019-02-25 20:59:18 -08:00 · 2019-02-25 20:59:18 -08:00 · 6f2dd67c11
commit 6f2dd67c11
parent e74a18e5e3
1 changed files with 3 additions and 2 deletions
--- 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: