Overview
Comment: | Use cvinclude.pl instead of sfdc for MorphOS
sfdc does not support SysV functions and is not part of the MorphOS SDK. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
8f9c2b55cecd27ee4e34938e65d1938e |
User & Date: | js on 2019-05-19 21:30:24 |
Other Links: | manifest | tags |
Context
2019-06-16
| ||
01:40 | bridge: Improve static types check-in: f8fb6172af user: js tags: trunk | |
2019-05-19
| ||
21:30 | Use cvinclude.pl instead of sfdc for MorphOS check-in: 8f9c2b55ce user: js tags: trunk | |
17:18 | configure: Fix killing OBJCFLAGS check-in: a1dcb80c83 user: js tags: trunk | |
Changes
Modified configure.ac from [be0d24ff06] to [fcd4c9ffc0].
︙ | |||
58 59 60 61 62 63 64 65 66 67 68 69 70 71 | 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 | + | ac_cv_snprintf_useful_ret="yes" AS_IF([test x"$enable_amiga_lib" != x"no"], [ AC_SUBST(OBJFW_RT_AMIGA_LIB, 'objfw_rt_${OBJFW_RT_LIB_MAJOR}_68k.library') AC_SUBST(SFDC_TARGET, m68k-amigaos) AC_SUBST(SFD_FILE, amigaos3.sfd) AC_SUBST(SFDC_INLINE_H, inline.h) dnl For 68000, GCC emits calls to helper functions that dnl do not work properly in a library. AC_SUBST(AMIGA_LIB_CFLAGS, "-mcpu=68020 -fbaserel") AC_SUBST(AMIGA_LIB_LDFLAGS, "-mcpu=68020 -fbaserel -resident -nostartfiles") ]) ;; |
︙ | |||
79 80 81 82 83 84 85 86 87 | 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 | + - + + - - + | OBJCFLAGS="-O2 -g" ]) OBJCFLAGS="$OBJCFLAGS -noixemul" OBJFW_OBJCFLAGS="$OBJFW_OBJCFLAGS -noixemul" LDFLAGS="$LDFLAGS -noixemul" enable_files="yes" # Required for reading ENV: supports_amiga_lib="yes" check_pedantic="no" # Breaks generated inlines AS_IF([test x"$enable_amiga_lib" != x"no"], [ |
︙ |
Modified extra.mk.in from [4fbf371cb1] to [30769b532e].
︙ | |||
17 18 19 20 21 22 23 24 25 26 27 28 29 30 | 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 | + | OBJFW_BRIDGE_SHARED_LIB = @OBJFW_BRIDGE_SHARED_LIB@ OBJFW_BRIDGE_STATIC_LIB = @OBJFW_BRIDGE_STATIC_LIB@ OBJFW_BRIDGE_FRAMEWORK = @OBJFW_BRIDGE_FRAMEWORK@ AUTORELEASE_M = @AUTORELEASE_M@ BIN_PREFIX = @BIN_PREFIX@ BRIDGE = @BRIDGE@ CVINCLUDE_INLINE_H = @CVINCLUDE_INLINE_H@ ENCODINGS = @ENCODINGS@ ENCODINGS_A = @ENCODINGS_A@ ENCODINGS_ENCODINGS_A = @ENCODINGS_ENCODINGS_A@ ENCODINGS_ENCODINGS_LIB_A = @ENCODINGS_ENCODINGS_LIB_A@ ENCODINGS_LIB_A = @ENCODINGS_LIB_A@ ENCODINGS_SRCS = @ENCODINGS_SRCS@ EXCEPTIONS_A = @EXCEPTIONS_A@ |
︙ | |||
65 66 67 68 69 70 71 72 73 74 75 76 77 78 | 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 | + | OFSTDIOSTREAM_WIN32CONSOLE_M = @OFSTDIOSTREAM_WIN32CONSOLE_M@ REEXPORT_RUNTIME = @REEXPORT_RUNTIME@ REEXPORT_RUNTIME_FRAMEWORK = @REEXPORT_RUNTIME_FRAMEWORK@ RUNTIME = @RUNTIME@ RUNTIME_FRAMEWORK_LIBS = @RUNTIME_FRAMEWORK_LIBS@ RUNTIME_LIBS = @RUNTIME_LIBS@ RUN_TESTS = @RUN_TESTS@ SFDC_INLINE_H = @SFDC_INLINE_H@ SFDC_TARGET = @SFDC_TARGET@ SFD_FILE = @SFD_FILE@ TESTPLUGIN = @TESTPLUGIN@ TESTPLUGIN_LIBS = @TESTPLUGIN_LIBS@ TESTS_LIBS = @TESTS_LIBS@ TESTS_STATIC_LIB = @TESTS_STATIC_LIB@ UNICODE_M = @UNICODE_M@ |
︙ |
Modified src/runtime/Makefile from [c6c73c6c03] to [5df25b2e4e].
︙ | |||
39 40 41 42 43 44 45 | 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 | - - - - + + - - + + | ${LOOKUP_ASM_LOOKUP_ASM_A} \ amiga-end.amigalib.o include ../../buildsys.mk ${OBJFW_RT_AMIGA_LIB}: inline.h |
Modified src/runtime/amiga-glue.m from [60e61a9415] to [ed9ba802b7].
︙ | |||
16 17 18 19 20 21 22 23 24 25 26 27 28 29 | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | + + + + + + + + + + + + + | */ #include "config.h" #import "ObjFW_RT.h" #import "private.h" #import "macros.h" extern bool objc_init(unsigned int, struct objc_libc *, FILE *, FILE *); bool __saveds objc_init_m68k(void) { OBJC_M68K_ARG(unsigned int, version, d0) OBJC_M68K_ARG(struct objc_libc *, libc, a0) OBJC_M68K_ARG(FILE *, stdout_, a1) OBJC_M68K_ARG(FILE *, stderr_, a2) return objc_init(version, libc, stdout_, stderr_); } void __saveds __objc_exec_class_m68k(void) { OBJC_M68K_ARG(void *, module, a0) __objc_exec_class(module); |
︙ |
Modified src/runtime/amiga-library.m from [1262807e23] to [7e60f6ed92].
︙ | |||
58 59 60 61 62 63 64 65 66 67 68 69 70 71 | 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 | + | #ifdef OF_AMIGAOS_M68K extern uintptr_t __CTOR_LIST__[]; extern const void *_EH_FRAME_BEGINS__; extern void *_EH_FRAME_OBJECTS__; #endif extern bool objc_init_m68k(void); extern void __objc_exec_class_m68k(void); extern IMP _Nonnull objc_msg_lookup_m68k(void); extern IMP _Nonnull objc_msg_lookup_stret_m68k(void); extern IMP _Nonnull objc_msg_lookup_super_m68k(void); extern IMP _Nonnull objc_msg_lookup_super_stret_m68k(void); extern Class _Nullable objc_lookUpClass_m68k(void); extern Class _Nullable objc_getClass_m68k(void); |
︙ | |||
371 372 373 374 375 376 377 | 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 | - - + + | static void * lib_null(void) { return NULL; } |
︙ | |||
562 563 564 565 566 567 568 | 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 | - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | (CONST_APTR)FUNCARRAY_BEGIN, (CONST_APTR)FUNCARRAY_32BIT_NATIVE, #endif (CONST_APTR)lib_open, (CONST_APTR)lib_close, (CONST_APTR)lib_expunge, (CONST_APTR)lib_null, |
︙ |
Modified src/runtime/amigaos3.sfd from [5d6ee07490] to [2296d58876].
1 2 3 4 5 6 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 | - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - | ==base _ObjFWRTBase ==basetype struct Library * ==libname objfw_rt_0_68k.library ==bias 30 ==public * Functions that are only for the linklib. |
Modified src/runtime/linklib/linklib.m from [e8efb8926f] to [5fd34ee158].
︙ | |||
19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 | + + + + | #import "ObjFW_RT.h" #import "private.h" #import "macros.h" #include <proto/exec.h> struct ObjFWRTBase; #import "inline.h" #include <stdio.h> #include <stdlib.h> #if defined(OF_AMIGAOS_M68K) # include <stabs.h> # define SYM(name) __asm__("_" name) #elif defined(OF_MORPHOS) # include <constructor.h> # define SYM(name) __asm__(name) #endif #ifdef HAVE_SJLJ_EXCEPTIONS extern int _Unwind_SjLj_RaiseException(void *); #else extern int _Unwind_RaiseException(void *); #endif |
︙ | |||
54 55 56 57 58 59 60 61 62 63 64 65 66 67 | 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | extern void _Unwind_Resume(void *); #endif extern void __register_frame_info(const void *, void *); extern void __deregister_frame_info(const void *); struct Library *ObjFWRTBase; void *__objc_class_name_Protocol; void linklib___objc_exec_class(void *module) SYM("__objc_exec_class"); IMP linklib_objc_msg_lookup(id object, SEL selector) SYM("objc_msg_lookup"); IMP linklib_objc_msg_lookup_stret(id object, SEL selector) SYM("objc_msg_lookup_stret"); IMP linklib_objc_msg_lookup_super(struct objc_super *super, SEL selector) SYM("objc_msg_lookup_super"); IMP linklib_objc_msg_lookup_super_stret(struct objc_super *super, SEL selector) SYM("objc_msg_lookup_super_stret"); Class linklib_objc_lookUpClass(const char *name) SYM("objc_lookUpClass"); Class linklib_objc_getClass(const char *name) SYM("objc_getClass"); Class linklib_objc_getRequiredClass(const char *name) SYM("objc_getRequiredClass"); Class linklib_objc_lookup_class(const char *name) SYM("objc_lookup_class"); Class linklib_objc_get_class(const char *name) SYM("objc_get_class"); void linklib_objc_exception_throw(id object) SYM("objc_exception_throw"); int linklib_objc_sync_enter(id object) SYM("objc_sync_enter"); int linklib_objc_sync_exit(id object) SYM("objc_sync_exit"); id linklib_objc_getProperty(id self, SEL _cmd, ptrdiff_t offset, bool atomic) SYM("objc_getProperty"); void linklib_objc_setProperty(id self, SEL _cmd, ptrdiff_t offset, id value, bool atomic, signed char copy) SYM("objc_setProperty"); void linklib_objc_getPropertyStruct(void *dest, const void *src, ptrdiff_t size, bool atomic, bool strong) SYM("objc_getPropertyStruct"); void linklib_objc_setPropertyStruct(void *dest, const void *src, ptrdiff_t size, bool atomic, bool strong) SYM("objc_setPropertyStruct"); void linklib_objc_enumerationMutation(id object) SYM("objc_enumerationMutation"); #ifdef HAVE_SJLJ_EXCEPTIONS int linklib___gnu_objc_personality_sj0(int version, int actions, uint64_t exClass, void *ex, void *ctx) SYM("__gnu_objc_personality_sj0"); #else int linklib___gnu_objc_personality_v0(int version, int actions, uint64_t exClass, void *ex, void *ctx) SYM("__gnu_objc_personality_v0"); #endif id linklib_objc_retain(id object) SYM("objc_retain"); id linklib_objc_retainBlock(id block) SYM("objc_retainBlock"); id linklib_objc_retainAutorelease(id object) SYM("objc_retainAutorelease"); void linklib_objc_release(id object) SYM("objc_release"); id linklib_objc_autorelease(id object) SYM("objc_autorelease"); id linklib_objc_autoreleaseReturnValue(id object) SYM("objc_autoreleaseReturnValue"); id linklib_objc_retainAutoreleaseReturnValue(id object) SYM("objc_retainAutoreleaseReturnValue"); id linklib_objc_retainAutoreleasedReturnValue(id object) SYM("objc_retainAutoreleasedReturnValue"); id linklib_objc_storeStrong(id *object, id value) SYM("objc_storeStrong"); id linklib_objc_storeWeak(id *object, id value) SYM("objc_storeWeak"); id linklib_objc_loadWeakRetained(id *object) SYM("objc_loadWeakRetained"); id linklib_objc_initWeak(id *object, id value) SYM("objc_initWeak"); void linklib_objc_destroyWeak(id *object) SYM("objc_destroyWeak"); id linklib_objc_loadWeak(id *object) SYM("objc_loadWeak"); void linklib_objc_copyWeak(id *dest, id *src) SYM("objc_copyWeak"); void linklib_objc_moveWeak(id *dest, id *src) SYM("objc_moveWeak"); SEL linklib_sel_registerName(const char *name) SYM("sel_registerName"); const char *linklib_sel_getName(SEL selector) SYM("sel_getName"); bool linklib_sel_isEqual(SEL selector1, SEL selector2) SYM("sel_isEqual"); Class linklib_objc_allocateClassPair(Class superclass, const char *name, size_t extraBytes) SYM("objc_allocateClassPair"); void linklib_objc_registerClassPair(Class class) SYM("objc_registerClassPair"); unsigned int linklib_objc_getClassList(Class *buffer, unsigned int count) SYM("objc_getClassList"); Class *linklib_objc_copyClassList(unsigned int *length) SYM("objc_copyClassList"); bool linklib_class_isMetaClass(Class class) SYM("class_isMetaClass"); const char *linklib_class_getName(Class class) SYM("class_getName"); Class linklib_class_getSuperclass(Class class) SYM("class_getSuperclass"); unsigned long linklib_class_getInstanceSize(Class class) SYM("class_getInstanceSize"); bool linklib_class_respondsToSelector(Class class, SEL selector) SYM("class_respondsToSelector"); bool linklib_class_conformsToProtocol(Class class, Protocol *protocol) SYM("class_conformsToProtocol"); IMP linklib_class_getMethodImplementation(Class class, SEL selector) SYM("class_getMethodImplementation"); IMP linklib_class_getMethodImplementation_stret(Class class, SEL selector) SYM("class_getMethodImplementation_stret"); const char *linklib_class_getMethodTypeEncoding(Class class, SEL selector) SYM("class_getMethodTypeEncoding"); bool linklib_class_addMethod(Class class, SEL selector, IMP implementation, const char *typeEncoding) SYM("class_addMethod"); IMP linklib_class_replaceMethod(Class class, SEL selector, IMP implementation, const char *typeEncoding) SYM("class_replaceMethod"); Class linklib_object_getClass(id object) SYM("object_getClass"); Class linklib_object_setClass(id object, Class class) SYM("object_setClass"); const char *linklib_object_getClassName(id object) SYM("object_getClassName"); const char *linklib_protocol_getName(Protocol *protocol) SYM("protocol_getName"); bool linklib_protocol_isEqual(Protocol *protocol1, Protocol *protocol2) SYM("protocol_isEqual"); bool linklib_protocol_conformsToProtocol(Protocol *protocol1, Protocol *protocol2) SYM("protocol_conformsToProtocol"); void linklib_objc_exit(void) SYM("objc_exit"); objc_uncaught_exception_handler_t linklib_objc_setUncaughtExceptionHandler( objc_uncaught_exception_handler_t handler) SYM("objc_setUncaughtExceptionHandler"); void linklib_objc_setForwardHandler(IMP forward, IMP stretForward) SYM("objc_setForwardHandler"); void linklib_objc_setEnumerationMutationHandler( objc_enumeration_mutation_handler_t handler) SYM("objc_setEnumerationMutationHandler"); void linklib_objc_zero_weak_references(id value) SYM("objc_zero_weak_references"); static void ctor(void) { static bool initialized = false; struct objc_libc libc = { .malloc = malloc, |
︙ | |||
100 101 102 103 104 105 106 | 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 | - + | if ((ObjFWRTBase = OpenLibrary(OBJFW_RT_AMIGA_LIB, OBJFW_RT_LIB_MINOR)) == NULL) { fputs("Failed to open " OBJFW_RT_AMIGA_LIB "!\n", stderr); abort(); } |
︙ | |||
132 133 134 135 136 137 138 | 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 | - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + - + - - + + - + - - + + - + - + - + - + - + - - + - + - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + + + + - - - - + - + - + - + + + - - + + + - - - - + - + - + - + - - + + + + + - - - - + - + - + - + - - + + + + + - - - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + + - + - + - + - + + - + - + - + - + | DESTRUCTOR_P(ObjFWRT, 4000) { dtor(); } #endif void |
Added src/runtime/morphos-clib.h version [752ecf36d7].
|
Added src/runtime/morphos.fd version [7e9de9f641].
|
Deleted src/runtime/morphos.sfd version [7018b90896].
| - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - |
|