diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index f8a0272..a032809 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -231,7 +231,7 @@
   math/atanhl.c         math/atanl.c       math/cbrt.c           \
   math/cbrtf.c          math/cbrtl.c       math/cephes_emath.c   math/copysign.c      math/copysignf.c     math/cos.c           \
   math/coshf.c          math/coshl.c       math/cosl.c           math/cossin.c        math/erfl.c          \
-  math/expf.c           math/expl.c        math/expm1.c          math/expm1l.c        \
+  math/expf.c           math/expl.c        math/expm1l.c         \
   math/fabs.c           math/fabsf.c       math/fabsl.c          math/fdim.c          math/fdimf.c         math/fdiml.c         \
   math/fmal.c           math/fmax.c        math/fmaxf.c          math/fmaxl.c         math/fmin.c          math/fminf.c         \
   math/fminl.c          math/fmod.c        math/fmodl.c          math/fp_consts.c     math/fp_constsf.c    \
@@ -297,26 +297,26 @@
 src_libmingwex64=\
   math/acosf.c              math/acosh.c              math/acoshf.c             math/asinf.c              math/asinh.c              \
   math/asinhf.c             math/atan2f.c             math/atanf.c              math/atanh.c              math/atanhf.c             \
-  math/cosf.c               math/exp.c                math/exp2.S               math/exp2f.S              math/expm1f.c             \
-  math/fmodf.c              math/ilogbf.S             math/log1pf.S             math/log2f.S              math/logbf.c              \
-  math/scalbnf.S            math/sinf.c               math/tanf.c
+  math/cosf.c               math/exp.c                math/exp2.S               math/exp2f.S              math/expm1.c              \
+  math/expm1f.c             math/fmodf.c              math/ilogbf.S             math/log1pf.S             math/log2f.S              \
+  math/logbf.c              math/scalbnf.S            math/sinf.c               math/tanf.c
 
 # these only go into the 32 bit version:
 src_libmingwex32=\
   math/acosf.c              math/acosh.c              math/acoshf.c             math/asinf.c              math/asinh.c              \
   math/asinhf.c             math/atan2f.c             math/atanf.c              math/atanh.c              math/atanhf.c             \
-  math/cosf.c               math/exp.c                math/exp2.S               math/exp2f.S              math/expm1f.c             \
-  math/fmodf.c              math/ilogbf.S             math/log1pf.S             math/log2f.S              math/logbf.c              \
-  math/scalbnf.S            math/sinf.c               math/tanf.c
+  math/cosf.c               math/exp.c                math/exp2.S               math/exp2f.S              math/expm1.c              \
+  math/expm1f.c             math/fmodf.c              math/ilogbf.S             math/log1pf.S             math/log2f.S              \
+  math/logbf.c              math/scalbnf.S            math/sinf.c               math/tanf.c
 
 # these only go into the ARM32 version:
 src_libmingwexarm32=\
   math/softmath/e_fmodf.c   math/softmath/e_powf.c    \
   math/softmath/acosf.c     math/softmath/acosh.c     math/softmath/acoshf.c    math/softmath/asinf.c     math/softmath/asinh.c     \
   math/softmath/asinhf.c    math/softmath/atan2f.c    math/softmath/atanf.c     math/softmath/atanh.c     math/softmath/atanhf.c    \
-  math/softmath/cosf.c      math/softmath/exp.c       math/softmath/exp2.c      math/softmath/exp2f.c     math/softmath/expm1f.c    \
-  math/softmath/fmodf.c     math/softmath/ilogbf.c    math/softmath/log1pf.c    math/softmath/log2f.c     math/softmath/logbf.c     \
-  math/softmath/scalbnf.c   math/softmath/sinf.c      math/softmath/tanf.c
+  math/softmath/cosf.c      math/softmath/exp.c       math/softmath/exp2.c      math/softmath/exp2f.c     math/softmath/expm1.c     \
+  math/softmath/expm1f.c    math/softmath/fmodf.c     math/softmath/ilogbf.c    math/softmath/log1pf.c    math/softmath/log2f.c     \
+  math/softmath/logbf.c     math/softmath/scalbnf.c   math/softmath/sinf.c      math/softmath/tanf.c
 
 
 # These intrinsics are target independent:
diff --git a/mingw-w64-crt/Makefile.in b/mingw-w64-crt/Makefile.in
index c075f86..68a1da2 100644
--- a/mingw-w64-crt/Makefile.in
+++ b/mingw-w64-crt/Makefile.in
@@ -585,9 +585,9 @@
 	math/cbrtf.c math/cbrtl.c math/cephes_emath.c math/copysign.c \
 	math/copysignf.c math/cos.c math/coshf.c math/coshl.c \
 	math/cosl.c math/cossin.c math/erfl.c math/expf.c math/expl.c \
-	math/expm1.c math/expm1l.c math/fabs.c math/fabsf.c \
-	math/fabsl.c math/fdim.c math/fdimf.c math/fdiml.c math/fmal.c \
-	math/fmax.c math/fmaxf.c math/fmaxl.c math/fmin.c math/fminf.c \
+	math/expm1l.c math/fabs.c math/fabsf.c math/fabsl.c \
+	math/fdim.c math/fdimf.c math/fdiml.c math/fmal.c math/fmax.c \
+	math/fmaxf.c math/fmaxl.c math/fmin.c math/fminf.c \
 	math/fminl.c math/fmod.c math/fmodl.c math/fp_consts.c \
 	math/fp_constsf.c math/fp_constsl.c math/fpclassify.c \
 	math/fpclassifyf.c math/fpclassifyl.c math/frexpf.c \
