diff options
| author | Roland McGrath <roland@hack.frob.com> | 2012-05-11 11:41:35 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2012-05-14 16:10:12 -0700 |
| commit | ceb809dcae3da4464ea7d34c3d6e01ba1aa2e3d8 (patch) | |
| tree | a05764e249ec74bb8b44831fe953a9ded628488c | |
| parent | 144c5467725f0868fadbdd236d67ee5b1df2fb45 (diff) | |
| download | glibc-ceb809dcae3da4464ea7d34c3d6e01ba1aa2e3d8.tar.gz glibc-ceb809dcae3da4464ea7d34c3d6e01ba1aa2e3d8.tar.xz glibc-ceb809dcae3da4464ea7d34c3d6e01ba1aa2e3d8.zip | |
Use _dl_fatal_printf instead of a private variant.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | elf/rtld.c | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/dl-osinfo.h | 14 |
3 files changed, 8 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog index e2de309c95..35bf7361c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-05-14 Roland McGrath <roland@hack.frob.com> + + * sysdeps/unix/sysv/linux/dl-osinfo.h (dl_fatal): Function removed. + * elf/rtld.c (dl_main) [DL_SYSDEP_OSCHECK]: + Use _dl_fatal_printf instead. + 2012-05-14 Joseph Myers <joseph@codesourcery.com> * sysdeps/unix/sysv/linux/configure.in (minimum_kernel): Always diff --git a/elf/rtld.c b/elf/rtld.c index 88a340d1ee..a5b0ab9815 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -1432,7 +1432,7 @@ of this helper program; chances are you did not intend to run this program.\n\ #endif #ifdef DL_SYSDEP_OSCHECK - DL_SYSDEP_OSCHECK (dl_fatal); + DL_SYSDEP_OSCHECK (_dl_fatal_printf); #endif /* Initialize the data structures for the search paths for shared diff --git a/sysdeps/unix/sysv/linux/dl-osinfo.h b/sysdeps/unix/sysv/linux/dl-osinfo.h index d0f41a7b2c..82d6e22ae9 100644 --- a/sysdeps/unix/sysv/linux/dl-osinfo.h +++ b/sysdeps/unix/sysv/linux/dl-osinfo.h @@ -1,5 +1,5 @@ /* Operating system specific code for generic dynamic loader functions. Linux. - Copyright (C) 2000-2002,2004-2009,2011 Free Software Foundation, Inc. + Copyright (C) 2000-2012 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 @@ -27,18 +27,6 @@ # define MIN(a,b) (((a)<(b))?(a):(b)) #endif -#ifdef SHARED -/* This is the function used in the dynamic linker to print the fatal error - message. */ -static void -__attribute__ ((__noreturn__)) -dl_fatal (const char *str) -{ - _dl_dprintf (2, str); - _exit (1); -} -#endif - #define DL_SYSDEP_OSCHECK(FATAL) \ do { \ /* Test whether the kernel is new enough. This test is only performed \ |