* configure.host (HOSTING_LIBS): Define for hppa*-*-linux*.

	* ld-elfvsb/elfvsb.exp: xfail non-pic shared library tests for
	non 64-bit hppa*-*-linux* targets.
	* ld-elfvsb/main.c (main_visibility_check): Cast value returned by
	visibility_funptr () to a function pointer.
	* ld-shared/shared.exp: xfail shared (non PIC), shared (non PIC, load
	offset), and shared (PIC main, non PIC so) tests for non 64-bit
	hppa*-*-linux* targets.

2 files changed, 13 insertions, 2 deletions

diff --git a/ld/testsuite/ld-elfvsb/elfvsb.exp b/ld/testsuite/ld-elfvsb/elfvsb.exp
index 9f0073a77c..f1f3f1fdf3 100644
--- a/ld/testsuite/ld-elfvsb/elfvsb.exp
+++ b/ld/testsuite/ld-elfvsb/elfvsb.exp
@@ -263,6 +263,9 @@ proc visibility_run {visibility} {
 		setup_xfail "s390x-*-linux*"
 	    }
 	    setup_xfail "x86_64-*-linux*"
+	    if { ![istarget hppa*64*-*-linux*] } {
+		setup_xfail "hppa*-*-linux*"
+	    }
 
 	    visibility_test $visibility vnp "visibility ($visibility) (non PIC)" mainnp.o sh1np.o sh2np.o elfvsb
 
@@ -294,6 +297,10 @@ proc visibility_run {visibility} {
 		setup_xfail "mips*-*-linux*"
 	    }
 	    setup_xfail "x86_64-*-linux*"
+	    if { ![istarget hppa*64*-*-linux*] } {
+		setup_xfail "hppa*-*-linux*"
+	    }
+
 	    visibility_test $visibility vnp "visibility ($visibility) (non PIC, load offset)" \
 		mainnp.o sh1np.o sh2np.o elfvsb \
 		"-T $srcdir/$subdir/elf-offset.ld"
@@ -353,6 +360,10 @@ proc visibility_run {visibility} {
 		    setup_xfail "s390x-*-linux*"
 		}
 		setup_xfail "x86_64-*-linux*"
+		if { ![istarget hppa*64*-*-linux*] } {
+		    setup_xfail "hppa*-*-linux*"
+		}
+
 		visibility_test $visibility vmpnp "visibility ($visibility) (PIC main, non PIC so)" mainp.o sh1np.o sh2np.o elfvsb
 	    }
 	} else {
diff --git a/ld/testsuite/ld-elfvsb/main.c b/ld/testsuite/ld-elfvsb/main.c
index 1ce2e3eb37..f071260d47 100644
--- a/ld/testsuite/ld-elfvsb/main.c
+++ b/ld/testsuite/ld-elfvsb/main.c
@@ -82,7 +82,7 @@ visibility ()
 static int
 main_visibility_check ()
 {
-  return visibility_funptr () != visibility;
+  return ((int (*) (void)) visibility_funptr ()) != visibility;
 }
 
 int visibility_var = 1;
@@ -117,7 +117,7 @@ main_visibility_check ()
 #ifdef WEAK_TEST
   return visibility_funptr () == NULL;
 #else
-  return visibility_funptr () == visibility;
+  return ((int (*) (void)) visibility_funptr ()) == visibility;
 #endif
 }