@@ -671,15 +671,15 @@
 	stdio/mingw_vasprintf.c math/acosf.c math/acosh.c \
 	math/acoshf.c math/asinf.c math/asinh.c math/asinhf.c \
 	math/atan2f.c math/atanf.c math/atanh.c math/atanhf.c \
-	math/cosf.c math/exp.c math/exp2.S math/exp2f.S math/expm1f.c \
-	math/fmodf.c math/ilogbf.S math/log1pf.S math/log2f.S \
-	math/logbf.c math/scalbnf.S math/sinf.c math/tanf.c \
-	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
+	math/cosf.c math/exp.c math/exp2.S math/exp2f.S math/expm1.c \
+	math/expm1f.c math/fmodf.c math/ilogbf.S math/log1pf.S \
+	math/log2f.S math/logbf.c math/scalbnf.S math/sinf.c \
+	math/tanf.c 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
 am__objects_16 = crt/lib32_libmingwex_a-dllentry.$(OBJEXT) \
 	crt/lib32_libmingwex_a-dllmain.$(OBJEXT) \
 	complex/lib32_libmingwex_a-cabs.$(OBJEXT) \
@@ -808,7 +808,6 @@
 	math/lib32_libmingwex_a-erfl.$(OBJEXT) \
 	math/lib32_libmingwex_a-expf.$(OBJEXT) \
 	math/lib32_libmingwex_a-expl.$(OBJEXT) \
-	math/lib32_libmingwex_a-expm1.$(OBJEXT) \
 	math/lib32_libmingwex_a-expm1l.$(OBJEXT) \
 	math/lib32_libmingwex_a-fabs.$(OBJEXT) \
 	math/lib32_libmingwex_a-fabsf.$(OBJEXT) \
@@ -1082,6 +1081,7 @@
 	math/lib32_libmingwex_a-exp.$(OBJEXT) \
 	math/lib32_libmingwex_a-exp2.$(OBJEXT) \
 	math/lib32_libmingwex_a-exp2f.$(OBJEXT) \
+	math/lib32_libmingwex_a-expm1.$(OBJEXT) \
 	math/lib32_libmingwex_a-expm1f.$(OBJEXT) \
 	math/lib32_libmingwex_a-fmodf.$(OBJEXT) \
 	math/lib32_libmingwex_a-ilogbf.$(OBJEXT) \
@@ -1720,9 +1720,9 @@
 	math/cbrtf.c math/cbrtl.c math/cephes_emath.c math/copysign.c \
 	math/copysignf.c math/cos.c math/coshf.c math/coshl.c \
 	math/cosl.c math/cossin.c math/erfl.c math/expf.c math/expl.c \
-	math/expm1.c math/expm1l.c math/fabs.c math/fabsf.c \
-	math/fabsl.c math/fdim.c math/fdimf.c math/fdiml.c math/fmal.c \
-	math/fmax.c math/fmaxf.c math/fmaxl.c math/fmin.c math/fminf.c \
+	math/expm1l.c math/fabs.c math/fabsf.c math/fabsl.c \
+	math/fdim.c math/fdimf.c math/fdiml.c math/fmal.c math/fmax.c \
+	math/fmaxf.c math/fmaxl.c math/fmin.c math/fminf.c \
 	math/fminl.c math/fmod.c math/fmodl.c math/fp_consts.c \
 	math/fp_constsf.c math/fp_constsl.c math/fpclassify.c \
 	math/fpclassifyf.c math/fpclassifyl.c math/frexpf.c \
@@ -1806,15 +1806,15 @@
 	stdio/mingw_vasprintf.c math/acosf.c math/acosh.c \
 	math/acoshf.c math/asinf.c math/asinh.c math/asinhf.c \
 	math/atan2f.c math/atanf.c math/atanh.c math/atanhf.c \
-	math/cosf.c math/exp.c math/exp2.S math/exp2f.S math/expm1f.c \
-	math/fmodf.c math/ilogbf.S math/log1pf.S math/log2f.S \
-	math/logbf.c math/scalbnf.S math/sinf.c math/tanf.c \
-	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
+	math/cosf.c math/exp.c math/exp2.S math/exp2f.S math/expm1.c \
+	math/expm1f.c math/fmodf.c math/ilogbf.S math/log1pf.S \
+	math/log2f.S math/logbf.c math/scalbnf.S math/sinf.c \
+	math/tanf.c 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
 am__objects_49 = crt/lib64_libmingwex_a-dllentry.$(OBJEXT) \
 	crt/lib64_libmingwex_a-dllmain.$(OBJEXT) \
 	complex/lib64_libmingwex_a-cabs.$(OBJEXT) \
@@ -1943,7 +1943,6 @@
 	math/lib64_libmingwex_a-erfl.$(OBJEXT) \
 	math/lib64_libmingwex_a-expf.$(OBJEXT) \
 	math/lib64_libmingwex_a-expl.$(OBJEXT) \
