@@ -1,7 +1,7 @@ /* - * Copyright (c) 2008-2022 Jonathan Schleifer + * Copyright (c) 2008-2024 Jonathan Schleifer * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in @@ -24,11 +24,11 @@ .section .text .macro GENERATE_LOOKUP name notFound \name: cmpwi %r3, 0 - beq- returnNilMethod + beq- .LreturnNilMethod andi. %r0, %r3, 1 bne- .LtaggedPointer_\name lwz %r5, 0(%r3) @@ -122,11 +122,11 @@ .macro GENERATE_LOOKUP_SUPER name lookup \name: mr %r5, %r3 lwz %r3, 0(%r3) cmpwi %r3, 0 - beq- returnNilMethod + beq- .LreturnNilMethod lwz %r5, 4(%r5) lwz %r5, 32(%r5) b .Lmain_\lookup @@ -137,23 +137,23 @@ GENERATE_LOOKUP objc_msg_lookup objc_methodNotFound GENERATE_LOOKUP objc_msg_lookup_stret objc_methodNotFound_stret GENERATE_LOOKUP_SUPER objc_msg_lookup_super objc_msg_lookup GENERATE_LOOKUP_SUPER objc_msg_lookup_super_stret objc_msg_lookup_stret -returnNilMethod: +.LreturnNilMethod: mflr %r0 - bl getPC + bl .LgetPC mtlr %r0 0: - addi %r3, %r3, nilMethod-0b + addi %r3, %r3, .LnilMethod-0b blr -nilMethod: +.LnilMethod: li %r3, 0 blr -getPC: +.LgetPC: mflr %r3 blr #ifdef OF_PIC .section .got2, "aw" @@ -166,8 +166,8 @@ .long objc_taggedPointerSecret .Lgot_objc_taggedPointerClasses: .long objc_taggedPointerClasses #endif -#ifdef OF_LINUX +#if defined(OF_LINUX) || defined(OF_HAIKU) || defined(OF_HURD) .section .note.GNU-stack, "", @progbits #endif