From 38b8f67a6d9306eb5fd1f04ad77347cf8cb1561c Mon Sep 17 00:00:00 2001
From: Doug Kwan <dougkwan@google.com>
Date: Tue, 15 Mar 2011 20:56:52 +0000
Subject: [PATCH] re PR libstdc++/48123 (bits/cpu_defines.h not installed in
freestanding mode.)
2011-03-15 Doug Kwan <dougkwan@google.com>
PR libstdc++/48123
* include/Makefile.am (install-freestanding-headers): Install
cpu_defines.h
* include/Makefile.in: Regenerate.
From-SVN: r171019
---
libstdc++-v3/ChangeLog | 7 +++++++
libstdc++-v3/include/Makefile.am | 3 ++-
libstdc++-v3/include/Makefile.in | 3 ++-
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index f5dd9b481c47..b368c0270450 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2011-03-15 Doug Kwan <dougkwan@google.com>
+
+ PR libstdc++/48123
+ * include/Makefile.am (install-freestanding-headers): Install
+ cpu_defines.h
+ * include/Makefile.in: Regenerate.
+
2011-03-15 Benjamin Kosnik <bkoz@redhat.com>
* config/abi/pre/gnu.ver: Make nested_exception exports super clear.
diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am
index 165adc1574d1..10ed04c4edbc 100644
--- a/libstdc++-v3/include/Makefile.am
+++ b/libstdc++-v3/include/Makefile.am
@@ -1200,7 +1200,8 @@ endif
install-freestanding-headers:
$(mkinstalldirs) $(DESTDIR)${gxx_include_dir}
$(mkinstalldirs) $(DESTDIR)${host_installdir}
- for file in ${host_srcdir}/os_defines.h ${host_builddir}/c++config.h; do \
+ for file in ${host_srcdir}/os_defines.h ${host_builddir}/c++config.h \
+ ${glibcxx_srcdir}/$(CPU_DEFINES_SRCDIR)/cpu_defines.h; do \
$(INSTALL_DATA) $${file} $(DESTDIR)${host_installdir}; done
$(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${std_builddir}
$(INSTALL_DATA) ${std_builddir}/limits $(DESTDIR)${gxx_include_dir}/${std_builddir}
diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in
index e853284a1578..01e593d1c31b 100644
--- a/libstdc++-v3/include/Makefile.in
+++ b/libstdc++-v3/include/Makefile.in
@@ -1584,7 +1584,8 @@ ${pch3_output}: ${pch3_source} ${pch2_output}
install-freestanding-headers:
$(mkinstalldirs) $(DESTDIR)${gxx_include_dir}
$(mkinstalldirs) $(DESTDIR)${host_installdir}
- for file in ${host_srcdir}/os_defines.h ${host_builddir}/c++config.h; do \
+ for file in ${host_srcdir}/os_defines.h ${host_builddir}/c++config.h \
+ ${glibcxx_srcdir}/$(CPU_DEFINES_SRCDIR)/cpu_defines.h; do \
$(INSTALL_DATA) $${file} $(DESTDIR)${host_installdir}; done
$(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${std_builddir}
$(INSTALL_DATA) ${std_builddir}/limits $(DESTDIR)${gxx_include_dir}/${std_builddir}
--
GitLab