-	math/lib64_libmingwex_a-expm1.$(OBJEXT) \
 	math/lib64_libmingwex_a-expm1l.$(OBJEXT) \
 	math/lib64_libmingwex_a-fabs.$(OBJEXT) \
 	math/lib64_libmingwex_a-fabsf.$(OBJEXT) \
@@ -2217,6 +2216,7 @@
 	math/lib64_libmingwex_a-exp.$(OBJEXT) \
 	math/lib64_libmingwex_a-exp2.$(OBJEXT) \
 	math/lib64_libmingwex_a-exp2f.$(OBJEXT) \
+	math/lib64_libmingwex_a-expm1.$(OBJEXT) \
 	math/lib64_libmingwex_a-expm1f.$(OBJEXT) \
 	math/lib64_libmingwex_a-fmodf.$(OBJEXT) \
 	math/lib64_libmingwex_a-ilogbf.$(OBJEXT) \
@@ -2769,9 +2769,9 @@
 	math/cbrtf.c math/cbrtl.c math/cephes_emath.c math/copysign.c \
 	math/copysignf.c math/cos.c math/coshf.c math/coshl.c \
 	math/cosl.c math/cossin.c math/erfl.c math/expf.c math/expl.c \
-	math/expm1.c math/expm1l.c math/fabs.c math/fabsf.c \
-	math/fabsl.c math/fdim.c math/fdimf.c math/fdiml.c math/fmal.c \
-	math/fmax.c math/fmaxf.c math/fmaxl.c math/fmin.c math/fminf.c \
+	math/expm1l.c math/fabs.c math/fabsf.c math/fabsl.c \
+	math/fdim.c math/fdimf.c math/fdiml.c math/fmal.c math/fmax.c \
+	math/fmaxf.c math/fmaxl.c math/fmin.c math/fminf.c \
 	math/fminl.c math/fmod.c math/fmodl.c math/fp_consts.c \
 	math/fp_constsf.c math/fp_constsl.c math/fpclassify.c \
 	math/fpclassifyf.c math/fpclassifyl.c math/frexpf.c \
@@ -2860,16 +2860,17 @@
 	math/softmath/atanf.c math/softmath/atanh.c \
 	math/softmath/atanhf.c math/softmath/cosf.c \
 	math/softmath/exp.c math/softmath/exp2.c math/softmath/exp2f.c \
-	math/softmath/expm1f.c math/softmath/fmodf.c \
-	math/softmath/ilogbf.c math/softmath/log1pf.c \
-	math/softmath/log2f.c math/softmath/logbf.c \
-	math/softmath/scalbnf.c math/softmath/sinf.c \
-	math/softmath/tanf.c 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
+	math/softmath/expm1.c math/softmath/expm1f.c \
+	math/softmath/fmodf.c math/softmath/ilogbf.c \
+	math/softmath/log1pf.c math/softmath/log2f.c \
+	math/softmath/logbf.c math/softmath/scalbnf.c \
+	math/softmath/sinf.c math/softmath/tanf.c \
+	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
 am__objects_78 = crt/libarm32_libmingwex_a-dllentry.$(OBJEXT) \
 	crt/libarm32_libmingwex_a-dllmain.$(OBJEXT) \
 	complex/libarm32_libmingwex_a-cabs.$(OBJEXT) \
@@ -2998,7 +2999,6 @@
 	math/libarm32_libmingwex_a-erfl.$(OBJEXT) \
 	math/libarm32_libmingwex_a-expf.$(OBJEXT) \
 	math/libarm32_libmingwex_a-expl.$(OBJEXT) \
-	math/libarm32_libmingwex_a-expm1.$(OBJEXT) \
 	math/libarm32_libmingwex_a-expm1l.$(OBJEXT) \
 	math/libarm32_libmingwex_a-fabs.$(OBJEXT) \
 	math/libarm32_libmingwex_a-fabsf.$(OBJEXT) \
@@ -3275,6 +3275,7 @@
 	math/softmath/libarm32_libmingwex_a-exp.$(OBJEXT) \
 	math/softmath/libarm32_libmingwex_a-exp2.$(OBJEXT) \
 	math/softmath/libarm32_libmingwex_a-exp2f.$(OBJEXT) \
+	math/softmath/libarm32_libmingwex_a-expm1.$(OBJEXT) \
 	math/softmath/libarm32_libmingwex_a-expm1f.$(OBJEXT) \
 	math/softmath/libarm32_libmingwex_a-fmodf.$(OBJEXT) \
 	math/softmath/libarm32_libmingwex_a-ilogbf.$(OBJEXT) \
@@ -5105,7 +5106,7 @@
   math/atanhl.c         math/atanl.c       math/cbrt.c           \
   math/cbrtf.c          math/cbrtl.c       math/cephes_emath.c   math/copysign.c      math/copysignf.c     math/cos.c           \
   math/coshf.c          math/coshl.c       math/cosl.c           math/cossin.c        math/erfl.c          \
-  math/expf.c           math/expl.c        math/expm1.c          math/expm1l.c        \
+  math/expf.c           math/expl.c        math/expm1l.c         \
   math/fabs.c           math/fabsf.c       math/fabsl.c          math/fdim.c          math/fdimf.c         math/fdiml.c         \
   math/fmal.c           math/fmax.c        math/fmaxf.c          math/fmaxl.c         math/fmin.c          math/fminf.c         \
   math/fminl.c          math/fmod.c        math/fmodl.c          math/fp_consts.c     math/fp_constsf.c    \
