[commits] r7149 - in /fsf/trunk/ports: ChangeLog.mips sysdeps/mips/dl-dtprocnum.h sysdeps/mips/dl-machine.h

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Thu Oct 16 00:04:11 2008
New Revision: 7149

Log:
Import glibc-ports-mainline for 2008-10-16

Modified:
    fsf/trunk/ports/ChangeLog.mips
    fsf/trunk/ports/sysdeps/mips/dl-dtprocnum.h
    fsf/trunk/ports/sysdeps/mips/dl-machine.h

Modified: fsf/trunk/ports/ChangeLog.mips
==============================================================================
--- fsf/trunk/ports/ChangeLog.mips (original)
+++ fsf/trunk/ports/ChangeLog.mips Thu Oct 16 00:04:11 2008
@@ -1,3 +1,9 @@
+2008-10-15  Daniel Jacobowitz  <dan@xxxxxxxxxxxxxxxx>
+
+	* 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@xxxxxxxxxxxxxxxx>
 	    Daniel Jacobowitz  <dan@xxxxxxxxxxxxxxxx>
 	    Richard Sandiford  <rdsandiford@xxxxxxxxxxxxxx>

Modified: fsf/trunk/ports/sysdeps/mips/dl-dtprocnum.h
==============================================================================
--- fsf/trunk/ports/sysdeps/mips/dl-dtprocnum.h (original)
+++ fsf/trunk/ports/sysdeps/mips/dl-dtprocnum.h Thu Oct 16 00:04:11 2008
@@ -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

Modified: fsf/trunk/ports/sysdeps/mips/dl-machine.h
==============================================================================
--- fsf/trunk/ports/sysdeps/mips/dl-machine.h (original)
+++ fsf/trunk/ports/sysdeps/mips/dl-machine.h Thu Oct 16 00:04:11 2008
@@ -51,14 +51,6 @@
 # define _RTLD_EPILOGUE(entry)						\
 	".end\t" __STRING(entry) "\n\t"					\
 	".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.