Hi Matthias,
Indeed there is a big issue with the branch merge. It is not a typo in the revision, I did a merge from r216130 but only a subset of the modification were committed, which is really weird as the merge is done via "svn merge", we're creating a git branch for our validation from the svn repo and the git merge branch contains all the changes, the validation was OK, and the svn commit was OK as well, but the list of modification below wasn't committed ... I really don't understand what happened
I've committed the missing modifications at revision r216616 and I'm doing a respin of the release. sorry for the trouble.
Missing modifications are: M contrib/ChangeLog M contrib/config-list.mk M libcpp/ChangeLog M libcpp/directives.c M libcpp/expr.c M libcpp/files.c M libcpp/identifiers.c M libcpp/internal.h M libcpp/pch.c M libcpp/traditional.c M libffi/ChangeLog M libffi/src/powerpc/linux64.S M libffi/src/powerpc/linux64_closure.S M libgcc/ChangeLog M libgcc/config/avr/lib1funcs.S M libgcc/config/avr/t-avr M libgcc/config/i386/sfp-machine.h M libgfortran/ChangeLog M libgfortran/io/unit.c M libgo/go/debug/elf/elf.go M libgo/go/debug/elf/file.go M libgo/go/syscall/exec_linux.go M libgo/runtime/getncpu-linux.c M libgomp/ChangeLog A + libgomp/testsuite/libgomp.c/pr61200.c A + libgomp/testsuite/libgomp.c++/pr63248.C M libjava/classpath M libstdc++-v3/ChangeLog M libstdc++-v3/doc/html/index.html M libstdc++-v3/doc/html/manual/containers.html M libstdc++-v3/doc/html/manual/index.html M libstdc++-v3/doc/html/manual/status.html M libstdc++-v3/doc/html/manual/std_contents.html M libstdc++-v3/doc/xml/manual/containers.xml M libstdc++-v3/doc/xml/manual/status_cxx2011.xml M libstdc++-v3/include/bits/basic_string.h M libstdc++-v3/include/bits/hashtable.h M libstdc++-v3/include/bits/regex.h M libstdc++-v3/include/bits/stl_algo.h M libstdc++-v3/include/bits/stl_algobase.h M libstdc++-v3/include/bits/stl_function.h M libstdc++-v3/include/bits/stl_queue.h M libstdc++-v3/include/bits/stl_stack.h M libstdc++-v3/include/bits/unique_ptr.h M libstdc++-v3/include/bits/vector.tcc M libstdc++-v3/include/std/chrono M libstdc++-v3/include/std/complex M libstdc++-v3/include/std/iomanip M libstdc++-v3/include/std/mutex M libstdc++-v3/include/std/shared_mutex M libstdc++-v3/include/std/tuple M libstdc++-v3/include/std/type_traits M libstdc++-v3/include/std/utility M libstdc++-v3/testsuite/20_util/declval/requirements/1_neg.cc A + libstdc++-v3/testsuite/20_util/is_final M libstdc++-v3/testsuite/20_util/make_signed/requirements/typedefs_neg.cc M libstdc++-v3/testsuite/20_util/make_unsigned/requirements/typedefs_neg.cc A + libstdc++-v3/testsuite/23_containers/priority_queue/requirements/uses_allocator.cc A + libstdc++-v3/testsuite/23_containers/queue/requirements/uses_allocator.cc A + libstdc++-v3/testsuite/23_containers/stack/requirements/uses_allocator.cc A + libstdc++-v3/testsuite/23_containers/unordered_set/63456.cc A + libstdc++-v3/testsuite/25_algorithms/random_shuffle/59603.cc A + libstdc++-v3/testsuite/28_regex/algorithms/regex_match/ecma/wchar_t/63199.cc M libstdc++-v3/testsuite/30_threads/try_lock/4.cc A + libstdc++-v3/testsuite/experimental/feat-cxx14.cc A + libstdc++-v3/testsuite/experimental/feat-lib-fund.cc M libstdc++-v3/testsuite/util/testsuite_tr1.h
Thanks, Yvan
On 23 October 2014 21:56, Matthias Klose doko@ubuntu.com wrote:
Am 17.10.2014 um 13:27 schrieb Yvan Roux:
The Linaro Toolchain Working Group (TCWG) is pleased to announce the 2014.10 release of the Linaro GCC 4.9 source package.
Linaro GCC 4.9 2014.10 is the seventh Linaro GCC source package release. It is based on FSF GCC 4.9.2-pre+svn216130 and includes performance improvements and bug fixes.
[...]
- Updates to GCC 4.9.2-pre+svn216130
doing a svn diff svn://gcc.gnu.org/svn/gcc/branches/gcc-4_9-branch@216130 svn://gcc.gnu.org/svn/gcc/branches/linaro/gcc-4_9-branch@216388
and trying to apply this on top of the fsf branch shows some diffs for the fsf ChangeLog's which shouldn't exist (and to other files). So this merge removes at least the following upstream revisions:
- r215998
- r215156
- r215909
- r215348
- r215153
- r215838
So this is definitely not a merge from r216130. Assuming a typo for the revision number, I tried to merge from r215130, but this results in other conflicts. Please could you name the revision you merged from, and maybe do a respin of the release?
It looks like the missing bits are in the lib* subdirs, and that the gcc subdir is at least partially merged.
Thanks, Matthias