Skip to content

Fix macOS arm64 (Apple Silicon) linker support #470

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
metaneutrons wants to merge 1 commit into
base: master
Choose a base branch
from
+47 −11
Open

Fix macOS arm64 (Apple Silicon) linker support #470

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,8 +342,13 @@ ifneq ($(filter 386 486 586 686 i386 i486 i586 i686,$(TARGET_ARCH)),)
TARGET_ARCH := x86
endif

# Normalize TARGET_ARCH to arm
ifneq ($(filter arm%,$(TARGET_ARCH)),)
# Normalize TARGET_ARCH to aarch64 (macOS reports arm64)
ifneq ($(filter aarch64 arm64,$(TARGET_ARCH)),)
TARGET_ARCH := aarch64
endif

# Normalize TARGET_ARCH to arm (32-bit only, after aarch64 is handled)
ifneq ($(filter armv% arm,$(TARGET_ARCH)),)
TARGET_ARCH := arm
endif

Expand Down
36 changes: 29 additions & 7 deletions src/compiler/fbc.bas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ private function hGet1stOutputLineFromCommand( byref cmd as string ) as string
end if

dim ln as string
input #f, ln
line input #f, ln

close f
return ln
Expand Down Expand Up @@ -840,6 +840,8 @@ private function hLinkFiles( ) as integer
case FB_CPUFAMILY_ARM
'' fixme: this is clearly too specific
ldcline += "-arch armv6 "
case FB_CPUFAMILY_AARCH64
ldcline += "-arch arm64 "
end select
end select

Expand Down Expand Up @@ -1123,9 +1125,11 @@ private function hLinkFiles( ) as integer
wend
end scope

'' And the sysroot
'' And the sysroot (Darwin uses -syslibroot, handled separately)
if( len( fbc.sysroot ) ) then
ldcline += " --sysroot=" + fbc.sysroot
if( fbGetOption( FB_COMPOPT_TARGET ) <> FB_COMPTARGET_DARWIN ) then
ldcline += " --sysroot=" + fbc.sysroot
end if
end if

'' crt begin objects
Expand Down Expand Up @@ -1323,7 +1327,27 @@ private function hLinkFiles( ) as integer
end select

if( fbGetOption( FB_COMPOPT_TARGET ) = FB_COMPTARGET_DARWIN ) then
ldcline += " -macosx_version_min 10.4"
scope
dim as string sdkver = "14.0"
dim as string sysroot
if( len( fbc.sysroot ) > 0 ) then
sysroot = fbc.sysroot
#ifdef __FB_DARWIN__
else
sysroot = hGet1stOutputLineFromCommand( "xcrun --show-sdk-path" )
dim as string v = hGet1stOutputLineFromCommand( "xcrun --show-sdk-version" )
if( len( v ) > 0 ) then sdkver = v
#endif
end if
if( fbGetCpuFamily( ) = FB_CPUFAMILY_AARCH64 ) then
ldcline += " -platform_version macos 11.0.0 " + sdkver
else
ldcline += " -platform_version macos 10.4.0 " + sdkver
end if
if( len( sysroot ) > 0 ) then
ldcline += " -syslibroot " + QUOTE + sysroot + QUOTE
end if
end scope
end if

'' This is required for 64-bit modules on *nix-y platforms
Expand All @@ -1332,8 +1356,7 @@ private function hLinkFiles( ) as integer
select case as const fbGetOption( FB_COMPOPT_TARGET )
case FB_COMPTARGET_LINUX, FB_COMPTARGET_FREEBSD, _
FB_COMPTARGET_OPENBSD, FB_COMPTARGET_NETBSD, _
FB_COMPTARGET_DRAGONFLY, FB_COMPTARGET_SOLARIS, _
FB_COMPTARGET_DARWIN
FB_COMPTARGET_DRAGONFLY, FB_COMPTARGET_SOLARIS
dim as long outtype = fbGetOption( FB_COMPOPT_OUTTYPE )
if outtype = FB_OUTTYPE_EXECUTABLE OrElse outtype = FB_OUTTYPE_DYNAMICLIB Then
dim as long cpufamily = fbGetCpuFamily( )
Expand Down Expand Up @@ -4308,7 +4331,6 @@ private sub hAddDefaultLibs( )
end if

case FB_COMPTARGET_DARWIN
fbcAddDefLib( "gcc" )
fbcAddDefLib( "System" )
fbcAddDefLib( "pthread" )
fbcAddDefLib( "ncurses" )
Expand Down
13 changes: 11 additions & 2 deletions src/rtlib/profile_cycles.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,11 @@
#endif
#endif

/* profile section data */
/* profile section data (ELF section boundary symbols, not available on Mach-O) */
#if !defined(HOST_DARWIN)
extern char __start_fb_profilecycledata[];
extern char __stop_fb_profilecycledata;
#endif

/* profiler record ids - these indicate what the record is */
enum FB_PROFILE_REDORD_ID
Expand Down Expand Up @@ -97,7 +99,9 @@ typedef struct _FB_PROFILER_CYCLES
/* FIXME: creating a library with other sections causes dxe3gen to fail
** when building the DXE dynamic link library support for DOS
*/
#if !defined(HOST_DOS)
#if !defined(HOST_DOS) && !defined(HOST_DARWIN)
/* Cycle profiling uses ELF __start_/__stop_ section boundary symbols
which are not available on Mach-O (Darwin). */

/* make sure there is at least one record in the profile data section */
static FB_PROFILE_RECORD_VERSION
Expand Down Expand Up @@ -301,8 +305,13 @@ static void hProfilerWriteReport( FB_PROFILER_CYCLES *prof )
fprintf( f, "Total program execution time: %5.4g seconds\n", fb_Timer() - prof->start_time );
}

#if !defined(HOST_DARWIN)
data = (unsigned char *)&__start_fb_profilecycledata[0];
length = (ssize_t)&__stop_fb_profilecycledata - (ssize_t)&__start_fb_profilecycledata[0];
#else
data = NULL;
length = 0;
#endif

count = hProfilerCountProcs( data, length );
if( count ) {
Expand Down
Loading