[commits] r7542 - in /trunk/libc: ChangeLog.eglibc debug/Makefile iconvdata/Makefile intl/dcigettext.c

[maxim@xxxxxxxxxx]

Author: maxim
Date: Mon Dec 15 05:37:21 2008
New Revision: 7542

Log:
	* intl/dcigettext.c: Condition use of libc_setlocale_lock on
	OPTION_EGLIBC_LOCALE_CODE.
	* debug/Makefile (tests): Condition affected tests on
	OPTION_EGLIBC_LOCALE_CODE.
	* iconvdata/Makefile (tests): Same.

Modified:
    trunk/libc/ChangeLog.eglibc
    trunk/libc/debug/Makefile
    trunk/libc/iconvdata/Makefile
    trunk/libc/intl/dcigettext.c

Modified: trunk/libc/ChangeLog.eglibc
==============================================================================
--- trunk/libc/ChangeLog.eglibc (original)
+++ trunk/libc/ChangeLog.eglibc Mon Dec 15 05:37:21 2008
@@ -1,3 +1,12 @@
+2008-12-15  Josh Boyer  <jwboyer@xxxxxxxxx>
+	    Maxim Kuvyrkov  <maxim@xxxxxxxxxxxxxxxx>
+
+	* intl/dcigettext.c: Condition use of libc_setlocale_lock on
+	OPTION_EGLIBC_LOCALE_CODE.
+	* debug/Makefile (tests): Condition affected tests on
+	OPTION_EGLIBC_LOCALE_CODE.
+	* iconvdata/Makefile (tests): Same.
+
 2008-12-09  Maxim Kuvyrkov  <maxim@xxxxxxxxxxxxxxxx>
 
 	Support smaller regex implementation.

Modified: trunk/libc/debug/Makefile
==============================================================================
--- trunk/libc/debug/Makefile (original)
+++ trunk/libc/debug/Makefile Mon Dec 15 05:37:21 2008
@@ -123,11 +123,13 @@
 LDFLAGS-tst-lfschk5 = -lstdc++
 LDFLAGS-tst-lfschk6 = -lstdc++
 
-tests = tst-chk1 tst-chk2 tst-chk3 \
-	tst-lfschk1 tst-lfschk2 tst-lfschk3 test-strcpy_chk test-stpcpy_chk
+tests = test-strcpy_chk test-stpcpy_chk
+tests-$(OPTION_EGLIBC_LOCALE_CODE) \
+      += tst-chk1 tst-chk2 tst-chk3 tst-lfschk1 tst-lfschk2 tst-lfschk3 
 tests-$(OPTION_EGLIBC_BACKTRACE) += backtrace-tst 
-tests-$(OPTION_EGLIBC_CXX_TESTS) \
-     += tst-chk4 tst-chk5 tst-chk6 tst-lfschk4 tst-lfschk5 tst-lfschk6
+ifeq (yy,$(OPTION_EGLIBC_LOCALE_CODE)$(OPTION_EGLIBC_CXX_TESTS))
+tests += tst-chk4 tst-chk5 tst-chk6 tst-lfschk4 tst-lfschk5 tst-lfschk6
+endif
 
 extra-libs = libSegFault libpcprofile
 extra-libs-others = $(extra-libs)

Modified: trunk/libc/iconvdata/Makefile
==============================================================================
--- trunk/libc/iconvdata/Makefile (original)
+++ trunk/libc/iconvdata/Makefile Mon Dec 15 05:37:21 2008
@@ -70,7 +70,8 @@
 
 ifeq (yes,$(build-shared))
 tests = bug-iconv1 bug-iconv2 tst-loading tst-e2big tst-iconv4 bug-iconv4 \
-	tst-iconv6 bug-iconv5 bug-iconv6 tst-iconv7
+	tst-iconv6 bug-iconv5
+tests-$(OPTION_EGLIBC_LOCALE_CODE) += bug-iconv6 tst-iconv7
 ifeq ($(have-thread-library),yes)
 tests += bug-iconv3
 endif

Modified: trunk/libc/intl/dcigettext.c
==============================================================================
--- trunk/libc/intl/dcigettext.c (original)
+++ trunk/libc/intl/dcigettext.c Mon Dec 15 05:37:21 2008
@@ -455,8 +455,10 @@
 #endif
 
 #ifdef _LIBC
+#if __OPTION_EGLIBC_LOCALE_CODE
   __libc_rwlock_define (extern, __libc_setlocale_lock attribute_hidden)
   __libc_rwlock_rdlock (__libc_setlocale_lock);
+#endif
 #endif
 
   __libc_rwlock_rdlock (_nl_state_lock);
@@ -504,7 +506,9 @@
 	retval = (char *) (*foundp)->translation;
 
 # ifdef _LIBC
+#if __OPTION_EGLIBC_LOCALE_CODE
       __libc_rwlock_unlock (__libc_setlocale_lock);
+#endif
 # endif
       __libc_rwlock_unlock (_nl_state_lock);
       return retval;
@@ -565,7 +569,9 @@
 	  /* We cannot get the current working directory.  Don't signal an
 	     error but simply return the default string.  */
 	  FREE_BLOCKS (block_list);
+#if __OPTION_EGLIBC_LOCALE_CODE
 	  __libc_rwlock_unlock (__libc_setlocale_lock);
+#endif
 	  __libc_rwlock_unlock (_nl_state_lock);
 	  __set_errno (saved_errno);
 	  return (plural == 0
@@ -632,7 +638,9 @@
 	{
 	no_translation:
 	  FREE_BLOCKS (block_list);
+#if __OPTION_EGLIBC_LOCALE_CODE
 	  __libc_rwlock_unlock (__libc_setlocale_lock);
+#endif
 	  __libc_rwlock_unlock (_nl_state_lock);
 	  __set_errno (saved_errno);
 	  return (plural == 0
@@ -746,7 +754,9 @@
 	      if (plural)
 		retval = plural_lookup (domain, n, retval, retlen);
 
+#if __OPTION_EGLIBC_LOCALE_CODE
 	      __libc_rwlock_unlock (__libc_setlocale_lock);
+#endif
 	      __libc_rwlock_unlock (_nl_state_lock);
 	      return retval;
 	    }