* Fix version map sorting
@ 2009-01-22 0:01 Andreas Schwab
2009-01-22 2:52 ` Roland McGrath
0 siblings, 1 reply; 7+ messages in thread
From: Andreas Schwab @ 2009-01-22 0:01 UTC (permalink / raw)
To: libc-hacker
The math/Versions file has an inline comment which is mishandled by the
version map scripts:
exp2; exp2f; # exp2l; -- bug omitted this until GLIBC_2.4 (below)
Such inline comments are not stripped, and the dot in it becomes
significant when sorting the temporary versions file. On targets where
GLIBC_2.2 is the earliest version for libm this causes the file to be
out of order: this line is sorted as if belonging to GLIBC_2.2.4. Fixed
by putting the comment on a line by itself.
Andreas.
2009-01-22 Andreas Schwab <schwab@suse.de>
* math/Versions: Avoid inline comment.
--- math/Versions 29 Mär 2005 11:41:38 +0200 1.9
+++ math/Versions 22 Jan 2009 00:42:47 +0100
@@ -94,7 +94,8 @@ libm {
}
GLIBC_2.1 {
# mathematical functions
- exp2; exp2f; # exp2l; -- bug omitted this until GLIBC_2.4 (below)
+ exp2; exp2f;
+ # exp2l; -- bug omitted this until GLIBC_2.4 (below)
exp10; exp10f; exp10l;
fdim; fdimf; fdiml;
fma; fmaf; fmal;
--
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux Products GmbH, MaxfeldstraÃe 5, 90409 Nürnberg, Germany
PGP key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: Fix version map sorting
2009-01-22 0:01 Fix version map sorting Andreas Schwab
@ 2009-01-22 2:52 ` Roland McGrath
2009-01-22 9:47 ` Andreas Schwab
0 siblings, 1 reply; 7+ messages in thread
From: Roland McGrath @ 2009-01-22 2:52 UTC (permalink / raw)
To: Andreas Schwab; +Cc: libc-hacker
Does this instead work for you?
Thanks,
Roland
2009-01-21 Roland McGrath <roland@redhat.com>
* Makeconfig (%.v.i): Strip trailing # comments,
not only whole-line comments.
Index: Makeconfig
===================================================================
RCS file: /cvs/glibc/libc/Makeconfig,v
retrieving revision 1.327
diff -u -r1.327 Makeconfig
--- Makeconfig 18 Aug 2008 09:42:17 -0000 1.327
+++ Makeconfig 22 Jan 2009 02:51:25 -0000
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-2003,2004,2005,2006,2007,2008
+# Copyright (C) 1991-2003,2004,2005,2006,2007,2008,2009
# Free Software Foundation, Inc.
# This file is part of the GNU C Library.
@@ -794,7 +794,8 @@
# listing both its input files, and any header files that it may reference
# (but no commands).
%.v.i: $(common-objpfx)config.h
- sed '/^[ ]*#/d;s/^[ ]*%/#/' $(filter-out FORCE %.h,$^) \
+ sed 's/#.*$$//;s//^[ ]*$$/d;s/^[ ]*%/#/' \
+ $(filter-out FORCE %.h,$^) \
| $(CC) -E -undef $(CPPFLAGS) -x assembler-with-cpp - \
> $@T
mv -f $@T $@
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: Fix version map sorting
2009-01-22 2:52 ` Roland McGrath
@ 2009-01-22 9:47 ` Andreas Schwab
2009-01-22 9:49 ` Roland McGrath
0 siblings, 1 reply; 7+ messages in thread
From: Andreas Schwab @ 2009-01-22 9:47 UTC (permalink / raw)
To: Roland McGrath; +Cc: libc-hacker
Roland McGrath <roland@redhat.com> writes:
> @@ -794,7 +794,8 @@
> # listing both its input files, and any header files that it may reference
> # (but no commands).
> %.v.i: $(common-objpfx)config.h
> - sed '/^[ ]*#/d;s/^[ ]*%/#/' $(filter-out FORCE %.h,$^) \
> + sed 's/#.*$$//;s//^[ ]*$$/d;s/^[ ]*%/#/' \
+ sed 's/#.*$$//;/^[ ]*$$/d;s/^[ ]*%/#/' \
Andreas.
--
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux Products GmbH, MaxfeldstraÃe 5, 90409 Nürnberg, Germany
PGP key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: Fix version map sorting
2009-01-22 9:47 ` Andreas Schwab
@ 2009-01-22 9:49 ` Roland McGrath
2009-01-22 10:28 ` Andreas Schwab
0 siblings, 1 reply; 7+ messages in thread
From: Roland McGrath @ 2009-01-22 9:49 UTC (permalink / raw)
To: Andreas Schwab; +Cc: libc-hacker
> > + sed 's/#.*$$//;s//^[ ]*$$/d;s/^[ ]*%/#/' \
> + sed 's/#.*$$//;/^[ ]*$$/d;s/^[ ]*%/#/' \
Oops, thanks. Do you mean that with that it does work fine without your
other patch?
Thanks,
Roland
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: Fix version map sorting
2009-01-22 9:49 ` Roland McGrath
@ 2009-01-22 10:28 ` Andreas Schwab
2009-01-22 13:01 ` Andreas Schwab
0 siblings, 1 reply; 7+ messages in thread
From: Andreas Schwab @ 2009-01-22 10:28 UTC (permalink / raw)
To: Roland McGrath; +Cc: libc-hacker
Roland McGrath <roland@redhat.com> writes:
>> > + sed 's/#.*$$//;s//^[ ]*$$/d;s/^[ ]*%/#/' \
>> + sed 's/#.*$$//;/^[ ]*$$/d;s/^[ ]*%/#/' \
>
> Oops, thanks. Do you mean that with that it does work fine without your
> other patch?
Yes.
Andreas.
--
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux Products GmbH, MaxfeldstraÃe 5, 90409 Nürnberg, Germany
PGP key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: Fix version map sorting
2009-01-22 10:28 ` Andreas Schwab
@ 2009-01-22 13:01 ` Andreas Schwab
2009-01-22 20:38 ` Roland McGrath
0 siblings, 1 reply; 7+ messages in thread
From: Andreas Schwab @ 2009-01-22 13:01 UTC (permalink / raw)
To: Roland McGrath; +Cc: libc-hacker
Andreas Schwab <schwab@suse.de> writes:
> Roland McGrath <roland@redhat.com> writes:
>
>>> > + sed 's/#.*$$//;s//^[ ]*$$/d;s/^[ ]*%/#/' \
>>> + sed 's/#.*$$//;/^[ ]*$$/d;s/^[ ]*%/#/' \
>>
>> Oops, thanks. Do you mean that with that it does work fine without your
>> other patch?
>
> Yes.
But not the change you just committed.
Andreas.
2009-01-22 Andreas Schwab <schwab@suse.de>
* Makeconfig (%.v.i): Fix typo.
Index: Makeconfig
===================================================================
RCS file: /cvs/glibc/libc/Makeconfig,v
retrieving revision 1.328
diff -u -a -p -u -p -a -r1.328 Makeconfig
--- Makeconfig 22 Jan 2009 11:25:16 -0000 1.328
+++ Makeconfig 22 Jan 2009 13:00:11 -0000
@@ -794,7 +794,7 @@ ifeq (yes, $(build-shared))
# listing both its input files, and any header files that it may reference
# (but no commands).
%.v.i: $(common-objpfx)config.h
- sed 's/#.*$$//;//^[ ]*$$/d;s/^[ ]*%/#/' \
+ sed 's/#.*$$//;/^[ ]*$$/d;s/^[ ]*%/#/' \
$(filter-out FORCE %.h,$^) \
| $(CC) -E -undef $(CPPFLAGS) -x assembler-with-cpp - \
> $@T
--
Andreas Schwab, SuSE Labs, schwab@suse.de
SuSE Linux Products GmbH, MaxfeldstraÃe 5, 90409 Nürnberg, Germany
PGP key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: Fix version map sorting
2009-01-22 13:01 ` Andreas Schwab
@ 2009-01-22 20:38 ` Roland McGrath
0 siblings, 0 replies; 7+ messages in thread
From: Roland McGrath @ 2009-01-22 20:38 UTC (permalink / raw)
To: Andreas Schwab; +Cc: libc-hacker
> But not the change you just committed.
:-) One day I'll learn how to do this stuff.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2009-01-22 20:38 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-01-22 0:01 Fix version map sorting Andreas Schwab
2009-01-22 2:52 ` Roland McGrath
2009-01-22 9:47 ` Andreas Schwab
2009-01-22 9:49 ` Roland McGrath
2009-01-22 10:28 ` Andreas Schwab
2009-01-22 13:01 ` Andreas Schwab
2009-01-22 20:38 ` Roland McGrath
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).