From 27a0f3a948f3c6eb9ea4535332277af097a35b77 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Wed, 28 Mar 2012 09:25:31 +0200 Subject: Move sysdeps/powerpc/elf files * sysdeps/powerpc/elf/ifunc-sel.h: Moved to ... * sysdeps/powerpc/ifunc-sel.h: ... here. * sysdeps/powerpc/elf/rtld-global-offsets.sym: Moved to ... * sysdeps/powerpc/rtld-global-offsets.sym: ... here. --- sysdeps/powerpc/elf/ifunc-sel.h | 46 ----------------------------- sysdeps/powerpc/elf/rtld-global-offsets.sym | 7 ----- sysdeps/powerpc/ifunc-sel.h | 46 +++++++++++++++++++++++++++++ sysdeps/powerpc/rtld-global-offsets.sym | 7 +++++ 4 files changed, 53 insertions(+), 53 deletions(-) delete mode 100644 sysdeps/powerpc/elf/ifunc-sel.h delete mode 100644 sysdeps/powerpc/elf/rtld-global-offsets.sym create mode 100644 sysdeps/powerpc/ifunc-sel.h create mode 100644 sysdeps/powerpc/rtld-global-offsets.sym diff --git a/sysdeps/powerpc/elf/ifunc-sel.h b/sysdeps/powerpc/elf/ifunc-sel.h deleted file mode 100644 index 526d8ed..0000000 --- a/sysdeps/powerpc/elf/ifunc-sel.h +++ /dev/null @@ -1,46 +0,0 @@ -/* 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 diff --git a/sysdeps/powerpc/elf/rtld-global-offsets.sym b/sysdeps/powerpc/elf/rtld-global-offsets.sym deleted file mode 100644 index ff4e97f..0000000 --- a/sysdeps/powerpc/elf/rtld-global-offsets.sym +++ /dev/null @@ -1,7 +0,0 @@ -#define SHARED 1 - -#include - -#define rtld_global_ro_offsetof(mem) offsetof (struct rtld_global_ro, mem) - -RTLD_GLOBAL_RO_DL_HWCAP_OFFSET rtld_global_ro_offsetof (_dl_hwcap) diff --git a/sysdeps/powerpc/ifunc-sel.h b/sysdeps/powerpc/ifunc-sel.h new file mode 100644 index 0000000..526d8ed --- /dev/null +++ b/sysdeps/powerpc/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 diff --git a/sysdeps/powerpc/rtld-global-offsets.sym b/sysdeps/powerpc/rtld-global-offsets.sym new file mode 100644 index 0000000..ff4e97f --- /dev/null +++ b/sysdeps/powerpc/rtld-global-offsets.sym @@ -0,0 +1,7 @@ +#define SHARED 1 + +#include + +#define rtld_global_ro_offsetof(mem) offsetof (struct rtld_global_ro, mem) + +RTLD_GLOBAL_RO_DL_HWCAP_OFFSET rtld_global_ro_offsetof (_dl_hwcap) -- cgit v1.1