From: paolo Date: Sun, 19 May 2013 10:39:47 +0000 (+0000) Subject: 2013-05-19 Paolo Carlini X-Git-Tag: upstream/4.9.2~5994 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6af3ee970545d4ddde77b5ac53404bb1ce7a593f;p=platform%2Fupstream%2Flinaro-gcc.git 2013-05-19 Paolo Carlini * Revert last commit. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@199081 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index d4f57c8..35175d1 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,7 @@ +2013-05-19 Paolo Carlini + + * Revert last commit. + 2013-05-19 Matthias Klose * include/Makefile.am (bits_headers): Remove ${bits_host_headers}. diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am index e8ef706..cbf4f1a 100644 --- a/libstdc++-v3/include/Makefile.am +++ b/libstdc++-v3/include/Makefile.am @@ -172,7 +172,8 @@ bits_headers = \ ${bits_srcdir}/valarray_array.tcc \ ${bits_srcdir}/valarray_before.h \ ${bits_srcdir}/valarray_after.h \ - ${bits_srcdir}/vector.tcc + ${bits_srcdir}/vector.tcc \ + ${bits_host_headers} bits_host_headers = \ ${glibcxx_srcdir}/${CPU_OPT_BITS_RANDOM} @@ -535,7 +536,8 @@ ext_headers = \ ${ext_srcdir}/vstring.tcc \ ${ext_srcdir}/vstring_fwd.h \ ${ext_srcdir}/vstring_util.h \ - ${ext_compat_headers} + ${ext_compat_headers} \ + ${ext_host_headers} ext_compat_headers = \ ${backward_srcdir}/hash_set \ @@ -1048,14 +1050,13 @@ stamp-profile-impl: ${profile_impl_headers} stamp-${host_alias}: @-mkdir -p ${host_builddir} - @-mkdir -p ${host_builddir}/../ext @$(STAMP) stamp-${host_alias} # Host includes static. # XXX Missing dependency info for {host_headers_extra} -stamp-host: ${host_headers} ${bits_host_headers} ${ext_host_headers} ${host_headers_noinst} stamp-${host_alias} +stamp-host: ${host_headers} ${host_headers_noinst} stamp-${host_alias} @cd ${host_builddir} && {\ - $(LN_S) ${host_headers} ${bits_host_headers} . || true ;\ + $(LN_S) ${host_headers} . || 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}/$(CSTDIO_H) c++io.h || true ;\ @@ -1065,9 +1066,6 @@ stamp-host: ${host_headers} ${bits_host_headers} ${ext_host_headers} ${host_head $(LN_S) ${glibcxx_srcdir}/$(CMESSAGES_H) messages_members.h || true ;\ $(LN_S) ${glibcxx_srcdir}/$(CTIME_H) time_members.h || true;\ } 2>/dev/null - @cd ${host_builddir}/../ext && {\ - $(LN_S) ${ext_host_headers} . || true ;\ - } 2>/dev/null $(STAMP) stamp-host # Host includes dynamic. @@ -1294,12 +1292,9 @@ install-headers: for file in ${profile_impl_headers}; do \ $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${profile_impl_builddir}; done $(mkinstalldirs) $(DESTDIR)${host_installdir} - for file in ${host_headers} ${bits_host_headers} ${host_headers_extra} \ + for file in ${host_headers} ${host_headers_extra} \ ${thread_host_headers}; do \ $(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' CLEANFILES = ${pch_output} ${pch_output_anchors} stamp-host diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index 2ba9433..b34e174 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -434,7 +434,8 @@ bits_headers = \ ${bits_srcdir}/valarray_array.tcc \ ${bits_srcdir}/valarray_before.h \ ${bits_srcdir}/valarray_after.h \ - ${bits_srcdir}/vector.tcc + ${bits_srcdir}/vector.tcc \ + ${bits_host_headers} bits_host_headers = \ ${glibcxx_srcdir}/${CPU_OPT_BITS_RANDOM} @@ -795,7 +796,8 @@ ext_headers = \ ${ext_srcdir}/vstring.tcc \ ${ext_srcdir}/vstring_fwd.h \ ${ext_srcdir}/vstring_util.h \ - ${ext_compat_headers} + ${ext_compat_headers} \ + ${ext_host_headers} ext_compat_headers = \ ${backward_srcdir}/hash_set \ @@ -1461,14 +1463,13 @@ stamp-profile-impl: ${profile_impl_headers} stamp-${host_alias}: @-mkdir -p ${host_builddir} - @-mkdir -p ${host_builddir}/../ext @$(STAMP) stamp-${host_alias} # Host includes static. # XXX Missing dependency info for {host_headers_extra} -stamp-host: ${host_headers} ${bits_host_headers} ${ext_host_headers} ${host_headers_noinst} stamp-${host_alias} +stamp-host: ${host_headers} ${host_headers_noinst} stamp-${host_alias} @cd ${host_builddir} && {\ - $(LN_S) ${host_headers} ${bits_host_headers} . || true ;\ + $(LN_S) ${host_headers} . || 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}/$(CSTDIO_H) c++io.h || true ;\ @@ -1478,9 +1479,6 @@ stamp-host: ${host_headers} ${bits_host_headers} ${ext_host_headers} ${host_head $(LN_S) ${glibcxx_srcdir}/$(CMESSAGES_H) messages_members.h || true ;\ $(LN_S) ${glibcxx_srcdir}/$(CTIME_H) time_members.h || true;\ } 2>/dev/null - @cd ${host_builddir}/../ext && {\ - $(LN_S) ${ext_host_headers} . || true ;\ - } 2>/dev/null $(STAMP) stamp-host # Host includes dynamic. @@ -1692,12 +1690,9 @@ install-headers: for file in ${profile_impl_headers}; do \ $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${profile_impl_builddir}; done $(mkinstalldirs) $(DESTDIR)${host_installdir} - for file in ${host_headers} ${bits_host_headers} ${host_headers_extra} \ + for file in ${host_headers} ${host_headers_extra} \ ${thread_host_headers}; do \ $(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. clean-local: