[prelink-cross][PATCH 0/2] aarch64 fixes reported by testsuite failures

[prelink-cross][PATCH 0/2] aarch64 fixes reported by testsuite failures

[Maninder Singh]

aarch64 fixes reported by testsuite failures

To work this we need to copy all required system libs
in testsuite directory, and at our set-up we copied
below libs:-
1. ld-linux-aarch64.so.1
2. libc.so.6
3. libgcc_s.so.1
4. libm.so.6
5. libstdc++.so.6

root# make check
make  check-TESTS
make[1]: Entering directory 'prelink-cross/testsuite'
make[2]: Entering directory 'prelink-cross/testsuite'
SKIP: movelibs.sh
PASS: reloc1.sh
PASS: reloc2.sh
PASS: reloc3.sh
SKIP: reloc4.sh
SKIP: reloc5.sh
PASS: reloc6.sh
PASS: reloc7.sh
PASS: reloc8.sh
PASS: reloc9.sh
PASS: reloc10.sh
PASS: reloc11.sh
PASS: shuffle1.sh
PASS: shuffle2.sh
PASS: shuffle3.sh
PASS: shuffle4.sh
PASS: shuffle5.sh
PASS: shuffle6.sh
PASS: shuffle7.sh
PASS: shuffle8.sh
PASS: shuffle9.sh
PASS: undo1.sh
PASS: layout1.sh
PASS: layout2.sh
FAIL: unprel1.sh
PASS: tls1.sh
PASS: tls2.sh
PASS: tls3.sh
PASS: tls4.sh
PASS: tls5.sh
PASS: tls6.sh
PASS: tls7.sh
PASS: cxx1.sh
PASS: cxx2.sh
PASS: cxx3.sh
FAIL: quick1.sh
FAIL: quick2.sh
FAIL: quick3.sh
PASS: cycle1.sh
PASS: cycle2.sh
FAIL: deps1.sh
FAIL: deps2.sh
SKIP: ifunc1.sh
SKIP: ifunc2.sh
SKIP: ifunc3.sh
PASS: undosyslibs.sh
FAIL: preload1.sh
============================================================================
Testsuite summary for
============================================================================
# TOTAL: 47
# PASS:  34
# SKIP:  6
# XFAIL: 0
# FAIL:  7
# XPASS: 0
# ERROR: 0

Maninder Singh (2):
  testsuite: fixes in testsuite according to aarch64
  src/arch-aarch64.c:testsuite failure fixes in aarch64

 src/arch-aarch64.c  |    7 ++++---
 testsuite/reloc2.sh |    2 +-
 testsuite/reloc8.sh |    2 +-
 testsuite/reloc9.sh |    2 +-
 testsuite/tls3.sh   |    2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

[prelink-cross][PATCH 1/2] testsuite: fixes in testsuite according to aarch64

[Maninder Singh]

This Patch fixes testsuite by adding support of aarch64

Signed-off-by: Vaneet Narang <v.narang@samsung.com>
Signed-off-by: Maninder Singh <maninder1.s@samsung.com>
---
 testsuite/reloc2.sh |    2 +-
 testsuite/reloc8.sh |    2 +-
 testsuite/reloc9.sh |    2 +-
 testsuite/tls3.sh   |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/testsuite/reloc2.sh b/testsuite/reloc2.sh
index b21d535..846182e 100755
--- a/testsuite/reloc2.sh
+++ b/testsuite/reloc2.sh
@@ -2,7 +2,7 @@
 . `dirname $0`/functions.sh
 SHFLAGS=
 case "`$RUN uname -m`" in
-  ia64|ppc*|x86_64|mips*|arm*) SHFLAGS=-fpic;; # Does not support non-pic shared libs
+  ia64|ppc*|x86_64|mips*|arm*|aarch64) SHFLAGS=-fpic;; # Does not support non-pic shared libs
   s390*) if file reloc1lib1.so | grep -q 64-bit; then SHFLAGS=-fpic; fi;;
 esac
 # Disable this test under SELinux if textrel
