Update SPARC divrem generation to match output

System Internals / glibc - Joseph Myers [codesourcery.com] - 15 December 2017 14:06 EST

While working on another patch I noticed that (a) sysdeps/sparc/sparc32/Makefile is the only place with special realclean settings, apart from po/, and (b) the generated files with a rule in that Makefile to generate them (using m4) had been patched manually so no longer corresponded with the output of the generator -so if the timestamps were wrong, a build would result in changes to the files in the source directory. (They also didn't correspond because of changes in make 3.81 to how make handles whitespace at the start of a line in a sequence of backslash-newline continuation lines within a recipe.)

This patch fixes the generation and output files to match. The issue with make and whitespace at start of continuation lines is fixed by putting those newlines outside of arguments to echo, so the number of spaces in the argument matches the number in the existing generated files. Then divrem.m4 is changed to avoid generating whitespace-only lines (my fix to the outputs from 2013; this fix to the generator also changes the indentation of a label in the output files) and to generate an alias in udiv.S (Adhemerval's fix from March).

build-many-glibcs.py doesn't have a non-v9 SPARC configuration, because non-v9 32-bit SPARC didn't build when I set up build-many-glibcs.py but sparcv9 did build. Whether or not non-v9 32-bit SPARC now builds (or indeed whether or not support for it is obsolete), I tested by removing the sparcv8 and sparcv9 versions of the four files in question, so forcing the generated files to be built and used, and the compilation parts of the glibc testsuite passed.

- sysdeps/sparc/sparc32/Makefile ($(divrem:%=$(sysdep_dir)/sparc/sparc32/%.S)): Do not include start-of-line whitespace in argument of echo.
- sysdeps/sparc/sparc32/divrem.m4: Avoid generating lines starting with whitespace. Generate __wrap_.udiv alias.
- sysdeps/sparc/sparc32/rem.S: Regenerated.
- sysdeps/sparc/sparc32/sdiv.S: Likewise.
- sysdeps/sparc/sparc32/udiv.S: Likewise.
- sysdeps/sparc/sparc32/urem.S: Likewise.

174edbde7e Update SPARC divrem generation to match output.
ChangeLog | 12 ++++++++++++
sysdeps/sparc/sparc32/Makefile | 8 ++++----
sysdeps/sparc/sparc32/divrem.m4 | 8 +++++---
sysdeps/sparc/sparc32/rem.S | 2 +-
sysdeps/sparc/sparc32/sdiv.S | 2 +-
sysdeps/sparc/sparc32/udiv.S | 2 +-
sysdeps/sparc/sparc32/urem.S | 2 +-
7 files changed, 25 insertions(+), 11 deletions(-)

Upstream: sourceware.org


  • Share