|
|
# --- ROCK-COPYRIGHT-NOTE-BEGIN --- # # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # Please add additional copyright information _after_ the line containing # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by # the ./scripts/Create-CopyPatch script. Do not edit this copyright text! # # ROCK Linux: rock-src/package/base/glibc23/elf-machine-rela.patch.mips # ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. A copy of the GNU General Public # License can be found at Documentation/COPYING. # # Many people helped and are helping developing ROCK Linux. Please # have a look at http://www.rocklinux.org/ and the Documentation/TEAM # file for details. # # --- ROCK-COPYRIGHT-NOTE-END ---
--- libc/elf/dl-conflict.c.mips Mon Feb 4 13:44:57 2002 +++ libc/elf/dl-conflict.c Mon Feb 4 15:10:31 2002 @@ -33,6 +33,7 @@ void _dl_resolve_conflicts (struct link_map *l, ElfW(Rela) *conflict, ElfW(Rela) *conflictend) { +#ifndef _DL_HAVE_NO_ELF_MACHINE_RELA if (__builtin_expect (GL(dl_debug_mask) & DL_DEBUG_RELOC, 0)) _dl_printf ("\nconflict processing: %s\n", l->l_name[0] ? l->l_name : _dl_argv[0]); @@ -63,4 +64,5 @@ _dl_resolve_conflicts (struct link_map * for (; conflict < conflictend; ++conflict) elf_machine_rela (l, conflict, NULL, NULL, (void *) conflict->r_offset); } +#endif } --- libc/sysdeps/mips/dl-machine.h.mips Mon Feb 4 13:45:18 2002 +++ libc/sysdeps/mips/dl-machine.h Mon Feb 4 15:08:39 2002 @@ -56,6 +56,9 @@ #define ELF_MACHINE_JMP_SLOT R_MIPS_REL32 #define elf_machine_type_class(type) ELF_RTYPE_CLASS_PLT +/* MIPS doesn't support RELA. */ +#define _DL_HAVE_NO_ELF_MACHINE_RELA + /* Translate a processor specific dynamic tag to the index in l_info array. */ #define DT_MIPS(x) (DT_MIPS_##x - DT_LOPROC + DT_NUM)
|