On Thu, Nov 27, 2008 at 6:57 AM, Carmelo AMOROSO <[EMAIL PROTECTED]> wrote: > [EMAIL PROTECTED] wrote: >> Author: carmelo >> Date: 2008-11-27 06:52:15 -0800 (Thu, 27 Nov 2008) >> New Revision: 24165 >> >> Log: >> Make __UCLIBC_HAVE_ASM_CFI_DIRECTIVES__ visible in case the arch >> supports this feature. SH4 will use this in some aseembly files >> for the NPTL implementation. Add now safely on trunk. >> > > don't worry guys... I'm not going to add any of NPTL part to trunk. > Just while working on merge trynk to branch, I'm going to add some > absolutely safe change in trunk to simplify future merge, and avoid > looking more and more times at the same files. > > I hope nobody would have some concerns on this. > It will simplify my work a lot.
Good idea.Yes common changes from the branch should be first brought into trunk. It can be done as you bring nptl branch upto date with trunk. > > TIA, > Carmelo > >> Signed-off-by: Carmelo Amoroso <[EMAIL PROTECTED]> >> >> >> Modified: >> trunk/uClibc/include/libc-symbols.h >> trunk/uClibc/libc/sysdeps/linux/sh/bits/uClibc_arch_features.h >> >> >> Changeset: >> Modified: trunk/uClibc/include/libc-symbols.h >> =================================================================== >> --- trunk/uClibc/include/libc-symbols.h 2008-11-27 14:43:17 UTC (rev >> 24164) >> +++ trunk/uClibc/include/libc-symbols.h 2008-11-27 14:52:15 UTC (rev >> 24165) >> @@ -133,6 +133,12 @@ >> # undef HAVE_ASM_GLOBAL_DOT_NAME >> #endif >> >> +#ifdef __UCLIBC_HAVE_ASM_CFI_DIRECTIVES__ >> +# define HAVE_ASM_CFI_DIRECTIVES >> +#else >> +# undef HAVE_ASM_CFI_DIRECTIVES >> +#endif >> + >> #if defined HAVE_ASM_WEAK_DIRECTIVE || defined HAVE_ASM_WEAKEXT_DIRECTIVE >> # define HAVE_WEAK_SYMBOLS >> #endif >> >> Modified: trunk/uClibc/libc/sysdeps/linux/sh/bits/uClibc_arch_features.h >> =================================================================== >> --- trunk/uClibc/libc/sysdeps/linux/sh/bits/uClibc_arch_features.h >> 2008-11-27 14:43:17 UTC (rev 24164) >> +++ trunk/uClibc/libc/sysdeps/linux/sh/bits/uClibc_arch_features.h >> 2008-11-27 14:52:15 UTC (rev 24165) >> @@ -39,6 +39,9 @@ >> /* needed probably only for ppc64 */ >> #undef __UCLIBC_HAVE_ASM_GLOBAL_DOT_NAME__ >> >> +/* define if target supports CFI pseudo ops */ >> +#define __UCLIBC_HAVE_ASM_CFI_DIRECTIVES__ >> + >> /* define if target supports IEEE signed zero floats */ >> #define __UCLIBC_HAVE_SIGNED_ZERO__ >> >> >> _______________________________________________ >> uClibc-cvs mailing list >> [EMAIL PROTECTED] >> http://busybox.net/cgi-bin/mailman/listinfo/uclibc-cvs >> > > _______________________________________________ > uClibc mailing list > [email protected] > http://busybox.net/cgi-bin/mailman/listinfo/uclibc > _______________________________________________ uClibc mailing list [email protected] http://busybox.net/cgi-bin/mailman/listinfo/uclibc
