Remove sysdeps/sparc/sparc32/soft-fp directory.

As per <https://sourceware.org/ml/libc-alpha/2014-10/msg00369.html>,
there should not be separate sysdeps/<arch>/soft-fp directories when
those are used by all configurations that use sysdeps/<arch>, and,
more generally, should not be sysdeps/foo/Implies files pointing to a
subdirectory foo/bar.  This patch eliminates the
sysdeps/sparc/sparc32/soft-fp directory accordingly, merging its
contents into sysdeps/sparc/sparc32.

Tested with build-many-glibcs.py that installed stripped shared
libraries for sparc configurations are unchanged by this patch.

	* sysdeps/sparc/sparc32/Implies: Remove sparc/sparc32/soft-fp.
	* sysdeps/sparc/sparc32/Makefile [$(subdir) = soft-fp]
	(sparc32-quad-routines): New variable.  Moved from ....
	[$(subdir) = soft-fp] (sysdep_routines): Add
	$(sparc32-quad-routines).  Moved from ....
	* sysdeps/sparc/sparc32/soft-fp/Makefile: ... here.  Remove file.
	* sysdeps/sparc/sparc32/Versions (libc): Add GLIBC_2.4 symbols
	moved from ....
	* sysdeps/sparc/sparc32/soft-fp/Versions: ... here.  Remove file.
	* sysdeps/sparc/sparc32/soft-fp/q_add.c: Move to ....
	* sysdeps/sparc/sparc32/q_add.c: ... here.
	* sysdeps/sparc/sparc32/soft-fp/q_cmp.c: Move to ....
	* sysdeps/sparc/sparc32/q_cmp.c: ... here.
	* sysdeps/sparc/sparc32/soft-fp/q_cmpe.c: Move to ....
	* sysdeps/sparc/sparc32/q_cmpe.c: ... here.
	* sysdeps/sparc/sparc32/soft-fp/q_div.c: Move to ....
	* sysdeps/sparc/sparc32/q_div.c: ... here.
	* sysdeps/sparc/sparc32/soft-fp/q_dtoq.c: Move to ....
	* sysdeps/sparc/sparc32/q_dtoq.c: ... here.
	* sysdeps/sparc/sparc32/soft-fp/q_feq.c: Move to ....
	* sysdeps/sparc/sparc32/q_feq.c: ... here.
	* sysdeps/sparc/sparc32/soft-fp/q_fge.c: Move to ....
	* sysdeps/sparc/sparc32/q_fge.c: ... here.
	* sysdeps/sparc/sparc32/soft-fp/q_fgt.c: Move to ....
	* sysdeps/sparc/sparc32/q_fgt.c: ... here.
	* sysdeps/sparc/sparc32/soft-fp/q_fle.c: Move to ....
	* sysdeps/sparc/sparc32/q_fle.c: ... here.
	* sysdeps/sparc/sparc32/soft-fp/q_flt.c: Move to ....
	* sysdeps/sparc/sparc32/q_flt.c: ... here.
	* sysdeps/sparc/sparc32/soft-fp/q_fne.c: Move to ....
	* sysdeps/sparc/sparc32/q_fne.c: ... here.
	* sysdeps/sparc/sparc32/soft-fp/q_itoq.c: Move to ....
	* sysdeps/sparc/sparc32/q_itoq.c: ... here.
	* sysdeps/sparc/sparc32/soft-fp/q_lltoq.c: Move to ....
	* sysdeps/sparc/sparc32/q_lltoq.c: ... here.
	* sysdeps/sparc/sparc32/soft-fp/q_mul.c: Move to ....
	* sysdeps/sparc/sparc32/q_mul.c: ... here.
	* sysdeps/sparc/sparc32/soft-fp/q_neg.c: Move to ....
	* sysdeps/sparc/sparc32/q_neg.c: ... here.
	* sysdeps/sparc/sparc32/soft-fp/q_qtod.c: Move to ....
	* sysdeps/sparc/sparc32/q_qtod.c: ... here.
	* sysdeps/sparc/sparc32/soft-fp/q_qtoi.c: Move to ....
	* sysdeps/sparc/sparc32/q_qtoi.c: ... here.
	* sysdeps/sparc/sparc32/soft-fp/q_qtoll.c: Move to ....
	* sysdeps/sparc/sparc32/q_qtoll.c: ... here.
	* sysdeps/sparc/sparc32/soft-fp/q_qtos.c: Move to ....
	* sysdeps/sparc/sparc32/q_qtos.c: ... here.
	* sysdeps/sparc/sparc32/soft-fp/q_qtou.c: Move to ....
	* sysdeps/sparc/sparc32/q_qtou.c: ... here.
	* sysdeps/sparc/sparc32/soft-fp/q_qtoull.c: Move to ....
	* sysdeps/sparc/sparc32/q_qtoull.c: ... here.
	* sysdeps/sparc/sparc32/soft-fp/q_sqrt.c: Move to ....
	* sysdeps/sparc/sparc32/q_sqrt.c: ... here.
	* sysdeps/sparc/sparc32/soft-fp/q_stoq.c: Move to ....
	* sysdeps/sparc/sparc32/q_stoq.c: ... here.
	* sysdeps/sparc/sparc32/soft-fp/q_sub.c: Move to ....
	* sysdeps/sparc/sparc32/q_sub.c: ... here.
	* sysdeps/sparc/sparc32/soft-fp/q_ulltoq.c: Move to ....
	* sysdeps/sparc/sparc32/q_ulltoq.c: ... here.
	* sysdeps/sparc/sparc32/soft-fp/q_util.c: Move to ....
	* sysdeps/sparc/sparc32/q_util.c: ... here.
	* sysdeps/sparc/sparc32/soft-fp/q_utoq.c: Move to ....
	* sysdeps/sparc/sparc32/q_utoq.c: ... here.
	* sysdeps/sparc/sparc32/soft-fp/sfp-machine.h: Move to ....
	* sysdeps/sparc/sparc32/sfp-machine.h: ... here.
