aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--Makeconfig6
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 99afa09..5febe40 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 5d86f56..795edd3 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,