diff --git a/testsuite/reloc8.sh b/testsuite/reloc8.sh
index 46382af..c2644f4 100755
--- a/testsuite/reloc8.sh
+++ b/testsuite/reloc8.sh
@@ -13,7 +13,7 @@ rm -f reloc8 reloc8lib*.so reloc8.log
 rm -f prelink.cache
 NOCOPYRELOC=-Wl,-z,nocopyreloc
 case "`$RUN uname -m`" in
-  x86_64|s390*|sparc*) if file reloc1lib1.so | grep -q 64-bit; then NOCOPYRELOC=; fi;;
+  x86_64|s390*|sparc*|aarch64) if file reloc1lib1.so | grep -q 64-bit; then NOCOPYRELOC=; fi;;
 esac
 $RUN_HOST $CC -shared -O2 -Wl,-z,nocombreloc -fpic -o reloc8lib1.so $srcdir/reloc3lib1.c
 $RUN_HOST $CC -shared -O2 -Wl,-z,nocombreloc -fpic -o reloc8lib2.so $srcdir/reloc1lib2.c reloc8lib1.so
diff --git a/testsuite/reloc9.sh b/testsuite/reloc9.sh
index 4350c30..33d2845 100755
--- a/testsuite/reloc9.sh
+++ b/testsuite/reloc9.sh
@@ -13,7 +13,7 @@ rm -f reloc9 reloc9lib*.so reloc9.log
 rm -f prelink.cache
 NOCOPYRELOC=-Wl,-z,nocopyreloc
 case "`$RUN uname -m`" in
-  x86_64|s390*|sparc*) if file reloc1lib1.so | grep -q 64-bit; then NOCOPYRELOC=; fi;;
+  x86_64|s390*|sparc*|aarch64) if file reloc1lib1.so | grep -q 64-bit; then NOCOPYRELOC=; fi;;
 esac
 $RUN_HOST $CC -shared -O2 -Wl,-z,nocombreloc -fpic -o reloc9lib1.so $srcdir/reloc3lib1.c
 $RUN_HOST $CC -shared -O2 -Wl,-z,nocombreloc -fpic -o reloc9lib2.so $srcdir/reloc1lib2.c reloc9lib1.so
diff --git a/testsuite/tls3.sh b/testsuite/tls3.sh
index eb6e626..cfab235 100755
--- a/testsuite/tls3.sh
+++ b/testsuite/tls3.sh
@@ -9,7 +9,7 @@ if [ "x$CROSS" = "x" ]; then
 fi
 SHFLAGS=
 case "`$RUN uname -m`" in
-  ia64|ppc*|x86_64|alpha*|s390*|mips*|arm*) SHFLAGS=-fpic;; # Does not support non-pic shared libs
+  ia64|ppc*|x86_64|alpha*|s390*|mips*|arm*|aarch64) SHFLAGS=-fpic;; # Does not support non-pic shared libs
 esac
 # Disable this test under SELinux if textrel
 if test -z "$SHFLAGS" -a -x /usr/sbin/getenforce; then
-- 
1.7.1

[prelink-cross][PATCH 2/2] src/arch-aarch64.c:testsuite failure fixes in aarch64

[Maninder Singh]

This patch fixes testsuite failure in aarch64 prelink undo section.

Signed-off-by: Vaneet Narang <v.narang@samsung.com>
Signed-off-by: Maninder Singh <maninder1.s@samsung.com>
---
 src/arch-aarch64.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/arch-aarch64.c b/src/arch-aarch64.c
index e04dd6e..3e5ddd1 100644
--- a/src/arch-aarch64.c
+++ b/src/arch-aarch64.c
@@ -470,7 +470,9 @@ aarch64_undo_prelink_rela (DSO *dso, GElf_Rela *rela, GElf_Addr relaaddr)
   switch (GELF_R_TYPE (rela->r_info))
     {
     case R_AARCH64_NONE:
+ 	break;	
     case R_AARCH64_RELATIVE:
+	write_ne64 (dso, rela->r_offset, 0);
       break;
     case R_AARCH64_JUMP_SLOT:
       sec = addr_to_sec (dso, rela->r_offset);
@@ -487,9 +489,7 @@ aarch64_undo_prelink_rela (DSO *dso, GElf_Rela *rela, GElf_Addr relaaddr)
 
 	  assert (rela->r_offset >= dso->shdr[sec].sh_addr + 24);
 	  assert (((rela->r_offset - dso->shdr[sec].sh_addr) & 7) == 0);
-	  write_neclass (dso, rela->r_offset,
-		      2 * (rela->r_offset - dso->shdr[sec].sh_addr - 24)
-		      + data);
+	  write_neclass (dso, rela->r_offset, data);
 	}
       break;
     case R_AARCH64_GLOB_DAT:
