diff options
| author | Roland McGrath <roland@hack.frob.com> | 2013-06-17 09:55:21 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2013-06-17 09:55:21 -0700 |
| commit | 346d65b33a3958c72faab6f675314cbef7963ace (patch) | |
| tree | af8e8e9638397fa5217b4848b52a3f161aa5e4c8 /Makerules | |
| parent | 1a8463176c3edf52c38af022ce44e210f9bf4aaa (diff) | |
| download | glibc-346d65b33a3958c72faab6f675314cbef7963ace.tar.gz glibc-346d65b33a3958c72faab6f675314cbef7963ace.tar.xz glibc-346d65b33a3958c72faab6f675314cbef7963ace.zip | |
Rewrite sysd-rules generation using an awk script.
Diffstat (limited to 'Makerules')
| -rw-r--r-- | Makerules | 43 |
1 files changed, 10 insertions, 33 deletions
diff --git a/Makerules b/Makerules index 2c25233c2f..03eafb036f 100644 --- a/Makerules +++ b/Makerules @@ -217,14 +217,9 @@ endif # later directory would be chosen over a .c file in an earlier directory, # which does not preserve the desired sysdeps ordering behavior. -# System-dependent makefiles can put in `inhibit-sysdep-asm' wildcard -# patterns matching sysdep directories whose assembly source files should -# be suppressed. -ifdef inhibit-sysdep-asm -define check-inhibit-asm -case $$sysdir in $(subst $(empty) ,|,$(inhibit-sysdep-asm))) asm= ;; esac; -endef -endif +# System-dependent makefiles can put in `inhibit-sysdep-asm' regexps +# matching sysdep directories whose assembly source files should be +# suppressed. -include $(common-objpfx)sysd-rules ifneq ($(sysd-rules-sysdirs),$(config-sysdirs)) @@ -233,34 +228,16 @@ ifneq ($(sysd-rules-sysdirs),$(config-sysdirs)) sysd-rules-force = FORCE FORCE: endif -$(common-objpfx)sysd-rules: $(common-objpfx)config.make $(..)Makerules \ +$(common-objpfx)sysd-rules: $(..)scripts/sysd-rules.awk \ + $(common-objpfx)config.make $(..)Makerules \ $(sysdep-makefiles) $(sysdep-makeconfigs) \ $(sysd-rules-force) -@rm -f $@T - (echo 'sysd-rules-sysdirs := $(config-sysdirs)'; \ - for dir in $(config-sysdirs); do \ - case "$$dir" in \ - /*) ;; \ - *) dir="\$$(..)$$dir" ;; \ - esac; \ - asm='.S'; \ - $(check-inhibit-asm) \ - for o in $(all-object-suffixes); do \ - set $(subst :, ,$(sysd-rules-patterns)); \ - while [ $$# -ge 2 ]; do \ - t=$$1; shift; \ - d=$$1; shift; \ - v=$${t%%%}; [ x"$$v" = x ] || v="\$$($${v}CPPFLAGS)"; \ - for s in $$asm .c; do \ - echo "\$$(objpfx)$$t$$o: $$dir/$$d$$s \$$(before-compile)"; \ - echo " \$$(compile-command$$s) $$v"; \ - done; \ - done; \ - done; \ - echo "\$$(inst_includedir)/%.h: $$dir/%.h \$$(+force)"; \ - echo " \$$(do-install)"; \ - done; \ - echo 'sysd-rules-done = t') > $@T + LC_ALL=C $(AWK) -f $< > $@T \ + -v all_object_suffixes='$(all-object-suffixes)' \ + -v inhibit_sysdep_asm='$(inhibit-sysdep-asm)' \ + -v sysd_rules_patterns='$(sysd-rules-patterns)' \ + -v config_sysdirs='$(config-sysdirs)' mv -f $@T $@ ifndef sysd-rules-done |