lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-12-24 17:51:17 +03:00
Code Activity

Fri Sep 1 16:16:12 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>

Browse Source 
* libc-symbols.h (link_warning): Take new first arg SYMBOL; ask
	for a warning on references to that specific symbol, not the
	entire containing object file.
	(stub_warning): Pass symbol name to link_warning.
	* stdio/gets.c: Pass function name in link_warning invocation.

	* hurd/intr-msg.c: Treat apparent EINTR return from msg trap like
	MACH_SEND_INTERRUPTED.  That indicates interrupt_operation was
	sent, but failed.

	* stdlib/msort.c: Include memcopy.h.
	(msort_with_tmp): If operating on aligned op_t words, use direct word
	fetches and stores.

	* sysdeps/i386/dl-machine.h (ELF_MACHINE_BEFORE_RTLD_RELOC): Add
	missing backslash.
This commit is contained in:
Roland McGrath
1995-09-01 22:25:08 +00:00
parent e3726b056b
commit 44c8d1a2a8
9 changed files with 106 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
stdlib/msort.c
View File

@@ -1,5 +1,5 @@
/* msort -- an alternative to qsort, with an identical interface.
Copyright (C) 1992 Free Software Foundation, Inc.
Copyright (C) 1992, 1995 Free Software Foundation, Inc.
Written by Mike Haertel, September 1988.
This file is part of the GNU C Library.
@@ -22,11 +22,7 @@ Cambridge, MA 02139, USA. */
#include <ansidecl.h>
#include <stdlib.h>
#include <string.h>
#define MEMCPY(dst, src, s) \
((s) == sizeof (int) \
? (*(int *) (dst) = *(int *) (src), (dst)) \
: memcpy (dst, src, s))
#include <memcopy.h>
static void
DEFUN(msort_with_tmp, (b, n, s, cmp, t),
@@ -49,22 +45,38 @@ DEFUN(msort_with_tmp, (b, n, s, cmp, t),
tmp = t;
while (n1 > 0 && n2 > 0)
{
if ((*cmp) (b1, b2) <= 0)
{
MEMCPY (tmp, b1, s);
b1 += s;
--n1;
}
else
{
MEMCPY (tmp, b2, s);
b2 += s;
--n2;
}
tmp += s;
}
if (s == OPSIZ && (b1 - b2) % OPSIZ == 0)
/* We are operating on aligned words. Use direct word stores. */
while (n1 > 0 && n2 > 0)
{
if ((*cmp) (b1, b2) <= 0)
{
--n1;
*((op_t *) tmp)++ = *((op_t *) b1)++;
}
else
{
--n2;
*((op_t *) tmp)++ = *((op_t *) b2)++;
}
}
else
while (n1 > 0 && n2 > 0)
{
if ((*cmp) (b1, b2) <= 0)
{
memcpy (tmp, b1, s);
b1 += s;
--n1;
}
else
{
memcpy (tmp, b2, s);
b2 += s;
--n2;
}
tmp += s;
}
if (n1 > 0)
memcpy (tmp, b1, n1 * s);
memcpy (b, t, (n - n2) * s);