Skip to contentSkip to conversation

clang: support darwin-arm64

PATCH New [email protected] 1 participant 2 messages Apr 10, 2025 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

PATCH 2/3 clang: support darwin-arm64

From: Dominik Schnitzer <[email protected]>

Updates 0037-Fixes_for_Darwin_SDKs.patch to support Apple Silicon.

---
 .../clang/0037-Fixes_for_Darwin_SDKs.patch    | 60 ++++++++++++-------
 1 file changed, 38 insertions(+), 22 deletions(-)
recipes-devtools/clang/clang/0037-Fixes_for_Darwin_SDKs.patch +38 -22
index 2071fa3..d5c72a8 100644
@@ -5,17 +5,11 @@ Subject: [PATCH] Fixes for Darwin SDKs
 
 Upstream-Status: Inappropriate [OE specific]
 Signed-off-by: Dominik Schnitzer <[email protected]>
----
- clang/lib/Driver/ToolChains/Darwin.cpp | 17 ++++++++++++-----
- llvm/cmake/modules/AddLLVM.cmake       |  1 -
- llvm/cmake/modules/CrossCompile.cmake  |  2 +-
- 3 files changed, 13 insertions(+), 7 deletions(-)
-
-diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp
-index f7da3f187814..0656f5cbad69 100644
---- a/clang/lib/Driver/ToolChains/Darwin.cpp
-+++ b/clang/lib/Driver/ToolChains/Darwin.cpp
-@@ -2299,12 +2299,19 @@ void DarwinClang::AddClangCXXStdlibIncludeArgs(
+Index: llvm-project-18.1.5.src/clang/lib/Driver/ToolChains/Darwin.cpp
+===================================================================
+--- llvm-project-18.1.5.src.orig/clang/lib/Driver/ToolChains/Darwin.cpp
++++ llvm-project-18.1.5.src/clang/lib/Driver/ToolChains/Darwin.cpp
+@@ -2583,12 +2583,19 @@ void DarwinClang::AddClangCXXStdlibInclu
      case llvm::Triple::x86:
      case llvm::Triple::x86_64:
        IsBaseFound = AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, UsrIncludeCxx,
@@ -40,11 +34,33 @@ index f7da3f187814..0656f5cbad69 100644
        break;
  
      case llvm::Triple::arm:
-diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake
-index d34083fa52ec..477dc1ade3fc 100644
---- a/llvm/cmake/modules/AddLLVM.cmake
-+++ b/llvm/cmake/modules/AddLLVM.cmake
-@@ -2137,7 +2137,6 @@ function(llvm_setup_rpath name)
+@@ -2605,9 +2612,19 @@
+ 
+     case llvm::Triple::aarch64:
+       IsBaseFound = AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, UsrIncludeCxx,
+-                                                "4.2.1",
+-                                                "arm64-apple-darwin10",
++                                                "13.3.0",
++                                                "aarch64#SDK_VENDOR#-darwin21",
+                                                 "");
++      IsBaseFound |= AddGnuCPlusPlusIncludePaths(DriverArgs, CC1Args, UsrIncludeCxx,
++                                                "13.3.0", "", "");
++      {
++          const char *S = ::getenv("YOCTO_SDKPATH");
++          if (S && (S[0] != '\0')) {
++              llvm::SmallString<128> Runtime;
++              llvm::sys::path::append(Runtime, S);
++              addSystemInclude(DriverArgs, CC1Args, Runtime);
++          }
++      }
+       break;
+     }
+ 
+Index: llvm-project-18.1.5.src/llvm/cmake/modules/AddLLVM.cmake
+===================================================================
+--- llvm-project-18.1.5.src.orig/llvm/cmake/modules/AddLLVM.cmake
++++ llvm-project-18.1.5.src/llvm/cmake/modules/AddLLVM.cmake
+@@ -2368,7 +2368,6 @@ function(llvm_setup_rpath name)
    endif()
  
    if (APPLE)
