Source-Changes-HG archive

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

[src/trunk]: src/lib/libc/locale disable dso protected to work around binutil...



details:   https://anonhg.NetBSD.org/src/rev/df4993b5a554
branches:  trunk
changeset: 343307:df4993b5a554
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Jan 29 15:18:08 2016 +0000

description:
disable dso protected to work around binutils bug.

diffstat:

 lib/libc/locale/global_locale.c   |  8 ++++----
 lib/libc/locale/setlocale_local.h |  4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diffs (55 lines):

diff -r 044224ee5f2d -r df4993b5a554 lib/libc/locale/global_locale.c
--- a/lib/libc/locale/global_locale.c   Fri Jan 29 14:42:43 2016 +0000
+++ b/lib/libc/locale/global_locale.c   Fri Jan 29 15:18:08 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: global_locale.c,v 1.21 2013/09/13 13:13:32 joerg Exp $ */
+/* $NetBSD: global_locale.c,v 1.22 2016/01/29 15:18:08 christos Exp $ */
 
 /*-
  * Copyright (c)2008 Citrus Project,
@@ -28,7 +28,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: global_locale.c,v 1.21 2013/09/13 13:13:32 joerg Exp $");
+__RCSID("$NetBSD: global_locale.c,v 1.22 2016/01/29 15:18:08 christos Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/types.h>
@@ -143,7 +143,7 @@
     .numeric_name = _lc_C_locale_name,
 };
 
-__dso_protected struct _locale _lc_global_locale = {
+/* __dso_protected */ struct _locale _lc_global_locale = {
     .cache = &_C_cache,
     .query = { _C_LOCALE },
     .part_name = {
@@ -171,7 +171,7 @@
     },
 };
 
-__dso_protected const struct _locale _lc_C_locale = {
+/* __dso_protected */ const struct _locale _lc_C_locale = {
     .cache = &_C_cache,
     .query = { _C_LOCALE },
     .part_name = {
diff -r 044224ee5f2d -r df4993b5a554 lib/libc/locale/setlocale_local.h
--- a/lib/libc/locale/setlocale_local.h Fri Jan 29 14:42:43 2016 +0000
+++ b/lib/libc/locale/setlocale_local.h Fri Jan 29 15:18:08 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: setlocale_local.h,v 1.15 2013/09/13 13:13:32 joerg Exp $ */
+/* $NetBSD: setlocale_local.h,v 1.16 2016/01/29 15:18:08 christos Exp $ */
 
 /*-
  * Copyright (c)2008 Citrus Project,
@@ -85,7 +85,9 @@
 __END_DECLS
 
 #ifdef _LIBC
+#if 0
 extern __dso_protected struct _locale  _lc_global_locale;
+#endif
 extern __dso_hidden const struct _locale_cache_t _C_cache;
 
 static __inline struct _locale *



Home | Main Index | Thread Index | Old Index