diff options
| author | Roland McGrath <roland@hack.frob.com> | 2013-02-26 16:01:06 -0800 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2013-02-26 16:01:06 -0800 |
| commit | 7e80ddb82478e6ad9694b78c441ed00b3d09efa9 (patch) | |
| tree | 4c3cd2795587b5889611323db750d96ad271b029 | |
| parent | 45f058844c33f670475bd02f266942746bcb332b (diff) | |
| download | glibc-7e80ddb82478e6ad9694b78c441ed00b3d09efa9.tar.gz glibc-7e80ddb82478e6ad9694b78c441ed00b3d09efa9.tar.xz glibc-7e80ddb82478e6ad9694b78c441ed00b3d09efa9.zip | |
Generalize %.v.i rule a bit.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makeconfig | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 99afa0963c..5febe40ad5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2013-02-26 Roland McGrath <roland@hack.frob.com> + + * Makeconfig (%.v.i, %.v): Move these pattern rules outside of + [$(build-shared = yes]. + (%.v.i): Filter out %.def prerequisites too. + 2013-02-26 Siddhesh Poyarekar <siddhesh@redhat.com> * sysdeps/ieee754/dbl-64/mpa.c: Include alloca.h. diff --git a/Makeconfig b/Makeconfig index 5d86f56514..795edd3bda 100644 --- a/Makeconfig +++ b/Makeconfig @@ -868,8 +868,6 @@ subdirs = $(sorted-subdirs) subdir-srcdirs = $(foreach dir,$(subdirs),\ $(firstword $($(dir)-srcdir) $(..)$(dir))) -ifeq (yes, $(build-shared)) - # This is a pair of implicit rules to preprocess a file with # comments, # %ifdef et al, based on config.h settings or other %include'd files. # We use chained rules instead of a pipeline here so that we can properly @@ -880,7 +878,7 @@ ifeq (yes, $(build-shared)) # (but no commands). %.v.i: $(common-objpfx)config.h $(..)Makeconfig sed '/^[ ]*%/!s/#.*$$//;/^[ ]*$$/d;s/^[ ]*%/#/' \ - $(filter-out FORCE %.h $(..)Makeconfig,$^) \ + $(filter-out FORCE %.h %.def $(..)Makeconfig,$^) \ | $(CC) -E -undef $(CPPFLAGS) -x assembler-with-cpp - \ > $@T mv -f $@T $@ @@ -888,6 +886,8 @@ ifeq (yes, $(build-shared)) sed '/^[ ]*#/d;/^[ ]*$$/d' $< > $@T mv -f $@T $@ +ifeq (yes, $(build-shared)) + # To generate a header to support more than one ABI for different # architecture variants, the CPU/Makefile defines abi-variants to be a # list of names for those variants (e.g. 32 64), and, for each variant, |