2014-12-17 Joseph Myers <joseph@codesourcery.com>
+ [BZ #17725]
+ * sysdeps/generic/profil-counter.h (profil_counter): Rename to
+ __profil_counter.
+ * sysdeps/unix/sysv/linux/hppa/profil-counter.h (profil_counter):
+ Likewise.
+ * sysdeps/unix/sysv/linux/i386/profil-counter.h (profil_counter):
+ Likewise.
+ * sysdeps/unix/sysv/linux/ia64/profil-counter.h (profil_counter):
+ Likewise.
+ * sysdeps/unix/sysv/linux/s390/s390-32/profil-counter.h
+ (profil_counter): Likewise.
+ * sysdeps/unix/sysv/linux/s390/s390-64/profil-counter.h
+ (profil_counter): Likewise.
+ * sysdeps/unix/sysv/linux/sh/profil-counter.h (profil_counter):
+ Likewise.
+ * sysdeps/unix/sysv/linux/tile/profil-counter.h (profil_counter):
+ Likewise.
+ * sysdeps/unix/sysv/linux/x86_64/profil-counter.h
+ (profil_counter): Likewise.
+ * sysdeps/unix/sysv/linux/arm/profil-counter.h (profil_counter):
+ Likewise.
+ [!__profil_counter] (profil_counter): Define as weak alias of
+ __profil_counter.
+ * sysdeps/unix/sysv/linux/sparc/sparc32/profil-counter.h
+ (profil_counter): Rename to __profil_counter.
+ [!__profil_counter] (profil_counter): Define as weak alias of
+ __profil_counter.
+ * sysdeps/unix/sysv/linux/sparc/sparc64/profil-counter.h
+ (profil_counter): Rename to __profil_counter.
+ [!__profil_counter] (profil_counter): Define as weak alias of
+ __profil_counter.
+ * sysdeps/posix/profil.c: Update comment referring to
+ profil_counter.
+ (__profil): Use __profil_counter instead of profil_counter.
+ * sysdeps/posix/sprofil.c (profil_counter): Rename to
+ __profil_counter. Use __profil_counter_ushort and
+ __profil_counter_uint in definitions.
+ (__sprofil): Use __profil_counter_uint and __profil_counter_ushort
+ instead of profil_counter_uint and profil_counter_ushort.
+
[BZ #17722]
* inet/inet_mkadr.c (inet_makeaddr): Rename to __inet_makeaddr and
define as weak alias of __inet_makeaddr.
17522, 17555, 17570, 17571, 17572, 17573, 17574, 17581, 17582, 17583,
17584, 17585, 17589, 17594, 17601, 17608, 17616, 17625, 17630, 17633,
17634, 17647, 17653, 17657, 17664, 17665, 17668, 17682, 17717, 17719,
- 17722.
+ 17722, 17725.
* CVE-2104-7817 The wordexp function could ignore the WRDE_NOCMD flag
under certain input conditions resulting in the execution of a shell for
and the interrupted PC is easily findable in the `struct sigcontext'. */
static void
-profil_counter (int signr, int code, struct sigcontext *scp)
+__profil_counter (int signr, int code, struct sigcontext *scp)
{
profil_count ((void *) scp->sc_pc);
}
++samples[i];
}
-/* Get the machine-dependent definition of `profil_counter', the signal
+/* Get the machine-dependent definition of `__profil_counter', the signal
handler for SIGPROF. It calls `profil_count' (above) with the PC of the
interrupted code. */
#include "profil-counter.h"
pc_offset = offset;
pc_scale = scale;
- act.sa_handler = (sighandler_t) &profil_counter;
+ act.sa_handler = (sighandler_t) &__profil_counter;
act.sa_flags = SA_RESTART;
__sigfillset (&act.sa_mask);
if (__sigaction (SIGPROF, &act, oact_ptr) < 0)
profil_count (pcp, 1);
}
-/* Get the machine-dependent definition of `profil_counter', the signal
+/* Get the machine-dependent definition of `__profil_counter', the signal
handler for SIGPROF. It calls `profil_count' (above) with the PC of the
interrupted code. */
-#define profil_counter profil_counter_ushort
+#define __profil_counter __profil_counter_ushort
#define profil_count(pc) profil_count (pc, 0)
#include <profil-counter.h>
-#undef profil_counter
+#undef __profil_counter
#undef profil_count
-#define profil_counter profil_counter_uint
+#define __profil_counter __profil_counter_uint
#define profil_count(pc) profil_count (pc, 1)
#include <profil-counter.h>
/* Install SIGPROF handler. */
if (flags & PROF_UINT)
- act.sa_handler = (sighandler_t) &profil_counter_uint;
+ act.sa_handler = (sighandler_t) &__profil_counter_uint;
else
- act.sa_handler = (sighandler_t) &profil_counter_ushort;
+ act.sa_handler = (sighandler_t) &__profil_counter_ushort;
act.sa_flags = SA_RESTART;
__sigfillset (&act.sa_mask);
if (__sigaction (SIGPROF, &act, &prof_info.saved_action) < 0)
#include <sigcontextinfo.h>
void
-profil_counter (int signo, const SIGCONTEXT scp)
+__profil_counter (int signo, const SIGCONTEXT scp)
{
profil_count ((void *) GET_PC (scp));
the signal context. */
asm volatile ("");
}
+#ifndef __profil_counter
+weak_alias (__profil_counter, profil_counter)
+#endif
<http://www.gnu.org/licenses/>. */
static void
-profil_counter (int signr, siginfo_t *si, struct ucontext *uctx)
+__profil_counter (int signr, siginfo_t *si, struct ucontext *uctx)
{
unsigned long ip = uctx->uc_mcontext.sc_iaoq[0] & ~0x3;
profil_count ((void *) ip);
#include <sigcontextinfo.h>
static void
-profil_counter (int signo, const SIGCONTEXT scp)
+__profil_counter (int signo, const SIGCONTEXT scp)
{
profil_count ((void *) GET_PC (scp));
and the interrupted PC is easily findable in the `struct sigcontext'. */
static void
-profil_counter (int signr, siginfo_t *si, struct sigcontext *scp)
+__profil_counter (int signr, siginfo_t *si, struct sigcontext *scp)
{
unsigned long ip = scp->sc_ip & ~0X3ULL, slot = scp->sc_ip & 0x3ull;
#include <sigcontextinfo.h>
static void
-profil_counter (int signo, SIGCONTEXT scp)
+__profil_counter (int signo, SIGCONTEXT scp)
{
profil_count((void *) ((unsigned long) GET_PC (scp) & 0x7fffffffUL));
}
#include <sigcontextinfo.h>
static void
-profil_counter (int signo, SIGCONTEXT scp)
+__profil_counter (int signo, SIGCONTEXT scp)
{
profil_count ((void *) GET_PC (scp));
}
#include <signal.h>
static void
-profil_counter (int signo, int _a2, int _a3, int _a4, struct sigcontext sc)
+__profil_counter (int signo, int _a2, int _a3, int _a4, struct sigcontext sc)
{
void *pc;
pc = (void *) sc.sc_pc;
#include <signal.h>
void
-profil_counter (int signo, struct sigcontext *si)
+__profil_counter (int signo, struct sigcontext *si)
{
profil_count ((void *) si->si_regs.pc);
}
+#ifndef __profil_counter
+weak_alias (__profil_counter, profil_counter)
+#endif
#include <signal.h>
void
-profil_counter (int signo, struct sigcontext *si)
+__profil_counter (int signo, struct sigcontext *si)
{
profil_count ((void *) si->sigc_regs.tpc);
}
+#ifndef __profil_counter
+weak_alias (__profil_counter, profil_counter)
+#endif
#include <sigcontextinfo.h>
static void
-profil_counter (int signo, SIGCONTEXT scp)
+__profil_counter (int signo, SIGCONTEXT scp)
{
profil_count ((void *) GET_PC (scp));
}
#include <sigcontextinfo.h>
static void
-profil_counter (int signo, SIGCONTEXT scp)
+__profil_counter (int signo, SIGCONTEXT scp)
{
profil_count ((void *) GET_PC (scp));