Skip to content

Commit

Permalink
Merge branch 'master' of ssh://sourceware.org/git/glibc
Browse files Browse the repository at this point in the history
Conflicts:
	ChangeLog
  • Loading branch information
Ulrich Drepper committed Feb 17, 2011
2 parents d55fd7a + 8e31c82 commit be6bd0b
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 1 deletion.
11 changes: 11 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,17 @@
* configure.in: No need to check for ranlib.
* elf/rtld-Rules: Don't use RANLIB.

2011-02-16 Samuel Thibault <samuel.thibault@ens-lyon.org>

* sysdeps/mach/i386/sysdep.h: Add _MACH_I386_SYSDEP_H inclusion
protection macro.
* sysdeps/mach/i386/thread_state.h: Add _MACH_I386_THREAD_STATE_H
inclusion protection macro.

* stdio-common/psiginfo.c (psiginfo): Check pinfo->si_signo against
SIGRTMIN and SIGRTMAX and print information in that case only when
SIGRTMIN is defined.

2011-02-11 Jakub Jelinek <jakub@redhat.com>

* stdio-common/printf-parsemb.c (__parse_one_specmb): Handle
Expand Down
7 changes: 6 additions & 1 deletion stdio-common/psiginfo.c
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,12 @@ psiginfo (const siginfo_t *pinfo, const char *s)
const char *desc;
if (pinfo->si_signo >= 0 && pinfo->si_signo < NSIG
&& ((desc = INTUSE(_sys_siglist)[pinfo->si_signo]) != NULL
|| (pinfo->si_signo >= SIGRTMIN && pinfo->si_signo < SIGRTMAX)))
#ifdef SIGRTMIN
|| (pinfo->si_signo >= SIGRTMIN && pinfo->si_signo < SIGRTMAX)
#endif
))
{
#ifdef SIGRTMIN
if (desc == NULL)
{
if (pinfo->si_signo - SIGRTMIN < SIGRTMAX - pinfo->si_signo)
Expand All @@ -106,6 +110,7 @@ psiginfo (const siginfo_t *pinfo, const char *s)
}
}
else
#endif
fprintf (fp, "%s (", _(desc));

const char *base = NULL;
Expand Down
5 changes: 5 additions & 0 deletions sysdeps/mach/i386/sysdep.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */

#ifndef _MACH_I386_SYSDEP_H
#define _MACH_I386_SYSDEP_H 1

/* Defines RTLD_PRIVATE_ERRNO and USE_DL_SYSINFO. */
#include <dl-sysdep.h>
#include <tls.h>
Expand Down Expand Up @@ -64,3 +67,5 @@
#undef ENTRY
#undef ALIGN
#include <sysdeps/unix/i386/sysdep.h>

#endif /* mach/i386/sysdep.h */
5 changes: 5 additions & 0 deletions sysdeps/mach/i386/thread_state.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */

#ifndef _MACH_I386_THREAD_STATE_H
#define _MACH_I386_THREAD_STATE_H 1

#include <mach/machine/thread_status.h>

#define MACHINE_THREAD_STATE_FLAVOR i386_THREAD_STATE
Expand All @@ -36,3 +39,5 @@ struct machine_thread_all_state
};

#include <sysdeps/mach/thread_state.h>

#endif /* mach/i386/thread_state.h */

0 comments on commit be6bd0b

Please sign in to comment.