* 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.

diff --git a/ChangeLog.mips b/ChangeLog.mips
index a4f03a731a269715a15fc02a520100aed601c864..e94e10981180ea0acb79f55d94c78f8ff8dfbda9 100644 (file)
--- a/ChangeLog.mips
+++ b/ChangeLog.mips
@@ -1,3 +1,9 @@
+2008-10-15  Daniel Jacobowitz  <dan@codesourcery.com>
+
+       * 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  <shinwell@codesourcery.com>
            Daniel Jacobowitz  <dan@codesourcery.com>
            Richard Sandiford  <rdsandiford@googlemail.com>

diff --git a/sysdeps/mips/dl-dtprocnum.h b/sysdeps/mips/dl-dtprocnum.h
index 41ae000820d518e4393b851c7063d2b6b55ead9d..dfd03ba317711994149c74ca285ba080eea6047c 100644 (file)
--- 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 bca0dbe45201a9ea50cb96ff65edae6f21fc1799..ef088bff3bc1b949f88641a13f77d89f3af6dad6 100644 (file)
--- 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).  */