diff mbox series

[uclibc-ng-devel] locale: rebuild the host generators when the generated headers change

Message ID 20260831081404.3557474-1-lordrasmus@gmail.com
State New
Headers show
Series [uclibc-ng-devel] locale: rebuild the host generators when the generated headers change | expand

Commit Message

Ramin Moussavi Aug. 31, 2026, 8:14 a.m. UTC 
From: ramin <lordrasmus@gmail.com>

gen_ldc includes c8tables.h, wctables.h, locale_tables.h and
locale_collate.h, all of which this Makefile generates; gen_locale includes
c8tables.h.  DEPH-gen_ldc and DEPH-gen_locale name those headers correctly and
have done so since 2005, but since b46830f8b ("fix locale dependencies",
2008-10-14) they are attached to $(locale_DIR)/gen_ldc.c -- a target with no
recipe.  make marks the .c up to date and never propagates anything to the
binary, so two things are lost:

  - ordering.  Nothing says the headers must exist before the compile runs.
    Before 2008 this was an order-only prerequisite of the binary, which did
    guarantee it.

  - rebuilding.  A generator built against an older layout of the tables is
    never recompiled, however often the tables change.

The second one is silent and does not need -j to bite.  Seen while building
arc from a long-lived tree: after a config change regenerated the tables, the
existing gen_ldc kept running and wrote locale_data.c in its old layout,
932841 bytes instead of 1247559, with the multi-byte digit strings missing.
At runtime every outdigit offset was zero, so all ten outdigit pointers aimed
at the same '\0' and the assert in libc/misc/locale/locale.c fired.  Only arc
noticed, because config.arc is the one that sets DOASSERTS=y; elsewhere the
same blob just yields wrong locale data.

The first one used to be covered by accident.  4c68c74d9 ("locale: disable
parallel build as it is broken here", 2016-09-27) added a bare .NOTPARALLEL:,
which -- because this file is include-d into the top-level Makefile -- ran the
entire build serially and thereby happened to order the headers first.  That
is very likely the race the commit message means.  Scoping .NOTPARALLEL to the
locale targets in 755281340 restored parallel builds and, on GNU make 4.4 or
newer, exposed the undeclared edge again.

Fix it where it belongs: make the headers ordinary prerequisites of the
binaries.  That gives ordering and rebuilding at once, independent of the make
version and of -jN, and is strictly stronger than the order-only form of 2005.
The recipe-less .c lines are left alone; they are now redundant.

hcompile.u passes $^ to the compiler, so the added prerequisites would land on
the gcc command line as input files.  Restrict that to %.c and %.o -- the only
things it was ever meant to pass -- so header prerequisites can be declared
anywhere hcompile.u is used.

Signed-off-by: Ramin Moussavi <lordrasmus@gmail.com>
---
 Makerules                |  2 +-
 extra/locale/Makefile.in | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/Makerules b/Makerules
index 309c206ad..4dd19210e 100644
--- a/Makerules
+++ b/Makerules
@@ -325,7 +325,7 @@  define compile.u
 	@$(disp_compile.u) ; $(cmd_compile.u)
 	@$(disp_t_strip)
 endef
-cmd_hcompile.u = $(HOSTCC) $(filter-out $(PHONY),$^) $(DEPS-$(notdir $@)) -o $@ $(BUILD_LDFLAGS) $(BUILD_LDFLAGS-$(notdir $(^D))) $(BUILD_LDFLAGS-$(notdir $@)) $(BUILD_CFLAGS) $(BUILD_CFLAGS-$(notdir $(^D))) $(BUILD_CFLAGS-$(notdir $@))
+cmd_hcompile.u = $(HOSTCC) $(filter %.c %.o,$(filter-out $(PHONY),$^)) $(DEPS-$(notdir $@)) -o $@ $(BUILD_LDFLAGS) $(BUILD_LDFLAGS-$(notdir $(^D))) $(BUILD_LDFLAGS-$(notdir $@)) $(BUILD_CFLAGS) $(BUILD_CFLAGS-$(notdir $(^D))) $(BUILD_CFLAGS-$(notdir $@))
 cmd_hcompile.o = $(HOSTCC) $(filter-out $(PHONY),$<) $(DEPS-$(notdir $@)) -c -o $@ $(BUILD_CFLAGS) $(BUILD_CFLAGS-$(notdir $(^D))) $(BUILD_CFLAGS-$(notdir $@))
 
 define link.so
diff --git a/extra/locale/Makefile.in b/extra/locale/Makefile.in
index d8023ebdb..9229bbfd9 100644
--- a/extra/locale/Makefile.in
+++ b/extra/locale/Makefile.in
@@ -150,19 +150,19 @@  endif
 endif
 
 $(locale_DIR)/gen_collate.c: $(DEPH-gen_collate)
-$(locale_OUT)/gen_collate : $(locale_DIR)/gen_collate.c
+$(locale_OUT)/gen_collate : $(locale_DIR)/gen_collate.c $(DEPH-gen_collate)
 	$(hcompile.u)
 $(locale_DIR)/gen_ldc.c: $(DEPH-gen_ldc)
-$(locale_OUT)/gen_ldc : $(locale_DIR)/gen_ldc.c
+$(locale_OUT)/gen_ldc : $(locale_DIR)/gen_ldc.c $(DEPH-gen_ldc)
 	$(hcompile.u)
 $(locale_DIR)/gen_locale.c: $(DEPH-gen_locale)
-$(locale_OUT)/gen_locale : $(locale_DIR)/gen_locale.c
+$(locale_OUT)/gen_locale : $(locale_DIR)/gen_locale.c $(DEPH-gen_locale)
 	$(hcompile.u)
 $(locale_DIR)/gen_wc8bit.c: $(DEPH-gen_wc8bit)
-$(locale_OUT)/gen_wc8bit : $(locale_DIR)/gen_wc8bit.c
+$(locale_OUT)/gen_wc8bit : $(locale_DIR)/gen_wc8bit.c $(DEPH-gen_wc8bit)
 	$(hcompile.u)
 $(locale_DIR)/gen_wctype.c: $(DEPH-gen_wctype)
-$(locale_OUT)/gen_wctype : $(locale_DIR)/gen_wctype.c
+$(locale_OUT)/gen_wctype : $(locale_DIR)/gen_wctype.c $(DEPH-gen_wctype)
 	$(hcompile.u)
 
 ifneq ($(V),)