This is the mail archive of the libc-hacker@sources.redhat.com mailing list for the glibc project.

Note that libc-hacker is a closed list. You may look at the archives of this list, but subscription and posting are not open.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

[PATCH] Fix soversions.awk

From: Jakub Jelinek <jakub at redhat dot com>
To: Roland McGrath <roland at redhat dot com>, Ulrich Drepper <drepper at redhat dot com>
Cc: Glibc hackers <libc-hacker at sources dot redhat dot com>
Date: Fri, 11 Feb 2005 15:55:33 +0100
Subject: [PATCH] Fix soversions.awk
Reply-to: Jakub Jelinek <jakub at redhat dot com>

Hi!

Current CVS doesn't build e.g. on ppc64.
The problem is that powerpc64-redhat-linux-gnu is matched by both:
powerpc64-.*-.*         WORDSIZE32              powerpc-@VENDOR@-@OS@
powerpc.*-.*-.*         WORDSIZE64              powerpc64-@VENDOR@-@OS@
so we end up with only WORDSIZE{32,64} keywords in first column of
soversions.i and thus e.g. Versions.all generation that looks for
DEFAULT keywords is broken.
The following patch considers only the first matching WORDSIZE32 resp.
WORDSIZE64.

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

	* scripts/soversions.awk: Only record first WORDSIZE{32,64}
	matching line.

--- libc/scripts/soversions.awk.jj	2005-02-11 14:22:01.000000000 +0100
+++ libc/scripts/soversions.awk	2005-02-11 15:01:26.824281128 +0100
@@ -8,7 +8,7 @@ BEGIN {
 { thiscf = $1 }
 
 $2 ~ /WORDSIZE[3264]/ {
-  if (config ~ thiscf) {
+  if ((config ~ thiscf) && !othercf) {
     othercf = $3;
     sub(/@CPU@/, cpu, othercf);
     sub(/@VENDOR@/, vendor, othercf);

	Jakub

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]