On 9/20/2016 3:39 PM, David Wohlferd wrote:
On 9/20/2016 3:01 AM, JonY wrote:
On 9/20/2016 14:29, David Wohlferd wrote:
1) The paths for the math/DFP stuff are totally messed up.
Directory names include a version number (2.3) which our tree has
removed, some directory names have changed (s/cmd/examples) and
some have been re-orged (mpdecimal-2.3/fnt.c ->
mpdecimal/libmpdec/fnt.c). I think I have fixed all these.
The libmpdec directory (and Makefile.am entries) stuff can be removed,
I was too ambitious to support DFP, but never really had the time to
go deep.
Ahh.
So, I have removed the DFP stuff from EXTRA_DIST (attached). That's an
easier patch and solves my distcheck problems. That's enough for me
to proceed.
But it sounds like you are talking about more?
If it will help, I'm willing to take a crack at removing whatever you
say should go. But I'm reluctant to remove things I don't understand
without clearer instructions. For example, are we getting rid of all
the ENABLE_DFP experimental stuff? Deleting all of
mingw-w64-crt/math/DFP from the tree? Or just
mingw-w64-crt/math/DFP/mpdecimal?
Creating patches that delete files makes for REALLY big patches. Instead
of me emailing the 8MB file, just pretend that the attached file also
deletes the entire mingw-w64-crt/math/DFP/mpdecimal directory, in
addition to removing all references to it from mingw-w64-crt/Makefile.am.
Note that it does NOT remove mingw-w64-crt/math/DFP.
So, we have:
- DFP2.patch (previous email) which just changes EXTRA_DIST to remove
the DFP/mpdecimal stuff.
- DFP3.patch (current email) which removes the entire
mingw-w64-crt/math/DFP/mpdecimal directory and all references to it.
I suppose the next step would be to remove the entire
--enable-experimental=dfp. Is that what you were proposing? Looks like
a much bigger change (__dfp_expansion macro? stdio\mingw_pformat.c?).
JonY, please either approve one of these patches or provide more guidance.
dw
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index 886fcf0..cc54f5b 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -71,35 +71,6 @@ _libm_dummy.c:
src_libm=_libm_dummy.c
-lib32/DFP_src_%.dfp.obj: math/DFP/mpdecimal/libmpdec/%.c
- $(COMPILE) $(CPPFLAGS32) -Wno-unknown-pragmas -std=gnu99 -DCONFIG_32 -DASM -DPPRO -DHAVE_GCC_ASM_FOR_X87=1 -DHAVE_INTTYPES_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STDINT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRINGS_H=1 -DHAVE_STRING_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_UNISTD_H=1 -DPACKAGE_BUGREPORT='"mpdecimal-b...@bytereef.org"' -DPACKAGE_NAME='"mpdecimal"' -DPACKAGE_STRING='"mpdecimal 2.4.0"' -DPACKAGE_TARNAME='"mpdecimal"' -DPACKAGE_URL='"http://www.bytereef.org/mpdecimal/index.html";' -DPACKAGE_VERSION='"2.4.0"' -DSIZEOF_SIZE_T=4 -DSIZEOF___UINT128_T=0 -DSTDC_HEADERS=1 -O2 -Dmpdecimal_header=\"mpdecimal-i686.h\" -c $< -o $@
-
-lib64/DFP_src_%.dfp.obj: math/DFP/mpdecimal/libmpdec/%.c
- $(COMPILE) $(CPPFLAGS64) -Wno-unknown-pragmas -std=gnu99 -DCONFIG_64 -DASM -DHAVE_GCC_ASM_FOR_X64=1 -DHAVE_GCC_ASM_FOR_X87=1 -DHAVE_INTTYPES_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STDINT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRINGS_H=1 -DHAVE_STRING_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_UINT128_T=1 -DHAVE_UNISTD_H=1 -DPACKAGE_BUGREPORT='"mpdecimal-b...@bytereef.org"' -DPACKAGE_NAME='"mpdecimal"' -DPACKAGE_STRING='"mpdecimal 2.4.0"' -DPACKAGE_TARNAME='"mpdecimal"' -DPACKAGE_URL='"http://www.bytereef.org/mpdecimal/index.html";' -DPACKAGE_VERSION='"2.4.0"' -DSIZEOF_SIZE_T=8 -DSIZEOF___UINT128_T=16 -DSTDC_HEADERS=1 -O2 -Dmpdecimal_header=\"mpdecimal-x86_64.h\" -c $< -o $@
-
-if ENABLE_DFP
-obj_dfpsrc32 = \
-lib32/DFP_src_basearith.dfp.obj lib32/DFP_src_context.dfp.obj lib32/DFP_src_constants.dfp.obj lib32/DFP_src_convolute.dfp.obj lib32/DFP_src_crt.dfp.obj \
-lib32/DFP_src_mpdecimal.dfp.obj lib32/DFP_src_mpsignal.dfp.obj lib32/DFP_src_difradix2.dfp.obj lib32/DFP_src_fnt.dfp.obj lib32/DFP_src_fourstep.dfp.obj \
-lib32/DFP_src_io.dfp.obj lib32/DFP_src_memory.dfp.obj lib32/DFP_src_numbertheory.dfp.obj lib32/DFP_src_sixstep.dfp.obj lib32/DFP_src_transpose.dfp.obj
-
-obj_dfpsrc64 = \
-lib64/DFP_src_basearith.dfp.obj lib64/DFP_src_context.dfp.obj lib64/DFP_src_constants.dfp.obj lib64/DFP_src_convolute.dfp.obj lib64/DFP_src_crt.dfp.obj \
-lib64/DFP_src_mpdecimal.dfp.obj lib64/DFP_src_mpsignal.dfp.obj lib64/DFP_src_difradix2.dfp.obj lib64/DFP_src_fnt.dfp.obj lib64/DFP_src_fourstep.dfp.obj \
-lib64/DFP_src_io.dfp.obj lib64/DFP_src_memory.dfp.obj lib64/DFP_src_numbertheory.dfp.obj lib64/DFP_src_sixstep.dfp.obj lib64/DFP_src_transpose.dfp.obj
-
-src_dfp_math = \
-math/DFP/__fpclassifyd32.c math/DFP/__fpclassifyd64.c math/DFP/__fpclassifyd128.c \
-math/DFP/__isnand32.c math/DFP/__isnand64.c math/DFP/__isnand128.c \
-math/DFP/__signbitd32.c math/DFP/__signbitd64.c math/DFP/__signbitd128.c \
-math/DFP/isinfd32.c math/DFP/isinfd64.c math/DFP/isinfd128.c
-
-else
-obj_dfpsrc32 =
-obj_dfpsrc64 =
-src_dfp_math =
-endif
-
src_libshell32=libsrc/shell32.c
src_libdinput=libsrc/dinput_kbd.c libsrc/dinput_joy.c libsrc/dinput_joy2.c libsrc/dinput_mouse.c libsrc/dinput_mouse2.c
src_libdinput8=libsrc/dinput_private.h libsrc/dinput_joy.c libsrc/dinput_joy2.c libsrc/dinput_mouse.c libsrc/dinput_mouse2.c libsrc/dinput_kbd.c
@@ -595,8 +566,7 @@ lib32_libmingw32_a_SOURCES = $(src_libmingw32)
lib32_LIBRARIES += lib32/libmingwex.a
lib32_libmingwex_a_CPPFLAGS=$(CPPFLAGS32) $(extra_include) $(AM_CPPFLAGS)
-lib32_libmingwex_a_SOURCES = $(src_libmingwex) $(src_libmingwex32) $(src_dfp_math)
-lib32_libmingwex_a_LIBADD = $(obj_dfpsrc32)
+lib32_libmingwex_a_SOURCES = $(src_libmingwex) $(src_libmingwex32)
lib32_LIBRARIES += lib32/libmoldname.a
lib32_libmoldname_a_CPPFLAGS=$(CPPFLAGS32) $(extra_include) $(AM_CPPFLAGS)
@@ -864,8 +834,7 @@ lib64_libmingw32_a_SOURCES = $(src_libmingw32)
lib64_LIBRARIES += lib64/libmingwex.a
lib64_libmingwex_a_CPPFLAGS=$(CPPFLAGS64) $(extra_include) $(AM_CPPFLAGS)
-lib64_libmingwex_a_SOURCES = $(src_libmingwex) $(src_libmingwex64) $(src_dfp_math)
-lib64_libmingwex_a_LIBADD = $(obj_dfpsrc64)
+lib64_libmingwex_a_SOURCES = $(src_libmingwex) $(src_libmingwex64)
lib64_LIBRARIES += lib64/libmoldname.a
lib64_libmoldname_a_CPPFLAGS=$(CPPFLAGS64) $(extra_include) $(AM_CPPFLAGS)
@@ -1399,8 +1368,7 @@ libarm32_libmingw32_a_SOURCES = $(src_libmingw32)
libarm32_LIBRARIES += libarm32/libmingwex.a
libarm32_libmingwex_a_CPPFLAGS=$(CPPFLAGSARM32) $(extra_include) $(AM_CPPFLAGS)
-libarm32_libmingwex_a_SOURCES = $(src_libmingwex) $(src_libmingwexarm32) $(src_dfp_math)
-libarm32_libmingwex_a_LIBADD = $(obj_dfpsrc32)
+libarm32_libmingwex_a_SOURCES = $(src_libmingwex) $(src_libmingwexarm32)
libarm32_LIBRARIES += libarm32/libmoldname.a
libarm32_libmoldname_a_CPPFLAGS=$(CPPFLAGSARM32) $(extra_include) $(AM_CPPFLAGS)
@@ -1512,189 +1480,6 @@ EXTRA_DIST += revstamp.h \
profile/COPYING \
profile/CYGWIN_LICENSE
-EXTRA_DIST += math/DFP/mpdecimal-2.3/.hg_archival.txt \
-math/DFP/mpdecimal-2.3/basearith.c \
-math/DFP/mpdecimal-2.3/basearith.h \
-math/DFP/mpdecimal-2.3/bench.c \
-math/DFP/mpdecimal-2.3/bits.h \
-math/DFP/mpdecimal-2.3/cdecimal2.c \
-math/DFP/mpdecimal-2.3/cdecimal3.c \
-math/DFP/mpdecimal-2.3/CHANGELOG.txt \
-math/DFP/mpdecimal-2.3/cmd/compare.c \
-math/DFP/mpdecimal-2.3/cmd/div.c \
-math/DFP/mpdecimal-2.3/cmd/divmod.c \
-math/DFP/mpdecimal-2.3/cmd/multiply.c \
-math/DFP/mpdecimal-2.3/cmd/pow.c \
-math/DFP/mpdecimal-2.3/cmd/powmod.c \
-math/DFP/mpdecimal-2.3/cmd/README.txt \
-math/DFP/mpdecimal-2.3/cmd/shift.c \
-math/DFP/mpdecimal-2.3/cmd/sqrt.c \
-math/DFP/mpdecimal-2.3/config.h.in \
-math/DFP/mpdecimal-2.3/configure \
-math/DFP/mpdecimal-2.3/configure.in \
-math/DFP/mpdecimal-2.3/constants.c \
-math/DFP/mpdecimal-2.3/constants.h \
-math/DFP/mpdecimal-2.3/context.c \
-math/DFP/mpdecimal-2.3/convolute.c \
-math/DFP/mpdecimal-2.3/convolute.h \
-math/DFP/mpdecimal-2.3/crt.c \
-math/DFP/mpdecimal-2.3/crt.h \
-math/DFP/mpdecimal-2.3/difradix2.c \
-math/DFP/mpdecimal-2.3/difradix2.h \
-math/DFP/mpdecimal-2.3/doc/cdecimal/index.html \
-math/DFP/mpdecimal-2.3/doc/index.html \
-math/DFP/mpdecimal-2.3/doc/libmpdec/arithmetic.html \
-math/DFP/mpdecimal-2.3/doc/libmpdec/assign-convert.html \
-math/DFP/mpdecimal-2.3/doc/libmpdec/attributes.html \
-math/DFP/mpdecimal-2.3/doc/libmpdec/context.html \
-math/DFP/mpdecimal-2.3/doc/libmpdec/decimals.html \
-math/DFP/mpdecimal-2.3/doc/libmpdec/functions.html \
-math/DFP/mpdecimal-2.3/doc/libmpdec/index.html \
-math/DFP/mpdecimal-2.3/doc/libmpdec/memory.html \
-math/DFP/mpdecimal-2.3/doc/libmpdec/various.html \
-math/DFP/mpdecimal-2.3/doc/LICENSE.txt \
-math/DFP/mpdecimal-2.3/doc/objects.inv \
-math/DFP/mpdecimal-2.3/doc/search.html \
-math/DFP/mpdecimal-2.3/doc/searchindex.js \
-math/DFP/mpdecimal-2.3/doc/_static/basic.css \
-math/DFP/mpdecimal-2.3/doc/_static/default.css \
-math/DFP/mpdecimal-2.3/doc/_static/doctools.js \
-math/DFP/mpdecimal-2.3/doc/_static/file.png \
-math/DFP/mpdecimal-2.3/doc/_static/jquery.js \
-math/DFP/mpdecimal-2.3/doc/_static/minus.png \
-math/DFP/mpdecimal-2.3/doc/_static/mpdecimal-doc.css \
-math/DFP/mpdecimal-2.3/doc/_static/plus.png \
-math/DFP/mpdecimal-2.3/doc/_static/pygments.css \
-math/DFP/mpdecimal-2.3/doc/_static/searchtools.js \
-math/DFP/mpdecimal-2.3/doc/_static/sidebar.js \
-math/DFP/mpdecimal-2.3/doc/_static/underscore.js \
-math/DFP/mpdecimal-2.3/docstrings.h \
-math/DFP/mpdecimal-2.3/fnt.c \
-math/DFP/mpdecimal-2.3/fnt.h \
-math/DFP/mpdecimal-2.3/fourstep.c \
-math/DFP/mpdecimal-2.3/fourstep.h \
-math/DFP/mpdecimal-2.3/io.c \
-math/DFP/mpdecimal-2.3/io.h \
-math/DFP/mpdecimal-2.3/LIBINSTALL.txt \
-math/DFP/mpdecimal-2.3/LICENSE.txt \
-math/DFP/mpdecimal-2.3/literature/mpdecimal.lisp \
-math/DFP/mpdecimal-2.3/literature/README.txt \
-math/DFP/mpdecimal-2.3/literature/umodarith.lisp \
-math/DFP/mpdecimal-2.3/Makefile.in \
-math/DFP/mpdecimal-2.3/Makefile.vc \
-math/DFP/mpdecimal-2.3/memory.c \
-math/DFP/mpdecimal-2.3/memory.h \
-math/DFP/mpdecimal-2.3/mpdecimal-i686.h \
-math/DFP/mpdecimal-2.3/mpdecimal-x86_64.h \
-math/DFP/mpdecimal-2.3/mpdecimal.c \
-math/DFP/mpdecimal-2.3/mpdecimal.h.in \
-math/DFP/mpdecimal-2.3/mpdecimal32vc.h \
-math/DFP/mpdecimal-2.3/mpdecimal64vc.h \
-math/DFP/mpdecimal-2.3/mpsignal.c \
-math/DFP/mpdecimal-2.3/mptest.h \
-math/DFP/mpdecimal-2.3/mptypes.h \
-math/DFP/mpdecimal-2.3/numbertheory.c \
-math/DFP/mpdecimal-2.3/numbertheory.h \
-math/DFP/mpdecimal-2.3/PKG-INFO \
-math/DFP/mpdecimal-2.3/PYINSTALL.txt \
-math/DFP/mpdecimal-2.3/python/Bench.class \
-math/DFP/mpdecimal-2.3/python/Bench.java \
-math/DFP/mpdecimal-2.3/python/bench.py \
-math/DFP/mpdecimal-2.3/python/BENCHMARK.txt \
-math/DFP/mpdecimal-2.3/python/build_all_branches.bat \
-math/DFP/mpdecimal-2.3/python/build_all_branches.sh \
-math/DFP/mpdecimal-2.3/python/build_all_releases.sh \
-math/DFP/mpdecimal-2.3/python/ctx-deccheck2.py \
-math/DFP/mpdecimal-2.3/python/deccheck2.py \
-math/DFP/mpdecimal-2.3/python/deccheck3.py \
-math/DFP/mpdecimal-2.3/python/failapi2.diff \
-math/DFP/mpdecimal-2.3/python/failapi3.diff \
-math/DFP/mpdecimal-2.3/python/formathelper.py \
-math/DFP/mpdecimal-2.3/python/genlocale.py \
-math/DFP/mpdecimal-2.3/python/genrandformat.py \
-math/DFP/mpdecimal-2.3/python/genrandlocale.py \
-math/DFP/mpdecimal-2.3/python/gettests.bat \
-math/DFP/mpdecimal-2.3/python/gettests.sh \
-math/DFP/mpdecimal-2.3/python/get_all_branches.bat \
-math/DFP/mpdecimal-2.3/python/get_all_branches.sh \
-math/DFP/mpdecimal-2.3/python/get_all_releases.sh \
-math/DFP/mpdecimal-2.3/python/randdec.py \
-math/DFP/mpdecimal-2.3/python/randfloat.py \
-math/DFP/mpdecimal-2.3/python/README.txt \
-math/DFP/mpdecimal-2.3/python/runall-amd64.bat \
-math/DFP/mpdecimal-2.3/python/runall-memorydebugger.sh \
-math/DFP/mpdecimal-2.3/python/runall-refleak.bat \
-math/DFP/mpdecimal-2.3/python/runall-releases.sh \
-math/DFP/mpdecimal-2.3/python/runall-x86.bat \
-math/DFP/mpdecimal-2.3/python/runall.sh \
-math/DFP/mpdecimal-2.3/python/test_cdecimal2.5.py \
-math/DFP/mpdecimal-2.3/python/test_cdecimal2.py \
-math/DFP/mpdecimal-2.3/python/test_cdecimal3.py \
-math/DFP/mpdecimal-2.3/python/valgrind.supp \
-math/DFP/mpdecimal-2.3/README.txt \
-math/DFP/mpdecimal-2.3/setup.py \
-math/DFP/mpdecimal-2.3/sixstep.c \
-math/DFP/mpdecimal-2.3/sixstep.h \
-math/DFP/mpdecimal-2.3/tests/additional.decTest \
-math/DFP/mpdecimal-2.3/tests/cov.c \
-math/DFP/mpdecimal-2.3/tests/covreport.py \
-math/DFP/mpdecimal-2.3/tests/deccheck.c \
-math/DFP/mpdecimal-2.3/tests/dnloop-windows.patch \
-math/DFP/mpdecimal-2.3/tests/dnloop.patch \
-math/DFP/mpdecimal-2.3/tests/fntcov.c \
-math/DFP/mpdecimal-2.3/tests/fullcov_header.patch \
-math/DFP/mpdecimal-2.3/tests/getdn.bat \
-math/DFP/mpdecimal-2.3/tests/getdn.sh \
-math/DFP/mpdecimal-2.3/tests/gettests.bat \
-math/DFP/mpdecimal-2.3/tests/gettests.sh \
-math/DFP/mpdecimal-2.3/tests/karatsuba_fnt.c \
-math/DFP/mpdecimal-2.3/tests/karatsuba_fnt2.c \
-math/DFP/mpdecimal-2.3/tests/Makefile.in \
-math/DFP/mpdecimal-2.3/tests/Makefile.vc \
-math/DFP/mpdecimal-2.3/tests/malloc_fail.c \
-math/DFP/mpdecimal-2.3/tests/malloc_fail.h \
-math/DFP/mpdecimal-2.3/tests/mpd_mpz_add.c \
-math/DFP/mpdecimal-2.3/tests/mpd_mpz_divmod.c \
-math/DFP/mpdecimal-2.3/tests/mpd_mpz_mul.c \
-math/DFP/mpdecimal-2.3/tests/mpd_mpz_sub.c \
-math/DFP/mpdecimal-2.3/tests/official.decTest \
-math/DFP/mpdecimal-2.3/tests/ppro_mulmod.c \
-math/DFP/mpdecimal-2.3/tests/README.txt \
-math/DFP/mpdecimal-2.3/tests/runallconfigs.bat \
-math/DFP/mpdecimal-2.3/tests/runallconfigs.sh \
-math/DFP/mpdecimal-2.3/tests/runalltests.bat \
-math/DFP/mpdecimal-2.3/tests/runalltests.sh \
-math/DFP/mpdecimal-2.3/tests/runshort.bat \
-math/DFP/mpdecimal-2.3/tests/runshort.sh \
-math/DFP/mpdecimal-2.3/tests/runtest.c \
-math/DFP/mpdecimal-2.3/tests/testdata_dist/baseconv.decTest \
-math/DFP/mpdecimal-2.3/tests/testdata_dist/binop_eq.decTest \
-math/DFP/mpdecimal-2.3/tests/testdata_dist/cov.decTest \
-math/DFP/mpdecimal-2.3/tests/testdata_dist/divmod.decTest \
-math/DFP/mpdecimal-2.3/tests/testdata_dist/divmod_eq.decTest \
-math/DFP/mpdecimal-2.3/tests/testdata_dist/extra.decTest \
-math/DFP/mpdecimal-2.3/tests/testdata_dist/fma_eq.decTest \
-math/DFP/mpdecimal-2.3/tests/testdata_dist/format.decTest \
-math/DFP/mpdecimal-2.3/tests/testdata_dist/getint.decTest \
-math/DFP/mpdecimal-2.3/tests/testdata_dist/invroot.decTest \
-math/DFP/mpdecimal-2.3/tests/testdata_dist/largeint.decTest \
-math/DFP/mpdecimal-2.3/tests/testdata_dist/powmod.decTest \
-math/DFP/mpdecimal-2.3/tests/testdata_dist/powmod_eq.decTest \
-math/DFP/mpdecimal-2.3/tests/testdata_dist/shiftlr.decTest \
-math/DFP/mpdecimal-2.3/tests/testdata_dist/testruntest.decTest \
-math/DFP/mpdecimal-2.3/tests/test_transpose.c \
-math/DFP/mpdecimal-2.3/tools/release.sh \
-math/DFP/mpdecimal-2.3/tools/replace.sh \
-math/DFP/mpdecimal-2.3/tools/todos.sh \
-math/DFP/mpdecimal-2.3/transpose.c \
-math/DFP/mpdecimal-2.3/transpose.h \
-math/DFP/mpdecimal-2.3/typearith.h \
-math/DFP/mpdecimal-2.3/umodarith.h \
-math/DFP/mpdecimal-2.3/vars.mk \
-math/DFP/mpdecimal-2.3/vccompat.h \
-math/DFP/mpdecimal-2.3/vcdiv64.asm \
-math/DFP/mpdecimal-2.3/vcstdint.h
-
DISTCHECK_CONFIGURE_FLAGS = --host=$(host_triplet) $(withsys)
dist-hook:
------------------------------------------------------------------------------
_______________________________________________
Mingw-w64-public mailing list
Mingw-w64-public@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
