summaryrefslogtreecommitdiff
path: root/libc/nptl
diff options
context:
space:
mode:
authorjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2012-03-10 01:14:00 +0000
committerjoseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2012-03-10 01:14:00 +0000
commit3989839bfe26b8c28a99727f0c290cbeeb7aea9e (patch)
treef003da420fc59627c5e994dc298a73ec35341bc4 /libc/nptl
parent06d9d5232ea8ec9fc7e55acdbdd9a87f09d06755 (diff)
Merge changes between r17501 and r17530 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@17531 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/nptl')
-rw-r--r--libc/nptl/ChangeLog5
-rw-r--r--libc/nptl/pt-crti.S5
2 files changed, 7 insertions, 3 deletions
diff --git a/libc/nptl/ChangeLog b/libc/nptl/ChangeLog
index 3f70b0a29..34a249207 100644
--- a/libc/nptl/ChangeLog
+++ b/libc/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-09 Paul Eggert <eggert@cs.ucla.edu>
+
+ [BZ #13673]
+ * pt-crti.S: Replace FSF snail mail address with URL.
+
2012-03-09 Joseph Myers <joseph@codesourcery.com>
* sysdeps/pthread/pthread.h (__need_clockid_t, __need_timespec):
diff --git a/libc/nptl/pt-crti.S b/libc/nptl/pt-crti.S
index 3ea359d7d..4c5cdddb9 100644
--- a/libc/nptl/pt-crti.S
+++ b/libc/nptl/pt-crti.S
@@ -30,9 +30,8 @@
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
/* Arrange for __pthread_initialize_minimal_internal to be called at
libpthread startup, instead of conditionally calling