From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.org/gmane.linux.lib.musl.general/1347 Path: news.gmane.org!not-for-mail From: Isaac Dunham Newsgroups: gmane.linux.lib.musl.general Subject: Re: [PATCH 9/10] GLIBC ABI patches Date: Sun, 22 Jul 2012 18:38:28 -0700 Message-ID: <20120722183828.20b71c9d@newbook> References: <20120722181332.191d4fa5@newbook> Reply-To: musl@lists.openwall.com NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="MP_/YMNsU.LQsdeij19bsa_PUqL" X-Trace: dough.gmane.org 1343007529 11368 80.91.229.3 (23 Jul 2012 01:38:49 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 23 Jul 2012 01:38:49 +0000 (UTC) To: musl@lists.openwall.com Original-X-From: musl-return-1348-gllmg-musl=m.gmane.org@lists.openwall.com Mon Jul 23 03:38:45 2012 Return-path: Envelope-to: gllmg-musl@plane.gmane.org Original-Received: from mother.openwall.net ([195.42.179.200]) by plane.gmane.org with smtp (Exim 4.69) (envelope-from ) id 1St7bg-0007Ae-UF for gllmg-musl@plane.gmane.org; Mon, 23 Jul 2012 03:38:45 +0200 Original-Received: (qmail 21518 invoked by uid 550); 23 Jul 2012 01:38:44 -0000 Mailing-List: contact musl-help@lists.openwall.com; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: Original-Received: (qmail 21507 invoked from network); 23 Jul 2012 01:38:43 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=lavabit; d=lavabit.com; b=W4nXfyit6kHuMMVWhnPtDda2yre9t8TBUas5lfFEttXExR6pGoDf8rO6tz5r+NqkAnt2FvuhUN9bbgcXUbWHbO9daT/YkcjtqUg4x9xHLVaVyCQ6IiCAkdCAyxm9nlgf7rO3Cbw4djXnS/XBm9r5qr3qo+SQM7QxKO9TTtJTosI=; h=Date:From:To:Subject:Message-ID:In-Reply-To:References:X-Mailer:Mime-Version:Content-Type; In-Reply-To: <20120722181332.191d4fa5@newbook> X-Mailer: Claws Mail 3.7.4 (GTK+ 2.20.1; i486-pc-linux-gnu) Xref: news.gmane.org gmane.linux.lib.musl.general:1347 Archived-At: --MP_/YMNsU.LQsdeij19bsa_PUqL Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Content-Disposition: inline On Sun, 22 Jul 2012 18:13:32 -0700 Isaac Dunham wrote: > This patch series is basically a reworked version of orc's previous > patch. > From what orc said, the first patch should provide enough to build > Xorg; I haven't tested this yet. > A few more patches are syscall wrappers (splice) or trivial > functions (finite). > Finally, there are several aliases. Just nonsense aliases GNU uses... Needed for ABI compatability. Isaac Dunham --MP_/YMNsU.LQsdeij19bsa_PUqL Content-Type: text/x-patch Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=9-__glibc.diff diff --git a/src/select/poll.c b/src/select/poll.c index f1e73e8..b2f8b00 100644 --- a/src/select/poll.c +++ b/src/select/poll.c @@ -6,3 +6,5 @@ int poll(struct pollfd *fds, nfds_t n, int timeout) { return syscall_cp(SYS_poll, fds, n, timeout); } + +weak_alias(poll, __poll); diff --git a/src/stdio/fscanf.c b/src/stdio/fscanf.c index 51fc9b3..155f8ac 100644 --- a/src/stdio/fscanf.c +++ b/src/stdio/fscanf.c @@ -1,5 +1,6 @@ #include #include +#include "libc.h" int fscanf(FILE *f, const char *fmt, ...) { @@ -10,3 +11,5 @@ int fscanf(FILE *f, const char *fmt, ...) va_end(ap); return ret; } + +weak_alias(fscanf, __isoc99_fscanf); diff --git a/src/stdio/sscanf.c b/src/stdio/sscanf.c index a1cea69..8c16343 100644 --- a/src/stdio/sscanf.c +++ b/src/stdio/sscanf.c @@ -1,5 +1,6 @@ #include #include +#include "libc.h" int sscanf(const char *s, const char *fmt, ...) { @@ -10,3 +11,5 @@ int sscanf(const char *s, const char *fmt, ...) va_end(ap); return ret; } + +weak_alias(sscanf, __isoc99_sscanf); diff --git a/src/string/strndup.c b/src/string/strndup.c index 617d27b..b162d8b 100644 --- a/src/string/strndup.c +++ b/src/string/strndup.c @@ -1,7 +1,8 @@ #include #include +#include "libc.h" -char *strndup(const char *s, size_t n) +char *__strndup(const char *s, size_t n) { size_t l = strnlen(s, n); char *d = malloc(l+1); @@ -10,3 +11,5 @@ char *strndup(const char *s, size_t n) d[l] = 0; return d; } + +weak_alias(__strndup, strndup); --MP_/YMNsU.LQsdeij19bsa_PUqL--