hrev49651 adds 3 changesets to branch 'master'
old head: 22dc6b7f47fd1ed9a2423438d7656cf8e1ac7698
new head: 594187ade252af22d2f8e192cadb500a9f746810
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=594187ade252+%5E22dc6b7f47fd
----------------------------------------------------------------------------
dab2aa8189d5: complex.h: fix __NO_LONG_DOUBLE_MATH test
PPC doesn't support long double yet...
bbdf4c27fafe: glibc: avoid linking long double math stuff on PPC and M68K
594187ade252: glibc/ppc: add missing math stuff
hopefully fixing the build for the 53rd time...
[ François Revol <revol@xxxxxxx> ]
----------------------------------------------------------------------------
3 files changed, 18 insertions(+), 7 deletions(-)
src/system/libroot/posix/glibc/arch/ppc/Jamfile | 2 ++
src/system/libroot/posix/glibc/math/Jamfile | 21 +++++++++++++++------
src/system/libroot/posix/glibc/math/complex.h | 2 +-
############################################################################
Commit: dab2aa8189d598acaf61ed5a0f1a599006773dc0
URL: http://cgit.haiku-os.org/haiku/commit/?id=dab2aa8189d5
Author: François Revol <revol@xxxxxxx>
Date: Fri Sep 18 00:33:46 2015 UTC
complex.h: fix __NO_LONG_DOUBLE_MATH test
PPC doesn't support long double yet...
----------------------------------------------------------------------------
diff --git a/src/system/libroot/posix/glibc/math/complex.h
b/src/system/libroot/posix/glibc/math/complex.h
index f005a93..448b0ca 100644
--- a/src/system/libroot/posix/glibc/math/complex.h
+++ b/src/system/libroot/posix/glibc/math/complex.h
@@ -84,7 +84,7 @@ __BEGIN_DECLS
/* And the long double versions. It is non-critical to define them
here unconditionally since `long double' is required in ISO C99. */
-#if __STDC__ - 0 || __GNUC__ - 0 && !defined __NO_LONG_DOUBLE_MATH
+#if (__STDC__ - 0 || __GNUC__ - 0) && !defined __NO_LONG_DOUBLE_MATH
# ifndef _Mlong_double_
# define _Mlong_double_ long double
# endif
############################################################################
Commit: bbdf4c27fafe00c61a5aa44c472135a12a91a4e9
URL: http://cgit.haiku-os.org/haiku/commit/?id=bbdf4c27fafe
Author: François Revol <revol@xxxxxxx>
Date: Fri Sep 18 00:34:49 2015 UTC
glibc: avoid linking long double math stuff on PPC and M68K
----------------------------------------------------------------------------
diff --git a/src/system/libroot/posix/glibc/math/Jamfile
b/src/system/libroot/posix/glibc/math/Jamfile
index 70c0855..4476eb1 100644
--- a/src/system/libroot/posix/glibc/math/Jamfile
+++ b/src/system/libroot/posix/glibc/math/Jamfile
@@ -17,14 +17,23 @@ for architectureObject in [ MultiArchSubDirSetup ] {
UsePrivateHeaders libroot ;
+ local longDoubleObjects ;
+ switch $(architecture) {
+ case ppc : longDoubleObjects = ;
+ case m68k : longDoubleObjects = ;
+ case * : longDoubleObjects = cabsl.c cargl.c cimagl.c
conjl.c creall.c k_casinhl.c ;
+ }
+
MergeObject <$(architecture)>posix_gnu_math.o :
- cabs.c cabsf.c cabsl.c
- carg.c cargf.c cargl.c
- cimag.c cimagf.c cimagl.c
- conj.c conjf.c conjl.c
- creal.c crealf.c creall.c
+ cabs.c cabsf.c
+ carg.c cargf.c
+ cimag.c cimagf.c
+ conj.c conjf.c
+ creal.c crealf.c
+
+ k_casinh.c k_casinhf.c
- k_casinh.c k_casinhf.c k_casinhl.c
+ $(longDoubleObjects)
;
}
}
############################################################################
Revision: hrev49651
Commit: 594187ade252af22d2f8e192cadb500a9f746810
URL: http://cgit.haiku-os.org/haiku/commit/?id=594187ade252
Author: François Revol <revol@xxxxxxx>
Date: Fri Sep 18 00:38:28 2015 UTC
glibc/ppc: add missing math stuff
hopefully fixing the build for the 53rd time...
----------------------------------------------------------------------------
diff --git a/src/system/libroot/posix/glibc/arch/ppc/Jamfile
b/src/system/libroot/posix/glibc/arch/ppc/Jamfile
index 149ab03..b7d740e 100644
--- a/src/system/libroot/posix/glibc/arch/ppc/Jamfile
+++ b/src/system/libroot/posix/glibc/arch/ppc/Jamfile
@@ -70,6 +70,8 @@ local genericSources =
s_erf.c s_erff.c # s_erfl.c
s_expm1f.c s_expm1.c
s_finite.c s_finitef.c # s_finitel.c
+ s_clog.c s_clogf.c # s_clogl.c
+ s_csqrt.c s_csqrtf.c # s_csqrtl.c
s_floor.c s_floorf.c # s_floorl.c
s_fma.c s_fmaf.c # s_fmal.c
s_fpclassify.c s_fpclassifyf.c # s_fpclassifyl.c
