diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2009-01-19 17:43:22 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2009-01-19 17:43:22 +0000 |
| commit | 432c294271be1798957a4760de545c04882ae433 (patch) | |
| tree | 3358fc24a955794a6a05e61f63fe633b42651855 /libc/csu | |
| parent | a3a5faa23bf173332bcf5454d0daef644c264213 (diff) | |
Merge changes between r7510 and r7756 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@7757 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/csu')
| -rw-r--r-- | libc/csu/libc-start.c | 4 | ||||
| -rw-r--r-- | libc/csu/version.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libc/csu/libc-start.c b/libc/csu/libc-start.c index a14ed7161..80b672f88 100644 --- a/libc/csu/libc-start.c +++ b/libc/csu/libc-start.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1998-2006, 2007 Free Software Foundation, Inc. +/* Copyright (C) 1998-2006, 2007, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -140,7 +140,7 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL), __pthread_initialize_minimal (); /* Set up the stack checker's canary. */ - uintptr_t stack_chk_guard = _dl_setup_stack_chk_guard (); + uintptr_t stack_chk_guard = _dl_setup_stack_chk_guard (_dl_random); # ifdef THREAD_SET_STACK_GUARD THREAD_SET_STACK_GUARD (stack_chk_guard); # else diff --git a/libc/csu/version.c b/libc/csu/version.c index 4435721fd..3ce7fe0c7 100644 --- a/libc/csu/version.c +++ b/libc/csu/version.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1992-2006, 2007, 2008 Free Software Foundation, Inc. +/* Copyright (C) 1992-2008, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -25,7 +25,7 @@ static const char __libc_version[] = VERSION; static const char banner[] = "GNU C Library "PKGVERSION RELEASE" release version "VERSION", by Roland McGrath et al.\n\ -Copyright (C) 2008 Free Software Foundation, Inc.\n\ +Copyright (C) 2009 Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions.\n\ There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n\ PARTICULAR PURPOSE.\n\ |