@@ -5172,18 +5173,18 @@
 src_libmingwex64 = \
   math/acosf.c              math/acosh.c              math/acoshf.c             math/asinf.c              math/asinh.c              \
   math/asinhf.c             math/atan2f.c             math/atanf.c              math/atanh.c              math/atanhf.c             \
-  math/cosf.c               math/exp.c                math/exp2.S               math/exp2f.S              math/expm1f.c             \
-  math/fmodf.c              math/ilogbf.S             math/log1pf.S             math/log2f.S              math/logbf.c              \
-  math/scalbnf.S            math/sinf.c               math/tanf.c
+  math/cosf.c               math/exp.c                math/exp2.S               math/exp2f.S              math/expm1.c              \
+  math/expm1f.c             math/fmodf.c              math/ilogbf.S             math/log1pf.S             math/log2f.S              \
+  math/logbf.c              math/scalbnf.S            math/sinf.c               math/tanf.c
 
 
 # these only go into the 32 bit version:
 src_libmingwex32 = \
   math/acosf.c              math/acosh.c              math/acoshf.c             math/asinf.c              math/asinh.c              \
   math/asinhf.c             math/atan2f.c             math/atanf.c              math/atanh.c              math/atanhf.c             \
-  math/cosf.c               math/exp.c                math/exp2.S               math/exp2f.S              math/expm1f.c             \
-  math/fmodf.c              math/ilogbf.S             math/log1pf.S             math/log2f.S              math/logbf.c              \
-  math/scalbnf.S            math/sinf.c               math/tanf.c
+  math/cosf.c               math/exp.c                math/exp2.S               math/exp2f.S              math/expm1.c              \
+  math/expm1f.c             math/fmodf.c              math/ilogbf.S             math/log1pf.S             math/log2f.S              \
+  math/logbf.c              math/scalbnf.S            math/sinf.c               math/tanf.c
 
 
 # these only go into the ARM32 version:
@@ -5191,9 +5192,9 @@
   math/softmath/e_fmodf.c   math/softmath/e_powf.c    \
   math/softmath/acosf.c     math/softmath/acosh.c     math/softmath/acoshf.c    math/softmath/asinf.c     math/softmath/asinh.c     \
   math/softmath/asinhf.c    math/softmath/atan2f.c    math/softmath/atanf.c     math/softmath/atanh.c     math/softmath/atanhf.c    \
-  math/softmath/cosf.c      math/softmath/exp.c       math/softmath/exp2.c      math/softmath/exp2f.c     math/softmath/expm1f.c    \
-  math/softmath/fmodf.c     math/softmath/ilogbf.c    math/softmath/log1pf.c    math/softmath/log2f.c     math/softmath/logbf.c     \
-  math/softmath/scalbnf.c   math/softmath/sinf.c      math/softmath/tanf.c
+  math/softmath/cosf.c      math/softmath/exp.c       math/softmath/exp2.c      math/softmath/exp2f.c     math/softmath/expm1.c     \
+  math/softmath/expm1f.c    math/softmath/fmodf.c     math/softmath/ilogbf.c    math/softmath/log1pf.c    math/softmath/log2f.c     \
+  math/softmath/logbf.c     math/softmath/scalbnf.c   math/softmath/sinf.c      math/softmath/tanf.c
 
 
 # These intrinsics are target independent:
@@ -8351,8 +8352,6 @@
 	math/$(DEPDIR)/$(am__dirstamp)
 math/lib32_libmingwex_a-expl.$(OBJEXT): math/$(am__dirstamp) \
 	math/$(DEPDIR)/$(am__dirstamp)
-math/lib32_libmingwex_a-expm1.$(OBJEXT): math/$(am__dirstamp) \
-	math/$(DEPDIR)/$(am__dirstamp)
 math/lib32_libmingwex_a-expm1l.$(OBJEXT): math/$(am__dirstamp) \
 	math/$(DEPDIR)/$(am__dirstamp)
 math/lib32_libmingwex_a-fabs.$(OBJEXT): math/$(am__dirstamp) \
@@ -8911,6 +8910,8 @@
 	math/$(DEPDIR)/$(am__dirstamp)
 math/lib32_libmingwex_a-exp2f.$(OBJEXT): math/$(am__dirstamp) \
 	math/$(DEPDIR)/$(am__dirstamp)
+math/lib32_libmingwex_a-expm1.$(OBJEXT): math/$(am__dirstamp) \
+	math/$(DEPDIR)/$(am__dirstamp)
 math/lib32_libmingwex_a-expm1f.$(OBJEXT): math/$(am__dirstamp) \
 	math/$(DEPDIR)/$(am__dirstamp)
 math/lib32_libmingwex_a-fmodf.$(OBJEXT): math/$(am__dirstamp) \
@@ -9975,8 +9976,6 @@
 	math/$(DEPDIR)/$(am__dirstamp)
 math/lib64_libmingwex_a-expl.$(OBJEXT): math/$(am__dirstamp) \
 	math/$(DEPDIR)/$(am__dirstamp)
