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

Re: [patches] Fix LOCALE_CODE option group on ARM

On Tue, 12 May 2009, Maxim Kuvyrkov wrote:

> OK to check in the following simple patch?
> Everything what __aeabi_localeconv() does is just calling __localeconv();
> without LOCALE_CODE option group there is no __localeconv() in the library, so
> the link fails.

This had the undesired effect of removing __aeabi_localeconv in all 
configurations.  The relevant part of ports/sysdeps/arm/eabi/Makefile 
applies in the csu subdirectory - and csu/Makefile does not include 
option-groups.mak so OPTION_EGLIBC_LOCALE_CODE was not defined for the 
comparison in ports/sysdeps/arm/eabi/Makefile.  I've applied this patch 
which should fix this to trunk, 2.11 branch and 2.10 branch.

(This function is broken because it doesn't do the reordering of fields 
required by the ARM EABI, but that's a separate issue not specific to 

Index: csu/Makefile
--- csu/Makefile	(revision 10128)
+++ csu/Makefile	(working copy)
@@ -24,6 +24,8 @@
 # to make the .init and .fini sections work right; both these files are
 # built (in an arcane manner) from initfini.c.
+include ../option-groups.mak
 subdir := csu
 routines = init-first libc-start $(libc-init) sysdep version check_fds \
Index: ChangeLog.eglibc
--- ChangeLog.eglibc	(revision 10128)
+++ ChangeLog.eglibc	(working copy)
@@ -1,3 +1,7 @@
+2010-03-28  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+	* csu/Makefile: Include option-groups.mak.
 2010-03-22  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 	* elf/Makefile (tst-audit3-ENV, tst-audit4-ENV, tst-audit5-ENV,

Joseph S. Myers