From f6e40d38942b13ae5347c52a5bc80ac23e233a21 Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Wed, 15 Oct 2008 19:37:36 +0000 Subject: [PATCH] * sysdeps/mips/dl-dtprocnum.h (DT_MIPS_NUM): Do not redefine. * sysdeps/mips/dl-machine.h (STO_MIPS_PLT, R_MIPS_COPY, R_MIPS_JUMP_SLOT, DT_MIPS_PLTGOT): Do not redefine. --- ChangeLog.mips | 6 ++++++ sysdeps/mips/dl-dtprocnum.h | 6 ------ sysdeps/mips/dl-machine.h | 8 -------- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/ChangeLog.mips b/ChangeLog.mips index a4f03a7..e94e109 100644 --- a/ChangeLog.mips +++ b/ChangeLog.mips @@ -1,3 +1,9 @@ +2008-10-15 Daniel Jacobowitz + + * sysdeps/mips/dl-dtprocnum.h (DT_MIPS_NUM): Do not redefine. + * sysdeps/mips/dl-machine.h (STO_MIPS_PLT, R_MIPS_COPY, + R_MIPS_JUMP_SLOT, DT_MIPS_PLTGOT): Do not redefine. + 2008-10-01 Mark Shinwell Daniel Jacobowitz Richard Sandiford diff --git a/sysdeps/mips/dl-dtprocnum.h b/sysdeps/mips/dl-dtprocnum.h index 41ae000..dfd03ba 100644 --- a/sysdeps/mips/dl-dtprocnum.h +++ b/sysdeps/mips/dl-dtprocnum.h @@ -17,12 +17,6 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -/* Until elf/elf.h in glibc is updated. */ -#ifndef STO_MIPS_PLT -# undef DT_MIPS_NUM -# define DT_MIPS_NUM 0x35 -#endif - /* Number of extra dynamic section entries for this architecture. By default there are none. */ #define DT_THISPROCNUM DT_MIPS_NUM diff --git a/sysdeps/mips/dl-machine.h b/sysdeps/mips/dl-machine.h index bca0dbe..ef088bf 100644 --- a/sysdeps/mips/dl-machine.h +++ b/sysdeps/mips/dl-machine.h @@ -53,14 +53,6 @@ ".size\t" __STRING(entry) ", . - " __STRING(entry) "\n\t" #endif -/* Until elf/elf.h in glibc is updated. */ -#ifndef STO_MIPS_PLT -#define STO_MIPS_PLT 0x8 -#define R_MIPS_COPY 126 -#define R_MIPS_JUMP_SLOT 127 -#define DT_MIPS_PLTGOT 0x70000032 -#endif - /* A reloc type used for ld.so cmdline arg lookups to reject PLT entries. This only makes sense on MIPS when using PLTs, so choose the PLT relocation (not encountered when not using PLTs). */ -- 2.7.4