Changeset 199458 in webkit
- Timestamp:
- Apr 13, 2016 3:50:50 AM (8 years ago)
- Location:
- trunk/Source/JavaScriptCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r199402 r199458 1 2016-04-13 Alberto Garcia <berto@igalia.com> 2 3 Fix build in glibc-based BSD systems 4 https://bugs.webkit.org/show_bug.cgi?id=156533 5 6 Reviewed by Carlos Garcia Campos. 7 8 Change the order of the #elif conditionals so glibc-based BSD 9 systems (e.g. Debian GNU/kFreeBSD) use the code inside the 10 OS(FREEBSD) blocks. 11 12 * heap/MachineStackMarker.cpp: 13 (JSC::MachineThreads::Thread::Registers::stackPointer): 14 (JSC::MachineThreads::Thread::Registers::framePointer): 15 (JSC::MachineThreads::Thread::Registers::instructionPointer): 16 (JSC::MachineThreads::Thread::Registers::llintPC): 17 1 18 2016-04-12 Keith Miller <keith_miller@apple.com> 2 19 -
trunk/Source/JavaScriptCore/heap/MachineStackMarker.cpp
r198919 r199458 551 551 #elif USE(PTHREADS) 552 552 553 #if defined(__GLIBC__) && ENABLE(JIT) 553 #if OS(FREEBSD) && ENABLE(JIT) 554 555 #if CPU(X86) 556 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_esp); 557 #elif CPU(X86_64) 558 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_rsp); 559 #elif CPU(ARM) 560 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.__gregs[_REG_SP]); 561 #elif CPU(ARM64) 562 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_gpregs.gp_sp); 563 #elif CPU(MIPS) 564 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_regs[29]); 565 #else 566 #error Unknown Architecture 567 #endif 568 569 #elif defined(__GLIBC__) && ENABLE(JIT) 554 570 555 571 #if CPU(X86) … … 563 579 #elif CPU(MIPS) 564 580 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[29]); 565 #else566 #error Unknown Architecture567 #endif568 569 #elif OS(FREEBSD) && ENABLE(JIT)570 571 #if CPU(X86)572 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_esp);573 #elif CPU(X86_64)574 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_rsp);575 #elif CPU(ARM)576 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.__gregs[_REG_SP]);577 #elif CPU(ARM64)578 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_gpregs.gp_sp);579 #elif CPU(MIPS)580 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_regs[29]);581 581 #else 582 582 #error Unknown Architecture … … 650 650 #endif 651 651 652 #elif OS(FREEBSD) 653 654 #if CPU(X86) 655 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_ebp); 656 #elif CPU(X86_64) 657 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_rbp); 658 #elif CPU(ARM) 659 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.__gregs[_REG_FP]); 660 #elif CPU(ARM64) 661 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_gpregs.gp_x[29]); 662 #elif CPU(MIPS) 663 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_regs[30]); 664 #else 665 #error Unknown Architecture 666 #endif 667 652 668 #elif defined(__GLIBC__) 653 669 … … 663 679 #elif CPU(MIPS) 664 680 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[30]); 665 #else666 #error Unknown Architecture667 #endif668 669 #elif OS(FREEBSD)670 671 #if CPU(X86)672 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_ebp);673 #elif CPU(X86_64)674 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_rbp);675 #elif CPU(ARM)676 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.__gregs[_REG_FP]);677 #elif CPU(ARM64)678 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_gpregs.gp_x[29]);679 #elif CPU(MIPS)680 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_regs[30]);681 681 #else 682 682 #error Unknown Architecture … … 732 732 #endif 733 733 734 #elif OS(FREEBSD) 735 736 #if CPU(X86) 737 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_eip); 738 #elif CPU(X86_64) 739 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_rip); 740 #elif CPU(ARM) 741 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.__gregs[_REG_PC]); 742 #elif CPU(ARM64) 743 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_gpregs.gp_elr); 744 #elif CPU(MIPS) 745 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_pc); 746 #else 747 #error Unknown Architecture 748 #endif 749 734 750 #elif defined(__GLIBC__) 735 751 … … 745 761 #elif CPU(MIPS) 746 762 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.pc); 747 #else748 #error Unknown Architecture749 #endif750 751 #elif OS(FREEBSD)752 753 #if CPU(X86)754 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_eip);755 #elif CPU(X86_64)756 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_rip);757 #elif CPU(ARM)758 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.__gregs[_REG_PC]);759 #elif CPU(ARM64)760 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_gpregs.gp_elr);761 #elif CPU(MIPS)762 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_pc);763 763 #else 764 764 #error Unknown Architecture … … 823 823 #endif 824 824 825 #elif OS(FREEBSD) 826 827 #if CPU(X86) 828 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_esi); 829 #elif CPU(X86_64) 830 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_r8); 831 #elif CPU(ARM) 832 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.__gregs[_REG_R8]); 833 #elif CPU(ARM64) 834 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_gpregs.gp_x[4]); 835 #elif CPU(MIPS) 836 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_regs[12]); 837 #else 838 #error Unknown Architecture 839 #endif 840 825 841 #elif defined(__GLIBC__) 826 842 … … 836 852 #elif CPU(MIPS) 837 853 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[12]); 838 #else839 #error Unknown Architecture840 #endif841 842 #elif OS(FREEBSD)843 844 #if CPU(X86)845 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_esi);846 #elif CPU(X86_64)847 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_r8);848 #elif CPU(ARM)849 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.__gregs[_REG_R8]);850 #elif CPU(ARM64)851 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_gpregs.gp_x[4]);852 #elif CPU(MIPS)853 return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_regs[12]);854 854 #else 855 855 #error Unknown Architecture
Note: See TracChangeset
for help on using the changeset viewer.