src/google/protobuf/compiler/command_line_interface.cc | 3 3 + 0 - 0 !
1 file changed, 3 insertions(+)

 add support for gnu/hurd which doesn't define path_max.

python/mox.py | 2 1 + 1 - 0 !
python/stubout.py | 2 1 + 1 - 0 !
2 files changed, 2 insertions(+), 2 deletions(-)

---

src/google/protobuf/stubs/platform_macros.h | 7 7 + 0 - 0 !
1 file changed, 7 insertions(+)

 add support for s390x architecture.
 Based on port of Google V8 JavaScript engine to z Systems

Makefile.am | 6 3 + 3 - 0 !
src/Makefile.am | 21 6 + 15 - 0 !
2 files changed, 9 insertions(+), 18 deletions(-)

 use packaged google test and google mock libraries
 Link tests with the already compiled libraries.

src/Makefile.am | 10 5 + 5 - 0 !
1 file changed, 5 insertions(+), 5 deletions(-)

 fix linking with recent google's c++ test framework
 Need to link with libgtest_main.a as well.

src/google/protobuf/compiler/command_line_interface_unittest.cc | 2 1 + 1 - 0 !
src/google/protobuf/descriptor_unittest.cc | 2 1 + 1 - 0 !
src/google/protobuf/dynamic_message_unittest.cc | 2 1 + 1 - 0 !
src/google/protobuf/map_field_test.cc | 2 1 + 1 - 0 !
src/google/protobuf/text_format_unittest.cc | 4 2 + 2 - 0 !
src/google/protobuf/util/internal/default_value_objectwriter_test.cc | 4 2 + 2 - 0 !
src/google/protobuf/util/internal/protostream_objectsource_test.cc | 12 6 + 6 - 0 !
src/google/protobuf/util/internal/protostream_objectwriter_test.cc | 16 8 + 8 - 0 !
8 files changed, 22 insertions(+), 22 deletions(-)

 fix googletest function name

Makefile.am | 2 1 + 1 - 0 !
configure.ac | 1 0 + 1 - 0 !
2 files changed, 1 insertion(+), 2 deletions(-)

 don't compile third_party source
 .

ruby/ext/google/protobuf_c/wrap_memcpy.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 fix ftbfs on x32 due to versioned glibc symbols
 protobuf assumes that glibc 2.2.5 memcpy symbols will be available #if
 defined(__x86-64__); however, x32 also defines this, but was not
 supported prior to 2.16.

python/google/protobuf/internal/text_format_test.py | 71 48 + 23 - 0 !
1 file changed, 48 insertions(+), 23 deletions(-)

 cut number 32 bit number parsing in python 2 self-tests
 Any number get back as zero. :-/

examples/add_person.py | 2 1 + 1 - 0 !
examples/list_people.py | 2 1 + 1 - 0 !
2 files changed, 2 insertions(+), 2 deletions(-)

 execute examples with pyhton 3
 Update shebang to call Python 3 binary.

java/util/src/main/java/com/google/protobuf/util/Durations.java | 8 4 + 4 - 0 !
java/util/src/main/java/com/google/protobuf/util/FieldMaskTree.java | 6 3 + 3 - 0 !
java/util/src/main/java/com/google/protobuf/util/FieldMaskUtil.java | 8 4 + 4 - 0 !
java/util/src/main/java/com/google/protobuf/util/JsonFormat.java | 6 3 + 3 - 0 !
java/util/src/main/java/com/google/protobuf/util/Timestamps.java | 4 2 + 2 - 0 !
5 files changed, 16 insertions(+), 16 deletions(-)

 remove dependency on errror-prone library
 Library is not necessary and is not currently available in Debian. This patch
 can be safely removed if the error-prone library is ever added to Debian and
 that functionality is needed in protobuf.

src/google/protobuf/descriptor.cc | 16 16 + 0 - 0 !
1 file changed, 16 insertions(+)

---

java/core/src/main/java/com/google/protobuf/UnknownFieldSet.java | 249 126 + 123 - 0 !
1 file changed, 126 insertions(+), 123 deletions(-)

 [patch] improve performance of parsing unknown fields in java (#9371)

Credit should go to @elharo for most of these Java changes--I am just
cherry-picking them from our internal codebase. The one thing I did
change was to give the UTF-8 validation tests their own Bazel test
target. This makes it possible to give the other tests a shorter
timeout, which is important for UnknownFieldSetPerformanceTest in
particular.

src/google/protobuf/extension_set_inl.h | 23 17 + 6 - 0 !
src/google/protobuf/wire_format.cc | 24 18 + 6 - 0 !
src/google/protobuf/wire_format_lite.h | 27 18 + 9 - 0 !
src/google/protobuf/wire_format_unittest.cc | 105 96 + 9 - 0 !
4 files changed, 149 insertions(+), 30 deletions(-)

 [patch] sync from piper @473817856

PROTOBUF_SYNC_PIPER