libatomic still broken with --disable-dependency-tracking

[Stephen Kitt]

Hi,

I stumbled across an issue recently building gcc and libatomic with
--disable-dependency-tracking (in a cross-compiler). It turns out there's an
open bug with a patch by Richard Purdie for that at
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=55930 and the patch appears to
work fine, on gcc 6.2.0:

--- gcc-4.8.1.orig/libatomic/Makefile.am	2013-01-14 18:16:23.000000000 +0000
+++ gcc-4.8.1.orig/libatomic/Makefile.am	2013-09-22 10:38:18.904064750 +0000
@@ -100,7 +100,8 @@ 
 IFUNC_DEF	= -DIFUNC_ALT=$(PAT_S)
 IFUNC_OPT	= $(word $(PAT_S),$(IFUNC_OPTIONS))
 
-M_DEPS		= -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo
+@AMDEP_TRUE@M_DEPS		= -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo
+@AMDEP_FALSE@M_DEPS		= 
 M_SIZE		= -DN=$(PAT_N)
 M_IFUNC		= $(if $(PAT_S),$(IFUNC_DEF) $(IFUNC_OPT))
 M_FILE		= $(PAT_BASE)_n.c
--- gcc-4.8.1.orig/libatomic/Makefile.in	2013-05-31 09:09:26.000000000 +0000
+++ gcc-4.8.1.orig/libatomic/Makefile.in	2013-09-22 10:40:42.520059917 +0000
@@ -298,7 +298,8 @@ 
 PAT_S = $(word 3,$(PAT_SPLIT))
 IFUNC_DEF = -DIFUNC_ALT=$(PAT_S)
 IFUNC_OPT = $(word $(PAT_S),$(IFUNC_OPTIONS))
-M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo
+@AMDEP_TRUE@M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo
+@AMDEP_FALSE@M_DEPS = 
 M_SIZE = -DN=$(PAT_N)
 M_IFUNC = $(if $(PAT_S),$(IFUNC_DEF) $(IFUNC_OPT))
 M_FILE = $(PAT_BASE)_n.c


Is the patch suitable for merging?

Thanks,

Stephen
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <http://gcc.gnu.org/pipermail/gcc-bugs/attachments/20161127/736bd118/attachment.sig>