This commit is contained in:
Joseph Myers 2018-05-25 16:51:15 +00:00
parent c1dc1e1b34
commit 2c753f3e84
34 changed files with 83 additions and 38 deletions

View File

@ -1,3 +1,71 @@
2018-05-25 Joseph Myers <joseph@codesourcery.com>
* sysdeps/sparc/sparc32/Implies: Remove sparc/sparc32/soft-fp.
* sysdeps/sparc/sparc32/Makefile [$(subdir) = soft-fp]
(sparc32-quad-routines): New variable. Moved from ....
[$(subdir) = soft-fp] (sysdep_routines): Add
$(sparc32-quad-routines). Moved from ....
* sysdeps/sparc/sparc32/soft-fp/Makefile: ... here. Remove file.
* sysdeps/sparc/sparc32/Versions (libc): Add GLIBC_2.4 symbols
moved from ....
* sysdeps/sparc/sparc32/soft-fp/Versions: ... here. Remove file.
* sysdeps/sparc/sparc32/soft-fp/q_add.c: Move to ....
* sysdeps/sparc/sparc32/q_add.c: ... here.
* sysdeps/sparc/sparc32/soft-fp/q_cmp.c: Move to ....
* sysdeps/sparc/sparc32/q_cmp.c: ... here.
* sysdeps/sparc/sparc32/soft-fp/q_cmpe.c: Move to ....
* sysdeps/sparc/sparc32/q_cmpe.c: ... here.
* sysdeps/sparc/sparc32/soft-fp/q_div.c: Move to ....
* sysdeps/sparc/sparc32/q_div.c: ... here.
* sysdeps/sparc/sparc32/soft-fp/q_dtoq.c: Move to ....
* sysdeps/sparc/sparc32/q_dtoq.c: ... here.
* sysdeps/sparc/sparc32/soft-fp/q_feq.c: Move to ....
* sysdeps/sparc/sparc32/q_feq.c: ... here.
* sysdeps/sparc/sparc32/soft-fp/q_fge.c: Move to ....
* sysdeps/sparc/sparc32/q_fge.c: ... here.
* sysdeps/sparc/sparc32/soft-fp/q_fgt.c: Move to ....
* sysdeps/sparc/sparc32/q_fgt.c: ... here.
* sysdeps/sparc/sparc32/soft-fp/q_fle.c: Move to ....
* sysdeps/sparc/sparc32/q_fle.c: ... here.
* sysdeps/sparc/sparc32/soft-fp/q_flt.c: Move to ....
* sysdeps/sparc/sparc32/q_flt.c: ... here.
* sysdeps/sparc/sparc32/soft-fp/q_fne.c: Move to ....
* sysdeps/sparc/sparc32/q_fne.c: ... here.
* sysdeps/sparc/sparc32/soft-fp/q_itoq.c: Move to ....
* sysdeps/sparc/sparc32/q_itoq.c: ... here.
* sysdeps/sparc/sparc32/soft-fp/q_lltoq.c: Move to ....
* sysdeps/sparc/sparc32/q_lltoq.c: ... here.
* sysdeps/sparc/sparc32/soft-fp/q_mul.c: Move to ....
* sysdeps/sparc/sparc32/q_mul.c: ... here.
* sysdeps/sparc/sparc32/soft-fp/q_neg.c: Move to ....
* sysdeps/sparc/sparc32/q_neg.c: ... here.
* sysdeps/sparc/sparc32/soft-fp/q_qtod.c: Move to ....
* sysdeps/sparc/sparc32/q_qtod.c: ... here.
* sysdeps/sparc/sparc32/soft-fp/q_qtoi.c: Move to ....
* sysdeps/sparc/sparc32/q_qtoi.c: ... here.
* sysdeps/sparc/sparc32/soft-fp/q_qtoll.c: Move to ....
* sysdeps/sparc/sparc32/q_qtoll.c: ... here.
* sysdeps/sparc/sparc32/soft-fp/q_qtos.c: Move to ....
* sysdeps/sparc/sparc32/q_qtos.c: ... here.
* sysdeps/sparc/sparc32/soft-fp/q_qtou.c: Move to ....
* sysdeps/sparc/sparc32/q_qtou.c: ... here.
* sysdeps/sparc/sparc32/soft-fp/q_qtoull.c: Move to ....
* sysdeps/sparc/sparc32/q_qtoull.c: ... here.
* sysdeps/sparc/sparc32/soft-fp/q_sqrt.c: Move to ....
* sysdeps/sparc/sparc32/q_sqrt.c: ... here.
* sysdeps/sparc/sparc32/soft-fp/q_stoq.c: Move to ....
* sysdeps/sparc/sparc32/q_stoq.c: ... here.
* sysdeps/sparc/sparc32/soft-fp/q_sub.c: Move to ....
* sysdeps/sparc/sparc32/q_sub.c: ... here.
* sysdeps/sparc/sparc32/soft-fp/q_ulltoq.c: Move to ....
* sysdeps/sparc/sparc32/q_ulltoq.c: ... here.
* sysdeps/sparc/sparc32/soft-fp/q_util.c: Move to ....
* sysdeps/sparc/sparc32/q_util.c: ... here.
* sysdeps/sparc/sparc32/soft-fp/q_utoq.c: Move to ....
* sysdeps/sparc/sparc32/q_utoq.c: ... here.
* sysdeps/sparc/sparc32/soft-fp/sfp-machine.h: Move to ....
* sysdeps/sparc/sparc32/sfp-machine.h: ... here.
2018-05-24 Tulio Magno Quites Machado Filho <tuliom@linux.ibm.com>
Gabriel F. T. Gomes <gabriel@inconstante.eti.br>

