[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[patches] PATCH: fix ppc building without OPTION_EGLIBC_LOCALE_CODE



I noted last week that EGLIBC would not build on ppc with the OPTION_EGLIBC_LOCALE_CODE option group disabled. This patch fixes it.

Committed as pre-approved by JimB.

-Sandra

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.


Index: sysdeps/ieee754/ldbl-opt/Makefile
===================================================================
*** sysdeps/ieee754/ldbl-opt/Makefile	(revision 4415)
--- sysdeps/ieee754/ldbl-opt/Makefile	(working copy)
*************** libnldbl-calls = asprintf dprintf fprint
*** 22,28 ****
  		 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 \
--- 22,27 ----
*************** libnldbl-calls = asprintf dprintf fprint
*** 40,45 ****
--- 39,46 ----
  		 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)
Index: sysdeps/ieee754/ldbl-opt/nldbl-compat.c
===================================================================
*** sysdeps/ieee754/ldbl-opt/nldbl-compat.c	(revision 4415)
--- sysdeps/ieee754/ldbl-opt/nldbl-compat.c	(working copy)
*************** __nldbl___printf_fp (FILE *fp, const str
*** 693,698 ****
--- 693,699 ----
    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, ...)
*************** __nldbl___vstrfmon_l (char *s, size_t ma
*** 747,752 ****
--- 748,754 ----
    return res;
  }
  libc_hidden_def (__nldbl___vstrfmon_l)
+ #endif
  
  void
  attribute_compat_text_section