This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, roland/dl_fatal, created. glibc-2.15-842-g5dfb37c
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 11 May 2012 18:42:33 -0000
- Subject: GNU C Library master sources branch, roland/dl_fatal, created. glibc-2.15-842-g5dfb37c
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, roland/dl_fatal has been created
at 5dfb37cc340c8dfbcc41efbfc9d7fd0d2241652f (commit)
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=5dfb37cc340c8dfbcc41efbfc9d7fd0d2241652f
commit 5dfb37cc340c8dfbcc41efbfc9d7fd0d2241652f
Author: Roland McGrath <roland@hack.frob.com>
Date: Fri May 11 11:41:35 2012 -0700
Use _dl_fatal_printf instead of a private variant.
diff --git a/ChangeLog b/ChangeLog
index 8c88f81..547165a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-11 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-11 Andreas Schwab <schwab@linux-m68k.org>
[BZ #11837]
diff --git a/elf/rtld.c b/elf/rtld.c
index 88a340d..a5b0ab9 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 d0f41a7..82d6e22 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 \
-----------------------------------------------------------------------
hooks/post-receive
--
GNU C Library master sources