From: Richarde Purdie <rpurdie@rpsys.net>
Date: Sat, 22 Feb 2020 15:13:13 +0000 (-0500)
Subject: Honor --disable-dependency-tracking in libatomic
X-Git-Tag: basepoints/gcc-11~1281
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6f420d98126ac51396b89fbe287a32287cd92ed;p=thirdparty%2Fgcc.git

Honor --disable-dependency-tracking in libatomic

	PR other/55930
	* Makefile.am (M_DEPS): Honor -disable-dependency-tracking.
	* Makefile.in: Regenerated.
---

diff --git a/libatomic/ChangeLog b/libatomic/ChangeLog
index 4aeaadb189c5..d38961409cd7 100644
--- a/libatomic/ChangeLog
+++ b/libatomic/ChangeLog
@@ -1,3 +1,9 @@
+2020-02-22  Richard Purdie  <rpurdie@rpsys.net>
+
+	PR other/55930
+	* Makefile.am (M_DEPS): Honor -disable-dependency-tracking.
+	* Makefile.in: Regenerated.
+
 2020-01-24  Maciej W. Rozycki  <macro@wdc.com>
 
 	* configure.ac: Handle `--with-toolexeclibdir='.
diff --git a/libatomic/Makefile.am b/libatomic/Makefile.am
index 61e449a34049..46a060a6267f 100644
--- a/libatomic/Makefile.am
+++ b/libatomic/Makefile.am
@@ -101,7 +101,9 @@ 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_TRUE@M_DEPS		=
+
 M_SIZE		= -DN=$(PAT_N)
 M_IFUNC		= $(if $(PAT_S),$(IFUNC_DEF) $(IFUNC_OPT))
 M_FILE		= $(PAT_BASE)_n.c
diff --git a/libatomic/Makefile.in b/libatomic/Makefile.in
index acf8839a919a..935762e9dbdd 100644
--- a/libatomic/Makefile.in
+++ b/libatomic/Makefile.in
@@ -415,7 +415,8 @@ PAT_N = $(word 2,$(PAT_SPLIT))
 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