Module Name:    src
Committed By:   joerg
Date:           Sat Apr 23 16:40:08 UTC 2011

Modified Files:
        src/doc: CHANGES
        src/libexec/ld.elf_so: tls.c

Log Message:
Fix a Freudian slip found by rmind


To generate a diff of this commit:
cvs rdiff -u -r1.1539 -r1.1540 src/doc/CHANGES
cvs rdiff -u -r1.6 -r1.7 src/libexec/ld.elf_so/tls.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES
diff -u src/doc/CHANGES:1.1539 src/doc/CHANGES:1.1540
--- src/doc/CHANGES:1.1539	Fri Apr 15 15:30:59 2011
+++ src/doc/CHANGES	Sat Apr 23 16:40:08 2011
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1539 $>
+# LIST OF CHANGES FROM LAST RELEASE:			<$Revision: 1.1540 $>
 #
 #
 # [Note: This file does not mention every change made to the NetBSD source tree.
@@ -963,8 +963,8 @@
 		[bouyer 20110306]
 	tmux(1): First import of tmux (version 1.4).  [jmmv 20110310]
 	powerpc: add TLS (thread local storage) support.  [matt 20110311]
-	sh3: add TLS (thread locale storage) support.  [joerg 20110312]
-	x86: add TLS (thread locale storage) support.  [joerg 20110312]
+	sh3: add TLS (thread local storage) support.  [joerg 20110312]
+	x86: add TLS (thread local storage) support.  [joerg 20110312]
 	mips: add TLS (thread local storage) support.  [matt 20110314]
 	mips: add MIPS32R2 and MIPS64R2 support.  [matt 20110314]
 	shmif_dumpbus(1): Make endian-independent.  [pooka 20110314]
@@ -973,9 +973,9 @@
 	sandpoint: D-Link DSM-G600 support. [phx 20110319]
 	shark: chipsfb now works on shark. [macallan 20110323]
 	postfix(1): Import version 2.8.2 [tron 20110323]
-	sparc: add TLS (thread locale storage) support.  [martin 20110330]
-	sparc64: add TLS (thread locale storage) support.  [martin 20110330]
-	alpha: add TLS (thread locale storage) support.  [skrll 20110331]
+	sparc: add TLS (thread local storage) support.  [martin 20110330]
+	sparc64: add TLS (thread local storage) support.  [martin 20110330]
+	alpha: add TLS (thread local storage) support.  [skrll 20110331]
 	atf(7): Import 0.13.  [jmmv 20110331]
 	ssh-askpass: Updated to 1.2.0. [mbalmer 20110403]
 	rdcide(4): add a driver for the IDE controller found in RDC's

Index: src/libexec/ld.elf_so/tls.c
diff -u src/libexec/ld.elf_so/tls.c:1.6 src/libexec/ld.elf_so/tls.c:1.7
--- src/libexec/ld.elf_so/tls.c:1.6	Thu Apr  7 02:19:28 2011
+++ src/libexec/ld.elf_so/tls.c	Sat Apr 23 16:40:08 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: tls.c,v 1.6 2011/04/07 02:19:28 matt Exp $	*/
+/*	$NetBSD: tls.c,v 1.7 2011/04/23 16:40:08 joerg Exp $	*/
 /*-
  * Copyright (c) 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: tls.c,v 1.6 2011/04/07 02:19:28 matt Exp $");
+__RCSID("$NetBSD: tls.c,v 1.7 2011/04/23 16:40:08 joerg Exp $");
 
 #include <sys/param.h>
 #include <sys/ucontext.h>
@@ -243,7 +243,7 @@
 	if (_rtld_tls_static_space) {
 		if (obj->tlsinitsize) {
 			_rtld_error("%s: Use of initialized "
-			    "Thread Locale Storage with model initial-exec "
+			    "Thread Local Storage with model initial-exec "
 			    "and dlopen is not supported",
 			    obj->path);
 			return -1;

Reply via email to