DSO stub

dotnet · Jul 29, 2024 · e3b5ff1 · e3b5ff1
1 parent c157aed
commit e3b5ff1
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 1 deletion.
diff --git a/build-tools/create-packs/SignList.xml b/build-tools/create-packs/SignList.xml
@@ -14,6 +14,7 @@
     <ThirdParty Include="SgmlReaderDll.dll" />
     <ThirdParty Include="aapt2.exe" />
     <ThirdParty Include="llvm-mc.exe" />
+    <ThirdParty Include="llvm-objcopy.exe" />
     <ThirdParty Include="llvm-strip.exe" />
     <ThirdParty Include="aarch64-linux-android-ld.exe" />
     <ThirdParty Include="arm-linux-androideabi-ld.exe" />

diff --git a/build-tools/installers/create-installers.targets b/build-tools/installers/create-installers.targets
@@ -198,6 +198,7 @@
     <_MSBuildFilesWin Include="$(MicrosoftAndroidSdkOutDir)binutils\bin\ld.exe" />
     <_MSBuildFilesWin Include="$(MicrosoftAndroidSdkOutDir)binutils\bin\llc.exe" />
     <_MSBuildFilesWin Include="$(MicrosoftAndroidSdkOutDir)binutils\bin\llvm-mc.exe" />
+    <_MSBuildFilesWin Include="$(MicrosoftAndroidSdkOutDir)binutils\bin\llvm-objcopy.exe" />
     <_MSBuildFilesWin Include="$(MicrosoftAndroidSdkOutDir)binutils\bin\llvm-strip.exe" />
     <_MSBuildFilesWin Include="$(MicrosoftAndroidSdkOutDir)binutils\bin\aarch64-linux-android-as.cmd" />
     <_MSBuildFilesWin Include="$(MicrosoftAndroidSdkOutDir)binutils\bin\aarch64-linux-android-ld.cmd" />

diff --git a/build-tools/installers/unix-binutils.projitems b/build-tools/installers/unix-binutils.projitems
@@ -19,6 +19,7 @@
     <_BinUtilsFilesUnixSignAndHarden Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\bin\ld" />
     <_BinUtilsFilesUnixSignAndHarden Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\bin\llc" />
     <_BinUtilsFilesUnixSignAndHarden Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\bin\llvm-mc" />
+    <_BinUtilsFilesUnixSignAndHarden Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\bin\llvm-objcopy" />
     <_BinUtilsFilesUnixSignAndHarden Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\bin\llvm-strip" />
     <_BinUtilsFilesUnixSignAndHarden Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\bin\x86_64-linux-android-as" />
     <_BinUtilsFilesUnixSignAndHarden Include="$(MicrosoftAndroidSdkOutDir)$(HostOS)\binutils\bin\x86_64-linux-android-ld" />

diff --git a/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs b/build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs
@@ -15,7 +15,7 @@ namespace Xamarin.Android.Prepare
 	//
 	partial class Configurables
 	{
-		const string BinutilsVersion                = "L_18.1.6-8.0.0";
+		const string BinutilsVersion                = "L_18.1.7-8.0.0";
 
 		const string MicrosoftOpenJDK17Version      = "17.0.11";
 		const string MicrosoftOpenJDK17Release      = "17.0.11.9";
@@ -174,6 +174,7 @@ public static partial class Defaults
 				new NDKTool (name: "ld"),
 				new NDKTool (name: "llc"),
 				new NDKTool (name: "llvm-mc"),
+				new NDKTool (name: "llvm-objcopy"),
 				new NDKTool (name: "llvm-strip"),
 			};
 		}

diff --git a/src/native/CMakeLists.txt b/src/native/CMakeLists.txt
@@ -482,6 +482,9 @@ add_subdirectory(pinvoke-override)
 
 if(DEBUG_BUILD)
   add_subdirectory(xamarin-debug-app-helper)
+else()
+  # We need to build this only once per target architecture
+  add_subdirectory(archive-dso-stub)
 endif()
 
 add_subdirectory(monodroid)

diff --git a/src/native/archive-dso-stub/CMakeLists.txt b/src/native/archive-dso-stub/CMakeLists.txt
@@ -0,0 +1,23 @@
+set(LIB_NAME archive-dso-stub)
+
+set(LIB_SOURCES
+  stub.cc
+)
+
+add_library(
+  ${LIB_NAME}
+  SHARED
+  ${LIB_SOURCES}
+)
+
+target_compile_options(
+  ${LIB_NAME}
+  PRIVATE
+  ${XA_COMMON_CXX_ARGS} -nostdlib -fno-exceptions -fno-rtti
+)
+
+target_link_options(
+  ${LIB_NAME}
+  PRIVATE
+  ${XA_COMMON_CXX_LINKER_ARGS} -nostdlib -fno-exceptions -fno-rtti -s
+)
diff --git a/src/native/archive-dso-stub/stub.cc b/src/native/archive-dso-stub/stub.cc
@@ -0,0 +1,2 @@
+[[gnu::visibility("default")]]
+bool i_am_a_dummy_stub = true;