aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@linux-m68k.org>2012-05-05 09:56:47 +0200
committerAndreas Schwab <schwab@linux-m68k.org>2012-05-16 18:47:38 +0200
commit5bd66283dbfa7a20b0c50c9a3e4362409b61ec06 (patch)
treeae96be31ae4d234a32b869e65f3756b0f553aff3
parent656416c96528437f54b345b1470aaa40f145ed30 (diff)
downloadglibc-5bd66283dbfa7a20b0c50c9a3e4362409b61ec06.tar
glibc-5bd66283dbfa7a20b0c50c9a3e4362409b61ec06.tar.gz
glibc-5bd66283dbfa7a20b0c50c9a3e4362409b61ec06.tar.bz2
glibc-5bd66283dbfa7a20b0c50c9a3e4362409b61ec06.zip
Track dependencies for .oS-only objects
-rw-r--r--ChangeLog5
-rw-r--r--Makerules1
-rw-r--r--sysdeps/ieee754/ldbl-opt/Makefile1
3 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 629a31a170..a4851e7fde 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2012-05-16 Andreas Schwab <schwab@linux-m68k.org>
+ * Makerules (+depfiles): Also collect depfiles from .oS in
+ $(extra-objs).
+ * sysdeps/ieee754/ldbl-opt/Makefile (extra-objs): Add $(addsuffix
+ .oS, $(libnldbl-routines)).
+
* Makerules (native-compile-mkdep-flags): Define.
* sunrpc/Makefile (extra-objs): Add $(addprefix
cross-,$(rpcgen-objs)), don't add $(cross-rpcgen-objs).
diff --git a/Makerules b/Makerules
index a897d4ea65..f374700a3e 100644
--- a/Makerules
+++ b/Makerules
@@ -647,6 +647,7 @@ endif
+depfiles := $(sources:.c=.d) \
$(patsubst %.o,%.d,$(filter %.o,$(extra-objs:.os=.o))) \
+ $(patsubst %.oS,%.d,$(filter %.oS,$(extra-objs))) \
$(patsubst %.o,%.d,$(filter %.o,$(extra-test-objs:.os=.o))) \
$(addsuffix .d,$(tests) $(xtests) $(test-srcs))
ifeq ($(build-programs),yes)
diff --git a/sysdeps/ieee754/ldbl-opt/Makefile b/sysdeps/ieee754/ldbl-opt/Makefile
index 97b9c9f8bd..98c9a9c791 100644
--- a/sysdeps/ieee754/ldbl-opt/Makefile
+++ b/sysdeps/ieee754/ldbl-opt/Makefile
@@ -44,5 +44,6 @@ libnldbl-calls = asprintf dprintf fprintf fscanf fwprintf fwscanf iovfscanf \
libnldbl-routines = $(libnldbl-calls:%=nldbl-%)
libnldbl-inhibit-o = $(object-suffixes)
libnldbl-static-only-routines = $(libnldbl-routines)
+extra-objs += $(addsuffix .oS, $(libnldbl-routines))
endif