Message ID | 20110416202739.6D629AE18B@tobiano.tor.corp.google.com |
---|---|
State | New |
Headers | show |
> This patch adds cpu_defines.h to the set of files to be installed. > Doug, could you describe why we need to do this? Will you be > submitting this patch for trunk? It's already in trunk, see 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. -benjamin
On Tue, Apr 19, 2011 at 12:04, Benjamin Kosnik <bkoz@redhat.com> wrote: > >> This patch adds cpu_defines.h to the set of files to be installed. >> Doug, could you describe why we need to do this? Will you be >> submitting this patch for trunk? > > It's already in trunk, see D'oh. Thanks. Clearly, I was no autopilot. Doug even said so in the internal patch tracking tool. Diego.
This is used for a freestanding C++ library (i.e., we build libsupc++.a only). This is in trunk but for some reason it is not in the 4.6 release. -Doug On Sat, Apr 16, 2011 at 1:27 PM, Diego Novillo <dnovillo@google.com> wrote: > I am committing this patch from Doug Kwan on google/main. > > This patch adds cpu_defines.h to the set of files to be installed. > Doug, could you describe why we need to do this? Will you be > submitting this patch for trunk? > > Tested on x86_64. Committed on google/main. > > > Diego. > > 2011-03-15 Doug Kwan <dougkwan@google.com> > > Google ref 50044. > > PR libstdc++/48123 > * include/Makefile.am (install-freestanding-headers): Install > cpu_defines.h > * include/Makefile.in: Regenerate. > > diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am > index e7f1543..d3b44bc 100644 > --- a/libstdc++-v3/include/Makefile.am > +++ b/libstdc++-v3/include/Makefile.am > @@ -1201,7 +1201,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 a93b2ea..8a23c1b 100644 > --- a/libstdc++-v3/include/Makefile.in > +++ b/libstdc++-v3/include/Makefile.in > @@ -1585,7 +1585,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} > > > -- > This patch is available for review at http://codereview.appspot.com/4440044 >
On 04/19/2011 07:26 PM, Doug Kwan (關振德) wrote: > This is used for a freestanding C++ library (i.e., we build > libsupc++.a only). This is in trunk but for some reason it is not in > the 4.6 release. Why do you think so? For sure upon approval you committed it to the branch too, on March, 15th. Paolo.
My bad. I looked at the gcc-4.6.0 tarball and it is indeed there. -Doug On Tue, Apr 19, 2011 at 10:36 AM, Paolo Carlini <paolo.carlini@oracle.com> wrote: > On 04/19/2011 07:26 PM, Doug Kwan (關振德) wrote: >> >> This is used for a freestanding C++ library (i.e., we build >> libsupc++.a only). This is in trunk but for some reason it is not in >> the 4.6 release. > > Why do you think so? For sure upon approval you committed it to the branch > too, on March, 15th. > > Paolo. >
diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am index e7f1543..d3b44bc 100644 --- a/libstdc++-v3/include/Makefile.am +++ b/libstdc++-v3/include/Makefile.am @@ -1201,7 +1201,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 a93b2ea..8a23c1b 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -1585,7 +1585,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}