@@ -52,12 +68,12 @@ index d34083fa52ec..477dc1ade3fc 100644
      set(_install_rpath "@loader_path/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})
    elseif(${CMAKE_SYSTEM_NAME} MATCHES "AIX" AND BUILD_SHARED_LIBS)
      # $ORIGIN is not interpreted at link time by aix ld.
-diff --git a/llvm/cmake/modules/CrossCompile.cmake b/llvm/cmake/modules/CrossCompile.cmake
-index 8a441729c943..8e19e4c93d9f 100644
---- a/llvm/cmake/modules/CrossCompile.cmake
-+++ b/llvm/cmake/modules/CrossCompile.cmake
-@@ -68,7 +68,7 @@ function(llvm_create_cross_target project_name target_name toolchain buildtype)
-   endforeach()
+Index: llvm-project-18.1.5.src/llvm/cmake/modules/CrossCompile.cmake
+===================================================================
+--- llvm-project-18.1.5.src.orig/llvm/cmake/modules/CrossCompile.cmake
++++ llvm-project-18.1.5.src/llvm/cmake/modules/CrossCompile.cmake
+@@ -72,7 +72,7 @@ function(llvm_create_cross_target projec
+   endif()
  
    add_custom_command(OUTPUT ${${project_name}_${target_name}_BUILD}/CMakeCache.txt
 -    COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}"
Signature · 1 line
2.43.0
#2 lore raw

PATCH 3/3 arm64-darwin: add new arm64 machine

In reply to a message not in the archive

From: Dominik Schnitzer <[email protected]>

Adds a machine for initial Apple Silicon support

---
 conf/machine-sdk/arm64-darwin.conf  |  3 +++
 conf/machine-sdk/darwin-common.inc  | 37 +++++++++++++++++++++++++++
 conf/machine-sdk/x86_64-darwin.conf | 39 +----------------------------
 3 files changed, 41 insertions(+), 38 deletions(-)
 create mode 100644 conf/machine-sdk/arm64-darwin.conf
 create mode 100644 conf/machine-sdk/darwin-common.inc
conf/machine-sdk/arm64-darwin.conf new file +3 -0
new file mode 100644
index 0000000..d91a78f
@@ -0,0 +1,3 @@
+SDK_ARCH = "aarch64"
+
+require darwin-common.inc
conf/machine-sdk/darwin-common.inc new file +37 -0
new file mode 100644
index 0000000..cec76a5
@@ -0,0 +1,37 @@
+SDK_OS = "darwin21"
+
+SOLIBS:darwin21 = ".dylib"
+SOLIBSDEV:darwin21 = ".dylibbroken"
+
+PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-for-gcc = "nativesdk-osx-runtime"
+PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-initial = "nativesdk-osx-runtime"
+PREFERRED_PROVIDER_virtual/${SDK_PREFIX}binutils = "cctools-port-crosssdk"
+PREFERRED_PROVIDER_virtual/nativesdk-libc = "nativesdk-osx-runtime"
+PREFERRED_PROVIDER_virtual/nativesdk-libintl = "nativesdk-osx-runtime"
+PREFERRED_PROVIDER_virtual/nativesdk-libiconv = "nativesdk-osx-runtime"
+
+SDKUSE_NLS = "no"
+SDKIMAGE_LINGUAS = ""
+SDK_DEPENDS:remove = "nativesdk-glibc-locale nativesdk-qemuwrapper-cross"
+
+SDKPKGSUFFIX = "nativesdk-darwin"
+
+OSX_TOOLCHAIN_OPTIONS = " \
+    -mmacosx-version-min=12.3 \
+    -L${STAGING_DIR_TARGET}${SDKPATHNATIVE}/usr/lib \
+    -L${STAGING_DIR_TARGET}${SDKPATHNATIVE}/runtime/usr/lib \
+    -L${STAGING_DIR_TARGET}${SDKPATHNATIVE}/runtime/usr/lib/system \
+"
+
+TOOLCHAIN_OPTIONS:append:darwin21 = " \
+    ${OSX_TOOLCHAIN_OPTIONS}"
+TOOLCHAIN_OPTIONS:append:class-cross-canadian = " \
+    ${OSX_TOOLCHAIN_OPTIONS}"
+
+# Remove -rpath-link
+BUILDSDK_LDFLAGS = " \
+    -L${STAGING_LIBDIR} \
+    -Wl,-rpath,${libdir} \
+"
+
+MACHINEOVERRIDES .= ":darwinsdk"
conf/machine-sdk/x86_64-darwin.conf +1 -38
index 89f3e0a..199cab7 100644
@@ -1,40 +1,3 @@
 SDK_ARCH = "x86_64"
-SDK_OS = "darwin21"
 
-SOLIBS:darwin21 = ".dylib"
-SOLIBSDEV:darwin21 = ".dylibbroken"
-
-PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-for-gcc = "nativesdk-osx-runtime"
-PREFERRED_PROVIDER_virtual/nativesdk-${SDK_PREFIX}libc-initial = "nativesdk-osx-runtime"
-PREFERRED_PROVIDER_virtual/${SDK_PREFIX}binutils = "cctools-port-crosssdk"
-PREFERRED_PROVIDER_virtual/nativesdk-libc = "nativesdk-osx-runtime"
-PREFERRED_PROVIDER_virtual/nativesdk-libintl = "nativesdk-osx-runtime"
-PREFERRED_PROVIDER_virtual/nativesdk-libiconv = "nativesdk-osx-runtime"
-
-SDKUSE_NLS = "no"
-SDKIMAGE_LINGUAS = ""
-SDK_DEPENDS:remove = "nativesdk-glibc-locale nativesdk-qemuwrapper-cross"
-
-SDKPKGSUFFIX = "nativesdk-darwin"
-
-OSX_TOOLCHAIN_OPTIONS = " \
-    -mmacosx-version-min=12.3 \
-    -L${STAGING_DIR_TARGET}${SDKPATHNATIVE}/usr/lib \
-    -L${STAGING_DIR_TARGET}${SDKPATHNATIVE}/runtime/usr/lib \
-    -L${STAGING_DIR_TARGET}${SDKPATHNATIVE}/runtime/usr/lib/system \
-"
-
-TOOLCHAIN_OPTIONS:append:darwin21 = " \
-    ${OSX_TOOLCHAIN_OPTIONS}"
-TOOLCHAIN_OPTIONS:append:class-cross-canadian = " \
-    ${OSX_TOOLCHAIN_OPTIONS}"
-
-# Remove -rpath-link
-BUILDSDK_LDFLAGS = " \
-    -L${STAGING_LIBDIR} \
-    -Wl,-rpath,${libdir} \
-    -L${STAGING_DIR_HOST}${base_libdir} \
-    -Wl,-rpath,${base_libdir} \
-"
-
-MACHINEOVERRIDES .= ":darwinsdk"
+require darwin-common.inc
Signature · 1 line
2.43.0