diff options
| author | Thomas Schwinge <thomas@schwinge.name> | 2010-03-01 09:32:56 +0100 |
|---|---|---|
| committer | Thomas Schwinge <thomas@schwinge.name> | 2010-03-01 09:32:56 +0100 |
| commit | eeeb03c5d10b2e44f619a6178daa6a61030fb1ad (patch) | |
| tree | 2cb558f922a593c1a8d6ab74b550064577b9ae69 /csu | |
| parent | bd18e30e08e2dce7b053854202edbb21ce90cf8d (diff) | |
| parent | 441ba5169f79b3ae7fe55e31cf4bdd1622b80c35 (diff) | |
Merge branch 't/bits_atomic.h_multiple_threads' into refs/top-bases/tschwinge/Roger_Whittaker
Diffstat (limited to 'csu')
| -rw-r--r-- | csu/libc-start.c | 4 | ||||
| -rw-r--r-- | csu/version.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/csu/libc-start.c b/csu/libc-start.c index b21aef952c..db2939bee8 100644 --- a/csu/libc-start.c +++ b/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 @@ -142,7 +142,7 @@ LIBC_START_MAIN (int (*main) (int, char **, char ** MAIN_AUXVEC_DECL), #endif /* 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/csu/version.c b/csu/version.c index 9b4edd834b..db913be800 100644 --- a/csu/version.c +++ b/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 "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\ |