Module Name: src
Committed By: joerg
Date: Tue Aug 26 17:13:42 UTC 2014
Modified Files:
src/tests/libexec/ld.elf_so/helper_ifunc_dso: h_helper_ifunc.c
Log Message:
Really revert to the original version.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
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.3 src/tests/libexec/ld.elf_so/helper_ifunc_dso/h_helper_ifunc.c:1.4
--- src/tests/libexec/ld.elf_so/helper_ifunc_dso/h_helper_ifunc.c:1.3 Tue Aug 26 16:25:35 2014
+++ src/tests/libexec/ld.elf_so/helper_ifunc_dso/h_helper_ifunc.c Tue Aug 26 17:13:42 2014
@@ -49,9 +49,4 @@ int (*resolve_ifunc(void))(void)
return e && strcmp(e, "1") == 0 ? ifunc2 : ifunc1;
}
-int ifunc(void);
-int
-ifunc(void) {
- const char *e = getenv("USE_IFUNC2");
- return e && strcmp(e, "1") == 0 ? ifunc2() : ifunc1();
-}
+__ifunc(ifunc, resolve_ifunc);
