* [PATCH 0/5] Fix defect in sort-makefile-lines.py
@ 2023-05-18 13:03 Carlos O'Donell
2023-05-18 13:03 ` [PATCH 1/5] scripts: sort-makefile-lines.py Carlos O'Donell
` (4 more replies)
0 siblings, 5 replies; 12+ messages in thread
From: Carlos O'Donell @ 2023-05-18 13:03 UTC (permalink / raw)
To: libc-alpha, siddhesh; +Cc: Carlos O'Donell
A defect in sort-makefile-lines.py failed to correctly handle the
less-than case in the custom sorting function. Correcting this requires
updating elf, misc, stdio-common, and wcsmbs Makefiles. The udpated
sorting shows that bug23-N.c and scanfNa are sorted inconsistently and
need to be renamed as suggested in the sorting rules.
Carlos O'Donell (5):
scripts: sort-makefile-lines.py
elf: Adjust tests in Makefile.
stdio-common: Adjust tests in Makefile
misc: Reformat Makefile.
wcsmbs: Reformat Makefile.
elf/Makefile | 20 ++++++------
misc/Makefile | 6 ++--
scripts/sort-makefile-lines.py | 5 ++-
stdio-common/Makefile | 44 +++++++++++++-------------
stdio-common/{bug23-2.c => bug27.c} | 0
stdio-common/{bug23-3.c => bug28.c} | 0
stdio-common/{bug23-4.c => bug29.c} | 0
stdio-common/{scanf14a.c => scanf18.c} | 0
stdio-common/{scanf16a.c => scanf19.c} | 0
wcsmbs/Makefile | 2 +-
10 files changed, 40 insertions(+), 37 deletions(-)
rename stdio-common/{bug23-2.c => bug27.c} (100%)
rename stdio-common/{bug23-3.c => bug28.c} (100%)
rename stdio-common/{bug23-4.c => bug29.c} (100%)
rename stdio-common/{scanf14a.c => scanf18.c} (100%)
rename stdio-common/{scanf16a.c => scanf19.c} (100%)
--
2.40.0
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 1/5] scripts: sort-makefile-lines.py
2023-05-18 13:03 [PATCH 0/5] Fix defect in sort-makefile-lines.py Carlos O'Donell
@ 2023-05-18 13:03 ` Carlos O'Donell
2023-05-18 15:56 ` Siddhesh Poyarekar
2023-05-18 13:03 ` [PATCH 2/5] elf: Adjust tests in Makefile Carlos O'Donell
` (3 subsequent siblings)
4 siblings, 1 reply; 12+ messages in thread
From: Carlos O'Donell @ 2023-05-18 13:03 UTC (permalink / raw)
To: libc-alpha, siddhesh; +Cc: Carlos O'Donell
We must return < 0, 0, or > 0 as the result of the comparison function
for cmp_to_key() to work correctly across all comparisons.
---
scripts/sort-makefile-lines.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/scripts/sort-makefile-lines.py b/scripts/sort-makefile-lines.py
index fd657df970..c0badebf8c 100755
--- a/scripts/sort-makefile-lines.py
+++ b/scripts/sort-makefile-lines.py
@@ -102,7 +102,10 @@ def glibc_makefile_numeric(string1, string2):
# string1 and string2 both share a prefix and
# have a numeric suffix that can be compared.
# Sort order is based on the numeric suffix.
- return int(var1.group(1)) > int(var2.group(1))
+ # If the suffix is the same return 0, otherwise
+ # > 0 for greater-than, and < 0 for less-than.
+ # This is equivalent to the numerical difference.
+ return int(var1.group(1)) - int(var2.group(1))
# Default to strcoll.
return locale.strcoll(string1, string2)
--
2.40.0
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 2/5] elf: Adjust tests in Makefile.
2023-05-18 13:03 [PATCH 0/5] Fix defect in sort-makefile-lines.py Carlos O'Donell
2023-05-18 13:03 ` [PATCH 1/5] scripts: sort-makefile-lines.py Carlos O'Donell
@ 2023-05-18 13:03 ` Carlos O'Donell
2023-05-18 16:05 ` Siddhesh Poyarekar
2023-05-18 13:03 ` [PATCH 3/5] stdio-common: " Carlos O'Donell
` (2 subsequent siblings)
4 siblings, 1 reply; 12+ messages in thread
From: Carlos O'Donell @ 2023-05-18 13:03 UTC (permalink / raw)
To: libc-alpha, siddhesh; +Cc: Carlos O'Donell
Sort tests against updated scripts/sort-makefile-lines.py.
No changes in generated code.
No regressions on x86_64 and i686.
---
elf/Makefile | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/elf/Makefile b/elf/Makefile
index c6d499aa66..e262f3e6b1 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -440,6 +440,8 @@ tests += \
tst-tls-ie \
tst-tls-ie-dlmopen \
tst-tls-manydynamic \
+ tst-tls4 \
+ tst-tls5 \
tst-tls10 \
tst-tls11 \
tst-tls12 \
@@ -452,8 +454,6 @@ tests += \
tst-tls19 \
tst-tls20 \
tst-tls21 \
- tst-tls4 \
- tst-tls5 \
tst-tlsalign \
tst-tlsalign-extern \
tst-unique1 \
@@ -929,14 +929,6 @@ modules-names += \
modules-names-cxx = \
tst-dlopen-nodelete-reloc-mod1 \
- tst-dlopen-nodelete-reloc-mod10 \
- tst-dlopen-nodelete-reloc-mod11 \
- tst-dlopen-nodelete-reloc-mod12 \
- tst-dlopen-nodelete-reloc-mod13 \
- tst-dlopen-nodelete-reloc-mod14 \
- tst-dlopen-nodelete-reloc-mod15 \
- tst-dlopen-nodelete-reloc-mod16 \
- tst-dlopen-nodelete-reloc-mod17 \
tst-dlopen-nodelete-reloc-mod2 \
tst-dlopen-nodelete-reloc-mod3 \
tst-dlopen-nodelete-reloc-mod4 \
@@ -945,6 +937,14 @@ modules-names-cxx = \
tst-dlopen-nodelete-reloc-mod7 \
tst-dlopen-nodelete-reloc-mod8 \
tst-dlopen-nodelete-reloc-mod9 \
+ tst-dlopen-nodelete-reloc-mod10 \
+ tst-dlopen-nodelete-reloc-mod11 \
+ tst-dlopen-nodelete-reloc-mod12 \
+ tst-dlopen-nodelete-reloc-mod13 \
+ tst-dlopen-nodelete-reloc-mod14 \
+ tst-dlopen-nodelete-reloc-mod15 \
+ tst-dlopen-nodelete-reloc-mod16 \
+ tst-dlopen-nodelete-reloc-mod17 \
tst-nodelete-rtldmod \
tst-nodelete-uniquemod \
tst-nodelete-zmod \
--
2.40.0
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 3/5] stdio-common: Adjust tests in Makefile
2023-05-18 13:03 [PATCH 0/5] Fix defect in sort-makefile-lines.py Carlos O'Donell
2023-05-18 13:03 ` [PATCH 1/5] scripts: sort-makefile-lines.py Carlos O'Donell
2023-05-18 13:03 ` [PATCH 2/5] elf: Adjust tests in Makefile Carlos O'Donell
@ 2023-05-18 13:03 ` Carlos O'Donell
2023-05-18 16:05 ` Siddhesh Poyarekar
2023-05-18 13:03 ` [PATCH 4/5] misc: Reformat Makefile Carlos O'Donell
2023-05-18 13:03 ` [PATCH 5/5] wcsmbs: " Carlos O'Donell
4 siblings, 1 reply; 12+ messages in thread
From: Carlos O'Donell @ 2023-05-18 13:03 UTC (permalink / raw)
To: libc-alpha, siddhesh; +Cc: Carlos O'Donell
Sort tests against updated scripts/sort-makefile-lines.py.
No changes in generated code.
No regressions on x86_64 and i686.
---
stdio-common/Makefile | 44 +++++++++++++-------------
stdio-common/{bug23-2.c => bug27.c} | 0
stdio-common/{bug23-3.c => bug28.c} | 0
stdio-common/{bug23-4.c => bug29.c} | 0
stdio-common/{scanf14a.c => scanf18.c} | 0
stdio-common/{scanf16a.c => scanf19.c} | 0
6 files changed, 22 insertions(+), 22 deletions(-)
rename stdio-common/{bug23-2.c => bug27.c} (100%)
rename stdio-common/{bug23-3.c => bug28.c} (100%)
rename stdio-common/{bug23-4.c => bug29.c} (100%)
rename stdio-common/{scanf14a.c => scanf18.c} (100%)
rename stdio-common/{scanf16a.c => scanf19.c} (100%)
diff --git a/stdio-common/Makefile b/stdio-common/Makefile
index 1b4997afc8..4c15b97683 100644
--- a/stdio-common/Makefile
+++ b/stdio-common/Makefile
@@ -130,6 +130,13 @@ aux := \
tests := \
bug-vfprintf-nargs \
bug1 \
+ bug3 \
+ bug4 \
+ bug5 \
+ bug6 \
+ bug7 \
+ bug8 \
+ bug9 \
bug10 \
bug11 \
bug12 \
@@ -146,38 +153,31 @@ tests := \
bug21 \
bug22 \
bug23 \
- bug23-2 \
- bug23-3 \
- bug23-4 \
bug24 \
bug25 \
bug26 \
- bug3 \
- bug4 \
- bug5 \
- bug6 \
- bug7 \
- bug8 \
- bug9 \
+ bug27 \
+ bug28 \
+ bug29 \
errnobug \
scanf1 \
+ scanf2 \
+ scanf3 \
+ scanf4 \
+ scanf5 \
+ scanf7 \
+ scanf8 \
+ scanf9 \
scanf10 \
scanf11 \
scanf12 \
scanf13 \
scanf14 \
- scanf14a \
scanf15 \
scanf16 \
- scanf16a \
scanf17 \
- scanf2 \
- scanf3 \
- scanf4 \
- scanf5 \
- scanf7 \
- scanf8 \
- scanf9 \
+ scanf18 \
+ scanf19 \
temptest \
test-fseek \
test-fwrite \
@@ -442,11 +442,11 @@ CFLAGS-isoc23_scanf.c += -fexceptions
CFLAGS-dprintf.c += $(config-cflags-wno-ignored-attributes)
-# scanf14a.c and scanf16a.c test a deprecated extension which is no
+# scanf18.c and scanf19.c test a deprecated extension which is no
# longer visible under most conformance levels; see the source files
# for more detail.
-CFLAGS-scanf14a.c += -std=gnu89
-CFLAGS-scanf16a.c += -std=gnu89
+CFLAGS-scanf18.c += -std=gnu89
+CFLAGS-scanf19.c += -std=gnu89
CFLAGS-bug3.c += -DOBJPFX=\"$(objpfx)\"
CFLAGS-bug4.c += -DOBJPFX=\"$(objpfx)\"
diff --git a/stdio-common/bug23-2.c b/stdio-common/bug27.c
similarity index 100%
rename from stdio-common/bug23-2.c
rename to stdio-common/bug27.c
diff --git a/stdio-common/bug23-3.c b/stdio-common/bug28.c
similarity index 100%
rename from stdio-common/bug23-3.c
rename to stdio-common/bug28.c
diff --git a/stdio-common/bug23-4.c b/stdio-common/bug29.c
similarity index 100%
rename from stdio-common/bug23-4.c
rename to stdio-common/bug29.c
diff --git a/stdio-common/scanf14a.c b/stdio-common/scanf18.c
similarity index 100%
rename from stdio-common/scanf14a.c
rename to stdio-common/scanf18.c
diff --git a/stdio-common/scanf16a.c b/stdio-common/scanf19.c
similarity index 100%
rename from stdio-common/scanf16a.c
rename to stdio-common/scanf19.c
--
2.40.0
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 4/5] misc: Reformat Makefile.
2023-05-18 13:03 [PATCH 0/5] Fix defect in sort-makefile-lines.py Carlos O'Donell
` (2 preceding siblings ...)
2023-05-18 13:03 ` [PATCH 3/5] stdio-common: " Carlos O'Donell
@ 2023-05-18 13:03 ` Carlos O'Donell
2023-05-18 16:06 ` Siddhesh Poyarekar
2023-05-18 13:03 ` [PATCH 5/5] wcsmbs: " Carlos O'Donell
4 siblings, 1 reply; 12+ messages in thread
From: Carlos O'Donell @ 2023-05-18 13:03 UTC (permalink / raw)
To: libc-alpha, siddhesh; +Cc: Carlos O'Donell
Reflow Makefile.
Sort using updated scripts/sort-makefile-lines.py.
Code generation is changed as routines are linked in sorted order
as expected.
No regressions on x86_64 and i686.
---
misc/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/misc/Makefile b/misc/Makefile
index 1a21347f5e..84aa4cb0ad 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -156,14 +156,14 @@ routines := \
munlockall \
munmap \
preadv \
- preadv64 \
preadv2 \
+ preadv64 \
preadv64v2 \
pselect \
ptrace \
pwritev \
- pwritev64 \
pwritev2 \
+ pwritev64 \
pwritev64v2 \
qefgcvt \
qefgcvt_r \
@@ -243,8 +243,8 @@ tests := \
tst-mntent-escape \
tst-mntent2 \
tst-preadvwritev \
- tst-preadvwritev64 \
tst-preadvwritev2 \
+ tst-preadvwritev64 \
tst-preadvwritev64v2 \
tst-pselect \
tst-select \
--
2.40.0
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH 5/5] wcsmbs: Reformat Makefile.
2023-05-18 13:03 [PATCH 0/5] Fix defect in sort-makefile-lines.py Carlos O'Donell
` (3 preceding siblings ...)
2023-05-18 13:03 ` [PATCH 4/5] misc: Reformat Makefile Carlos O'Donell
@ 2023-05-18 13:03 ` Carlos O'Donell
2023-05-18 16:06 ` Siddhesh Poyarekar
4 siblings, 1 reply; 12+ messages in thread
From: Carlos O'Donell @ 2023-05-18 13:03 UTC (permalink / raw)
To: libc-alpha, siddhesh; +Cc: Carlos O'Donell
Reflow Makefile.
Sort using updated scripts/sort-makefile-lines.py.
Code generation is changed as routines are linked in sorted order
as expected.
No regressions on x86_64 and i686.
---
wcsmbs/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile
index 347b44841e..ea8ea7b3e6 100644
--- a/wcsmbs/Makefile
+++ b/wcsmbs/Makefile
@@ -52,9 +52,9 @@ routines := \
isoc99_vwscanf \
isoc99_wscanf \
mbrlen \
+ mbrtoc8 \
mbrtoc16 \
mbrtoc32 \
- mbrtoc8 \
mbrtowc \
mbsinit \
mbsnrtowcs \
--
2.40.0
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/5] scripts: sort-makefile-lines.py
2023-05-18 13:03 ` [PATCH 1/5] scripts: sort-makefile-lines.py Carlos O'Donell
@ 2023-05-18 15:56 ` Siddhesh Poyarekar
2023-05-18 16:53 ` Carlos O'Donell
0 siblings, 1 reply; 12+ messages in thread
From: Siddhesh Poyarekar @ 2023-05-18 15:56 UTC (permalink / raw)
To: Carlos O'Donell, libc-alpha
On 2023-05-18 09:03, Carlos O'Donell wrote:
> We must return < 0, 0, or > 0 as the result of the comparison function
> for cmp_to_key() to work correctly across all comparisons.
> ---
LGTM.
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
> scripts/sort-makefile-lines.py | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/scripts/sort-makefile-lines.py b/scripts/sort-makefile-lines.py
> index fd657df970..c0badebf8c 100755
> --- a/scripts/sort-makefile-lines.py
> +++ b/scripts/sort-makefile-lines.py
> @@ -102,7 +102,10 @@ def glibc_makefile_numeric(string1, string2):
> # string1 and string2 both share a prefix and
> # have a numeric suffix that can be compared.
> # Sort order is based on the numeric suffix.
> - return int(var1.group(1)) > int(var2.group(1))
> + # If the suffix is the same return 0, otherwise
> + # > 0 for greater-than, and < 0 for less-than.
> + # This is equivalent to the numerical difference.
> + return int(var1.group(1)) - int(var2.group(1))
> # Default to strcoll.
> return locale.strcoll(string1, string2)
>
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 2/5] elf: Adjust tests in Makefile.
2023-05-18 13:03 ` [PATCH 2/5] elf: Adjust tests in Makefile Carlos O'Donell
@ 2023-05-18 16:05 ` Siddhesh Poyarekar
0 siblings, 0 replies; 12+ messages in thread
From: Siddhesh Poyarekar @ 2023-05-18 16:05 UTC (permalink / raw)
To: Carlos O'Donell, libc-alpha
On 2023-05-18 09:03, Carlos O'Donell wrote:
> Sort tests against updated scripts/sort-makefile-lines.py.
>
> No changes in generated code.
> No regressions on x86_64 and i686.
> ---
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
> elf/Makefile | 20 ++++++++++----------
> 1 file changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/elf/Makefile b/elf/Makefile
> index c6d499aa66..e262f3e6b1 100644
> --- a/elf/Makefile
> +++ b/elf/Makefile
> @@ -440,6 +440,8 @@ tests += \
> tst-tls-ie \
> tst-tls-ie-dlmopen \
> tst-tls-manydynamic \
> + tst-tls4 \
> + tst-tls5 \
> tst-tls10 \
> tst-tls11 \
> tst-tls12 \
> @@ -452,8 +454,6 @@ tests += \
> tst-tls19 \
> tst-tls20 \
> tst-tls21 \
> - tst-tls4 \
> - tst-tls5 \
> tst-tlsalign \
> tst-tlsalign-extern \
> tst-unique1 \
> @@ -929,14 +929,6 @@ modules-names += \
>
> modules-names-cxx = \
> tst-dlopen-nodelete-reloc-mod1 \
> - tst-dlopen-nodelete-reloc-mod10 \
> - tst-dlopen-nodelete-reloc-mod11 \
> - tst-dlopen-nodelete-reloc-mod12 \
> - tst-dlopen-nodelete-reloc-mod13 \
> - tst-dlopen-nodelete-reloc-mod14 \
> - tst-dlopen-nodelete-reloc-mod15 \
> - tst-dlopen-nodelete-reloc-mod16 \
> - tst-dlopen-nodelete-reloc-mod17 \
> tst-dlopen-nodelete-reloc-mod2 \
> tst-dlopen-nodelete-reloc-mod3 \
> tst-dlopen-nodelete-reloc-mod4 \
> @@ -945,6 +937,14 @@ modules-names-cxx = \
> tst-dlopen-nodelete-reloc-mod7 \
> tst-dlopen-nodelete-reloc-mod8 \
> tst-dlopen-nodelete-reloc-mod9 \
> + tst-dlopen-nodelete-reloc-mod10 \
> + tst-dlopen-nodelete-reloc-mod11 \
> + tst-dlopen-nodelete-reloc-mod12 \
> + tst-dlopen-nodelete-reloc-mod13 \
> + tst-dlopen-nodelete-reloc-mod14 \
> + tst-dlopen-nodelete-reloc-mod15 \
> + tst-dlopen-nodelete-reloc-mod16 \
> + tst-dlopen-nodelete-reloc-mod17 \
> tst-nodelete-rtldmod \
> tst-nodelete-uniquemod \
> tst-nodelete-zmod \
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 3/5] stdio-common: Adjust tests in Makefile
2023-05-18 13:03 ` [PATCH 3/5] stdio-common: " Carlos O'Donell
@ 2023-05-18 16:05 ` Siddhesh Poyarekar
0 siblings, 0 replies; 12+ messages in thread
From: Siddhesh Poyarekar @ 2023-05-18 16:05 UTC (permalink / raw)
To: Carlos O'Donell, libc-alpha
On 2023-05-18 09:03, Carlos O'Donell wrote:
> Sort tests against updated scripts/sort-makefile-lines.py.
>
> No changes in generated code.
> No regressions on x86_64 and i686.
> ---
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
> stdio-common/Makefile | 44 +++++++++++++-------------
> stdio-common/{bug23-2.c => bug27.c} | 0
> stdio-common/{bug23-3.c => bug28.c} | 0
> stdio-common/{bug23-4.c => bug29.c} | 0
> stdio-common/{scanf14a.c => scanf18.c} | 0
> stdio-common/{scanf16a.c => scanf19.c} | 0
> 6 files changed, 22 insertions(+), 22 deletions(-)
> rename stdio-common/{bug23-2.c => bug27.c} (100%)
> rename stdio-common/{bug23-3.c => bug28.c} (100%)
> rename stdio-common/{bug23-4.c => bug29.c} (100%)
> rename stdio-common/{scanf14a.c => scanf18.c} (100%)
> rename stdio-common/{scanf16a.c => scanf19.c} (100%)
>
> diff --git a/stdio-common/Makefile b/stdio-common/Makefile
> index 1b4997afc8..4c15b97683 100644
> --- a/stdio-common/Makefile
> +++ b/stdio-common/Makefile
> @@ -130,6 +130,13 @@ aux := \
> tests := \
> bug-vfprintf-nargs \
> bug1 \
> + bug3 \
> + bug4 \
> + bug5 \
> + bug6 \
> + bug7 \
> + bug8 \
> + bug9 \
> bug10 \
> bug11 \
> bug12 \
> @@ -146,38 +153,31 @@ tests := \
> bug21 \
> bug22 \
> bug23 \
> - bug23-2 \
> - bug23-3 \
> - bug23-4 \
> bug24 \
> bug25 \
> bug26 \
> - bug3 \
> - bug4 \
> - bug5 \
> - bug6 \
> - bug7 \
> - bug8 \
> - bug9 \
> + bug27 \
> + bug28 \
> + bug29 \
> errnobug \
> scanf1 \
> + scanf2 \
> + scanf3 \
> + scanf4 \
> + scanf5 \
> + scanf7 \
> + scanf8 \
> + scanf9 \
> scanf10 \
> scanf11 \
> scanf12 \
> scanf13 \
> scanf14 \
> - scanf14a \
> scanf15 \
> scanf16 \
> - scanf16a \
> scanf17 \
> - scanf2 \
> - scanf3 \
> - scanf4 \
> - scanf5 \
> - scanf7 \
> - scanf8 \
> - scanf9 \
> + scanf18 \
> + scanf19 \
> temptest \
> test-fseek \
> test-fwrite \
> @@ -442,11 +442,11 @@ CFLAGS-isoc23_scanf.c += -fexceptions
>
> CFLAGS-dprintf.c += $(config-cflags-wno-ignored-attributes)
>
> -# scanf14a.c and scanf16a.c test a deprecated extension which is no
> +# scanf18.c and scanf19.c test a deprecated extension which is no
> # longer visible under most conformance levels; see the source files
> # for more detail.
> -CFLAGS-scanf14a.c += -std=gnu89
> -CFLAGS-scanf16a.c += -std=gnu89
> +CFLAGS-scanf18.c += -std=gnu89
> +CFLAGS-scanf19.c += -std=gnu89
>
> CFLAGS-bug3.c += -DOBJPFX=\"$(objpfx)\"
> CFLAGS-bug4.c += -DOBJPFX=\"$(objpfx)\"
> diff --git a/stdio-common/bug23-2.c b/stdio-common/bug27.c
> similarity index 100%
> rename from stdio-common/bug23-2.c
> rename to stdio-common/bug27.c
> diff --git a/stdio-common/bug23-3.c b/stdio-common/bug28.c
> similarity index 100%
> rename from stdio-common/bug23-3.c
> rename to stdio-common/bug28.c
> diff --git a/stdio-common/bug23-4.c b/stdio-common/bug29.c
> similarity index 100%
> rename from stdio-common/bug23-4.c
> rename to stdio-common/bug29.c
> diff --git a/stdio-common/scanf14a.c b/stdio-common/scanf18.c
> similarity index 100%
> rename from stdio-common/scanf14a.c
> rename to stdio-common/scanf18.c
> diff --git a/stdio-common/scanf16a.c b/stdio-common/scanf19.c
> similarity index 100%
> rename from stdio-common/scanf16a.c
> rename to stdio-common/scanf19.c
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 4/5] misc: Reformat Makefile.
2023-05-18 13:03 ` [PATCH 4/5] misc: Reformat Makefile Carlos O'Donell
@ 2023-05-18 16:06 ` Siddhesh Poyarekar
0 siblings, 0 replies; 12+ messages in thread
From: Siddhesh Poyarekar @ 2023-05-18 16:06 UTC (permalink / raw)
To: Carlos O'Donell, libc-alpha
On 2023-05-18 09:03, Carlos O'Donell wrote:
> Reflow Makefile.
> Sort using updated scripts/sort-makefile-lines.py.
>
> Code generation is changed as routines are linked in sorted order
> as expected.
>
> No regressions on x86_64 and i686.
> ---
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
> misc/Makefile | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/misc/Makefile b/misc/Makefile
> index 1a21347f5e..84aa4cb0ad 100644
> --- a/misc/Makefile
> +++ b/misc/Makefile
> @@ -156,14 +156,14 @@ routines := \
> munlockall \
> munmap \
> preadv \
> - preadv64 \
> preadv2 \
> + preadv64 \
> preadv64v2 \
> pselect \
> ptrace \
> pwritev \
> - pwritev64 \
> pwritev2 \
> + pwritev64 \
> pwritev64v2 \
> qefgcvt \
> qefgcvt_r \
> @@ -243,8 +243,8 @@ tests := \
> tst-mntent-escape \
> tst-mntent2 \
> tst-preadvwritev \
> - tst-preadvwritev64 \
> tst-preadvwritev2 \
> + tst-preadvwritev64 \
> tst-preadvwritev64v2 \
> tst-pselect \
> tst-select \
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 5/5] wcsmbs: Reformat Makefile.
2023-05-18 13:03 ` [PATCH 5/5] wcsmbs: " Carlos O'Donell
@ 2023-05-18 16:06 ` Siddhesh Poyarekar
0 siblings, 0 replies; 12+ messages in thread
From: Siddhesh Poyarekar @ 2023-05-18 16:06 UTC (permalink / raw)
To: Carlos O'Donell, libc-alpha
On 2023-05-18 09:03, Carlos O'Donell wrote:
> Reflow Makefile.
> Sort using updated scripts/sort-makefile-lines.py.
>
> Code generation is changed as routines are linked in sorted order
> as expected.
>
> No regressions on x86_64 and i686.
> ---
Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
> wcsmbs/Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile
> index 347b44841e..ea8ea7b3e6 100644
> --- a/wcsmbs/Makefile
> +++ b/wcsmbs/Makefile
> @@ -52,9 +52,9 @@ routines := \
> isoc99_vwscanf \
> isoc99_wscanf \
> mbrlen \
> + mbrtoc8 \
> mbrtoc16 \
> mbrtoc32 \
> - mbrtoc8 \
> mbrtowc \
> mbsinit \
> mbsnrtowcs \
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 1/5] scripts: sort-makefile-lines.py
2023-05-18 15:56 ` Siddhesh Poyarekar
@ 2023-05-18 16:53 ` Carlos O'Donell
0 siblings, 0 replies; 12+ messages in thread
From: Carlos O'Donell @ 2023-05-18 16:53 UTC (permalink / raw)
To: Siddhesh Poyarekar, libc-alpha
On 5/18/23 11:56, Siddhesh Poyarekar wrote:
>
>
> On 2023-05-18 09:03, Carlos O'Donell wrote:
>> We must return < 0, 0, or > 0 as the result of the comparison function
>> for cmp_to_key() to work correctly across all comparisons.
>> ---
>
> LGTM.
>
> Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
Thanks for the series review!
I've pushed this along with a rewrite of nptl/Makefile as consensus.
>> scripts/sort-makefile-lines.py | 5 ++++-
>> 1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/scripts/sort-makefile-lines.py b/scripts/sort-makefile-lines.py
>> index fd657df970..c0badebf8c 100755
>> --- a/scripts/sort-makefile-lines.py
>> +++ b/scripts/sort-makefile-lines.py
>> @@ -102,7 +102,10 @@ def glibc_makefile_numeric(string1, string2):
>> # string1 and string2 both share a prefix and
>> # have a numeric suffix that can be compared.
>> # Sort order is based on the numeric suffix.
>> - return int(var1.group(1)) > int(var2.group(1))
>> + # If the suffix is the same return 0, otherwise
>> + # > 0 for greater-than, and < 0 for less-than.
>> + # This is equivalent to the numerical difference.
>> + return int(var1.group(1)) - int(var2.group(1))
>> # Default to strcoll.
>> return locale.strcoll(string1, string2)
>>
>
--
Cheers,
Carlos.
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2023-05-18 16:53 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-18 13:03 [PATCH 0/5] Fix defect in sort-makefile-lines.py Carlos O'Donell
2023-05-18 13:03 ` [PATCH 1/5] scripts: sort-makefile-lines.py Carlos O'Donell
2023-05-18 15:56 ` Siddhesh Poyarekar
2023-05-18 16:53 ` Carlos O'Donell
2023-05-18 13:03 ` [PATCH 2/5] elf: Adjust tests in Makefile Carlos O'Donell
2023-05-18 16:05 ` Siddhesh Poyarekar
2023-05-18 13:03 ` [PATCH 3/5] stdio-common: " Carlos O'Donell
2023-05-18 16:05 ` Siddhesh Poyarekar
2023-05-18 13:03 ` [PATCH 4/5] misc: Reformat Makefile Carlos O'Donell
2023-05-18 16:06 ` Siddhesh Poyarekar
2023-05-18 13:03 ` [PATCH 5/5] wcsmbs: " Carlos O'Donell
2023-05-18 16:06 ` Siddhesh Poyarekar
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).