Fix gcrt0.o compilation
When static-start-installed-name is different from start-installed-name, we must not use the shared objects. * csu/Makefile (extra-objs): Add gmon-start.o when building shared library and $(static-start-installed-name) is different from $(start-installed-name). $(objpfx)g$(static-start-installed-name): When building shared library and $(static-start-installed-name) is different from $(static-start-installed-name), revert to non-shared rule, i.e. using $(objpfx)% and gmon-start.o.
This commit is contained in:
parent
5e29dd5737
commit
edd4cbcf83
16
ChangeLog
16
ChangeLog
|
@ -1,3 +1,19 @@
|
||||||
|
2015-08-07 Samuel Thibault <samuel.thibault@ens-lyon.org>
|
||||||
|
|
||||||
|
Fix gcrt0.o compilation
|
||||||
|
|
||||||
|
When static-start-installed-name is different from
|
||||||
|
start-installed-name, we must not use the shared objects.
|
||||||
|
|
||||||
|
* csu/Makefile
|
||||||
|
(extra-objs): Add gmon-start.o when building shared library and
|
||||||
|
$(static-start-installed-name) is different from
|
||||||
|
$(start-installed-name).
|
||||||
|
$(objpfx)g$(static-start-installed-name): When building shared
|
||||||
|
library and $(static-start-installed-name) is different from
|
||||||
|
$(static-start-installed-name), revert to non-shared rule,
|
||||||
|
i.e. using $(objpfx)% and gmon-start.o.
|
||||||
|
|
||||||
2015-08-06 Joseph Myers <joseph@codesourcery.com>
|
2015-08-06 Joseph Myers <joseph@codesourcery.com>
|
||||||
|
|
||||||
[BZ #16519]
|
[BZ #16519]
|
||||||
|
|
11
csu/Makefile
11
csu/Makefile
|
@ -47,6 +47,9 @@ tests-static := tst-empty
|
||||||
|
|
||||||
ifeq (yes,$(build-shared))
|
ifeq (yes,$(build-shared))
|
||||||
extra-objs += S$(start-installed-name) gmon-start.os
|
extra-objs += S$(start-installed-name) gmon-start.os
|
||||||
|
ifneq ($(start-installed-name),$(static-start-installed-name))
|
||||||
|
extra-objs += gmon-start.o
|
||||||
|
endif
|
||||||
install-lib += S$(start-installed-name)
|
install-lib += S$(start-installed-name)
|
||||||
generated += start.os
|
generated += start.os
|
||||||
else
|
else
|
||||||
|
@ -98,10 +101,14 @@ endif
|
||||||
# startfile with gmon-start.o, which defines a constructor function
|
# startfile with gmon-start.o, which defines a constructor function
|
||||||
# to turn on profiling code at startup.
|
# to turn on profiling code at startup.
|
||||||
ifeq (yes,$(build-shared))
|
ifeq (yes,$(build-shared))
|
||||||
$(addprefix $(objpfx),$(sort g$(start-installed-name) \
|
$(objpfx)g$(start-installed-name): \
|
||||||
g$(static-start-installed-name))): \
|
|
||||||
$(objpfx)g%: $(objpfx)S% $(objpfx)gmon-start.os
|
$(objpfx)g%: $(objpfx)S% $(objpfx)gmon-start.os
|
||||||
$(link-relocatable)
|
$(link-relocatable)
|
||||||
|
ifneq ($(start-installed-name),$(static-start-installed-name))
|
||||||
|
$(objpfx)g$(static-start-installed-name): \
|
||||||
|
$(objpfx)g%: $(objpfx)% $(objpfx)gmon-start.o
|
||||||
|
$(link-relocatable)
|
||||||
|
endif
|
||||||
else
|
else
|
||||||
$(addprefix $(objpfx),$(sort g$(start-installed-name) \
|
$(addprefix $(objpfx),$(sort g$(start-installed-name) \
|
||||||
g$(static-start-installed-name))): \
|
g$(static-start-installed-name))): \
|
||||||
|
|
Loading…
Reference in New Issue