From b21fbbd29cee0d18b2e5babf2bee470db98ebb51 Mon Sep 17 00:00:00 2001
From: Richard Sandiford <rdsandiford@googlemail.com>
Date: Wed, 4 Dec 2013 10:49:14 +0000
Subject: [PATCH] longlong.h: New file.
include/
* longlong.h: New file.
libgcc/
* longlong.h: Delete (moved to include/).
libquadmath/
* Makefile.am (AM_CPPFLAGS): Define.
* Makefile.in: Regenerate.
* printf/gmp-impl.h: Remove path from longlong.h include.
From-SVN: r205659
---
include/ChangeLog | 4 ++++
{libgcc => include}/longlong.h | 0
libgcc/ChangeLog | 4 ++++
libquadmath/ChangeLog | 6 ++++++
libquadmath/Makefile.am | 1 +
libquadmath/Makefile.in | 1 +
libquadmath/printf/gmp-impl.h | 2 +-
7 files changed, 17 insertions(+), 1 deletion(-)
rename {libgcc => include}/longlong.h (100%)
diff --git a/include/ChangeLog b/include/ChangeLog
index a43d36758d61..9109c7694e69 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-04 Richard Sandiford <rdsandiford@googlemail.com>
+
+ * longlong.h: New file.
+
2013-10-29 Marc Glisse <marc.glisse@inria.fr>
PR tree-optimization/58689
diff --git a/libgcc/longlong.h b/include/longlong.h
similarity index 100%
rename from libgcc/longlong.h
rename to include/longlong.h
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index fea1c054766b..94f69caaaf5c 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-04 Richard Sandiford <rdsandiford@googlemail.com>
+
+ * longlong.h: Delete (moved to include/).
+
2013-12-03 Adhemerval Zanella <azanella@linux.vnet.ibm.com>
* config/rs6000/ibm-ldouble.c (__gcc_qadd): Fix add
diff --git a/libquadmath/ChangeLog b/libquadmath/ChangeLog
index d3c17f67d5d8..804a3d54551d 100644
--- a/libquadmath/ChangeLog
+++ b/libquadmath/ChangeLog
@@ -1,3 +1,9 @@
+2013-12-04 Richard Sandiford <rdsandiford@googlemail.com>
+
+ * Makefile.am (AM_CPPFLAGS): Define.
+ * Makefile.in: Regenerate.
+ * printf/gmp-impl.h: Remove path from longlong.h include.
+
2013-09-20 Alan Modra <amodra@gmail.com>
* configure: Regenerate.
diff --git a/libquadmath/Makefile.am b/libquadmath/Makefile.am
index 6c97ee81c5cf..6519731b9b9e 100644
--- a/libquadmath/Makefile.am
+++ b/libquadmath/Makefile.am
@@ -6,6 +6,7 @@ AUTOMAKE_OPTIONS = 1.8 foreign
## Skip over everything if the quadlib is not available:
if BUILD_LIBQUADMATH
ACLOCAL_AMFLAGS = -I .. -I ../config
+AM_CPPFLAGS = -I $(top_srcdir)/../include
## May be used by toolexeclibdir.
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
diff --git a/libquadmath/Makefile.in b/libquadmath/Makefile.in
index 92c5d256d5af..331780931af0 100644
--- a/libquadmath/Makefile.in
+++ b/libquadmath/Makefile.in
@@ -310,6 +310,7 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = 1.8 foreign
@BUILD_LIBQUADMATH_TRUE@ACLOCAL_AMFLAGS = -I .. -I ../config
+@BUILD_LIBQUADMATH_TRUE@AM_CPPFLAGS = -I $(top_srcdir)/../include
@BUILD_LIBQUADMATH_TRUE@gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
@BUILD_LIBQUADMATH_TRUE@@LIBQUAD_USE_SYMVER_FALSE@version_arg =
@BUILD_LIBQUADMATH_TRUE@@LIBQUAD_USE_SYMVER_GNU_TRUE@@LIBQUAD_USE_SYMVER_TRUE@version_arg = -Wl,--version-script=$(srcdir)/quadmath.map
diff --git a/libquadmath/printf/gmp-impl.h b/libquadmath/printf/gmp-impl.h
index 0f1419277deb..969574c853a2 100644
--- a/libquadmath/printf/gmp-impl.h
+++ b/libquadmath/printf/gmp-impl.h
@@ -60,7 +60,7 @@ typedef unsigned int UHWtype;
#define attribute_hidden
#endif
-#include "../../libgcc/longlong.h"
+#include "longlong.h"
/* Copy NLIMBS *limbs* from SRC to DST. */
#define MPN_COPY_INCR(DST, SRC, NLIMBS) \
--
GitLab