diff options
author | Adam Cozzette <acozzette@gmail.com> | 2017-03-09 14:30:50 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-09 14:30:50 -0800 |
commit | bbfb9d52da5d44f838bef2caa2be55d57a9d29a8 (patch) | |
tree | c5a1e98cf04b7092dbd9340307c172f2522e362c /ruby | |
parent | 8e465dcf467beb92549e6d987e5dc3683b718f58 (diff) | |
parent | 9fa40314fcfd19d2e09459faeb480d213af56324 (diff) | |
download | protobuf-bbfb9d52da5d44f838bef2caa2be55d57a9d29a8.tar.gz protobuf-bbfb9d52da5d44f838bef2caa2be55d57a9d29a8.tar.bz2 protobuf-bbfb9d52da5d44f838bef2caa2be55d57a9d29a8.zip |
Merge pull request #2804 from acozzette/ruby-memcpy
Ruby: wrap calls to memcpy so that gem is compatible with pre-2.14 glibc
Diffstat (limited to 'ruby')
-rw-r--r-- | ruby/ext/google/protobuf_c/extconf.rb | 9 | ||||
-rw-r--r-- | ruby/ext/google/protobuf_c/wrap_memcpy.c | 51 |
2 files changed, 59 insertions, 1 deletions
diff --git a/ruby/ext/google/protobuf_c/extconf.rb b/ruby/ext/google/protobuf_c/extconf.rb index b368dcc6..0886e607 100644 --- a/ruby/ext/google/protobuf_c/extconf.rb +++ b/ruby/ext/google/protobuf_c/extconf.rb @@ -4,7 +4,14 @@ require 'mkmf' $CFLAGS += " -std=c99 -O3 -DNDEBUG" + +if RUBY_PLATFORM =~ /linux/ + # Instruct the linker to point memcpy calls at our __wrap_memcpy wrapper. + $LDFLAGS += " -Wl,-wrap,memcpy" +end + $objs = ["protobuf.o", "defs.o", "storage.o", "message.o", - "repeated_field.o", "map.o", "encode_decode.o", "upb.o"] + "repeated_field.o", "map.o", "encode_decode.o", "upb.o", + "wrap_memcpy.o"] create_makefile("google/protobuf_c") diff --git a/ruby/ext/google/protobuf_c/wrap_memcpy.c b/ruby/ext/google/protobuf_c/wrap_memcpy.c new file mode 100644 index 00000000..158952a8 --- /dev/null +++ b/ruby/ext/google/protobuf_c/wrap_memcpy.c @@ -0,0 +1,51 @@ +// Protocol Buffers - Google's data interchange format +// Copyright 2017 Google Inc. All rights reserved. +// https://developers.google.com/protocol-buffers/ +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are +// met: +// +// * Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// * Redistributions in binary form must reproduce the above +// copyright notice, this list of conditions and the following disclaimer +// in the documentation and/or other materials provided with the +// distribution. +// * Neither the name of Google Inc. nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#include <string.h> + +// On x86-64 Linux, we link against the 2.2.5 version of memcpy so that we +// avoid depending on the 2.14 version of the symbol. This way, distributions +// that are using pre-2.14 versions of glibc can successfully use the gem we +// distribute (https://github.com/google/protobuf/issues/2783). +// +// This wrapper is enabled by passing the linker flags -Wl,-wrap,memcpy in +// extconf.rb. +#ifdef __linux__ +#ifdef __x86_64__ +__asm__(".symver memcpy,memcpy@GLIBC_2.2.5"); +void *__wrap_memcpy(void *dest, const void *src, size_t n) { + return memcpy(dest, src, n); +} +#else +void *__wrap_memcpy(void *dest, const void *src, size_t n) { + return memmove(dest, src, n); +} +#endif +#endif |