Module Name: src
Committed By: joerg
Date: Tue Aug 26 16:25:35 UTC 2014
Modified Files:
src/tests/libexec/ld.elf_so/helper_ifunc_dso: h_helper_ifunc.c
Log Message:
Revert. There is no such thing as __HAVE_IFUNC and there should not be
one in first place.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/tests/libexec/ld.elf_so/helper_ifunc_dso/h_helper_ifunc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/libexec/ld.elf_so/helper_ifunc_dso/h_helper_ifunc.c
diff -u src/tests/libexec/ld.elf_so/helper_ifunc_dso/h_helper_ifunc.c:1.2 src/tests/libexec/ld.elf_so/helper_ifunc_dso/h_helper_ifunc.c:1.3
--- src/tests/libexec/ld.elf_so/helper_ifunc_dso/h_helper_ifunc.c:1.2 Tue Aug 26 11:10:02 2014
+++ src/tests/libexec/ld.elf_so/helper_ifunc_dso/h_helper_ifunc.c Tue Aug 26 16:25:35 2014
@@ -49,15 +49,9 @@ int (*resolve_ifunc(void))(void)
return e && strcmp(e, "1") == 0 ? ifunc2 : ifunc1;
}
-#ifdef __HAVE_IFUNC
-// XXX: m68k, vax, mips, sh3 (and others) binutils don't support this.
-// Needs to be staged in for archs that support it.
-__ifunc(ifunc, resolve_ifunc);
-#else
int ifunc(void);
int
ifunc(void) {
const char *e = getenv("USE_IFUNC2");
return e && strcmp(e, "1") == 0 ? ifunc2() : ifunc1();
}
-#endif