-math/lib64_libmingwex_a-expm1.$(OBJEXT): math/$(am__dirstamp) \
-	math/$(DEPDIR)/$(am__dirstamp)
 math/lib64_libmingwex_a-expm1l.$(OBJEXT): math/$(am__dirstamp) \
 	math/$(DEPDIR)/$(am__dirstamp)
 math/lib64_libmingwex_a-fabs.$(OBJEXT): math/$(am__dirstamp) \
@@ -10523,6 +10522,8 @@
 	math/$(DEPDIR)/$(am__dirstamp)
 math/lib64_libmingwex_a-exp2f.$(OBJEXT): math/$(am__dirstamp) \
 	math/$(DEPDIR)/$(am__dirstamp)
+math/lib64_libmingwex_a-expm1.$(OBJEXT): math/$(am__dirstamp) \
+	math/$(DEPDIR)/$(am__dirstamp)
 math/lib64_libmingwex_a-expm1f.$(OBJEXT): math/$(am__dirstamp) \
 	math/$(DEPDIR)/$(am__dirstamp)
 math/lib64_libmingwex_a-fmodf.$(OBJEXT): math/$(am__dirstamp) \
@@ -11462,8 +11463,6 @@
 	math/$(DEPDIR)/$(am__dirstamp)
 math/libarm32_libmingwex_a-expl.$(OBJEXT): math/$(am__dirstamp) \
 	math/$(DEPDIR)/$(am__dirstamp)
-math/libarm32_libmingwex_a-expm1.$(OBJEXT): math/$(am__dirstamp) \
-	math/$(DEPDIR)/$(am__dirstamp)
 math/libarm32_libmingwex_a-expm1l.$(OBJEXT): math/$(am__dirstamp) \
 	math/$(DEPDIR)/$(am__dirstamp)
 math/libarm32_libmingwex_a-fabs.$(OBJEXT): math/$(am__dirstamp) \
@@ -12036,6 +12035,9 @@
 math/softmath/libarm32_libmingwex_a-exp2f.$(OBJEXT):  \
 	math/softmath/$(am__dirstamp) \
 	math/softmath/$(DEPDIR)/$(am__dirstamp)
+math/softmath/libarm32_libmingwex_a-expm1.$(OBJEXT):  \
+	math/softmath/$(am__dirstamp) \
+	math/softmath/$(DEPDIR)/$(am__dirstamp)
 math/softmath/libarm32_libmingwex_a-expm1f.$(OBJEXT):  \
 	math/softmath/$(am__dirstamp) \
 	math/softmath/$(DEPDIR)/$(am__dirstamp)
@@ -14606,7 +14608,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote@math/$(DEPDIR)/libarm32_libmingwex_a-exp2l.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@math/$(DEPDIR)/libarm32_libmingwex_a-expf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@math/$(DEPDIR)/libarm32_libmingwex_a-expl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@math/$(DEPDIR)/libarm32_libmingwex_a-expm1.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@math/$(DEPDIR)/libarm32_libmingwex_a-expm1l.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@math/$(DEPDIR)/libarm32_libmingwex_a-fabs.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@math/$(DEPDIR)/libarm32_libmingwex_a-fabsf.Po@am__quote@
@@ -14779,6 +14780,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@math/softmath/$(DEPDIR)/libarm32_libmingwex_a-exp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@math/softmath/$(DEPDIR)/libarm32_libmingwex_a-exp2.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@math/softmath/$(DEPDIR)/libarm32_libmingwex_a-exp2f.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@math/softmath/$(DEPDIR)/libarm32_libmingwex_a-expm1.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@math/softmath/$(DEPDIR)/libarm32_libmingwex_a-expm1f.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@math/softmath/$(DEPDIR)/libarm32_libmingwex_a-fmodf.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@math/softmath/$(DEPDIR)/libarm32_libmingwex_a-ilogbf.Po@am__quote@
@@ -20718,20 +20720,6 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o math/lib32_libmingwex_a-expl.obj `if test -f 'math/expl.c'; then $(CYGPATH_W) 'math/expl.c'; else $(CYGPATH_W) '$(srcdir)/math/expl.c'; fi`
 
