From 128ff73d7c5b70b20991b191b64a27d64145d762 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek <jakub@redhat.com> Date: Sat, 22 Feb 2020 19:55:09 +0100 Subject: [PATCH] libatomic: Fix last change [PR55930] 2020-02-22 Jakub Jelinek <jakub@redhat.com> PR other/55930 * Makefile.am (M_DEPS): Guard the empty definition with @AMDEP_FALSE@ rather than @AMDEP_TRUE@. * Makefile.in: Regenerated. --- libatomic/ChangeLog | 7 +++++++ libatomic/Makefile.am | 2 +- libatomic/Makefile.in | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/libatomic/ChangeLog b/libatomic/ChangeLog index d38961409cd7..93031221e54e 100644 --- a/libatomic/ChangeLog +++ b/libatomic/ChangeLog @@ -1,3 +1,10 @@ +2020-02-22 Jakub Jelinek <jakub@redhat.com> + + PR other/55930 + * Makefile.am (M_DEPS): Guard the empty definition with + @AMDEP_FALSE@ rather than @AMDEP_TRUE@. + * Makefile.in: Regenerated. + 2020-02-22 Richard Purdie <rpurdie@rpsys.net> PR other/55930 diff --git a/libatomic/Makefile.am b/libatomic/Makefile.am index 46a060a6267f..133fbbca77eb 100644 --- a/libatomic/Makefile.am +++ b/libatomic/Makefile.am @@ -102,7 +102,7 @@ IFUNC_DEF = -DIFUNC_ALT=$(PAT_S) IFUNC_OPT = $(word $(PAT_S),$(IFUNC_OPTIONS)) @AMDEP_TRUE@M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo -@AMDEP_TRUE@M_DEPS = +@AMDEP_FALSE@M_DEPS = M_SIZE = -DN=$(PAT_N) M_IFUNC = $(if $(PAT_S),$(IFUNC_DEF) $(IFUNC_OPT)) diff --git a/libatomic/Makefile.in b/libatomic/Makefile.in index 935762e9dbdd..a51807e95c95 100644 --- a/libatomic/Makefile.in +++ b/libatomic/Makefile.in @@ -416,7 +416,7 @@ PAT_S = $(word 3,$(PAT_SPLIT)) IFUNC_DEF = -DIFUNC_ALT=$(PAT_S) IFUNC_OPT = $(word $(PAT_S),$(IFUNC_OPTIONS)) @AMDEP_TRUE@M_DEPS = -MT $@ -MD -MP -MF $(DEPDIR)/$(@F).Ppo -@AMDEP_FALSE@M_DEPS = +@AMDEP_FALSE@M_DEPS = M_SIZE = -DN=$(PAT_N) M_IFUNC = $(if $(PAT_S),$(IFUNC_DEF) $(IFUNC_OPT)) M_FILE = $(PAT_BASE)_n.c -- GitLab