diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2017-07-09 11:52:33 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2017-07-09 14:28:06 -0700 |
| commit | 9f9d3a4ca3428f053393d38fec146b7511a02272 (patch) | |
| tree | a02361aeb6f8a3ef4541726520fbe3cf849e6b75 | |
| parent | 7fec70268f9b52c80c2a0994839c779c53cc2800 (diff) | |
| download | glibc-hjl/pr21741.tar.gz | |
Don't include _dl_resolve_conflicts in libc.a [BZ #21742]hjl/pr21741
Since _dl_resolve_conflicts is only used in elf/rtld.c, don't include
it in libc.a.
[BZ #21742]
* elf/dl-conflict.c (_dl_resolve_conflicts): Define only if
SHARED is defined.
| -rw-r--r-- | elf/dl-conflict.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/elf/dl-conflict.c b/elf/dl-conflict.c index 3cbd07435e..875bf66212 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 |