Module Name: src
Committed By: christos
Date: Fri Jan 29 15:18:08 UTC 2016
Modified Files:
src/lib/libc/locale: global_locale.c setlocale_local.h
Log Message:
disable dso protected to work around binutils bug.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/lib/libc/locale/global_locale.c
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/locale/setlocale_local.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/locale/global_locale.c
diff -u src/lib/libc/locale/global_locale.c:1.21 src/lib/libc/locale/global_locale.c:1.22
--- src/lib/libc/locale/global_locale.c:1.21 Fri Sep 13 09:13:32 2013
+++ src/lib/libc/locale/global_locale.c Fri Jan 29 10:18:08 2016
@@ -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 @@ __dso_hidden const struct _locale_cache_
.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 struct _locale _lc_globa
},
};
-__dso_protected const struct _locale _lc_C_locale = {
+/* __dso_protected */ const struct _locale _lc_C_locale = {
.cache = &_C_cache,
.query = { _C_LOCALE },
.part_name = {
Index: src/lib/libc/locale/setlocale_local.h
diff -u src/lib/libc/locale/setlocale_local.h:1.15 src/lib/libc/locale/setlocale_local.h:1.16
--- src/lib/libc/locale/setlocale_local.h:1.15 Fri Sep 13 09:13:32 2013
+++ src/lib/libc/locale/setlocale_local.h Fri Jan 29 10:18:08 2016
@@ -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 @@ int _setlocale_cache(locale_t, struct _l
__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 *