-math/lib32_libmingwex_a-expm1.o: math/expm1.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT math/lib32_libmingwex_a-expm1.o -MD -MP -MF math/$(DEPDIR)/lib32_libmingwex_a-expm1.Tpo -c -o math/lib32_libmingwex_a-expm1.o `test -f 'math/expm1.c' || echo '$(srcdir)/'`math/expm1.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) math/$(DEPDIR)/lib32_libmingwex_a-expm1.Tpo math/$(DEPDIR)/lib32_libmingwex_a-expm1.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='math/expm1.c' object='math/lib32_libmingwex_a-expm1.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o math/lib32_libmingwex_a-expm1.o `test -f 'math/expm1.c' || echo '$(srcdir)/'`math/expm1.c
-
-math/lib32_libmingwex_a-expm1.obj: math/expm1.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT math/lib32_libmingwex_a-expm1.obj -MD -MP -MF math/$(DEPDIR)/lib32_libmingwex_a-expm1.Tpo -c -o math/lib32_libmingwex_a-expm1.obj `if test -f 'math/expm1.c'; then $(CYGPATH_W) 'math/expm1.c'; else $(CYGPATH_W) '$(srcdir)/math/expm1.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) math/$(DEPDIR)/lib32_libmingwex_a-expm1.Tpo math/$(DEPDIR)/lib32_libmingwex_a-expm1.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='math/expm1.c' object='math/lib32_libmingwex_a-expm1.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o math/lib32_libmingwex_a-expm1.obj `if test -f 'math/expm1.c'; then $(CYGPATH_W) 'math/expm1.c'; else $(CYGPATH_W) '$(srcdir)/math/expm1.c'; fi`
-
 math/lib32_libmingwex_a-expm1l.o: math/expm1l.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT math/lib32_libmingwex_a-expm1l.o -MD -MP -MF math/$(DEPDIR)/lib32_libmingwex_a-expm1l.Tpo -c -o math/lib32_libmingwex_a-expm1l.o `test -f 'math/expm1l.c' || echo '$(srcdir)/'`math/expm1l.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) math/$(DEPDIR)/lib32_libmingwex_a-expm1l.Tpo math/$(DEPDIR)/lib32_libmingwex_a-expm1l.Po
@@ -24428,6 +24416,20 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o math/lib32_libmingwex_a-exp.obj `if test -f 'math/exp.c'; then $(CYGPATH_W) 'math/exp.c'; else $(CYGPATH_W) '$(srcdir)/math/exp.c'; fi`
 
+math/lib32_libmingwex_a-expm1.o: math/expm1.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT math/lib32_libmingwex_a-expm1.o -MD -MP -MF math/$(DEPDIR)/lib32_libmingwex_a-expm1.Tpo -c -o math/lib32_libmingwex_a-expm1.o `test -f 'math/expm1.c' || echo '$(srcdir)/'`math/expm1.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) math/$(DEPDIR)/lib32_libmingwex_a-expm1.Tpo math/$(DEPDIR)/lib32_libmingwex_a-expm1.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='math/expm1.c' object='math/lib32_libmingwex_a-expm1.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o math/lib32_libmingwex_a-expm1.o `test -f 'math/expm1.c' || echo '$(srcdir)/'`math/expm1.c
+
+math/lib32_libmingwex_a-expm1.obj: math/expm1.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT math/lib32_libmingwex_a-expm1.obj -MD -MP -MF math/$(DEPDIR)/lib32_libmingwex_a-expm1.Tpo -c -o math/lib32_libmingwex_a-expm1.obj `if test -f 'math/expm1.c'; then $(CYGPATH_W) 'math/expm1.c'; else $(CYGPATH_W) '$(srcdir)/math/expm1.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) math/$(DEPDIR)/lib32_libmingwex_a-expm1.Tpo math/$(DEPDIR)/lib32_libmingwex_a-expm1.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='math/expm1.c' object='math/lib32_libmingwex_a-expm1.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o math/lib32_libmingwex_a-expm1.obj `if test -f 'math/expm1.c'; then $(CYGPATH_W) 'math/expm1.c'; else $(CYGPATH_W) '$(srcdir)/math/expm1.c'; fi`
+
 math/lib32_libmingwex_a-expm1f.o: math/expm1f.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT math/lib32_libmingwex_a-expm1f.o -MD -MP -MF math/$(DEPDIR)/lib32_libmingwex_a-expm1f.Tpo -c -o math/lib32_libmingwex_a-expm1f.o `test -f 'math/expm1f.c' || echo '$(srcdir)/'`math/expm1f.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) math/$(DEPDIR)/lib32_libmingwex_a-expm1f.Tpo math/$(DEPDIR)/lib32_libmingwex_a-expm1f.Po
@@ -29818,20 +29820,6 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o math/lib64_libmingwex_a-expl.obj `if test -f 'math/expl.c'; then $(CYGPATH_W) 'math/expl.c'; else $(CYGPATH_W) '$(srcdir)/math/expl.c'; fi`
 
