lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

Use _dl_fatal_printf instead of a private variant.

Browse Source
This commit is contained in:
Roland McGrath
2012-05-11 11:41:35 -07:00
parent 144c546772
commit ceb809dcae
3 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -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> 2012-05-14 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/configure.in (minimum_kernel): Always * sysdeps/unix/sysv/linux/configure.in (minimum_kernel): Always

2
elf/rtld.c
View File

@ -1432,7 +1432,7 @@ of this helper program; chances are you did not intend to run this program.\n\
#endif #endif
#ifdef DL_SYSDEP_OSCHECK #ifdef DL_SYSDEP_OSCHECK
DL_SYSDEP_OSCHECK (dl_fatal); DL_SYSDEP_OSCHECK (_dl_fatal_printf);
#endif #endif
/* Initialize the data structures for the search paths for shared /* Initialize the data structures for the search paths for shared

14
sysdeps/unix/sysv/linux/dl-osinfo.h
View File

@ -1,5 +1,5 @@
/* Operating system specific code for generic dynamic loader functions. Linux. /* 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. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or 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)) # define MIN(a,b) (((a)<(b))?(a):(b))
#endif #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) \ #define DL_SYSDEP_OSCHECK(FATAL) \
do { \ do { \
/* Test whether the kernel is new enough. This test is only performed \ /* Test whether the kernel is new enough. This test is only performed \