From 3129cfc6ec7be65a0bdc1f82432ee421c1c65a77 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 26 Jul 2012 11:29:07 +0000 Subject: Move testsuite audit definitions to sysdeps tst-audit.h files. --- elf/tst-auditmod1.c | 71 +--------------------------------------------------- elf/tst-auditmod3b.c | 13 ---------- elf/tst-auditmod4b.c | 13 ---------- elf/tst-auditmod5b.c | 13 ---------- elf/tst-auditmod6b.c | 13 ---------- elf/tst-auditmod6c.c | 13 ---------- elf/tst-auditmod7b.c | 13 ---------- 7 files changed, 1 insertion(+), 148 deletions(-) (limited to 'elf') diff --git a/elf/tst-auditmod1.c b/elf/tst-auditmod1.c index 108d6ded59..227a3b623a 100644 --- a/elf/tst-auditmod1.c +++ b/elf/tst-auditmod1.c @@ -102,79 +102,10 @@ la_symbind64 (Elf64_Sym *sym, unsigned int ndx, uintptr_t *refcook, return sym->st_value; } -#ifdef __i386__ -# define pltenter la_i86_gnu_pltenter -# define pltexit la_i86_gnu_pltexit -# define La_regs La_i86_regs -# define La_retval La_i86_retval -# define int_retval lrv_eax -#elif defined __x86_64__ -# ifndef __ILP32__ -# define pltenter la_x86_64_gnu_pltenter -# define pltexit la_x86_64_gnu_pltexit -# define La_regs La_x86_64_regs -# define La_retval La_x86_64_retval -# else -# define pltenter la_x32_gnu_pltenter -# define pltexit la_x32_gnu_pltexit -# define La_regs La_x32_regs -# define La_retval La_x32_retval -# endif -# define int_retval lrv_rax -#elif defined __powerpc__ && __WORDSIZE == 32 -# define pltenter la_ppc32_gnu_pltenter -# define pltexit la_ppc32_gnu_pltexit -# define La_regs La_ppc32_regs -# define La_retval La_ppc32_retval -# define int_retval lrv_r3 -#elif defined __powerpc__ && __WORDSIZE == 64 -# define pltenter la_ppc64_gnu_pltenter -# define pltexit la_ppc64_gnu_pltexit -# define La_regs La_ppc64_regs -# define La_retval La_ppc64_retval -# define int_retval lrv_r3 -#elif defined __sh__ -# define pltenter la_sh_gnu_pltenter -# define pltexit la_sh_gnu_pltexit -# define La_regs La_sh_regs -# define La_retval La_sh_retval -# define int_retval lrv_r0 -#elif defined __alpha__ -# define pltenter la_alpha_gnu_pltenter -# define pltexit la_alpha_gnu_pltexit -# define La_regs La_alpha_regs -# define La_retval La_alpha_retval -# define int_retval lrv_r0 -#elif defined __s390__ && __WORDSIZE == 32 -# define pltenter la_s390_32_gnu_pltenter -# define pltexit la_s390_32_gnu_pltexit -# define La_regs La_s390_32_regs -# define La_retval La_s390_32_retval -# define int_retval lrv_r2 -#elif defined __s390__ && __WORDSIZE == 64 -# define pltenter la_s390_64_gnu_pltenter -# define pltexit la_s390_64_gnu_pltexit -# define La_regs La_s390_64_regs -# define La_retval La_s390_64_retval -# define int_retval lrv_r2 -#elif defined __sparc__ && __WORDSIZE == 32 -# define pltenter la_sparc32_gnu_pltenter -# define pltexit la_sparc32_gnu_pltexit -# define La_regs La_sparc32_regs -# define La_retval La_sparc32_retval -# define int_retval lrv_reg[0] -#elif defined __sparc__ && __WORDSIZE == 64 -# define pltenter la_sparc64_gnu_pltenter -# define pltexit la_sparc64_gnu_pltexit -# define La_regs La_sparc64_regs -# define La_retval La_sparc64_retval -# define int_retval lrv_reg[0] -#endif - #include #if (!defined (pltenter) || !defined (pltexit) || !defined (La_regs) \ || !defined (La_retval) || !defined (int_retval)) -# error "architecture specific code needed in sysdeps/CPU/tst-audit.h or here" +# error "architecture specific code needed in sysdeps/CPU/tst-audit.h" #endif diff --git a/elf/tst-auditmod3b.c b/elf/tst-auditmod3b.c index a9bb0e22c3..1a41ca80c0 100644 --- a/elf/tst-auditmod3b.c +++ b/elf/tst-auditmod3b.c @@ -105,19 +105,6 @@ la_symbind64 (Elf64_Sym *sym, unsigned int ndx, uintptr_t *refcook, return sym->st_value; } -# ifndef __ILP32__ -# define pltenter la_x86_64_gnu_pltenter -# define pltexit la_x86_64_gnu_pltexit -# define La_regs La_x86_64_regs -# define La_retval La_x86_64_retval -#else -# define pltenter la_x32_gnu_pltenter -# define pltexit la_x32_gnu_pltexit -# define La_regs La_x32_regs -# define La_retval La_x32_retval -#endif -#define int_retval lrv_rax - #include ElfW(Addr) diff --git a/elf/tst-auditmod4b.c b/elf/tst-auditmod4b.c index 7778d6a172..80aaedcd3e 100644 --- a/elf/tst-auditmod4b.c +++ b/elf/tst-auditmod4b.c @@ -94,19 +94,6 @@ la_symbind64 (Elf64_Sym *sym, unsigned int ndx, uintptr_t *refcook, return sym->st_value; } -# ifndef __ILP32__ -# define pltenter la_x86_64_gnu_pltenter -# define pltexit la_x86_64_gnu_pltexit -# define La_regs La_x86_64_regs -# define La_retval La_x86_64_retval -#else -# define pltenter la_x32_gnu_pltenter -# define pltexit la_x32_gnu_pltexit -# define La_regs La_x32_regs -# define La_retval La_x32_retval -#endif -#define int_retval lrv_rax - #include #ifdef __AVX__ diff --git a/elf/tst-auditmod5b.c b/elf/tst-auditmod5b.c index 3a4221536c..576183d722 100644 --- a/elf/tst-auditmod5b.c +++ b/elf/tst-auditmod5b.c @@ -95,19 +95,6 @@ la_symbind64 (Elf64_Sym *sym, unsigned int ndx, uintptr_t *refcook, return sym->st_value; } -# ifndef __ILP32__ -# define pltenter la_x86_64_gnu_pltenter -# define pltexit la_x86_64_gnu_pltexit -# define La_regs La_x86_64_regs -# define La_retval La_x86_64_retval -#else -# define pltenter la_x32_gnu_pltenter -# define pltexit la_x32_gnu_pltexit -# define La_regs La_x32_regs -# define La_retval La_x32_retval -#endif -#define int_retval lrv_rax - #include ElfW(Addr) diff --git a/elf/tst-auditmod6b.c b/elf/tst-auditmod6b.c index a9fe5dcadc..b1c155a26e 100644 --- a/elf/tst-auditmod6b.c +++ b/elf/tst-auditmod6b.c @@ -94,19 +94,6 @@ la_symbind64 (Elf64_Sym *sym, unsigned int ndx, uintptr_t *refcook, return sym->st_value; } -# ifndef __ILP32__ -# define pltenter la_x86_64_gnu_pltenter -# define pltexit la_x86_64_gnu_pltexit -# define La_regs La_x86_64_regs -# define La_retval La_x86_64_retval -#else -# define pltenter la_x32_gnu_pltenter -# define pltexit la_x32_gnu_pltexit -# define La_regs La_x32_regs -# define La_retval La_x32_retval -#endif -#define int_retval lrv_rax - #include #ifdef __AVX__ diff --git a/elf/tst-auditmod6c.c b/elf/tst-auditmod6c.c index 9b1063b23f..88adb21aa1 100644 --- a/elf/tst-auditmod6c.c +++ b/elf/tst-auditmod6c.c @@ -94,19 +94,6 @@ la_symbind64 (Elf64_Sym *sym, unsigned int ndx, uintptr_t *refcook, return sym->st_value; } -# ifndef __ILP32__ -# define pltenter la_x86_64_gnu_pltenter -# define pltexit la_x86_64_gnu_pltexit -# define La_regs La_x86_64_regs -# define La_retval La_x86_64_retval -#else -# define pltenter la_x32_gnu_pltenter -# define pltexit la_x32_gnu_pltexit -# define La_regs La_x32_regs -# define La_retval La_x32_retval -#endif -#define int_retval lrv_rax - #include #ifdef __AVX__ diff --git a/elf/tst-auditmod7b.c b/elf/tst-auditmod7b.c index 1ae9e72769..68052efe97 100644 --- a/elf/tst-auditmod7b.c +++ b/elf/tst-auditmod7b.c @@ -94,19 +94,6 @@ la_symbind64 (Elf64_Sym *sym, unsigned int ndx, uintptr_t *refcook, return sym->st_value; } -#ifndef __ILP32__ -# define pltenter la_x86_64_gnu_pltenter -# define pltexit la_x86_64_gnu_pltexit -# define La_regs La_x86_64_regs -# define La_retval La_x86_64_retval -#else -# define pltenter la_x32_gnu_pltenter -# define pltexit la_x32_gnu_pltexit -# define La_regs La_x32_regs -# define La_retval La_x32_retval -#endif -#define int_retval lrv_rax - #include #ifdef __AVX__ -- cgit 1.4.1