From 0764a2eab84ee0c22dddc7cbed40d5f39e54adf6 Mon Sep 17 00:00:00 2001
From: Jeff Johnston <jjohnstn@redhat.com>
Date: Thu, 31 Oct 2019 14:52:04 -0400
Subject: [PATCH] Fix some generated files

---
 newlib/libm/Makefile.in                 |  4 +++-
 newlib/libm/machine/aarch64/Makefile.in |  7 +++----
 newlib/libm/machine/x86_64/Makefile.in  | 11 +++++------
 newlib/libm/machine/x86_64/aclocal.m4   | 10 +++++-----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/newlib/libm/Makefile.in b/newlib/libm/Makefile.in
index dd1a71750..20fc2902c 100644
--- a/newlib/libm/Makefile.in
+++ b/newlib/libm/Makefile.in
@@ -907,7 +907,7 @@ uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \
 
 $(SUBLIBS):
 
-libm.dvi: targetdep.tex math/stmp-def complex/stmp-def
+libm.dvi: targetdep.tex math/stmp-def complex/stmp-def fenv/stmp-def
 
 stmp-targetdep: force
 	rm -f tmp.texi
@@ -926,6 +926,8 @@ math/stmp-def: stmp-targetdep ; @true
 
 complex/stmp-def: stmp-targetdep ; @true
 
+fenv/stmp-def: stmp-targetdep ; @true
+
 docbook-recursive: force
 	for d in $(SUBDIRS); do \
 	  if test "$$d" != "."; then \
diff --git a/newlib/libm/machine/aarch64/Makefile.in b/newlib/libm/machine/aarch64/Makefile.in
index ac85b3fef..d31237e0f 100644
--- a/newlib/libm/machine/aarch64/Makefile.in
+++ b/newlib/libm/machine/aarch64/Makefile.in
@@ -52,10 +52,9 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/../../../Makefile.shared INSTALL \
-	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) \
-	$(srcdir)/../../../../mkinstalldirs
+DIST_COMMON = $(srcdir)/../../../Makefile.shared $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(srcdir)/../../../../mkinstalldirs
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../../../acinclude.m4 \
diff --git a/newlib/libm/machine/x86_64/Makefile.in b/newlib/libm/machine/x86_64/Makefile.in
index 71881666b..201913a68 100644
--- a/newlib/libm/machine/x86_64/Makefile.in
+++ b/newlib/libm/machine/x86_64/Makefile.in
@@ -58,12 +58,11 @@ DIST_COMMON = $(srcdir)/../../../Makefile.shared $(srcdir)/Makefile.in \
 	$(am__configure_deps) $(srcdir)/../../../../mkinstalldirs
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps =  \
-	$(top_srcdir)/../../../../newlib-3.1.0libtool.m4 \
-	$(top_srcdir)/../../../../newlib-3.1.0ltoptions.m4 \
-	$(top_srcdir)/../../../../newlib-3.1.0ltsugar.m4 \
-	$(top_srcdir)/../../../../newlib-3.1.0ltversion.m4 \
-	$(top_srcdir)/../../../../newlib-3.1.0lt~obsolete.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/../../../../libtool.m4 \
+	$(top_srcdir)/../../../../ltoptions.m4 \
+	$(top_srcdir)/../../../../ltsugar.m4 \
+	$(top_srcdir)/../../../../ltversion.m4 \
+	$(top_srcdir)/../../../../lt~obsolete.m4 \
 	$(top_srcdir)/../../../acinclude.m4 $(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
diff --git a/newlib/libm/machine/x86_64/aclocal.m4 b/newlib/libm/machine/x86_64/aclocal.m4
index c5293fc4b..b10d973c5 100644
--- a/newlib/libm/machine/x86_64/aclocal.m4
+++ b/newlib/libm/machine/x86_64/aclocal.m4
@@ -1009,9 +1009,9 @@ AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
-m4_include([../../../../newlib-3.1.0libtool.m4])
-m4_include([../../../../newlib-3.1.0ltoptions.m4])
-m4_include([../../../../newlib-3.1.0ltsugar.m4])
-m4_include([../../../../newlib-3.1.0ltversion.m4])
-m4_include([../../../../newlib-3.1.0lt~obsolete.m4])
+m4_include([../../../../libtool.m4])
+m4_include([../../../../ltoptions.m4])
+m4_include([../../../../ltsugar.m4])
+m4_include([../../../../ltversion.m4])
+m4_include([../../../../lt~obsolete.m4])
 m4_include([../../../acinclude.m4])