Merge changes from topic "fix_pie" into integration
* changes:
fix(pie): align fixup_gdt_reloc() for aarch64
fix(pie): do not skip __RW_END__ address during relocation
diff --git a/lib/aarch32/misc_helpers.S b/lib/aarch32/misc_helpers.S
index 8b16f93..59e15bd 100644
--- a/lib/aarch32/misc_helpers.S
+++ b/lib/aarch32/misc_helpers.S
@@ -301,9 +301,9 @@
cmp r4, r6
blo 2f
- /* Skip adding offset if address is >= upper limit */
+ /* Skip adding offset if address is > upper limit */
cmp r4, r7
- bhs 2f
+ bhi 2f
add r4, r0, r4
str r4, [r3]
diff --git a/lib/aarch64/misc_helpers.S b/lib/aarch64/misc_helpers.S
index 6e4d1fc..01531ca 100644
--- a/lib/aarch64/misc_helpers.S
+++ b/lib/aarch64/misc_helpers.S
@@ -532,9 +532,9 @@
cmp x3, x6
b.lo 2f
- /* Skip adding offset if address is >= upper limit */
+ /* Skip adding offset if address is > upper limit */
cmp x3, x7
- b.hs 2f
+ b.hi 2f
add x3, x3, x0
str x3, [x1]
@@ -582,9 +582,9 @@
cmp x4, x6
b.lo 2f
- /* Skip adding offset if r_addend entry is >= upper limit */
+ /* Skip adding offset if r_addend entry is > upper limit */
cmp x4, x7
- b.hs 2f
+ b.hi 2f
add x4, x0, x4 /* Diff(S) + r_addend */
str x4, [x3]