| Message ID | daa718af20211b36f090c393d83fff3651275a95.1695113064.git.fweimer@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Fine-tune ELF destructor ordering (bug 30869) | expand |
On 9/19/23 04:48, Florian Weimer wrote: > This allows us to avoid some #ifdef SHARED conditionals. LGTM. Reviewed-by: Carlos O'Donell <carlos@redhat.com> > --- > sysdeps/generic/ldsodefs.h | 9 ++++++++- > 1 file changed, 8 insertions(+), 1 deletion(-) > > diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h > index edebca9a23..82c5383c7e 100644 > --- a/sysdeps/generic/ldsodefs.h > +++ b/sysdeps/generic/ldsodefs.h > @@ -1383,7 +1383,14 @@ void DL_ARCH_FIXUP_ATTRIBUTE _dl_audit_pltexit (struct link_map *l, > const void *inregs, > void *outregs) > attribute_hidden; > -#endif /* SHARED */ > + > +#else /* !SHARED */ > +static inline void > +_dl_audit_objclose (struct link_map *l) > +{ > + /* No audit implementation for !SHARED. */ > +} > +#endif /* !SHARED */ OK. > > #if PTHREAD_IN_LIBC && defined SHARED > /* Recursive locking implementation for use within the dynamic loader.
diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index edebca9a23..82c5383c7e 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -1383,7 +1383,14 @@ void DL_ARCH_FIXUP_ATTRIBUTE _dl_audit_pltexit (struct link_map *l, const void *inregs, void *outregs) attribute_hidden; -#endif /* SHARED */ + +#else /* !SHARED */ +static inline void +_dl_audit_objclose (struct link_map *l) +{ + /* No audit implementation for !SHARED. */ +} +#endif /* !SHARED */ #if PTHREAD_IN_LIBC && defined SHARED /* Recursive locking implementation for use within the dynamic loader.