Message ID | 20170709210507.GA14761@gmail.com |
---|---|
State | New |
Headers | show |
On Jul 09 2017, "H.J. Lu" <hjl.tools@gmail.com> wrote: > Since _dl_resolve_conflicts is only used in elf/rtld.c, don't include > it in libc.a. > > OK for master? Add it to shared-only-routines instead. Andreas.
diff --git a/elf/dl-conflict.c b/elf/dl-conflict.c index 3cbd074..875bf66 100644 --- a/elf/dl-conflict.c +++ b/elf/dl-conflict.c @@ -17,6 +17,7 @@ License along with the GNU C Library; see the file COPYING.LIB. If not, see <http://www.gnu.org/licenses/>. */ +#ifdef SHARED #include <errno.h> #include <libintl.h> #include <stdlib.h> @@ -72,3 +73,4 @@ _dl_resolve_conflicts (struct link_map *l, ElfW(Rela) *conflict, } #endif } +#endif