diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2008-10-18 18:20:55 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2008-10-18 18:20:55 +0000 |
| commit | fab640f0bdf4e32f752e93859718a2a302406ac3 (patch) | |
| tree | 3eaf4a90dbfb90eef84bd1a4b0bbd3cf03442235 /ports | |
| parent | 1f9eaa66061764bb98f4860a9333fb95e573c4ac (diff) | |
| download | eglibc2-fab640f0bdf4e32f752e93859718a2a302406ac3.tar.gz | |
Merge changes between r7062 and r7165 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@7166 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/ChangeLog.mips | 6 | ||||
| -rw-r--r-- | ports/sysdeps/mips/dl-dtprocnum.h | 6 | ||||
| -rw-r--r-- | ports/sysdeps/mips/dl-machine.h | 8 |
3 files changed, 6 insertions, 14 deletions
diff --git a/ports/ChangeLog.mips b/ports/ChangeLog.mips index a4f03a731..e94e10981 100644 --- a/ports/ChangeLog.mips +++ b/ports/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/ports/sysdeps/mips/dl-dtprocnum.h b/ports/sysdeps/mips/dl-dtprocnum.h index 41ae00082..dfd03ba31 100644 --- a/ports/sysdeps/mips/dl-dtprocnum.h +++ b/ports/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/ports/sysdeps/mips/dl-machine.h b/ports/sysdeps/mips/dl-machine.h index f7af107f1..ec2e9b58c 100644 --- a/ports/sysdeps/mips/dl-machine.h +++ b/ports/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). */ |