From 31c759bf37a7a41faf8b13800deb769e8a5f3871 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Fri, 30 Oct 2009 00:48:54 -0700 Subject: Uglify IFUNC tests for PPC. --- elf/ifuncdep2.c | 34 ++++++---------------------------- elf/ifuncmain1.c | 2 -- elf/ifuncmain1vis.c | 2 -- elf/ifuncmain2.c | 2 -- elf/ifuncmain5.c | 2 -- elf/ifuncmain6pie.c | 3 ++- elf/ifuncmain7.c | 3 ++- elf/ifuncmod1.c | 41 +++++++++-------------------------------- elf/ifuncmod3.c | 1 - elf/ifuncmod5.c | 33 +++++---------------------------- 10 files changed, 24 insertions(+), 99 deletions(-) (limited to 'elf') 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 -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 -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 -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 -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 +#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 +#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. */ -- cgit 1.4.1