-math/lib64_libmingwex_a-expm1.o: math/expm1.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT math/lib64_libmingwex_a-expm1.o -MD -MP -MF math/$(DEPDIR)/lib64_libmingwex_a-expm1.Tpo -c -o math/lib64_libmingwex_a-expm1.o `test -f 'math/expm1.c' || echo '$(srcdir)/'`math/expm1.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) math/$(DEPDIR)/lib64_libmingwex_a-expm1.Tpo math/$(DEPDIR)/lib64_libmingwex_a-expm1.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='math/expm1.c' object='math/lib64_libmingwex_a-expm1.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o math/lib64_libmingwex_a-expm1.o `test -f 'math/expm1.c' || echo '$(srcdir)/'`math/expm1.c
-
-math/lib64_libmingwex_a-expm1.obj: math/expm1.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT math/lib64_libmingwex_a-expm1.obj -MD -MP -MF math/$(DEPDIR)/lib64_libmingwex_a-expm1.Tpo -c -o math/lib64_libmingwex_a-expm1.obj `if test -f 'math/expm1.c'; then $(CYGPATH_W) 'math/expm1.c'; else $(CYGPATH_W) '$(srcdir)/math/expm1.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) math/$(DEPDIR)/lib64_libmingwex_a-expm1.Tpo math/$(DEPDIR)/lib64_libmingwex_a-expm1.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='math/expm1.c' object='math/lib64_libmingwex_a-expm1.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o math/lib64_libmingwex_a-expm1.obj `if test -f 'math/expm1.c'; then $(CYGPATH_W) 'math/expm1.c'; else $(CYGPATH_W) '$(srcdir)/math/expm1.c'; fi`
-
 math/lib64_libmingwex_a-expm1l.o: math/expm1l.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT math/lib64_libmingwex_a-expm1l.o -MD -MP -MF math/$(DEPDIR)/lib64_libmingwex_a-expm1l.Tpo -c -o math/lib64_libmingwex_a-expm1l.o `test -f 'math/expm1l.c' || echo '$(srcdir)/'`math/expm1l.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) math/$(DEPDIR)/lib64_libmingwex_a-expm1l.Tpo math/$(DEPDIR)/lib64_libmingwex_a-expm1l.Po
@@ -33528,6 +33516,20 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o math/lib64_libmingwex_a-exp.obj `if test -f 'math/exp.c'; then $(CYGPATH_W) 'math/exp.c'; else $(CYGPATH_W) '$(srcdir)/math/exp.c'; fi`
 
+math/lib64_libmingwex_a-expm1.o: math/expm1.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT math/lib64_libmingwex_a-expm1.o -MD -MP -MF math/$(DEPDIR)/lib64_libmingwex_a-expm1.Tpo -c -o math/lib64_libmingwex_a-expm1.o `test -f 'math/expm1.c' || echo '$(srcdir)/'`math/expm1.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) math/$(DEPDIR)/lib64_libmingwex_a-expm1.Tpo math/$(DEPDIR)/lib64_libmingwex_a-expm1.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='math/expm1.c' object='math/lib64_libmingwex_a-expm1.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o math/lib64_libmingwex_a-expm1.o `test -f 'math/expm1.c' || echo '$(srcdir)/'`math/expm1.c
+
+math/lib64_libmingwex_a-expm1.obj: math/expm1.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT math/lib64_libmingwex_a-expm1.obj -MD -MP -MF math/$(DEPDIR)/lib64_libmingwex_a-expm1.Tpo -c -o math/lib64_libmingwex_a-expm1.obj `if test -f 'math/expm1.c'; then $(CYGPATH_W) 'math/expm1.c'; else $(CYGPATH_W) '$(srcdir)/math/expm1.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) math/$(DEPDIR)/lib64_libmingwex_a-expm1.Tpo math/$(DEPDIR)/lib64_libmingwex_a-expm1.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='math/expm1.c' object='math/lib64_libmingwex_a-expm1.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o math/lib64_libmingwex_a-expm1.obj `if test -f 'math/expm1.c'; then $(CYGPATH_W) 'math/expm1.c'; else $(CYGPATH_W) '$(srcdir)/math/expm1.c'; fi`
+
 math/lib64_libmingwex_a-expm1f.o: math/expm1f.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib64_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT math/lib64_libmingwex_a-expm1f.o -MD -MP -MF math/$(DEPDIR)/lib64_libmingwex_a-expm1f.Tpo -c -o math/lib64_libmingwex_a-expm1f.o `test -f 'math/expm1f.c' || echo '$(srcdir)/'`math/expm1f.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) math/$(DEPDIR)/lib64_libmingwex_a-expm1f.Tpo math/$(DEPDIR)/lib64_libmingwex_a-expm1f.Po
@@ -38330,20 +38332,6 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarm32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o math/libarm32_libmingwex_a-expl.obj `if test -f 'math/expl.c'; then $(CYGPATH_W) 'math/expl.c'; else $(CYGPATH_W) '$(srcdir)/math/expl.c'; fi`
 
