Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/tests/libexec/ld.elf_so Disable attempt to use ifunc on hppa...



details:   https://anonhg.NetBSD.org/src/rev/431cef3a733c
branches:  trunk
changeset: 971832:431cef3a733c
user:      skrll <skrll%NetBSD.org@localhost>
date:      Tue May 05 20:47:14 2020 +0000

description:
Disable attempt to use ifunc on hppa.  It doesn't work and new binutils
throws a build error.

diffstat:

 tests/libexec/ld.elf_so/h_ifunc.c                         |  9 ++++++++-
 tests/libexec/ld.elf_so/helper_ifunc_dso/h_helper_ifunc.c |  6 ++++++
 2 files changed, 14 insertions(+), 1 deletions(-)

diffs (42 lines):

diff -r cf8934b680ca -r 431cef3a733c tests/libexec/ld.elf_so/h_ifunc.c
--- a/tests/libexec/ld.elf_so/h_ifunc.c Tue May 05 20:43:47 2020 +0000
+++ b/tests/libexec/ld.elf_so/h_ifunc.c Tue May 05 20:47:14 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: h_ifunc.c,v 1.2 2018/03/09 20:15:03 joerg Exp $        */
+/*     $NetBSD: h_ifunc.c,v 1.3 2020/05/05 20:47:14 skrll Exp $        */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -39,5 +39,12 @@
 
        if (argc != 2)
                return 1;
+/*
+ * Not supported on hppa
+ */
+#if defined(__hppa__)
+       return 1;
+#else
        return ifunc() != atoll(argv[1]);
+#endif
 }
diff -r cf8934b680ca -r 431cef3a733c tests/libexec/ld.elf_so/helper_ifunc_dso/h_helper_ifunc.c
--- a/tests/libexec/ld.elf_so/helper_ifunc_dso/h_helper_ifunc.c Tue May 05 20:43:47 2020 +0000
+++ b/tests/libexec/ld.elf_so/helper_ifunc_dso/h_helper_ifunc.c Tue May 05 20:47:14 2020 +0000
@@ -30,6 +30,11 @@
 #include <stdlib.h>
 #include <string.h>
 
+/*
+ * Not supported on hppa
+ */
+#if !defined(__hppa__)
+
 static long long
 ifunc1(void)
 {
@@ -73,3 +78,4 @@
 {
        return ifunc_hidden;
 }
+#endif



Home | Main Index | Thread Index | Old Index