Skip to content

R
riscv-gcc-1
Commit 6ca935e6 by Matthias Klose Committed by Matthias Klose
Options

Makefile.am (bits_headers): Remove ${bits_host_headers}. 

2013-05-23  Matthias Klose  <doko@ubuntu.com>

        * include/Makefile.am (bits_headers): Remove ${bits_host_headers}.
        (ext_headers): Remove ${ext_host_headers}.
        (stamp-${host_alias}): Create ${host_builddir}/../ext.
        (stamp-host): Link ${bits_host_headers} and ${ext_host_headers}.
        (install-headers): Install ${bits_host_headers} and ${ext_host_headers}.
        * include/Makefile.in: Regenerate.
        * include/ext/random: Include ext/opt_random.h.

From-SVN: r199257
parent 76c36cb1
Showing with 35 additions and 15 deletions
libstdc++-v3/ChangeLog
2013-05-23 Matthias Klose <doko@ubuntu.com>
* include/Makefile.am (bits_headers): Remove ${bits_host_headers}.
(ext_headers): Remove ${ext_host_headers}.
(stamp-${host_alias}): Create ${host_builddir}/../ext.
(stamp-host): Link ${bits_host_headers} and ${ext_host_headers}.
(install-headers): Install ${bits_host_headers} and ${ext_host_headers}.
* include/Makefile.in: Regenerate.
* include/ext/random: Include ext/opt_random.h.
2013-05-22 Jonathan Wakely <jwakely.gcc@gmail.com> 2013-05-22 Jonathan Wakely <jwakely.gcc@gmail.com>
* acinclude.m4 (GLIBCXX_ENABLE_LIBSTDCXX_TIME): Add KIND=auto to * acinclude.m4 (GLIBCXX_ENABLE_LIBSTDCXX_TIME): Add KIND=auto to
......
libstdc++-v3/include/Makefile.am
...@@ -172,8 +172,7 @@ bits_headers = \ ...@@ -172,8 +172,7 @@ bits_headers = \
${bits_srcdir}/valarray_array.tcc \ ${bits_srcdir}/valarray_array.tcc \
${bits_srcdir}/valarray_before.h \ ${bits_srcdir}/valarray_before.h \
${bits_srcdir}/valarray_after.h \ ${bits_srcdir}/valarray_after.h \
${bits_srcdir}/vector.tcc \ ${bits_srcdir}/vector.tcc
${bits_host_headers}
bits_host_headers = \ bits_host_headers = \
${glibcxx_srcdir}/${CPU_OPT_BITS_RANDOM} ${glibcxx_srcdir}/${CPU_OPT_BITS_RANDOM}
...@@ -536,8 +535,7 @@ ext_headers = \ ...@@ -536,8 +535,7 @@ ext_headers = \
${ext_srcdir}/vstring.tcc \ ${ext_srcdir}/vstring.tcc \
${ext_srcdir}/vstring_fwd.h \ ${ext_srcdir}/vstring_fwd.h \
${ext_srcdir}/vstring_util.h \ ${ext_srcdir}/vstring_util.h \
${ext_compat_headers} \ ${ext_compat_headers}
${ext_host_headers}
ext_compat_headers = \ ext_compat_headers = \
${backward_srcdir}/hash_set \ ${backward_srcdir}/hash_set \
...@@ -1050,13 +1048,14 @@ stamp-profile-impl: ${profile_impl_headers} ...@@ -1050,13 +1048,14 @@ stamp-profile-impl: ${profile_impl_headers}
stamp-${host_alias}: stamp-${host_alias}:
@-mkdir -p ${host_builddir} @-mkdir -p ${host_builddir}
@-mkdir -p ${host_builddir}/../ext
@$(STAMP) stamp-${host_alias} @$(STAMP) stamp-${host_alias}
# Host includes static. # Host includes static.
# XXX Missing dependency info for {host_headers_extra} # XXX Missing dependency info for {host_headers_extra}
stamp-host: ${host_headers} ${host_headers_noinst} stamp-${host_alias} stamp-host: ${host_headers} ${bits_host_headers} ${ext_host_headers} ${host_headers_noinst} stamp-${host_alias}
@cd ${host_builddir} && {\ @cd ${host_builddir} && {\
$(LN_S) ${host_headers} . || true ;\ $(LN_S) ${host_headers} ${bits_host_headers} . || true ;\
$(LN_S) ${glibcxx_srcdir}/$(BASIC_FILE_H) basic_file.h || true ;\ $(LN_S) ${glibcxx_srcdir}/$(BASIC_FILE_H) basic_file.h || true ;\
$(LN_S) ${glibcxx_srcdir}/$(ALLOCATOR_H) c++allocator.h || true ;\ $(LN_S) ${glibcxx_srcdir}/$(ALLOCATOR_H) c++allocator.h || true ;\
$(LN_S) ${glibcxx_srcdir}/$(CSTDIO_H) c++io.h || true ;\ $(LN_S) ${glibcxx_srcdir}/$(CSTDIO_H) c++io.h || true ;\
...@@ -1066,6 +1065,9 @@ stamp-host: ${host_headers} ${host_headers_noinst} stamp-${host_alias} ...@@ -1066,6 +1065,9 @@ stamp-host: ${host_headers} ${host_headers_noinst} stamp-${host_alias}
$(LN_S) ${glibcxx_srcdir}/$(CMESSAGES_H) messages_members.h || true ;\ $(LN_S) ${glibcxx_srcdir}/$(CMESSAGES_H) messages_members.h || true ;\
$(LN_S) ${glibcxx_srcdir}/$(CTIME_H) time_members.h || true;\ $(LN_S) ${glibcxx_srcdir}/$(CTIME_H) time_members.h || true;\
} 2>/dev/null } 2>/dev/null
@cd ${host_builddir}/../ext && {\
$(LN_S) ${ext_host_headers} . || true ;\
} 2>/dev/null
$(STAMP) stamp-host $(STAMP) stamp-host
# Host includes dynamic. # Host includes dynamic.
...@@ -1292,9 +1294,12 @@ install-headers: ...@@ -1292,9 +1294,12 @@ install-headers:
for file in ${profile_impl_headers}; do \ for file in ${profile_impl_headers}; do \
$(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${profile_impl_builddir}; done $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${profile_impl_builddir}; done
$(mkinstalldirs) $(DESTDIR)${host_installdir} $(mkinstalldirs) $(DESTDIR)${host_installdir}
for file in ${host_headers} ${host_headers_extra} \ for file in ${host_headers} ${bits_host_headers} ${host_headers_extra} \
${thread_host_headers}; do \ ${thread_host_headers}; do \
$(INSTALL_DATA) $${file} $(DESTDIR)${host_installdir}; done $(INSTALL_DATA) $${file} $(DESTDIR)${host_installdir}; done
$(mkinstalldirs) $(DESTDIR)${host_installdir}/../ext
for file in ${ext_host_headers}; do \
$(INSTALL_DATA) $${file} $(DESTDIR)${host_installdir}/../ext; done
# By adding these files here, automake will remove them for 'make clean' # By adding these files here, automake will remove them for 'make clean'
CLEANFILES = ${pch_output} ${pch_output_anchors} stamp-host CLEANFILES = ${pch_output} ${pch_output_anchors} stamp-host
......
libstdc++-v3/include/Makefile.in
...@@ -434,8 +434,7 @@ bits_headers = \ ...@@ -434,8 +434,7 @@ bits_headers = \
${bits_srcdir}/valarray_array.tcc \ ${bits_srcdir}/valarray_array.tcc \
${bits_srcdir}/valarray_before.h \ ${bits_srcdir}/valarray_before.h \
${bits_srcdir}/valarray_after.h \ ${bits_srcdir}/valarray_after.h \
${bits_srcdir}/vector.tcc \ ${bits_srcdir}/vector.tcc
${bits_host_headers}
bits_host_headers = \ bits_host_headers = \
${glibcxx_srcdir}/${CPU_OPT_BITS_RANDOM} ${glibcxx_srcdir}/${CPU_OPT_BITS_RANDOM}
...@@ -796,8 +795,7 @@ ext_headers = \ ...@@ -796,8 +795,7 @@ ext_headers = \
${ext_srcdir}/vstring.tcc \ ${ext_srcdir}/vstring.tcc \
${ext_srcdir}/vstring_fwd.h \ ${ext_srcdir}/vstring_fwd.h \
${ext_srcdir}/vstring_util.h \ ${ext_srcdir}/vstring_util.h \
${ext_compat_headers} \ ${ext_compat_headers}
${ext_host_headers}
ext_compat_headers = \ ext_compat_headers = \
${backward_srcdir}/hash_set \ ${backward_srcdir}/hash_set \
...@@ -1463,13 +1461,14 @@ stamp-profile-impl: ${profile_impl_headers} ...@@ -1463,13 +1461,14 @@ stamp-profile-impl: ${profile_impl_headers}
stamp-${host_alias}: stamp-${host_alias}:
@-mkdir -p ${host_builddir} @-mkdir -p ${host_builddir}
@-mkdir -p ${host_builddir}/../ext
@$(STAMP) stamp-${host_alias} @$(STAMP) stamp-${host_alias}
# Host includes static. # Host includes static.
# XXX Missing dependency info for {host_headers_extra} # XXX Missing dependency info for {host_headers_extra}
stamp-host: ${host_headers} ${host_headers_noinst} stamp-${host_alias} stamp-host: ${host_headers} ${bits_host_headers} ${ext_host_headers} ${host_headers_noinst} stamp-${host_alias}
@cd ${host_builddir} && {\ @cd ${host_builddir} && {\
$(LN_S) ${host_headers} . || true ;\ $(LN_S) ${host_headers} ${bits_host_headers} . || true ;\
$(LN_S) ${glibcxx_srcdir}/$(BASIC_FILE_H) basic_file.h || true ;\ $(LN_S) ${glibcxx_srcdir}/$(BASIC_FILE_H) basic_file.h || true ;\
$(LN_S) ${glibcxx_srcdir}/$(ALLOCATOR_H) c++allocator.h || true ;\ $(LN_S) ${glibcxx_srcdir}/$(ALLOCATOR_H) c++allocator.h || true ;\
$(LN_S) ${glibcxx_srcdir}/$(CSTDIO_H) c++io.h || true ;\ $(LN_S) ${glibcxx_srcdir}/$(CSTDIO_H) c++io.h || true ;\
...@@ -1479,6 +1478,9 @@ stamp-host: ${host_headers} ${host_headers_noinst} stamp-${host_alias} ...@@ -1479,6 +1478,9 @@ stamp-host: ${host_headers} ${host_headers_noinst} stamp-${host_alias}
$(LN_S) ${glibcxx_srcdir}/$(CMESSAGES_H) messages_members.h || true ;\ $(LN_S) ${glibcxx_srcdir}/$(CMESSAGES_H) messages_members.h || true ;\
$(LN_S) ${glibcxx_srcdir}/$(CTIME_H) time_members.h || true;\ $(LN_S) ${glibcxx_srcdir}/$(CTIME_H) time_members.h || true;\
} 2>/dev/null } 2>/dev/null
@cd ${host_builddir}/../ext && {\
$(LN_S) ${ext_host_headers} . || true ;\
} 2>/dev/null
$(STAMP) stamp-host $(STAMP) stamp-host
# Host includes dynamic. # Host includes dynamic.
...@@ -1690,9 +1692,12 @@ install-headers: ...@@ -1690,9 +1692,12 @@ install-headers:
for file in ${profile_impl_headers}; do \ for file in ${profile_impl_headers}; do \
$(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${profile_impl_builddir}; done $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${profile_impl_builddir}; done
$(mkinstalldirs) $(DESTDIR)${host_installdir} $(mkinstalldirs) $(DESTDIR)${host_installdir}
for file in ${host_headers} ${host_headers_extra} \ for file in ${host_headers} ${bits_host_headers} ${host_headers_extra} \
${thread_host_headers}; do \ ${thread_host_headers}; do \
$(INSTALL_DATA) $${file} $(DESTDIR)${host_installdir}; done $(INSTALL_DATA) $${file} $(DESTDIR)${host_installdir}; done
$(mkinstalldirs) $(DESTDIR)${host_installdir}/../ext
for file in ${ext_host_headers}; do \
$(INSTALL_DATA) $${file} $(DESTDIR)${host_installdir}/../ext; done
# To remove directories. # To remove directories.
clean-local: clean-local:
......
libstdc++-v3/include/ext/random
...@@ -2848,7 +2848,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -2848,7 +2848,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_GLIBCXX_END_NAMESPACE_VERSION _GLIBCXX_END_NAMESPACE_VERSION
} // namespace __gnu_cxx } // namespace __gnu_cxx
#include "opt_random.h" #include "ext/opt_random.h"
#include "random.tcc" #include "random.tcc"
#endif // _GLIBCXX_USE_C99_STDINT_TR1 #endif // _GLIBCXX_USE_C99_STDINT_TR1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment