diff options
| -rw-r--r-- | scripts/merge-abilist.awk | 9 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/ia64/brk.S | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/scripts/merge-abilist.awk b/scripts/merge-abilist.awk index 88ca0b08ea..91999d9221 100644 --- a/scripts/merge-abilist.awk +++ b/scripts/merge-abilist.awk @@ -131,15 +131,22 @@ END { # S[I] is a sorted, comma-separated list of SET:CONFIG pairs. # All we have to do is pretty-print them. nc = split(s[i], c, ","); - lastvers = ""; + lastvers = lastconf = ""; for (j = 1; j <= nc; ++j) { split(c[j], temp, ":"); version = temp[1]; conf = temp[2]; if (version != lastvers) printf "%s%s", (lastvers != "" ? "\n| " : ""), version; + # Hack: if CONF is foo.*/bar and LASTCONF was foo.*, + # then we can omit the foo.*/bar since foo.* matches already. + # Note we don't update LASTCONF, so foo.*/baz next time will match too. + else if ((slash = index(conf, ".*/")) > 0 && \ + substr(conf, 1, slash + 2 - 1) == lastconf) + continue; printf " %s", conf; lastvers = version; + lastconf = conf; } print ""; outpipe = "sort"; diff --git a/sysdeps/unix/sysv/linux/ia64/brk.S b/sysdeps/unix/sysv/linux/ia64/brk.S index c60296fe03..0638d42ac8 100644 --- a/sysdeps/unix/sysv/linux/ia64/brk.S +++ b/sysdeps/unix/sysv/linux/ia64/brk.S @@ -1,5 +1,5 @@ /* brk system call for Linux/ia64 - Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1999,2000,2001,2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Stephane Eranian <eranian@hpl.hp.com> and Jes Sorensen, <Jes.Sorensen@cern.ch>, April 1999. @@ -25,6 +25,8 @@ #include <asm/errno.h> .global __curbrk + .type __curbrk,@object + .size __curbrk,8 .data .align 8 __curbrk: |