-math/libarm32_libmingwex_a-expm1.o: math/expm1.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarm32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT math/libarm32_libmingwex_a-expm1.o -MD -MP -MF math/$(DEPDIR)/libarm32_libmingwex_a-expm1.Tpo -c -o math/libarm32_libmingwex_a-expm1.o `test -f 'math/expm1.c' || echo '$(srcdir)/'`math/expm1.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) math/$(DEPDIR)/libarm32_libmingwex_a-expm1.Tpo math/$(DEPDIR)/libarm32_libmingwex_a-expm1.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='math/expm1.c' object='math/libarm32_libmingwex_a-expm1.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarm32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o math/libarm32_libmingwex_a-expm1.o `test -f 'math/expm1.c' || echo '$(srcdir)/'`math/expm1.c
-
-math/libarm32_libmingwex_a-expm1.obj: math/expm1.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarm32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT math/libarm32_libmingwex_a-expm1.obj -MD -MP -MF math/$(DEPDIR)/libarm32_libmingwex_a-expm1.Tpo -c -o math/libarm32_libmingwex_a-expm1.obj `if test -f 'math/expm1.c'; then $(CYGPATH_W) 'math/expm1.c'; else $(CYGPATH_W) '$(srcdir)/math/expm1.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) math/$(DEPDIR)/libarm32_libmingwex_a-expm1.Tpo math/$(DEPDIR)/libarm32_libmingwex_a-expm1.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='math/expm1.c' object='math/libarm32_libmingwex_a-expm1.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarm32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o math/libarm32_libmingwex_a-expm1.obj `if test -f 'math/expm1.c'; then $(CYGPATH_W) 'math/expm1.c'; else $(CYGPATH_W) '$(srcdir)/math/expm1.c'; fi`
-
 math/libarm32_libmingwex_a-expm1l.o: math/expm1l.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarm32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT math/libarm32_libmingwex_a-expm1l.o -MD -MP -MF math/$(DEPDIR)/libarm32_libmingwex_a-expm1l.Tpo -c -o math/libarm32_libmingwex_a-expm1l.o `test -f 'math/expm1l.c' || echo '$(srcdir)/'`math/expm1l.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) math/$(DEPDIR)/libarm32_libmingwex_a-expm1l.Tpo math/$(DEPDIR)/libarm32_libmingwex_a-expm1l.Po
@@ -42096,6 +42084,20 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarm32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o math/softmath/libarm32_libmingwex_a-exp2f.obj `if test -f 'math/softmath/exp2f.c'; then $(CYGPATH_W) 'math/softmath/exp2f.c'; else $(CYGPATH_W) '$(srcdir)/math/softmath/exp2f.c'; fi`
 
+math/softmath/libarm32_libmingwex_a-expm1.o: math/softmath/expm1.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarm32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT math/softmath/libarm32_libmingwex_a-expm1.o -MD -MP -MF math/softmath/$(DEPDIR)/libarm32_libmingwex_a-expm1.Tpo -c -o math/softmath/libarm32_libmingwex_a-expm1.o `test -f 'math/softmath/expm1.c' || echo '$(srcdir)/'`math/softmath/expm1.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) math/softmath/$(DEPDIR)/libarm32_libmingwex_a-expm1.Tpo math/softmath/$(DEPDIR)/libarm32_libmingwex_a-expm1.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='math/softmath/expm1.c' object='math/softmath/libarm32_libmingwex_a-expm1.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarm32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o math/softmath/libarm32_libmingwex_a-expm1.o `test -f 'math/softmath/expm1.c' || echo '$(srcdir)/'`math/softmath/expm1.c
+
+math/softmath/libarm32_libmingwex_a-expm1.obj: math/softmath/expm1.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarm32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT math/softmath/libarm32_libmingwex_a-expm1.obj -MD -MP -MF math/softmath/$(DEPDIR)/libarm32_libmingwex_a-expm1.Tpo -c -o math/softmath/libarm32_libmingwex_a-expm1.obj `if test -f 'math/softmath/expm1.c'; then $(CYGPATH_W) 'math/softmath/expm1.c'; else $(CYGPATH_W) '$(srcdir)/math/softmath/expm1.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) math/softmath/$(DEPDIR)/libarm32_libmingwex_a-expm1.Tpo math/softmath/$(DEPDIR)/libarm32_libmingwex_a-expm1.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='math/softmath/expm1.c' object='math/softmath/libarm32_libmingwex_a-expm1.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarm32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o math/softmath/libarm32_libmingwex_a-expm1.obj `if test -f 'math/softmath/expm1.c'; then $(CYGPATH_W) 'math/softmath/expm1.c'; else $(CYGPATH_W) '$(srcdir)/math/softmath/expm1.c'; fi`
+
 math/softmath/libarm32_libmingwex_a-expm1f.o: math/softmath/expm1f.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libarm32_libmingwex_a_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT math/softmath/libarm32_libmingwex_a-expm1f.o -MD -MP -MF math/softmath/$(DEPDIR)/libarm32_libmingwex_a-expm1f.Tpo -c -o math/softmath/libarm32_libmingwex_a-expm1f.o `test -f 'math/softmath/expm1f.c' || echo '$(srcdir)/'`math/softmath/expm1f.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) math/softmath/$(DEPDIR)/libarm32_libmingwex_a-expm1f.Tpo math/softmath/$(DEPDIR)/libarm32_libmingwex_a-expm1f.Po
diff --git a/mingw-w64-crt/math/softmath/expm1.c b/mingw-w64-crt/math/softmath/expm1.c
new file mode 100644
index 0000000..a76f9c8
--- /dev/null
+++ b/mingw-w64-crt/math/softmath/expm1.c
@@ -0,0 +1,50 @@
+/*
+ This Software is provided under the Zope Public License (ZPL) Version 2.1.
+
+ Copyright (c) 2014 by the mingw-w64 project
+
+ See the AUTHORS file for the list of contributors to the mingw-w64 project.
+
+ This license has been certified as open source. It has also been designated
+ as GPL compatible by the Free Software Foundation (FSF).
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+   1. Redistributions in source code must retain the accompanying copyright
+      notice, this list of conditions, and the following disclaimer.
+   2. Redistributions in binary form must reproduce the accompanying
+      copyright notice, this list of conditions, and the following disclaimer
+      in the documentation and/or other materials provided with the
+      distribution.
+   3. Names of the copyright holders must not be used to endorse or promote
+      products derived from this software without prior written permission
+      from the copyright holders.
+   4. The right to distribute this software or to use it for any purpose does
+      not give you the right to use Servicemarks (sm) or Trademarks (tm) of
+      the copyright holders.  Use of them is covered by separate agreement
+      with the copyright holders.
+   5. If any files are modified, you must cause the modified files to carry
+      prominent notices stating that you changed the files and the date of
+      any change.
+
+ Disclaimer
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY EXPRESSED
+ OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "softmath_private.h"
+
+double expm1(double x)
+{
+    return exp(x) - 1;
+}