Mercurial > projects > ldc
comparison runtime/ldc.diff @ 795:06ba66bc0689
Adjust Tango patch for Tango rev 4134.
author | Christian Kamm <kamm incasoftware de> |
---|---|
date | Fri, 28 Nov 2008 23:29:00 +0100 |
parents | e6fe47d46783 |
children | e8f8cafcaa62 |
comparison
equal
deleted
inserted
replaced
794:661384d6a936 | 795:06ba66bc0689 |
---|---|
1 Index: lib/unittest.sh | 1 Index: lib/unittest.sh |
2 =================================================================== | 2 =================================================================== |
3 --- lib/unittest.sh (revision 4110) | 3 --- lib/unittest.sh (revision 4134) |
4 +++ lib/unittest.sh (working copy) | 4 +++ lib/unittest.sh (working copy) |
5 @@ -18,8 +18,9 @@ | 5 @@ -18,8 +18,9 @@ |
6 --help: This message | 6 --help: This message |
7 --run-all: Reports result instead of breaking. Do not use this if you want to | 7 --run-all: Reports result instead of breaking. Do not use this if you want to |
8 run unittest runner through a debugger. | 8 run unittest runner through a debugger. |
55 +then | 55 +then |
56 + compile ldc runUnitTest_ldc | 56 + compile ldc runUnitTest_ldc |
57 +fi | 57 +fi |
58 Index: lib/common/tango/core/BitManip.d | 58 Index: lib/common/tango/core/BitManip.d |
59 =================================================================== | 59 =================================================================== |
60 --- lib/common/tango/core/BitManip.d (revision 4110) | 60 --- lib/common/tango/core/BitManip.d (revision 4134) |
61 +++ lib/common/tango/core/BitManip.d (working copy) | 61 +++ lib/common/tango/core/BitManip.d (working copy) |
62 @@ -171,6 +171,10 @@ | 62 @@ -171,6 +171,10 @@ |
63 */ | 63 */ |
64 uint outpl( uint port_address, uint value ); | 64 uint outpl( uint port_address, uint value ); |
65 } | 65 } |
70 else | 70 else |
71 { | 71 { |
72 public import std.intrinsic; | 72 public import std.intrinsic; |
73 Index: lib/common/tango/core/Thread.d | 73 Index: lib/common/tango/core/Thread.d |
74 =================================================================== | 74 =================================================================== |
75 --- lib/common/tango/core/Thread.d (revision 4110) | 75 --- lib/common/tango/core/Thread.d (revision 4134) |
76 +++ lib/common/tango/core/Thread.d (working copy) | 76 +++ lib/common/tango/core/Thread.d (working copy) |
77 @@ -273,8 +273,50 @@ | 77 @@ -273,8 +273,50 @@ |
78 } | 78 } |
79 body | 79 body |
80 { | 80 { |
244 else static if( is( ucontext_t ) ) | 244 else static if( is( ucontext_t ) ) |
245 { | 245 { |
246 getcontext( &m_utxt ); | 246 getcontext( &m_utxt ); |
247 Index: lib/gc/basic/gcx.d | 247 Index: lib/gc/basic/gcx.d |
248 =================================================================== | 248 =================================================================== |
249 --- lib/gc/basic/gcx.d (revision 4110) | 249 --- lib/gc/basic/gcx.d (revision 4134) |
250 +++ lib/gc/basic/gcx.d (working copy) | 250 +++ lib/gc/basic/gcx.d (working copy) |
251 @@ -65,6 +65,13 @@ | 251 @@ -65,6 +65,13 @@ |
252 } | 252 } |
253 | 253 |
254 | 254 |
337 else | 337 else |
338 { | 338 { |
339 asm | 339 asm |
340 Index: lib/gc/basic/gcbits.d | 340 Index: lib/gc/basic/gcbits.d |
341 =================================================================== | 341 =================================================================== |
342 --- lib/gc/basic/gcbits.d (revision 4110) | 342 --- lib/gc/basic/gcbits.d (revision 4134) |
343 +++ lib/gc/basic/gcbits.d (working copy) | 343 +++ lib/gc/basic/gcbits.d (working copy) |
344 @@ -39,6 +39,10 @@ | 344 @@ -39,6 +39,10 @@ |
345 { | 345 { |
346 // use the unoptimized version | 346 // use the unoptimized version |
347 } | 347 } |
352 else version (D_InlineAsm_X86) | 352 else version (D_InlineAsm_X86) |
353 { | 353 { |
354 version = Asm86; | 354 version = Asm86; |
355 Index: lib/build-tango.sh | 355 Index: lib/build-tango.sh |
356 =================================================================== | 356 =================================================================== |
357 --- lib/build-tango.sh (revision 4110) | 357 --- lib/build-tango.sh (revision 4134) |
358 +++ lib/build-tango.sh (working copy) | 358 +++ lib/build-tango.sh (working copy) |
359 @@ -23,7 +23,7 @@ | 359 @@ -23,7 +23,7 @@ |
360 --debug: Will enable debug info | 360 --debug: Will enable debug info |
361 --warn: Will enable warnings | 361 --warn: Will enable warnings |
362 --verbose: Increase verbosity | 362 --verbose: Increase verbosity |
384 mac) | 384 mac) |
385 # build Universal Binary version of the Tango library | 385 # build Universal Binary version of the Tango library |
386 build powerpc-apple-darwin8-gdmd libgtango.a.ppc libgphobos.a.ppc | 386 build powerpc-apple-darwin8-gdmd libgtango.a.ppc libgphobos.a.ppc |
387 Index: tango/text/convert/Layout.d | 387 Index: tango/text/convert/Layout.d |
388 =================================================================== | 388 =================================================================== |
389 --- tango/text/convert/Layout.d (revision 4110) | 389 --- tango/text/convert/Layout.d (revision 4134) |
390 +++ tango/text/convert/Layout.d (working copy) | 390 +++ tango/text/convert/Layout.d (working copy) |
391 @@ -47,6 +47,12 @@ | 391 @@ -47,6 +47,12 @@ |
392 alias void* Arg; | 392 alias void* Arg; |
393 alias va_list ArgList; | 393 alias va_list ArgList; |
394 } | 394 } |
410 } | 410 } |
411 } | 411 } |
412 return parse (formatStr, arguments, arglist, sink); | 412 return parse (formatStr, arguments, arglist, sink); |
413 Index: tango/net/cluster/CacheInvalidator.d | 413 Index: tango/net/cluster/CacheInvalidator.d |
414 =================================================================== | 414 =================================================================== |
415 --- tango/net/cluster/CacheInvalidator.d (revision 4110) | 415 --- tango/net/cluster/CacheInvalidator.d (revision 4134) |
416 +++ tango/net/cluster/CacheInvalidator.d (working copy) | 416 +++ tango/net/cluster/CacheInvalidator.d (working copy) |
417 @@ -79,7 +79,7 @@ | 417 @@ -79,7 +79,7 @@ |
418 | 418 |
419 *******************************************************************************/ | 419 *******************************************************************************/ |
420 | 420 |
423 { | 423 { |
424 private char[] key_; | 424 private char[] key_; |
425 | 425 |
426 Index: tango/core/Vararg.d | 426 Index: tango/core/Vararg.d |
427 =================================================================== | 427 =================================================================== |
428 --- tango/core/Vararg.d (revision 4110) | 428 --- tango/core/Vararg.d (revision 4134) |
429 +++ tango/core/Vararg.d (working copy) | 429 +++ tango/core/Vararg.d (working copy) |
430 @@ -15,6 +15,10 @@ | 430 @@ -15,6 +15,10 @@ |
431 { | 431 { |
432 public import std.stdarg; | 432 public import std.stdarg; |
433 } | 433 } |
438 else | 438 else |
439 { | 439 { |
440 /** | 440 /** |
441 Index: tango/core/sync/Semaphore.d | 441 Index: tango/core/sync/Semaphore.d |
442 =================================================================== | 442 =================================================================== |
443 --- tango/core/sync/Semaphore.d (revision 4110) | 443 --- tango/core/sync/Semaphore.d (revision 4134) |
444 +++ tango/core/sync/Semaphore.d (working copy) | 444 +++ tango/core/sync/Semaphore.d (working copy) |
445 @@ -376,7 +376,8 @@ | 445 @@ -380,7 +380,8 @@ |
446 { | 446 { |
447 synchronized( synComplete ) | 447 synchronized( synComplete ) |
448 { | 448 { |
449 - if( numComplete == numConsumers ) | 449 - if( numComplete == numConsumers ) |
450 + // if( numComplete == numConsumers ) | 450 + // if( numComplete == numConsumers ) |
451 + if( numComplete == numToProduce ) | 451 + if( numComplete == numToProduce ) |
452 break; | 452 break; |
453 } | 453 } |
454 Thread.yield(); | 454 Thread.yield(); |
455 @@ -384,9 +385,9 @@ | 455 @@ -388,9 +389,9 @@ |
456 | 456 |
457 synchronized( synComplete ) | 457 synchronized( synComplete ) |
458 { | 458 { |
459 - assert( numComplete == numConsumers ); | 459 - assert( numComplete == numConsumers ); |
460 + assert( numComplete == numToProduce ); | 460 + assert( numComplete == numToProduce ); |
462 } | 462 } |
463 - | 463 - |
464 synchronized( synConsumed ) | 464 synchronized( synConsumed ) |
465 { | 465 { |
466 assert( numConsumed == numToProduce ); | 466 assert( numConsumed == numToProduce ); |
467 @@ -447,7 +448,8 @@ | 467 @@ -451,7 +452,8 @@ |
468 | 468 |
469 unittest | 469 unittest |
470 { | 470 { |
471 + version(darwin){}else{ | 471 + version(darwin){}else{ |
472 testWait(); | 472 testWait(); |
474 + testWaitTimeout();} | 474 + testWaitTimeout();} |
475 } | 475 } |
476 } | 476 } |
477 Index: tango/core/sync/Condition.d | 477 Index: tango/core/sync/Condition.d |
478 =================================================================== | 478 =================================================================== |
479 --- tango/core/sync/Condition.d (revision 4110) | 479 --- tango/core/sync/Condition.d (revision 4134) |
480 +++ tango/core/sync/Condition.d (working copy) | 480 +++ tango/core/sync/Condition.d (working copy) |
481 @@ -553,8 +553,11 @@ | 481 @@ -553,8 +553,11 @@ |
482 | 482 |
483 unittest | 483 unittest |
484 { | 484 { |
490 + } | 490 + } |
491 } | 491 } |
492 } | 492 } |
493 Index: tango/core/Atomic.d | 493 Index: tango/core/Atomic.d |
494 =================================================================== | 494 =================================================================== |
495 --- tango/core/Atomic.d (revision 4110) | 495 --- tango/core/Atomic.d (revision 4134) |
496 +++ tango/core/Atomic.d (working copy) | 496 +++ tango/core/Atomic.d (working copy) |
497 @@ -270,6 +270,167 @@ | 497 @@ -270,6 +270,167 @@ |
498 | 498 |
499 | 499 |
500 //////////////////////////////////////////////////////////////////////////////// | 500 //////////////////////////////////////////////////////////////////////////////// |
660 + | 660 + |
661 +//////////////////////////////////////////////////////////////////////////////// | 661 +//////////////////////////////////////////////////////////////////////////////// |
662 // x86 Atomic Function Implementation | 662 // x86 Atomic Function Implementation |
663 //////////////////////////////////////////////////////////////////////////////// | 663 //////////////////////////////////////////////////////////////////////////////// |
664 | 664 |
665 @@ -282,9 +443,9 @@ | |
666 { | |
667 pragma( msg, "tango.core.Atomic: using IA-32 inline asm" ); | |
668 } | |
669 - | |
670 + version(darwin){} | |
671 + else { version = Has64BitCAS; } | |
672 version = Has32BitOps; | |
673 - version = Has64BitCAS; | |
674 } | |
675 version( X86_64 ) | |
676 { | |
677 Index: tango/math/IEEE.d | 665 Index: tango/math/IEEE.d |
678 =================================================================== | 666 =================================================================== |
679 --- tango/math/IEEE.d (revision 4110) | 667 --- tango/math/IEEE.d (revision 4134) |
680 +++ tango/math/IEEE.d (working copy) | 668 +++ tango/math/IEEE.d (working copy) |
681 @@ -1554,7 +1554,12 @@ | 669 @@ -1554,7 +1554,12 @@ |
682 return (bitsdiff == 0 && !((pa[F.EXPPOS_SHORT] ^ pb[F.EXPPOS_SHORT])& F.EXPMASK)) ? 1 : 0; | 670 return (bitsdiff == 0 && !((pa[F.EXPPOS_SHORT] ^ pb[F.EXPPOS_SHORT])& F.EXPMASK)) ? 1 : 0; |
683 } | 671 } |
684 } else { | 672 } else { |
692 } | 680 } |
693 } | 681 } |
694 | 682 |
695 Index: tango/math/Math.d | 683 Index: tango/math/Math.d |
696 =================================================================== | 684 =================================================================== |
697 --- tango/math/Math.d (revision 4110) | 685 --- tango/math/Math.d (revision 4134) |
698 +++ tango/math/Math.d (working copy) | 686 +++ tango/math/Math.d (working copy) |
699 @@ -76,6 +76,14 @@ | 687 @@ -76,6 +76,14 @@ |
700 version = DigitalMars_D_InlineAsm_X86; | 688 version = DigitalMars_D_InlineAsm_X86; |
701 } | 689 } |
702 } | 690 } |
841 } | 829 } |
842 | 830 |
843 debug(UnitTest) { | 831 debug(UnitTest) { |
844 Index: tango/stdc/posix/sys/types.d | 832 Index: tango/stdc/posix/sys/types.d |
845 =================================================================== | 833 =================================================================== |
846 --- tango/stdc/posix/sys/types.d (revision 4110) | 834 --- tango/stdc/posix/sys/types.d (revision 4134) |
847 +++ tango/stdc/posix/sys/types.d (working copy) | 835 +++ tango/stdc/posix/sys/types.d (working copy) |
848 @@ -422,7 +422,11 @@ | 836 @@ -422,7 +422,11 @@ |
849 } | 837 } |
850 else version( darwin ) | 838 else version( darwin ) |
851 { | 839 { |
858 } | 846 } |
859 else version( freebsd ) | 847 else version( freebsd ) |
860 { | 848 { |
861 Index: tango/stdc/stdlib.d | 849 Index: tango/stdc/stdlib.d |
862 =================================================================== | 850 =================================================================== |
863 --- tango/stdc/stdlib.d (revision 4110) | 851 --- tango/stdc/stdlib.d (revision 4134) |
864 +++ tango/stdc/stdlib.d (working copy) | 852 +++ tango/stdc/stdlib.d (working copy) |
865 @@ -94,6 +94,11 @@ | 853 @@ -94,6 +94,11 @@ |
866 { | 854 { |
867 void* alloca(size_t size); | 855 void* alloca(size_t size); |
868 } | 856 } |
874 else version( GNU ) | 862 else version( GNU ) |
875 { | 863 { |
876 private import gcc.builtins; | 864 private import gcc.builtins; |
877 Index: tango/stdc/stdarg.d | 865 Index: tango/stdc/stdarg.d |
878 =================================================================== | 866 =================================================================== |
879 --- tango/stdc/stdarg.d (revision 4110) | 867 --- tango/stdc/stdarg.d (revision 4134) |
880 +++ tango/stdc/stdarg.d (working copy) | 868 +++ tango/stdc/stdarg.d (working copy) |
881 @@ -13,6 +13,10 @@ | 869 @@ -13,6 +13,10 @@ |
882 { | 870 { |
883 public import std.c.stdarg; | 871 public import std.c.stdarg; |
884 } | 872 } |