Index: head/contrib/gcc/config/arm/libgcc-bpabi.ver =================================================================== --- head/contrib/gcc/config/arm/libgcc-bpabi.ver (revision 318023) +++ head/contrib/gcc/config/arm/libgcc-bpabi.ver (revision 318024) @@ -1,83 +1,91 @@ GCC_3.5 { # BPABI symbols __aeabi_cdcmpeq __aeabi_cdcmple __aeabi_cdrcmple __aeabi_cfcmpeq __aeabi_cfcmple __aeabi_cfrcmple __aeabi_d2f __aeabi_d2iz __aeabi_d2lz __aeabi_d2uiz __aeabi_d2ulz __aeabi_dadd __aeabi_dcmpeq __aeabi_dcmpge __aeabi_dcmpgt __aeabi_dcmple __aeabi_dcmplt __aeabi_dcmpun __aeabi_ddiv __aeabi_dmul __aeabi_dneg __aeabi_drsub __aeabi_dsub __aeabi_f2d __aeabi_f2iz __aeabi_f2lz __aeabi_f2uiz __aeabi_f2ulz __aeabi_fadd __aeabi_fcmpeq __aeabi_fcmpge __aeabi_fcmpgt __aeabi_fcmple __aeabi_fcmplt __aeabi_fcmpun __aeabi_fdiv __aeabi_fmul __aeabi_fneg __aeabi_frsub __aeabi_fsub __aeabi_i2d __aeabi_i2f __aeabi_idiv __aeabi_idiv0 __aeabi_idivmod __aeabi_l2d __aeabi_l2f __aeabi_lasr __aeabi_lcmp __aeabi_ldiv0 __aeabi_ldivmod __aeabi_llsl __aeabi_llsr __aeabi_lmul __aeabi_ui2d __aeabi_ui2f __aeabi_uidiv __aeabi_uidivmod __aeabi_uldivmod __aeabi_ulcmp __aeabi_ul2d __aeabi_ul2f __aeabi_uread4 __aeabi_uread8 __aeabi_uwrite4 __aeabi_uwrite8 # Exception-Handling # \S 7.5 _Unwind_Complete _Unwind_VRS_Get _Unwind_VRS_Set _Unwind_VRS_Pop # \S 9.2 __aeabi_unwind_cpp_pr0 __aeabi_unwind_cpp_pr1 __aeabi_unwind_cpp_pr2 # The libstdc++ exception-handling personality routine uses this # GNU-specific entry point. __gnu_unwind_frame } + +%exclude { + _Unwind_Backtrace +} + +GCC_4.3.0 { + _Unwind_Backtrace +} Index: head/contrib/gcc/config/arm/libunwind-arm.S =================================================================== --- head/contrib/gcc/config/arm/libunwind-arm.S (revision 318023) +++ head/contrib/gcc/config/arm/libunwind-arm.S (revision 318024) @@ -1,136 +1,154 @@ /* Support functions for the unwinder. Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. Contributed by Paul Brook This file is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. In addition to the permissions in the GNU General Public License, the Free Software Foundation gives you unlimited permission to link the compiled version of this file into combinations with other programs, and to distribute those combinations without any restriction coming from the use of this file. (The General Public License restrictions do apply in other respects; for example, they cover modification of the file, and distribution when not linked into a combine executable.) This file is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include /* Allow the use of VFP instructions */ #if __ARM_ARCH >= 7 .fpu vfp #endif #ifndef __symbian__ #include "lib1funcs.asm" .macro UNPREFIX name .global SYM (\name) EQUIV SYM (\name), SYM (__\name) .endm /* r0 points to a 16-word block. Upload these values to the actual core state. */ ARM_FUNC_START restore_core_regs /* We must use sp as the base register when restoring sp. Push the last 3 registers onto the top of the current stack to achieve this. */ add r1, r0, #52 ldmia r1, {r3, r4, r5} /* {sp, lr, pc}. */ #ifdef __INTERWORKING__ /* Restore pc into ip. */ mov r2, r5 stmfd sp!, {r2, r3, r4} #else stmfd sp!, {r3, r4, r5} #endif /* Don't bother restoring ip. */ ldmia r0, {r0, r1, r2, r3, r4, r5, r6, r7, r8, r9, sl, fp} /* Pop the three registers we pushed earlier. */ #ifdef __INTERWORKING__ ldmfd sp, {ip, sp, lr} bx ip #else ldmfd sp, {sp, lr, pc} #endif FUNC_END restore_core_regs UNPREFIX restore_core_regs /* Load VFP registers d0-d15 from the address in r0. */ ARM_FUNC_START gnu_Unwind_Restore_VFP /* Use the generic coprocessor form so that gas doesn't complain on soft-float targets. */ #if __ARM_ARCH >= 7 fldmiax r0, {d0-d15} #else ldc p11,cr0,[r0],{0x21} /* fldmiax r0, {d0-d15} */ #endif RET /* Store VFR regsters d0-d15 to the address in r0. */ ARM_FUNC_START gnu_Unwind_Save_VFP /* Use the generic coprocessor form so that gas doesn't complain on soft-float targets. */ #if __ARM_ARCH >= 7 fstmiax r0, {d0-d15} #else stc p11,cr0,[r0],{0x21} /* fstmiax r0, {d0-d15} */ #endif RET /* Wrappers to save core registers, then call the real routine. */ .macro UNWIND_WRAPPER name nargs ARM_FUNC_START \name /* Create a phase2_vrs structure. */ /* Split reg push in two to ensure the correct value for sp. */ stmfd sp!, {sp, lr, pc} stmfd sp!, {r0, r1, r2, r3, r4, r5, r6, r7, r8, r9, sl, fp, ip} /* Demand-save flags, plus an extra word for alignment. */ mov r3, #0 stmfd sp!, {r2, r3} /* Point r1 at the block. Pass r[0..nargs) unchanged. */ add r\nargs, sp, #4 #if defined(__thumb__) /* Switch back to thumb mode to avoid interworking hassle. */ adr ip, .L1_\name orr ip, ip, #1 bx ip .thumb .L1_\name: bl SYM (__gnu\name) __PLT__ ldr r3, [sp, #64] add sp, #72 bx r3 #else bl SYM (__gnu\name) __PLT__ ldr lr, [sp, #64] add sp, sp, #72 RET #endif FUNC_END \name UNPREFIX \name .endm UNWIND_WRAPPER _Unwind_RaiseException 1 UNWIND_WRAPPER _Unwind_Resume 1 UNWIND_WRAPPER _Unwind_Resume_or_Rethrow 1 UNWIND_WRAPPER _Unwind_ForcedUnwind 3 UNWIND_WRAPPER _Unwind_Backtrace 2 +/* + * Originally, we incorrectly export _Unwind_Backtrace symbol + * with GCC_3.3 version, but real GCC libgcc export it as GCC_4.3.0. + * To maintain backward compatibility, export it with both versions where + * GCC_4.3.0 is default one. + * + * The workaround is complicated by next two issues: + * - old GNU ld cannot handle two (or more) symbol versions + * targeting same function. + * - the .weakref crashes clang 4.0 + */ + .globl SYM(_Unwind_Backtrace33) + TYPE(_Unwind_Backtrace33) +SYM(_Unwind_Backtrace33): + b _Unwind_Backtrace + + .symver SYM(_Unwind_Backtrace33),_Unwind_Backtrace@GCC_3.3 + #endif /* ndef __symbian__ */ Index: head/contrib/gcc/libgcc-std.ver =================================================================== --- head/contrib/gcc/libgcc-std.ver (revision 318023) +++ head/contrib/gcc/libgcc-std.ver (revision 318024) @@ -1,283 +1,283 @@ GCC_3.0 { # libgcc1 integer symbols __absvsi2 __addvsi3 __ashlsi3 __ashrsi3 __divsi3 __lshrsi3 __modsi3 __mulsi3 __mulvsi3 __negvsi2 __subvsi3 __udivsi3 __umodsi3 # libgcc1 floating point symbols __addsf3 __adddf3 __addxf3 __addtf3 __divsf3 __divdf3 __divxf3 __divtf3 __eqsf2 __eqdf2 __eqxf2 __eqtf2 __extenddfxf2 __extenddftf2 __extendsfdf2 __extendsfxf2 __extendsftf2 __fixsfsi __fixdfsi __fixxfsi __fixtfsi __floatsisf __floatsidf __floatsixf __floatsitf __gesf2 __gedf2 __gexf2 __getf2 __gtsf2 __gtdf2 __gtxf2 __gttf2 __lesf2 __ledf2 __lexf2 __letf2 __ltsf2 __ltdf2 __ltxf2 __lttf2 __mulsf3 __muldf3 __mulxf3 __multf3 __negsf2 __negdf2 __negxf2 __negtf2 __nesf2 __nedf2 __nexf2 __netf2 __subsf3 __subdf3 __subxf3 __subtf3 __truncdfsf2 __truncxfsf2 __trunctfsf2 __truncxfdf2 __trunctfdf2 # libgcc2 DImode arithmetic (for 32-bit targets). __absvdi2 __addvdi3 __ashldi3 __ashrdi3 __cmpdi2 __divdi3 __ffsdi2 __fixdfdi __fixsfdi __fixtfdi __fixxfdi __fixunsdfdi __fixunsdfsi __fixunssfsi __fixunssfdi __fixunstfdi __fixunstfsi __fixunsxfdi __fixunsxfsi __floatdidf __floatdisf __floatdixf __floatditf __lshrdi3 __moddi3 __muldi3 __mulvdi3 __negdi2 __negvdi2 __subvdi3 __ucmpdi2 __udivdi3 __udivmoddi4 __umoddi3 # libgcc2 TImode arithmetic (for 64-bit targets). __ashlti3 __ashrti3 __cmpti2 __divti3 __ffsti2 __fixdfti __fixsfti __fixtfti __fixxfti __lshrti3 __modti3 __multi3 __negti2 __ucmpti2 __udivmodti4 __udivti3 __umodti3 __fixunsdfti __fixunssfti __fixunstfti __fixunsxfti __floattidf __floattisf __floattixf __floattitf # Used to deal with trampoline initialization on some platforms __clear_cache # EH symbols _Unwind_DeleteException _Unwind_Find_FDE _Unwind_ForcedUnwind _Unwind_GetGR _Unwind_GetIP _Unwind_GetLanguageSpecificData _Unwind_GetRegionStart _Unwind_GetTextRelBase _Unwind_GetDataRelBase _Unwind_RaiseException _Unwind_Resume _Unwind_SetGR _Unwind_SetIP __deregister_frame __deregister_frame_info __deregister_frame_info_bases __register_frame __register_frame_info __register_frame_info_bases __register_frame_info_table __register_frame_info_table_bases __register_frame_table # SjLj EH symbols _Unwind_SjLj_Register _Unwind_SjLj_Unregister _Unwind_SjLj_RaiseException _Unwind_SjLj_ForcedUnwind _Unwind_SjLj_Resume } %inherit GCC_3.3 GCC_3.0 GCC_3.3 { _Unwind_FindEnclosingFunction _Unwind_GetCFA _Unwind_Backtrace _Unwind_Resume_or_Rethrow _Unwind_SjLj_Resume_or_Rethrow } %inherit GCC_3.3.1 GCC_3.3 GCC_3.3.1 { __gcc_personality_sj0 __gcc_personality_v0 } %inherit GCC_3.3.2 GCC_3.3.1 GCC_3.3.2 { } %inherit GCC_3.3.4 GCC_3.3.2 GCC_3.3.4 { __unorddf2 __unordsf2 } %inherit GCC_3.4 GCC_3.3.4 GCC_3.4 { # bit scanning and counting built-ins __clzsi2 __clzdi2 __clzti2 __ctzsi2 __ctzdi2 __ctzti2 __popcountsi2 __popcountdi2 __popcountti2 __paritysi2 __paritydi2 __parityti2 } %inherit GCC_3.4.2 GCC_3.4 GCC_3.4.2 { # Used to deal with trampoline initialization on some platforms __enable_execute_stack __trampoline_setup } %inherit GCC_3.4.4 GCC_3.4.2 GCC_3.4.4 { # libgcc2 TImode arithmetic (for 64-bit targets). __absvti2 __addvti3 __mulvti3 __negvti2 __subvti3 } %inherit GCC_4.0.0 GCC_3.4.4 GCC_4.0.0 { # libgcc2 __builtin_powi helpers. __powisf2 __powidf2 __powixf2 __powitf2 # c99 compliant complex arithmetic __divsc3 __divdc3 __divxc3 __divtc3 __mulsc3 __muldc3 __mulxc3 __multc3 } %inherit GCC_4.1.0 GCC_4.0.0 GCC_4.1.0 { } %inherit GCC_4.2.0 GCC_4.1.0 GCC_4.2.0 { # unsigned-to-floating conversions __floatunsisf __floatunsidf __floatunsixf __floatunsitf __floatundidf __floatundisf __floatundixf __floatunditf __floatuntidf __floatuntisf __floatuntixf __floatuntitf _Unwind_GetIPInfo } -%inherit GCC_4.3 GCC_4.2.0 +%inherit GCC_4.3.0 GCC_4.2.0 GCC_4.3.0 { # byte swapping routines __bswapsi2 __bswapdi2 } Index: head/sys/arm/conf/std.armv6 =================================================================== --- head/sys/arm/conf/std.armv6 (revision 318023) +++ head/sys/arm/conf/std.armv6 (revision 318024) @@ -1,79 +1,79 @@ # Standard kernel config items for all ARMv6/v7 systems. # # $FreeBSD$ options HZ=1000 options ARM_L2_PIPT # Only L2 PIPT is supported options PREEMPTION # Enable kernel thread preemption options INET # InterNETworking options INET6 # IPv6 communications protocols options TCP_HHOOK # hhook(9) framework for TCP options IPSEC # IP (v4/v6) security options SCTP # Stream Control Transmission Protocol options FFS # Berkeley Fast Filesystem options SOFTUPDATES # Enable FFS soft updates support options UFS_ACL # Support for access control lists options UFS_DIRHASH # Improve performance on big directories options UFS_GJOURNAL # Enable gjournal-based UFS journaling options QUOTA # Enable disk quotas for UFS options NFSCL # Network Filesystem Client options NFSLOCKD # Network Lock Manager options NFS_ROOT # NFS usable as /, requires NFSCL options MSDOSFS # MSDOS Filesystem options CD9660 # ISO 9660 Filesystem options PROCFS # Process filesystem (requires PSEUDOFS) options PSEUDOFS # Pseudo-filesystem framework options TMPFS # Efficient memory filesystem options GEOM_PART_GPT # GUID Partition Tables options GEOM_PART_BSD # BSD partition scheme options GEOM_PART_MBR # MBR partition scheme options GEOM_LABEL # Provides labelization options COMPAT_43 # Compatible with BSD 4.3 [KEEP THIS!] options SCSI_DELAY=5000 # Delay (in ms) before probing SCSI options KTRACE # ktrace(1) support options SYSVSHM # SYSV-style shared memory options SYSVMSG # SYSV-style message queues options SYSVSEM # SYSV-style semaphores options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions options PRINTF_BUFR_SIZE=128 # Prevent printf output being interspersed. options KBD_INSTALL_CDEV # install a CDEV entry in /dev options HWPMC_HOOKS # Necessary kernel hooks for hwpmc(4) options FREEBSD_BOOT_LOADER # Process metadata passed from loader(8) options VFP # Enable floating point hardware support options COMPAT_FREEBSD10 # Compatible with FreeBSD10 options COMPAT_FREEBSD11 # Compatible with FreeBSD11 # DTrace support options KDTRACE_HOOKS # Kernel DTrace hooks options DDB_CTF # all architectures - kernel ELF linker loads CTF data makeoptions WITH_CTF=1 # Debugging support. Always need this: makeoptions DEBUG=-g # Build kernel with gdb(1) debug symbols options KDB # Enable kernel debugger support. options KDB_TRACE # Print a stack trace for a panic. # For full debugger support use (turn off in stable branch): options DDB # Support DDB #options DEADLKRES # Enable the deadlock resolver options INVARIANTS # Enable calls of extra sanity checking options INVARIANT_SUPPORT # Extra sanity checks of internal structures, required by INVARIANTS options WITNESS # Enable checks to detect deadlocks and cycles options WITNESS_SKIPSPIN # Don't run witness on spinlocks for speed options MALLOC_DEBUG_MAXZONES=8 # Separate malloc(9) zones options ALT_BREAK_TO_DEBUGGER # Enter debugger on keyboard escape sequence options USB_DEBUG # Enable usb debug support code # Optional extras, never enabled by default: #options BOOTVERBOSE #options DEBUG # May result in extreme spewage -#options KTR -#options KTR_COMPILE=KTR_ALL -#options KTR_ENTRIES=16384 -#options KTR_MASK=(KTR_SPARE2) +options KTR +options KTR_COMPILE=KTR_ALL +options KTR_ENTRIES=163840 +options KTR_MASK=(KTR_SPARE3) #options KTR_VERBOSE=0 #options USB_REQ_DEBUG #options USB_VERBOSE #options VERBOSE_SYSINIT # Enable verbose sysinit messages