diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2006-01-30 09:30:09 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2006-01-30 09:30:09 +0000 |
| commit | 3e543bc56346540cbf73fd48d0172fc6a588efd5 (patch) | |
| tree | b2c3502b6596d238ac861cc82cafdc6f8b84e143 /Makerules | |
| parent | 06f313e361a523605ba6d4c9cdc67a7353cd367c (diff) | |
| download | glibc-3e543bc56346540cbf73fd48d0172fc6a588efd5.tar.gz glibc-3e543bc56346540cbf73fd48d0172fc6a588efd5.tar.xz glibc-3e543bc56346540cbf73fd48d0172fc6a588efd5.zip | |
Updated to fedora-glibc-20060130T0922
Diffstat (limited to 'Makerules')
| -rw-r--r-- | Makerules | 42 |
1 files changed, 27 insertions, 15 deletions
diff --git a/Makerules b/Makerules index 36e2441be0..a96a03eee4 100644 --- a/Makerules +++ b/Makerules @@ -257,6 +257,10 @@ $(+sysdir_pfx)sysd-rules: $(+sysdir_pfx)config.make $(..)Makerules \ \$$(compile-command.S)"; \ echo "\$$(objpfx)ptw-%$$o: $$dir/%.s \$$(before-compile); \ \$$(compile-command.s)"; \ + echo "\$$(objpfx)m_%$$o: $$dir/s_%.S \$$(before-compile); \ + \$$(compile-command.S)"; \ + echo "\$$(objpfx)m_%$$o: $$dir/s_%.s \$$(before-compile); \ + \$$(compile-command.s)"; \ $(close-check-inhibit-asm) \ echo "\$$(objpfx)%$$o: $$dir/%.c \$$(before-compile); \ \$$(compile-command.c)"; \ @@ -264,11 +268,12 @@ $(+sysdir_pfx)sysd-rules: $(+sysdir_pfx)config.make $(..)Makerules \ \$$(compile-command.c)"; \ echo "\$$(objpfx)ptw-%$$o: $$dir/%.c \$$(before-compile); \ \$$(compile-command.c)"; \ + echo "\$$(objpfx)m_%$$o: $$dir/s_%.c \$$(before-compile); \ + \$$(compile-command.c)"; \ done; \ - echo "\$$(objpfx)m_%.S: $$dir/s_%.S; \$$(+make-include-of-dep)"; \ - echo "\$$(objpfx)m_%.c: $$dir/s_%.c; \$$(+make-include-of-dep)"; \ + echo "\$$(inst_includedir)/%.h: $$dir/%.h \$$(+force); \ + \$$(do-install)"; \ done; \ - echo "\$$(objpfx)m_%.c: s_%.c; \$$(+make-include-of-dep)"; \ echo 'sysd-rules-done = t') > $@T mv -f $@T $@ @@ -277,17 +282,6 @@ ifndef sysd-rules-done no_deps=t endif -# This is used by the m_%.[Sc] pattern rules in sysd-rules. -define +make-include-of-dep -echo '#include <$<>' > $@T -mv -f $@T $@ -endef - -# It matters that this set of rules, for compiling from sources in -# the current directory (the $srcdir/$subdir) come before the -# generated sysdep rules in included from sysd-rules below. When -# compiling in the source tree, generated sources go into the current -# directory, and those should be chosen before any sources in sysdeps. define o-iterator-doit $(objpfx)%$o: %.S $(before-compile); $$(compile-command.S) endef @@ -572,6 +566,11 @@ define build-module $(build-module-helper) -o $@ -T $(common-objpfx)shlib.lds \ $(csu-objpfx)abi-note.o $(build-module-objlist) endef +define build-module-asneeded +$(build-module-helper) -o $@ -T $(common-objpfx)shlib.lds \ + $(csu-objpfx)abi-note.o \ + -Wl,--as-needed $(build-module-objlist) -Wl,--no-as-needed +endef else ifneq (,$(findstring aix,$(config-os))) define build-module @@ -1121,8 +1120,21 @@ $(addprefix $(inst_datadir)/,$(install-data)): $(inst_datadir)/%: % $(+force) endif headers := $(strip $(headers)) ifdef headers -$(addprefix $(inst_includedir)/,$(headers)): $(inst_includedir)/%: % $(+force) +# This implicit rule installs headers from the source directory. +# It may be ignored in preference to rules from sysd-rules to find +# headers in the sysdeps tree. +$(inst_includedir)/%.h: $(objpfx)%.h $(+force) + $(do-install) +$(inst_includedir)/%.h: %.h $(+force) + $(do-install) +$(inst_includedir)/%.h: $(..)include/%.h $(+force) + $(do-install) +headers-nonh := $(filter-out %.h,$(headers)) +ifdef headers-nonh +$(addprefix $(inst_includedir)/,$(headers-nonh)): $(inst_includedir)/%: \ + % $(+force) $(do-install) +endif # headers-nonh endif # headers .PHONY: install-bin-nosubdir install-bin-script-nosubdir \ |