MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gold: Remove the circular IFUNC dependency in ifuncmain6pie

Browse Source 
On Fedora 33 x86-64 with glibc 2.32-3, ifuncmain6pie failed with:

./ifuncmain6pie: IFUNC symbol 'foo' referenced in './ifuncmod6.so' is defined in the executable and creates an unsatisfiable circular dependency.
FAIL ifuncmain6pie (exit status: 127)

Remove non-JUMP_SLOT relocations against foo in ifuncmod6.so, which
trigger the circular IFUNC dependency.

	* testsuite/ifuncmain6pie.c: Remove non-JUMP_SLOT relocations
	against foo in ifuncmod6.so.
	* testsuite/ifuncmod6.c: Likewise.
This commit is contained in:
H.J. Lu 2021-01-17 16:43:45 -08:00
parent d46153313b
commit 25294ff049
3 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gold/ChangeLog
View File

@ -1,3 +1,9 @@
2021-01-17 H.J. Lu <hongjiu.lu@intel.com>
* testsuite/ifuncmain6pie.c: Remove non-JUMP_SLOT relocations
against foo in ifuncmod6.so.
* testsuite/ifuncmod6.c: Likewise.
2021-01-14 Nick Clifton <nickc@redhat.com> 2021-01-14 Nick Clifton <nickc@redhat.com>
* po/fr.po: Updated French translation. * po/fr.po: Updated French translation.

14
gold/testsuite/ifuncmain6pie.c
View File

@ -9,7 +9,6 @@
#include "ifunc-sel.h" #include "ifunc-sel.h"
typedef int (*foo_p) (void); typedef int (*foo_p) (void);
extern foo_p foo_ptr;
static int static int
one (void) one (void)
@ -27,20 +26,17 @@ foo_ifunc (void)
} }
extern int foo (void); extern int foo (void);
extern foo_p get_foo (void); extern int call_foo (void);
extern foo_p get_foo_p (void); extern foo_p get_foo_p (void);
foo_p my_foo_ptr = foo; foo_p foo_ptr = foo;
int int
main (void) main (void)
{ {
foo_p p; foo_p p;
p = get_foo (); if (call_foo () != -30)
if (p != foo)
abort ();
if ((*p) () != -30)
abort (); abort ();
p = get_foo_p (); p = get_foo_p ();
@ -51,12 +47,8 @@ main (void)
if (foo_ptr != foo) if (foo_ptr != foo)
abort (); abort ();
if (my_foo_ptr != foo)
abort ();
if ((*foo_ptr) () != -30) if ((*foo_ptr) () != -30)
abort (); abort ();
if ((*my_foo_ptr) () != -30)
abort ();
if (foo () != -30) if (foo () != -30)
abort (); abort ();

10
gold/testsuite/ifuncmod6.c
View File

@ -5,9 +5,9 @@ extern int foo (void);
typedef int (*foo_p) (void); typedef int (*foo_p) (void);
extern foo_p get_foo_p (void); extern foo_p get_foo_p (void);
extern foo_p get_foo (void); extern int call_foo (void);
foo_p foo_ptr = foo; extern foo_p foo_ptr;
foo_p foo_p
get_foo_p (void) get_foo_p (void)
@ -15,8 +15,8 @@ get_foo_p (void)
return foo_ptr; return foo_ptr;
} }
foo_p int
get_foo (void) call_foo (void)
{ {
return foo; return foo ();
} }