@@ -501,6 +501,7 @@ aarch64_undo_prelink_rela (DSO *dso, GElf_Rela *rela, GElf_Addr relaaddr)
       write_ne64 (dso, rela->r_offset, 0);
       break;
     case R_AARCH64_TLS_TPREL:
+      write_ne64 (dso, rela->r_offset, 0);
       break;
     case R_AARCH64_TLSDESC:
       write_ne64 (dso, rela->r_offset, 0);
-- 
1.7.1

Re: [prelink-cross][PATCH 0/2] aarch64 fixes reported by testsuite failures

[Mark Hatle]

Thank you.  I'm going to try to get this and the previous set of pending patches
merged in the next day or so.

I'll let everyone know when the next test version is ready.

--Mark

On 11/26/15 2:01 AM, Maninder Singh wrote:
> aarch64 fixes reported by testsuite failures
> 
> To work this we need to copy all required system libs
> in testsuite directory, and at our set-up we copied
> below libs:-
> 1. ld-linux-aarch64.so.1
> 2. libc.so.6
> 3. libgcc_s.so.1
> 4. libm.so.6
> 5. libstdc++.so.6
> 
> root# make check
> make  check-TESTS
> make[1]: Entering directory 'prelink-cross/testsuite'
> make[2]: Entering directory 'prelink-cross/testsuite'
> SKIP: movelibs.sh
> PASS: reloc1.sh
> PASS: reloc2.sh
> PASS: reloc3.sh
> SKIP: reloc4.sh
> SKIP: reloc5.sh
> PASS: reloc6.sh
> PASS: reloc7.sh
> PASS: reloc8.sh
> PASS: reloc9.sh
> PASS: reloc10.sh
> PASS: reloc11.sh
> PASS: shuffle1.sh
> PASS: shuffle2.sh
> PASS: shuffle3.sh
> PASS: shuffle4.sh
> PASS: shuffle5.sh
> PASS: shuffle6.sh
> PASS: shuffle7.sh
> PASS: shuffle8.sh
> PASS: shuffle9.sh
> PASS: undo1.sh
> PASS: layout1.sh
> PASS: layout2.sh
> FAIL: unprel1.sh
> PASS: tls1.sh
> PASS: tls2.sh
> PASS: tls3.sh
> PASS: tls4.sh
> PASS: tls5.sh
> PASS: tls6.sh
> PASS: tls7.sh
> PASS: cxx1.sh
> PASS: cxx2.sh
> PASS: cxx3.sh
> FAIL: quick1.sh
> FAIL: quick2.sh
> FAIL: quick3.sh
> PASS: cycle1.sh
> PASS: cycle2.sh
> FAIL: deps1.sh
> FAIL: deps2.sh
> SKIP: ifunc1.sh
> SKIP: ifunc2.sh
> SKIP: ifunc3.sh
> PASS: undosyslibs.sh
> FAIL: preload1.sh
> ============================================================================
> Testsuite summary for
> ============================================================================
> # TOTAL: 47
> # PASS:  34
> # SKIP:  6
> # XFAIL: 0
> # FAIL:  7
> # XPASS: 0
> # ERROR: 0
> 
> Maninder Singh (2):
>   testsuite: fixes in testsuite according to aarch64
>   src/arch-aarch64.c:testsuite failure fixes in aarch64
> 
>  src/arch-aarch64.c  |    7 ++++---
>  testsuite/reloc2.sh |    2 +-
>  testsuite/reloc8.sh |    2 +-
>  testsuite/reloc9.sh |    2 +-
>  testsuite/tls3.sh   |    2 +-
>  5 files changed, 8 insertions(+), 7 deletions(-)
>