On 25/11/2014 15:17, Peter Maydell wrote:
> Questions for review:
> * can we do the git cherry-pick thing I mention above?
I'm afraid that would double the size of the repository (in terms of
number of commits).
One possibility is this:
git checkout 158142c2
git cherry-pick this-series~5 # patch 1
git cherry-pick this-series~2 # patch 4
git cherry-pick this-series~1 # patch 5
git merge origin/master
git checkout -p -- this-series~1 # patch 5
git commit --amend -C HEAD
git cherry-pick this-series # patch 6
Then the reverts are implicit in the merge commit.
However, this will probably still cause problems with bisection, since
the merge base between 2.2 and 2.3 will be in prehistory.
> * should we squash the revert and reimplement patches together?
> (avoids bisection break but makes the revert-and-reimplement less clear)
I think we can do that, provided the reimplemented functions are in
different places than the originals, so that the revert-and-reimplement
is still clear from the diff.
> * would anybody like to cross-check my examination of the commit logs
> to confirm I didn't miss any patches we need to revert?
Ok.
> * are there any bugs in my reimplementations?
I guess Maciej took care of this
> * are people happy with my attempt to clarify the licensing status of
> the source files in patch 6, and my choice of GPLv2+ for future
> contributions to them?
I think SoftFloat-2a is more appropriate but I don't really care.
> I've put the full details of how I constructed this patchset after the
> diffstat. References in that text to "this archive" are to
> http://people.linaro.org/~peter.maydell/softfloat-relicensing-proposed.tar.gz
> which is a complete archive of everything needed to reproduce the
> patchset, including copies of upstream's pristine 2a and 2b tarballs.
> If/when this patchset is applied I plan to upload it to the QEMU webserver
> as a permanent archive of what happened here (since the commit diffs
> themselves don't tell the full story).
Sonuds good.
Paolo
>
> thanks
> -- PMM
>
> Peter Maydell (6):
> softfloat: Apply patch corresponding to rebasing to softfloat-2a
> softfloat: Revert remaining portions of commits 75d62a5856 and
> 3430b0be36f
> softfloat: Revert remaining parts of commits b645bb4885 and 5a6932d51d
> softfloat: Implement uint64_to_float64() and uint64_to_float32()
> softfloat: reimplement SNAN_BIT_IS_ONE support
> softfloat: Clarify license status
>
> fpu/softfloat-macros.h | 86 +++++++++++++++++++++-------
> fpu/softfloat-specialize.h | 139
> ++++++++++++++++++++++++++++++---------------
> fpu/softfloat.c | 136 +++++++++++++++++++++++++++++++-------------
> include/fpu/softfloat.h | 82 +++++++++++++++++++-------
> 4 files changed, 316 insertions(+), 127 deletions(-)
>
