• Home
  • Line#
  • Scopes#
  • Navigate#
  • Raw
  • Download
1From d9394eebf42aee6de56a970df3c56e67e5455545 Mon Sep 17 00:00:00 2001
2From: Doug Kwan <dougkwan@google.com>
3Date: Wed, 16 Mar 2011 14:47:42 -0700
4Subject: [PATCH 1/4] Update gcc-4.4.3 for building libsupc++ in freestanding mode.
5
6-Backport upstream patch from gcc rev 171019.
7
8Change-Id: I177e4e11f38d57c6ca1d065ebf3e8a37d9bacc33
9---
10 gcc-4.4.3/README.google                    |    5 +++++
11 gcc-4.4.3/libstdc++-v3/include/Makefile.am |    3 ++-
12 gcc-4.4.3/libstdc++-v3/include/Makefile.in |    3 ++-
13 3 files changed, 9 insertions(+), 2 deletions(-)
14
15diff --git a/gcc-4.4.3/README.google b/gcc-4.4.3/README.google
16index 47fe1fc..f36db91 100644
17--- a/gcc-4.4.3/README.google
18+++ b/gcc-4.4.3/README.google
19@@ -3381,3 +3381,8 @@ gcc/crtstuff.c
20   Owner: dougkwan
21   Status: apply the patch http://gcc.gnu.org/ml/gcc-patches/2011-01/msg01942.html.
22   Not yet upstream.
23+
24+libstdc++/include/Makefile.in
25+  Installed cpu_defines.h in freestanding standing mode (libstdc++/48123)
26+  Owner: dougkwan
27+  Status: In gcc trunk rev 171019
28diff --git a/gcc-4.4.3/libstdc++-v3/include/Makefile.am b/gcc-4.4.3/libstdc++-v3/include/Makefile.am
29index 99a627b..162983a 100644
30--- a/gcc-4.4.3/libstdc++-v3/include/Makefile.am
31+++ b/gcc-4.4.3/libstdc++-v3/include/Makefile.am
32@@ -1136,7 +1136,8 @@ endif
33 install-freestanding-headers:
34 	$(mkinstalldirs) $(DESTDIR)${gxx_include_dir}
35 	$(mkinstalldirs) $(DESTDIR)${host_installdir}
36-	for file in ${host_srcdir}/os_defines.h ${host_builddir}/c++config.h; do \
37+	for file in ${host_srcdir}/os_defines.h ${host_builddir}/c++config.h \
38+	  ${glibcxx_srcdir}/$(CPU_DEFINES_SRCDIR)/cpu_defines.h; do \
39 	  $(INSTALL_DATA) $${file} $(DESTDIR)${host_installdir}; done
40 	$(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${std_builddir}
41 	$(INSTALL_DATA) ${std_builddir}/limits $(DESTDIR)${gxx_include_dir}/${std_builddir}
42diff --git a/gcc-4.4.3/libstdc++-v3/include/Makefile.in b/gcc-4.4.3/libstdc++-v3/include/Makefile.in
43index cdaecac..c4614f4 100644
44--- a/gcc-4.4.3/libstdc++-v3/include/Makefile.in
45+++ b/gcc-4.4.3/libstdc++-v3/include/Makefile.in
46@@ -1537,7 +1537,8 @@ ${pch3_output}: ${pch3_source} ${pch2_output}
47 install-freestanding-headers:
48 	$(mkinstalldirs) $(DESTDIR)${gxx_include_dir}
49 	$(mkinstalldirs) $(DESTDIR)${host_installdir}
50-	for file in ${host_srcdir}/os_defines.h ${host_builddir}/c++config.h; do \
51+	for file in ${host_srcdir}/os_defines.h ${host_builddir}/c++config.h \
52+	  ${glibcxx_srcdir}/$(CPU_DEFINES_SRCDIR)/cpu_defines.h; do \
53 	  $(INSTALL_DATA) $${file} $(DESTDIR)${host_installdir}; done
54 	$(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${std_builddir}
55 	$(INSTALL_DATA) ${std_builddir}/limits $(DESTDIR)${gxx_include_dir}/${std_builddir}
56--
571.7.1
58
59