8336849: Remove .llvm_addrsig section from JDK/VM static libraries (.…

…a files)
jianglizhou · Jul 20, 2024 · bc427ba · bc427ba
1 parent 21a6cf8
commit bc427ba
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/make/common/native/Link.gmk b/make/common/native/Link.gmk
@@ -109,6 +109,11 @@ define CreateStaticLibrary
 	      $(if $$($1_LINK_OBJS_RELATIVE), $$(CD) $$(OUTPUTDIR) ; ) \
 	      $$($1_LD) $(LDFLAGS_CXX_PARTIAL_LINKING) $$($1_SYSROOT_LDFLAGS) \
 	          -o $$($1_TARGET_RELOCATABLE) $$($1_LD_OBJ_ARG))
+          # Linking with '-Wl,--icf=safe' using objects created by 'ld -r' may not work
+          # and could cause errors like the following:
+          #   ld: --icf=safe conservatively ignores SHT_LLVM_ADDRSIG [...] with sh_link=0 (likely created using objcopy or ld -r)
+	  $$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_objcopy_remove_llvm_addrsig_section, \
+	      $$($1_OBJCOPY) --remove-section=.llvm_addrsig $$($1_TARGET_RELOCATABLE))
         endif
 	$$(call ExecuteWithLog, $$($1_OBJECT_DIR)/$$($1_SAFE_NAME)_run_ar, \
 	    $(if $$($1_LINK_OBJS_RELATIVE), $$(CD) $$(OUTPUTDIR) ; ) \