diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2017-10-28 17:41:16 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2017-10-28 19:05:09 -0700 |
| commit | 340c6cf9bdf6734013f0c6b4e0d8f3a10fbd4ed0 (patch) | |
| tree | e4b264ea6124739f36d850a06cacc5830de713c1 /nptl | |
| parent | f301e5334065e93aace667fd4a87bce6fc1dbd13 (diff) | |
| download | glibc-hjl/pr22362/master.zip glibc-hjl/pr22362/master.tar.gz glibc-hjl/pr22362/master.tar.bz2 | |
Use newly built crt*.o files to build shared objects [BZ #22362]hjl/pr22362/master
When multi-lib GCC is used to build glibc, the search order of GCC driver
for crt*.o is -B*/`gcc -print-multi-directory`, the installed diretory,
-B*/. This patch extends multi-lib support from nptl/Makefile to
csu/Makefile so that -B/glibc-build-directory/csu/ will pick up the newly
built crt*.o.
Tested on x86-64 for i686 and x32.
[BZ #22362]
* config.make.in (multidir): New.
* configure.ac (libc_cv_multidir): New. AC_SUBST.
* configure: Regenerated.
* csu/Makefile [$(multidir) != .](multilib-extra-objs): New.
[$(multidir) != .](extra-objs): Add $(multilib-extra-objs).
[$(multidir) != .]($(addprefix $(objpfx)$(multidir)/, $(install-lib))):
New target.
* nptl/Makefile: Don't include multidir.mk.
($(objpfx)multidir.mk): Removed.
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/Makefile | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index d819349..314cbda 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -401,16 +401,6 @@ tests: $(test-modules) endif ifeq ($(build-shared),yes) - -# Set the `multidir' variable by grabbing the variable from the compiler. -# We do it once and save the result in a generated makefile. --include $(objpfx)multidir.mk -$(objpfx)multidir.mk: $(common-objpfx)config.make - $(make-target-directory) - dir=`$(CC) $(CFLAGS) $(CPPFLAGS) -print-multi-directory`; \ - echo "multidir := $$dir" > $@T - mv -f $@T $@ - crti-objs := crti.o crtn-objs := crtn.o ifneq (,$(patsubst .,,$(multidir))) |