r244194 - in /branches/ibm/sflogical: ./ gcc/Ch...

[meissner@gcc.gnu.org]

Author: meissner
Date: Sat Jan  7 00:58:02 2017
New Revision: 244194

URL: https://gcc.gnu.org/viewcvs?rev=244194&root=gcc&view=rev
Log:
Merge up

Added:
    branches/ibm/sflogical/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/char/6.cc
      - copied unchanged from r244193, trunk/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/char/6.cc
    branches/ibm/sflogical/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/wchar_t/6.cc
      - copied unchanged from r244193, trunk/libstdc++-v3/testsuite/21_strings/basic_string/operations/find/wchar_t/6.cc
Modified:
    branches/ibm/sflogical/libstdc++-v3/ChangeLog

Changes in other areas also in this revision:
Modified:
    branches/ibm/sflogical/   (props changed)
    branches/ibm/sflogical/gcc/ChangeLog
    branches/ibm/sflogical/gcc/ChangeLog.meissner
    branches/ibm/sflogical/gcc/DATESTAMP
    branches/ibm/sflogical/gcc/REVISION
    branches/ibm/sflogical/gcc/common/config/microblaze/microblaze-common.c
    branches/ibm/sflogical/gcc/config/m68k/linux.h
    branches/ibm/sflogical/gcc/config/m68k/m68k.h
    branches/ibm/sflogical/gcc/config/m68k/m68k.md
    branches/ibm/sflogical/gcc/config/m68k/m68k.opt
    branches/ibm/sflogical/gcc/config/m68k/m68kelf.h
    branches/ibm/sflogical/gcc/config/m68k/netbsd-elf.h
    branches/ibm/sflogical/gcc/config/microblaze/microblaze-protos.h
    branches/ibm/sflogical/gcc/config/microblaze/microblaze.c
    branches/ibm/sflogical/gcc/config/microblaze/microblaze.h
    branches/ibm/sflogical/gcc/config/microblaze/microblaze.md
    branches/ibm/sflogical/gcc/doc/invoke.texi
    branches/ibm/sflogical/gcc/po/ChangeLog
    branches/ibm/sflogical/gcc/po/fr.po
    branches/ibm/sflogical/gcc/testsuite/ChangeLog.meissner
    branches/ibm/sflogical/libgcc/ChangeLog.meissner

Propchange: branches/ibm/sflogical/
            ('svn:mergeinfo' added)

Propchange: branches/ibm/sflogical/
            ('svnmerge-integrated' modified)