6 files changed, 18 insertions, 6 deletions
diff --git a/lib/msun/src/s_cimag.c b/lib/msun/src/s_cimag.c
index 03ddf79..aa25423 100644
--- a/lib/msun/src/s_cimag.c
+++ b/lib/msun/src/s_cimag.c
@@ -31,5 +31,6 @@
 double
 cimag(double complex z)
 {
-	return -z * I;
+
+	return (__imag__ z);
 }
diff --git a/lib/msun/src/s_cimagf.c b/lib/msun/src/s_cimagf.c
index 6f943d8..6bd00d9 100644
--- a/lib/msun/src/s_cimagf.c
+++ b/lib/msun/src/s_cimagf.c
@@ -31,5 +31,6 @@
 float
 cimagf(float complex z)
 {
-	return -z * I;
+
+	return (__imag__ z);
 }
diff --git a/lib/msun/src/s_cimagl.c b/lib/msun/src/s_cimagl.c
index 7f531d0..581f443 100644
--- a/lib/msun/src/s_cimagl.c
+++ b/lib/msun/src/s_cimagl.c
@@ -31,5 +31,6 @@
 long double
 cimagl(long double complex z)
 {
-	return -z * I;
+
+    return (__imag__ z);
 }
diff --git a/lib/msun/src/s_conj.c b/lib/msun/src/s_conj.c
index 1d0011b..5770c29 100644
--- a/lib/msun/src/s_conj.c
+++ b/lib/msun/src/s_conj.c
@@ -28,8 +28,11 @@
 
 #include <complex.h>
 
+#include "math_private.h"
+
 double complex
 conj(double complex z)
 {
-	return creal(z) - I * cimag(z);
+
+	return (cpack(creal(z), -cimag(z)));
 }
diff --git a/lib/msun/src/s_conjf.c b/lib/msun/src/s_conjf.c
index ea951b9..b090760 100644
--- a/lib/msun/src/s_conjf.c
+++ b/lib/msun/src/s_conjf.c
@@ -28,8 +28,11 @@
 
 #include <complex.h>
 
+#include "math_private.h"
+
 float complex
 conjf(float complex z)
 {
-	return crealf(z) - I * cimagf(z);
+
+	return (cpackf(crealf(z), -cimagf(z)));
 }
diff --git a/lib/msun/src/s_conjl.c b/lib/msun/src/s_conjl.c
index e6cb2ef..0e431ef 100644
--- a/lib/msun/src/s_conjl.c
+++ b/lib/msun/src/s_conjl.c
@@ -28,8 +28,11 @@
 
 #include <complex.h>
 
+#include "math_private.h"
+
 long double complex
 conjl(long double complex z)
 {
-	return creall(z) - I * cimagl(z);
+
+	return (cpackl(creall(z), -cimagl(z)));
 }