View File

@ -3,4 +3,3 @@ wordsize-32
ieee754/ldbl-128
ieee754/dbl-64
ieee754/flt-32
sparc/sparc32/soft-fp

View File

@ -53,3 +53,12 @@ sysdep-realclean := $(sysdep-realclean) $(divrem:%=sysdeps/sparc/sparc32/%.S)
# the exported libc one to __wrap_.udiv and use linker option --wrap to make any
# call to .udiv to call the wrapper symbol.
libc.so-gnulib += -Wl,--wrap=.udiv
ifeq ($(subdir),soft-fp)
sparc32-quad-routines := q_add q_cmp q_cmpe q_div q_dtoq q_feq q_fge \
q_fgt q_fle q_flt q_fne q_itoq q_mul q_neg q_qtod q_qtoi \
q_qtos q_qtou q_qtoull q_qtoll q_sqrt q_stoq q_sub q_utoq \
q_ulltoq q_lltoq q_util
sysdep_routines += $(sparc32-quad-routines)
endif

View File

@ -2,6 +2,12 @@ libc {
GLIBC_2.0 {
.div; .mul; .rem; .udiv; .umul; .urem;
}
GLIBC_2.4 {
_Q_add; _Q_cmp; _Q_cmpe; _Q_div; _Q_dtoq; _Q_feq; _Q_fge; _Q_fgt;
_Q_fle; _Q_flt; _Q_fne; _Q_itoq; _Q_mul; _Q_neg; _Q_qtod; _Q_qtoi;
_Q_qtos; _Q_qtou; _Q_qtoull; _Q_qtoll; _Q_sqrt; _Q_stoq; _Q_sub;
_Q_utoq; _Q_ulltoq; _Q_lltoq;
}
}
libm {
GLIBC_2.23 {

View File

@ -1,29 +0,0 @@
# Software floating-point emulation.
# Makefile for SPARC v8 long double utility functions (_Q_*).
# Copyright (C) 1999-2018 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# Contributed by Jakub Jelinek (jj@ultra.linux.cz).
#
# The GNU C Library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2.1 of the License, or (at your option) any later version.
# The GNU C Library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
# You should have received a copy of the GNU Lesser General Public
# License along with the GNU C Library; if not, see
# <http://www.gnu.org/licenses/>.
ifeq ($(subdir),soft-fp)
sparc32-quad-routines := q_add q_cmp q_cmpe q_div q_dtoq q_feq q_fge \
q_fgt q_fle q_flt q_fne q_itoq q_mul q_neg q_qtod q_qtoi \
q_qtos q_qtou q_qtoull q_qtoll q_sqrt q_stoq q_sub q_utoq \
q_ulltoq q_lltoq q_util
sysdep_routines += $(sparc32-quad-routines)
endif

View File

@ -1,8 +0,0 @@
libc {
GLIBC_2.4 {
_Q_add; _Q_cmp; _Q_cmpe; _Q_div; _Q_dtoq; _Q_feq; _Q_fge; _Q_fgt;
_Q_fle; _Q_flt; _Q_fne; _Q_itoq; _Q_mul; _Q_neg; _Q_qtod; _Q_qtoi;
_Q_qtos; _Q_qtou; _Q_qtoull; _Q_qtoll; _Q_sqrt; _Q_stoq; _Q_sub;
_Q_utoq; _Q_ulltoq; _Q_lltoq;
}
}