Skip to content

[runtime] Fix usage of objc_msgSend[Super] according to modified headers. #6865

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

Merged
rolfbjarne merged 1 commit into from
Aug 28, 2019
Merged

[runtime] Fix usage of objc_msgSend[Super] according to modified headers. #6865

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
4 changes: 2 additions & 2 deletions mk/rules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,8 @@ define NativeCompilationTemplate
$$(call Q_2,LD, [tvos]) $(DEVICE_CC) $(DEVICETV_CFLAGS) $$(EXTRA_FLAGS) -dynamiclib -o $$@ $$^ -F$(IOS_DESTDIR)$(XAMARIN_TVOS_SDK)/Frameworks -fapplication-extension
endef

$(eval $(call NativeCompilationTemplate,,-O2 -DOBJC_OLD_DISPATCH_PROTOTYPES=1))
$(eval $(call NativeCompilationTemplate,-debug,-DDEBUG -DOBJC_OLD_DISPATCH_PROTOTYPES=1))
$(eval $(call NativeCompilationTemplate,,-O2))
$(eval $(call NativeCompilationTemplate,-debug,-DDEBUG))

.libs/ios .libs/watchos .libs/tvos:
$(Q) mkdir -p $@
4 changes: 2 additions & 2 deletions runtime/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,8 +482,8 @@ SYSTEM_LAUNCHER$(2)_OBJECTS = $$(foreach src,$$(MAC_SOURCES),.libs/mac/$$(basena

endef

$(eval $(call ObjTemplate,x86_64,64,,-DOBJC_OLD_DISPATCH_PROTOTYPES=1,64))
$(eval $(call ObjTemplate,x86_64,DEBUG64,-debug,-DDEBUG -DOBJC_OLD_DISPATCH_PROTOTYPES=1,64))
$(eval $(call ObjTemplate,x86_64,64,,,64))
$(eval $(call ObjTemplate,x86_64,DEBUG64,-debug,-DDEBUG,64))

$(foreach arch,$(MAC_ARCHITECTURES),.libs/mac/extension-main.$(arch).o): EXTRA_DEFINES=-DEXTENSION

Expand Down
4 changes: 2 additions & 2 deletions runtime/monotouch-support.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ const char * xamarin_GetFolderPath (int folder);
#endif

#if defined (__arm64__)
void objc_msgSend_stret (id self, SEL op, ...);
void objc_msgSendSuper_stret (struct objc_super *super, SEL op, ...);
void objc_msgSend_stret (void);
void objc_msgSendSuper_stret (void);
#endif

#ifdef __cplusplus
Expand Down
3 changes: 2 additions & 1 deletion runtime/trampolines.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,8 @@
// COOP: does not access managed memory: any mode
struct objc_super sup;
find_objc_method_implementation (&sup, self, sel, xamarin_impl);
return objc_msgSendSuper (&sup, sel);
typedef id (*func_objc_msgSendSuper) (struct objc_super *sup, SEL sel);
return ((func_objc_msgSendSuper) objc_msgSendSuper) (&sup, sel);
}

#if MONOMAC
Expand Down
8 changes: 4 additions & 4 deletions runtime/xamarin-support.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,15 +158,15 @@
// it impossible to disable dlsym and, for example, run dontlink on devices
// https://bugzilla.xamarin.com/show_bug.cgi?id=36569#c4

void objc_msgSend_stret (id self, SEL op, ...)
void objc_msgSend_stret (void)
{
PRINT ("Unimplemented objc_msgSend_stret %s", sel_getName (op));
PRINT ("Unimplemented objc_msgSend_stret");
abort ();
}

void objc_msgSendSuper_stret (struct objc_super *super, SEL op, ...)
void objc_msgSendSuper_stret (void)
{
PRINT ("Unimplemented objc_msgSendSuper_stret %s", sel_getName (op));
PRINT ("Unimplemented objc_msgSendSuper_stret");
abort ();
}

Expand Down
2 changes: 1 addition & 1 deletion tools/mmp/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ Xamarin.Mac.registrar.full.x86_64.m: $(TOP)/src/build/mac/full-64/Xamarin.Mac.
$(Q) touch Xamarin.Mac.registrar.full.x86_64.m Xamarin.Mac.registrar.full.x86_64.h

Xamarin.Mac.registrar.%.x86_64.a: Xamarin.Mac.registrar.%.x86_64.m
$(Q_CC) xcrun -sdk macosx clang -DDEBUG -DOBJC_OLD_DISPATCH_PROTOTYPES=1 -g -gdwarf-2 -x objective-c++ -stdlib=libc++ -o $@ -c -arch x86_64 $< -Wall -Wno-unguarded-availability-new -I$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/include -mmacosx-version-min=$(MIN_OSX_SDK_VERSION) -fobjc-runtime=macosx
$(Q_CC) xcrun -sdk macosx clang -DDEBUG -g -gdwarf-2 -x objective-c++ -stdlib=libc++ -o $@ -c -arch x86_64 $< -Wall -Wno-unguarded-availability-new -I$(MAC_DESTDIR)$(MAC_FRAMEWORK_CURRENT_DIR)/include -mmacosx-version-min=$(MIN_OSX_SDK_VERSION) -fobjc-runtime=macosx

Xamarin.Mac.registrar.%.a: Xamarin.Mac.registrar.%.x86_64.a
$(Q_LIPO) $(DEVICE_BIN_PATH)/lipo -create -output $@ $^
Expand Down