Removed wrap_memcpy.c compatibility shim for pre-2.14 glibc

haberman · copybara-github · commit 4ba973314112 · 2025-06-26T14:46:13.000-07:00
This shim was added in 2017 to make binary gems compatible with pre-2.14 glibc: #2804 glibc 2.14 was released in 2011. Our Python wheels build for manylinux 2014, which requires glibc 2.17 or later: https://github.com/pypa/manylinux?tab=readme-ov-file#manylinux2014-centos-7-based-glibc-217 We should no longer need binary compatibility with a 14-year-old glibc. Fixes: #11935 PiperOrigin-RevId: 776288819
diff --git a/ruby/ext/google/protobuf_c/BUILD.bazel b/ruby/ext/google/protobuf_c/BUILD.bazel
@@ -21,7 +21,6 @@ PROTOBUF_C_SOURCES = [
     "shared_convert.h",
     "shared_message.c",
     "shared_message.h",
-    "wrap_memcpy.c",
 ]
 
 # We copy everything into a copy/ subdirectory so that we can use the
diff --git a/ruby/ext/google/protobuf_c/extconf.rb b/ruby/ext/google/protobuf_c/extconf.rb
@@ -28,17 +28,11 @@
   $CFLAGS += " -std=gnu99 #{additional_c_flags}"
 end
 
-if RUBY_PLATFORM =~ /linux/
-  # Instruct the linker to point memcpy calls at our __wrap_memcpy wrapper.
-  $LDFLAGS += " -Wl,-wrap,memcpy"
-end
-
 $VPATH << "$(srcdir)/third_party/utf8_range"
 $INCFLAGS += " -I$(srcdir)/third_party/utf8_range"
 
-$srcs = ["protobuf.c", "convert.c", "defs.c", "message.c",
-         "repeated_field.c", "map.c", "ruby-upb.c", "wrap_memcpy.c",
-         "utf8_range.c", "shared_convert.c",
+$srcs = ["protobuf.c", "convert.c", "defs.c", "message.c", "repeated_field.c",
+         "map.c", "ruby-upb.c", "utf8_range.c", "shared_convert.c",
          "shared_message.c"]
 
 create_makefile(ext_name)
diff --git a/ruby/ext/google/protobuf_c/wrap_memcpy.c b/ruby/ext/google/protobuf_c/wrap_memcpy.c

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,6 @@ PROTOBUF_C_SOURCES = [`
`21`	`21`	`"shared_convert.h",`
`22`	`22`	`"shared_message.c",`
`23`	`23`	`"shared_message.h",`
`24`		`- "wrap_memcpy.c",`
`25`	`24`	`]`
`26`	`25`
`27`	`26`	`# We copy everything into a copy/ subdirectory so that we can use the`