summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog20
-rw-r--r--elf/ifuncdep2.c34
-rw-r--r--elf/ifuncmain1.c2
-rw-r--r--elf/ifuncmain1vis.c2
-rw-r--r--elf/ifuncmain2.c2
-rw-r--r--elf/ifuncmain5.c2
-rw-r--r--elf/ifuncmain6pie.c3
-rw-r--r--elf/ifuncmain7.c3
-rw-r--r--elf/ifuncmod1.c41
-rw-r--r--elf/ifuncmod3.c1
-rw-r--r--elf/ifuncmod5.c33
-rw-r--r--sysdeps/generic/elf/ifunc-sel.h26
-rw-r--r--sysdeps/powerpc/elf/ifunc-sel.h46
13 files changed, 116 insertions, 99 deletions
diff --git a/ChangeLog b/ChangeLog
index 3359bc20bf..ebae859280 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2009-10-28 Alan Modra <amodra@bigpond.net.au>
+
+ * elf/ifuncdep2.c: Include ifunc-sel.h.
+ (global): Delete.
+ (foo1_ifunc, foo2_ifunc, foo3_ifunc): Use ifunc_sel.
+ * elf/ifuncmain1.c (global): Delete.
+ * elf/ifuncmain1vis.c: Likewise.
+ * elf/ifuncmain2.c: Likewise.
+ * elf/ifuncmain5.c: Likewise.
+ * elf/ifuncmod3.c: Likewise.
+ * elf/ifuncmain6pie.c: Include ifunc-sel.h.
+ (foo_ifunc): Use ifunc_one.
+ * elf/ifuncmain7.c: Likewise.
+ * elf/ifuncmod1.c: Include ifunc-sel.h.
+ (global): Define protected var.
+ (foo_ifunc, foo_hidden_ifunc, foo_protected_ifunc): Use ifunc_sel.
+ * elf/ifuncmod5.c: Likewise.
+ * sysdeps/generic/elf/ifunc-sel.h: New file.
+ * sysdeps/powerpc/elf/ifunc-sel.h: New file.
+
2009-07-30 Alan Modra <amodra@bigpond.net.au>
* elf/elf.h (R_PPC_NUM, R_PPC64_NUM): Delete unused and incorrect.
diff --git a/elf/ifuncdep2.c b/elf/ifuncdep2.c
index fb21eef5cb..758bae1932 100644
--- a/elf/ifuncdep2.c
+++ b/elf/ifuncdep2.c
@@ -1,6 +1,8 @@
/* Test 3 STT_GNU_IFUNC symbols. */
-extern int global;
+#include "ifunc-sel.h"
+
+int global __attribute__ ((visibility ("protected"))) = -1;
static int
one (void)
@@ -26,15 +28,7 @@ __asm__(".type foo1, %gnu_indirect_function");
void *
foo1_ifunc (void)
{
- switch (global)
- {
- case 1:
- return one;
- case -1:
- return minus_one;
- default:
- return zero;
- }
+ return ifunc_sel (one, minus_one, zero);
}
void * foo2_ifunc (void) __asm__ ("foo2");
@@ -43,15 +37,7 @@ __asm__(".type foo2, %gnu_indirect_function");
void *
foo2_ifunc (void)
{
- switch (global)
- {
- case 1:
- return minus_one;
- case -1:
- return one;
- default:
- return zero;
- }
+ return ifunc_sel (minus_one, one, zero);
}
void * foo3_ifunc (void) __asm__ ("foo3");
@@ -60,13 +46,5 @@ __asm__(".type foo3, %gnu_indirect_function");
void *
foo3_ifunc (void)
{
- switch (global)
- {
- case 1:
- return one;
- case -1:
- return zero;
- default:
- return minus_one;
- }
+ return ifunc_sel (one, zero, minus_one);
}
diff --git a/elf/ifuncmain1.c b/elf/ifuncmain1.c
index de7ffe8779..cc1e5ec5ba 100644
--- a/elf/ifuncmain1.c
+++ b/elf/ifuncmain1.c
@@ -7,8 +7,6 @@
#include <stdlib.h>
-int global = -1;
-
int ret_foo;
int ret_foo_hidden;
int ret_foo_protected;
diff --git a/elf/ifuncmain1vis.c b/elf/ifuncmain1vis.c
index a239d2dd0d..81cd12288e 100644
--- a/elf/ifuncmain1vis.c
+++ b/elf/ifuncmain1vis.c
@@ -7,8 +7,6 @@
#include <stdlib.h>
-int global = -1;
-
int ret_foo;
int ret_foo_hidden;
int ret_foo_protected;
diff --git a/elf/ifuncmain2.c b/elf/ifuncmain2.c
index cd9b2c8352..db3ba56a02 100644
--- a/elf/ifuncmain2.c
+++ b/elf/ifuncmain2.c
@@ -3,8 +3,6 @@
#include <stdlib.h>
-int global = -1;
-
extern int foo1 (void);
int
diff --git a/elf/ifuncmain5.c b/elf/ifuncmain5.c
index 7f128d006e..f398085cb4 100644
--- a/elf/ifuncmain5.c
+++ b/elf/ifuncmain5.c
@@ -2,8 +2,6 @@
#include <stdlib.h>
-int global = -1;
-
extern int foo (void);
extern int foo_protected (void);
diff --git a/elf/ifuncmain6pie.c b/elf/ifuncmain6pie.c
index 06f179bf9d..8478d4c408 100644
--- a/elf/ifuncmain6pie.c
+++ b/elf/ifuncmain6pie.c
@@ -6,6 +6,7 @@
*/
#include <stdlib.h>
+#include "ifunc-sel.h"
typedef int (*foo_p) (void);
extern foo_p foo_ptr;
@@ -22,7 +23,7 @@ __asm__(".type foo, %gnu_indirect_function");
void *
foo_ifunc (void)
{
- return one;
+ return ifunc_one (one);
}
extern int foo (void);
diff --git a/elf/ifuncmain7.c b/elf/ifuncmain7.c
index 099e929ffc..617a596d5e 100644
--- a/elf/ifuncmain7.c
+++ b/elf/ifuncmain7.c
@@ -5,6 +5,7 @@
*/
#include <stdlib.h>
+#include "ifunc-sel.h"
extern int foo (void);
@@ -21,7 +22,7 @@ static void *
__attribute__ ((used))
foo_ifunc (void)
{
- return one;
+ return ifunc_one (one);
}
typedef int (*foo_p) (void);
diff --git a/elf/ifuncmod1.c b/elf/ifuncmod1.c
index a1697b596d..2b8195ce55 100644
--- a/elf/ifuncmod1.c
+++ b/elf/ifuncmod1.c
@@ -4,8 +4,9 @@
2. Function pointer.
3. Visibility.
*/
+#include "ifunc-sel.h"
-extern int global;
+int global __attribute__ ((visibility ("protected"))) = -1;
static int
one (void)
@@ -20,7 +21,7 @@ minus_one (void)
}
static int
-zero (void)
+zero (void)
{
return 0;
}
@@ -28,52 +29,28 @@ zero (void)
void * foo_ifunc (void) __asm__ ("foo");
__asm__(".type foo, %gnu_indirect_function");
-void *
+void *
foo_ifunc (void)
{
- switch (global)
- {
- case 1:
- return one;
- case -1:
- return minus_one;
- default:
- return zero;
- }
+ return ifunc_sel (one, minus_one, zero);
}
void * foo_hidden_ifunc (void) __asm__ ("foo_hidden");
__asm__(".type foo_hidden, %gnu_indirect_function");
-void *
+void *
foo_hidden_ifunc (void)
{
- switch (global)
- {
- case 1:
- return minus_one;
- case -1:
- return one;
- default:
- return zero;
- }
+ return ifunc_sel (minus_one, one, zero);
}
void * foo_protected_ifunc (void) __asm__ ("foo_protected");
__asm__(".type foo_protected, %gnu_indirect_function");
-void *
+void *
foo_protected_ifunc (void)
{
- switch (global)
- {
- case 1:
- return one;
- case -1:
- return zero;
- default:
- return minus_one;
- }
+ return ifunc_sel (one, zero, minus_one);
}
/* Test hidden indirect function. */
diff --git a/elf/ifuncmod3.c b/elf/ifuncmod3.c
index 379d2c8d53..ca2d962600 100644
--- a/elf/ifuncmod3.c
+++ b/elf/ifuncmod3.c
@@ -5,4 +5,3 @@
int ret_foo;
int ret_foo_hidden;
int ret_foo_protected;
-int global = -1;
diff --git a/elf/ifuncmod5.c b/elf/ifuncmod5.c
index 2ca1c71541..9a08e8cf53 100644
--- a/elf/ifuncmod5.c
+++ b/elf/ifuncmod5.c
@@ -1,6 +1,7 @@
/* Test STT_GNU_IFUNC symbols without direct function call. */
+#include "ifunc-sel.h"
-extern int global;
+int global __attribute__ ((visibility ("protected"))) = -1;
static int
one (void)
@@ -26,15 +27,7 @@ __asm__(".type foo, %gnu_indirect_function");
void *
foo_ifunc (void)
{
- switch (global)
- {
- case 1:
- return one;
- case -1:
- return minus_one;
- default:
- return zero;
- }
+ return ifunc_sel (one, minus_one, zero);
}
void * foo_hidden_ifunc (void) __asm__ ("foo_hidden");
@@ -43,15 +36,7 @@ __asm__(".type foo_hidden, %gnu_indirect_function");
void *
foo_hidden_ifunc (void)
{
- switch (global)
- {
- case 1:
- return minus_one;
- case -1:
- return one;
- default:
- return zero;
- }
+ return ifunc_sel (minus_one, one, zero);
}
void * foo_protected_ifunc (void) __asm__ ("foo_protected");
@@ -60,15 +45,7 @@ __asm__(".type foo_protected, %gnu_indirect_function");
void *
foo_protected_ifunc (void)
{
- switch (global)
- {
- case 1:
- return one;
- case -1:
- return zero;
- default:
- return minus_one;
- }
+ return ifunc_sel (one, zero, minus_one);
}
/* Test hidden indirect function. */
diff --git a/sysdeps/generic/elf/ifunc-sel.h b/sysdeps/generic/elf/ifunc-sel.h
new file mode 100644
index 0000000000..6a27b69c5b
--- /dev/null
+++ b/sysdeps/generic/elf/ifunc-sel.h
@@ -0,0 +1,26 @@
+/* Used by the elf ifunc tests. */
+#ifndef ELF_IFUNC_SEL_H
+#define ELF_IFUNC_SEL_H 1
+
+extern int global;
+
+static inline void *
+ifunc_sel (int (*f1) (void), int (*f2) (void), int (*f3) (void))
+{
+ switch (global)
+ {
+ case 1:
+ return f1;
+ case -1:
+ return f2;
+ default:
+ return f3;
+ }
+}
+
+static inline void *
+ifunc_one (int (*f1) (void))
+{
+ return f1;
+}
+#endif
diff --git a/sysdeps/powerpc/elf/ifunc-sel.h b/sysdeps/powerpc/elf/ifunc-sel.h
new file mode 100644
index 0000000000..526d8ed88b
--- /dev/null
+++ b/sysdeps/powerpc/elf/ifunc-sel.h
@@ -0,0 +1,46 @@
+/* Used by the elf ifunc tests. */
+#ifndef ELF_IFUNC_SEL_H
+#define ELF_IFUNC_SEL_H 1
+
+extern int global;
+
+static inline void *
+ifunc_sel (int (*f1) (void), int (*f2) (void), int (*f3) (void))
+{
+ register void *ret __asm__ ("r3");
+ __asm__ ("mflr 12\n\t"
+ "bcl 20,31,1f\n"
+ "1:\tmflr 11\n\t"
+ "mtlr 12\n\t"
+ "addis 12,11,global-1b@ha\n\t"
+ "lwz 12,global-1b@l(12)\n\t"
+ "addis %0,11,%2-1b@ha\n\t"
+ "addi %0,%0,%2-1b@l\n\t"
+ "cmpwi 12,1\n\t"
+ "beqlr\n\t"
+ "addis %0,11,%3-1b@ha\n\t"
+ "addi %0,%0,%3-1b@l\n\t"
+ "cmpwi 12,-1\n\t"
+ "beqlr\n\t"
+ "addis %0,11,%4-1b@ha\n\t"
+ "addi %0,%0,%4-1b@l"
+ : "=r" (ret)
+ : "X" (&global), "X" (f1), "X" (f2), "X" (f3));
+ return ret;
+}
+
+static inline void *
+ifunc_one (int (*f1) (void))
+{
+ register void *ret __asm__ ("r3");
+ __asm__ ("mflr 12\n\t"
+ "bcl 20,31,1f\n"
+ "1:\tmflr %0\n\t"
+ "mtlr 12\n\t"
+ "addis %0,%0,%1-1b@ha\n\t"
+ "addi %0,%0,%1-1b@l"
+ : "=r" (ret)
+ : "X" (f1));
+ return ret;
+}
+#endif
View Lorry Controller Status