diff options
-rw-r--r-- | external/skia/Library_skia.mk | 8 | ||||
-rw-r--r-- | sc/Library_sc.mk | 24 | ||||
-rw-r--r-- | sc/source/core/tool/arraysum.hxx | 4 | ||||
-rw-r--r-- | sc/source/core/tool/arraysumAVX.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/tool/arraysumAVX512.cxx | 2 | ||||
-rw-r--r-- | sc/source/core/tool/arraysumSSE2.cxx | 2 |
6 files changed, 21 insertions, 21 deletions
diff --git a/external/skia/Library_skia.mk b/external/skia/Library_skia.mk index 0989e7e337c9..92215b0935d2 100644 --- a/external/skia/Library_skia.mk +++ b/external/skia/Library_skia.mk @@ -123,10 +123,6 @@ $(eval $(call gb_Library_add_exception_objects,skia,\ external/skia/source/skia_opts \ )) -$(eval $(call gb_Library_add_exception_objects,skia,\ - external/skia/source/skia_opts_ssse3, $(CXXFLAGS_INTRINSICS_SSSE3) $(LO_CLANG_CXXFLAGS_INTRINSICS_SSSE3) \ -)) - $(eval $(call gb_Library_set_generated_cxx_suffix,skia,cpp)) $(eval $(call gb_Library_add_generated_exception_objects,skia,\ @@ -835,6 +831,10 @@ $(eval $(call gb_Library_add_generated_exception_objects,skia,\ UnpackedTarball/skia/src/ports/SkOSFile_stdio \ )) +$(eval $(call gb_Library_add_exception_objects,skia,\ + external/skia/source/skia_opts_ssse3, $(CXXFLAGS_INTRINSICS_SSSE3) $(LO_CLANG_CXXFLAGS_INTRINSICS_SSSE3) \ +)) + $(eval $(call gb_Library_add_generated_exception_objects,skia,\ UnpackedTarball/skia/src/opts/SkOpts_avx, $(CXXFLAGS_INTRINSICS_AVX) $(LO_CLANG_CXXFLAGS_INTRINSICS_AVX) \ $(LO_SKIA_AVOID_INLINE_COPIES) \ diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk index a85650e935e6..ef9c62f42d53 100644 --- a/sc/Library_sc.mk +++ b/sc/Library_sc.mk @@ -99,18 +99,6 @@ $(eval $(call gb_Library_use_libraries,sc,\ )) $(eval $(call gb_Library_add_exception_objects,sc,\ - sc/source/core/tool/arraysumAVX512, $(CXXFLAGS_INTRINSICS_AVX512F) \ -)) - -$(eval $(call gb_Library_add_exception_objects,sc,\ - sc/source/core/tool/arraysumAVX, $(CXXFLAGS_INTRINSICS_AVX) \ -)) - -$(eval $(call gb_Library_add_exception_objects,sc,\ - sc/source/core/tool/arraysumSSE2, $(CXXFLAGS_INTRINSICS_SSE2) \ -)) - -$(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/core/data/attarray \ sc/source/core/data/attrib \ sc/source/core/data/autonamecache \ @@ -692,6 +680,18 @@ $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/ui/xmlsource/xmlsourcedlg \ )) +$(eval $(call gb_Library_add_exception_objects,sc,\ + sc/source/core/tool/arraysumAVX512, $(CXXFLAGS_INTRINSICS_AVX512F) \ +)) + +$(eval $(call gb_Library_add_exception_objects,sc,\ + sc/source/core/tool/arraysumAVX, $(CXXFLAGS_INTRINSICS_AVX) \ +)) + +$(eval $(call gb_Library_add_exception_objects,sc,\ + sc/source/core/tool/arraysumSSE2, $(CXXFLAGS_INTRINSICS_SSE2) \ +)) + ifeq ($(ENABLE_FORMULA_LOGGER),TRUE) $(eval $(call gb_Library_add_exception_objects,sc,\ sc/source/core/tool/formulalogger \ diff --git a/sc/source/core/tool/arraysum.hxx b/sc/source/core/tool/arraysum.hxx index 62c2514182b7..5d227bd85a48 100644 --- a/sc/source/core/tool/arraysum.hxx +++ b/sc/source/core/tool/arraysum.hxx @@ -10,7 +10,7 @@ #pragma once -#include <cmath> +#include <math.h> namespace sc::op { @@ -37,7 +37,7 @@ namespace LO_ARRAYSUM_SPACE INLINE void sumNeumanierNormal(double& sum, double& err, const double& value) { double t = sum + value; - if (std::abs(sum) >= std::abs(value)) + if (fabs(sum) >= fabs(value)) err += (sum - t) + value; else err += (value - t) + sum; diff --git a/sc/source/core/tool/arraysumAVX.cxx b/sc/source/core/tool/arraysumAVX.cxx index 54c47780f63c..c55d71f22983 100644 --- a/sc/source/core/tool/arraysumAVX.cxx +++ b/sc/source/core/tool/arraysumAVX.cxx @@ -16,7 +16,7 @@ #include <tools/simd.hxx> #include <tools/simdsupport.hxx> -#include <cstdlib> +#include <stdlib.h> namespace sc::op { diff --git a/sc/source/core/tool/arraysumAVX512.cxx b/sc/source/core/tool/arraysumAVX512.cxx index f8e8de729279..987e5a3e6ff6 100644 --- a/sc/source/core/tool/arraysumAVX512.cxx +++ b/sc/source/core/tool/arraysumAVX512.cxx @@ -16,7 +16,7 @@ #include <tools/simd.hxx> #include <tools/simdsupport.hxx> -#include <cstdlib> +#include <stdlib.h> /* TODO Remove this once GCC updated and AVX512 can work. */ #ifdef __GNUC__ diff --git a/sc/source/core/tool/arraysumSSE2.cxx b/sc/source/core/tool/arraysumSSE2.cxx index 95b42f868461..b4edb98286f9 100644 --- a/sc/source/core/tool/arraysumSSE2.cxx +++ b/sc/source/core/tool/arraysumSSE2.cxx @@ -16,7 +16,7 @@ #include <tools/simd.hxx> #include <tools/simdsupport.hxx> -#include <cstdlib> +#include <stdlib.h> namespace sc::op { |