[commits] r4527 - in /trunk/libc: ChangeLog.eglibc sysdeps/ieee754/ldbl-opt/Makefile sysdeps/ieee754/ldbl-opt/nldbl-compat.c

[sandra@xxxxxxxxxx]

Author: sandra
Date: Thu Dec 13 10:22:53 2007
New Revision: 4527

Log:
2007-12-13  Sandra Loosemore  <sandra@xxxxxxxxxxxxxxxx>

	* sysdeps/ieee754/ldbl-opt/Makefile (libnldbl-calls):  Make strfmon
	and strfmon_l conditional on OPTION_EGLIBC_LOCALE_CODE.
	* sysdeps/ieee754/ldbl-opt/nldbl-compat.c (__nldbl___vstrfmon,
	__nldbl___vstrfmon_l, __nldbl___strfmon, __nldbl___strfmon_l):
	Make conditional on __OPTION_EGLIBC_LOCALE_CODE.



Modified:
    trunk/libc/ChangeLog.eglibc
    trunk/libc/sysdeps/ieee754/ldbl-opt/Makefile
    trunk/libc/sysdeps/ieee754/ldbl-opt/nldbl-compat.c

Modified: trunk/libc/ChangeLog.eglibc
==============================================================================
--- trunk/libc/ChangeLog.eglibc (original)
+++ trunk/libc/ChangeLog.eglibc Thu Dec 13 10:22:53 2007
@@ -1,3 +1,11 @@
+2007-12-13  Sandra Loosemore  <sandra@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/ieee754/ldbl-opt/Makefile (libnldbl-calls):  Make strfmon
+	and strfmon_l conditional on OPTION_EGLIBC_LOCALE_CODE.
+	* sysdeps/ieee754/ldbl-opt/nldbl-compat.c (__nldbl___vstrfmon,
+	__nldbl___vstrfmon_l, __nldbl___strfmon, __nldbl___strfmon_l):
+	Make conditional on __OPTION_EGLIBC_LOCALE_CODE.
+
 2007-12-13  Jim Blandy  <jimb@xxxxxxxxxxxxxxxx>
 	    Sandra Loosemore  <sandra@xxxxxxxxxxxxxxxx>
 

Modified: trunk/libc/sysdeps/ieee754/ldbl-opt/Makefile
==============================================================================
--- trunk/libc/sysdeps/ieee754/ldbl-opt/Makefile (original)
+++ trunk/libc/sysdeps/ieee754/ldbl-opt/Makefile Thu Dec 13 10:22:53 2007
@@ -22,7 +22,6 @@
 		 vsnprintf_chk vsprintf_chk vswprintf_chk vwprintf_chk \
 		 wprintf_chk \
 		 syslog syslog_chk vsyslog vsyslog_chk \
-		 strfmon strfmon_l \
 		 strtold strtold_l strtoldint wcstold wcstold_l wcstoldint \
 		 qecvt qfcvt qgcvt qecvt_r qfcvt_r \
 		 isinf isnan finite signbit scalb log2 lgamma_r ceil \
@@ -40,6 +39,8 @@
 		 isoc99_vscanf isoc99_vfscanf isoc99_vsscanf \
 		 isoc99_wscanf isoc99_fwscanf isoc99_swscanf \
 		 isoc99_vwscanf isoc99_vfwscanf isoc99_vswscanf
+libnldbl-calls-$(OPTION_EGLIBC_LOCALE_CODE) += strfmon strfmon_l
+libnldbl-calls += $(libnldbl-calls-y)
 libnldbl-routines = $(libnldbl-calls:%=nldbl-%)
 libnldbl-inhibit-o = $(object-suffixes)
 libnldbl-static-only-routines = $(libnldbl-routines)

Modified: trunk/libc/sysdeps/ieee754/ldbl-opt/nldbl-compat.c
==============================================================================
--- trunk/libc/sysdeps/ieee754/ldbl-opt/nldbl-compat.c (original)
+++ trunk/libc/sysdeps/ieee754/ldbl-opt/nldbl-compat.c Thu Dec 13 10:22:53 2007
@@ -693,6 +693,7 @@
   return ___printf_fp (fp, &info_no_ldbl, args);
 }
 
+#if __OPTION_EGLIBC_LOCALE_CODE
 ssize_t
 attribute_compat_text_section
 __nldbl_strfmon (char *s, size_t maxsize, const char *format, ...)
@@ -747,6 +748,7 @@
   return res;
 }
 libc_hidden_def (__nldbl___vstrfmon_l)
+#endif
 
 void
 attribute_compat_text_section