On Thu, Jan 06, 2022 at 01:00:58AM -0600, Kyle Evans wrote:
> On Thu, Jan 6, 2022 at 12:46 AM Konstantin Belousov <k...@freebsd.org> wrote:
> >
> > The branch main has been updated by kib:
> >
> > URL:
> > https://cgit.FreeBSD.org/src/commit/?id=292cba9b4919ee188ca08cc8bf5057e346514383
> >
> > commit 292cba9b4919ee188ca08cc8bf5057e346514383
> > Author: Konstantin Belousov <k...@freebsd.org>
> > AuthorDate: 2022-01-06 00:43:51 +0000
> > Commit: Konstantin Belousov <k...@freebsd.org>
> > CommitDate: 2022-01-06 04:00:39 +0000
> >
> > rtld: remove mips-specific cases from generic code
> >
> > Reviewed by: imp
> > Sponsored by: The FreeBSD Foundation
> > Differential revision: https://reviews.freebsd.org/D33763
> > ---
> > libexec/rtld-elf/rtld.c | 47
> > -----------------------------------------------
> > libexec/rtld-elf/rtld.h | 6 ------
> > 2 files changed, 53 deletions(-)
> >
> > diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c
> > index fa0e61fe0c5c..14c4d44f50e4 100644
> > --- a/libexec/rtld-elf/rtld.c
> > +++ b/libexec/rtld-elf/rtld.c
> > @@ -1002,10 +1002,6 @@ rtld_resolve_ifunc(const Obj_Entry *obj, const
> > Elf_Sym *def)
> > return ((void *)target);
> > }
> >
> > -/*
> > - * NB: MIPS uses a private version of this function (_mips_rtld_bind).
> > - * Changes to this function should be applied there as well.
> > - */
> > Elf_Addr
> > _rtld_bind(Obj_Entry *obj, Elf_Size reloff)
> > {
> > @@ -1465,19 +1461,6 @@ digest_dynamic1(Obj_Entry *obj, int early, const
> > Elf_Dyn **dyn_rpath,
> > obj->fini_array_num = dynp->d_un.d_val / sizeof(Elf_Addr);
> > break;
> >
> > - /*
> > - * Don't process DT_DEBUG on MIPS as the dynamic section
> > - * is mapped read-only. DT_MIPS_RLD_MAP is used instead.
> > - */
> > -
> > -#ifndef __mips__
> > - case DT_DEBUG:
> > - if (!early)
> > - dbg("Filling in DT_DEBUG entry");
> > - (__DECONST(Elf_Dyn *, dynp))->d_un.d_ptr = (Elf_Addr)&r_debug;
> > - break;
> > -#endif
> > -
> > case DT_FLAGS:
> > if (dynp->d_un.d_val & DF_ORIGIN)
> > obj->z_origin = true;
>
> This one was #ifndef mips and the entire thing was removed, was that
> intentional?
Woops. Thank you.