diff options
author | Shashank Sahni <shredder12@linuxers.org> | 2011-07-21 13:37:30 +0530 |
---|---|---|
committer | Allan CORNET <allan.cornet@scilab.org> | 2011-07-26 11:33:03 +0200 |
commit | 1ea565b01dc690f6f08998ec099ea070bddc4dec (patch) | |
tree | 16edec3aca172ddb5d934f01d718d2062c2cb8c2 | |
parent | ca63917f58d718595a8c98558475b9effbdd9e23 (diff) | |
download | scilab-apef.zip scilab-apef.tar.gz |
fdlibm is integrated with scilab on linux and Windows (32,64) and gives correct resultsapef
Change-Id: I028083d7332265d5f4af4f855eaa35b7acdfbd38
5 files changed, 7 insertions, 9 deletions
diff --git a/scilab/configure.ac b/scilab/configure.ac index f89a221..95e7fe9 100644 --- a/scilab/configure.ac +++ b/scilab/configure.ac | |||
@@ -19,8 +19,6 @@ AC_INIT([Scilab],[5],[http://bugzilla.scilab.org/]) | |||
19 | AC_PREREQ(2.62) | 19 | AC_PREREQ(2.62) |
20 | AC_CONFIG_MACRO_DIR([m4/]) | 20 | AC_CONFIG_MACRO_DIR([m4/]) |
21 | 21 | ||
22 | AC_PROG_RANLIB | ||
23 | |||
24 | SCI_BUILDDIR="`pwd`" | 22 | SCI_BUILDDIR="`pwd`" |
25 | SCI_SRCDIR="$srcdir" | 23 | SCI_SRCDIR="$srcdir" |
26 | SCI_SRCDIR_FULL="`cd $SCI_SRCDIR && pwd`" | 24 | SCI_SRCDIR_FULL="`cd $SCI_SRCDIR && pwd`" |
diff --git a/scilab/modules/elementary_functions/Makefile.am b/scilab/modules/elementary_functions/Makefile.am index e6b4013..1bc7c35 100644 --- a/scilab/modules/elementary_functions/Makefile.am +++ b/scilab/modules/elementary_functions/Makefile.am | |||
@@ -421,7 +421,7 @@ libscielementary_functions_algo_la_CFLAGS = $(libscielementary_functions_la_CFLA | |||
421 | CHECK_SRC= $(ELEMENTARIES_FUNCTIONS_C_SOURCES) $(GATEWAY_C_SOURCES) | 421 | CHECK_SRC= $(ELEMENTARIES_FUNCTIONS_C_SOURCES) $(GATEWAY_C_SOURCES) |
422 | INCLUDE_FLAGS = $(libscielementary_functions_la_CFLAGS) | 422 | INCLUDE_FLAGS = $(libscielementary_functions_la_CFLAGS) |
423 | 423 | ||
424 | libscielementary_functions_la_LIBADD = libdummy-elementary_functions.la libscielementary_functions-algo.la | 424 | libscielementary_functions_la_LIBADD = libdummy-elementary_functions.la libscielementary_functions-algo.la $(srcdir)/src/c/fdlibm/libfdlibm.la |
425 | 425 | ||
426 | # Commented because it is one of the first module to be compiled | 426 | # Commented because it is one of the first module to be compiled |
427 | #libdummy-elementary_functions.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/libs/blas/libsciblas.la $(top_builddir)/modules/sparse/libscisparse.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/lapack/libscilapack.la $(top_builddir)/modules/integer/libsciinteger.la $(top_builddir)/modules/cacsd/libscicacsd.la | 427 | #libdummy-elementary_functions.la $(top_builddir)/modules/polynomials/libscipolynomials.la $(top_builddir)/libs/blas/libsciblas.la $(top_builddir)/modules/sparse/libscisparse.la $(top_builddir)/modules/string/libscistring.la $(top_builddir)/libs/MALLOC/libscimalloc.la $(top_builddir)/modules/output_stream/libscioutput_stream.la $(top_builddir)/libs/lapack/libscilapack.la $(top_builddir)/modules/integer/libsciinteger.la $(top_builddir)/modules/cacsd/libscicacsd.la |
diff --git a/scilab/modules/elementary_functions/src/c/fdlibm/Makefile.am b/scilab/modules/elementary_functions/src/c/fdlibm/Makefile.am index 62d869b..097b960 100644 --- a/scilab/modules/elementary_functions/src/c/fdlibm/Makefile.am +++ b/scilab/modules/elementary_functions/src/c/fdlibm/Makefile.am | |||
@@ -19,5 +19,5 @@ libfdlibm_la_SOURCES= k_standard.c k_rem_pio2.c \ | |||
19 | s_log1p.c s_logb.c s_matherr.c s_modf.c s_nextafter.c \ | 19 | s_log1p.c s_logb.c s_matherr.c s_modf.c s_nextafter.c \ |
20 | s_rint.c s_scalbn.c s_signgam.c s_significand.c s_sin.c \ | 20 | s_rint.c s_scalbn.c s_signgam.c s_significand.c s_sin.c \ |
21 | s_tan.c s_tanh.c | 21 | s_tan.c s_tanh.c |
22 | libfdlibm_la_CFLAGS= -D_IEEE_LIBM | 22 | libfdlibm_la_CFLAGS= -D_IEEE_LIBM -fno-strict-aliasing |
23 | include_HEADERS=fdlibm.h | 23 | include_HEADERS=fdlibm.h |
diff --git a/scilab/modules/elementary_functions/src/c/fdlibm/fdlibm.h b/scilab/modules/elementary_functions/src/c/fdlibm/fdlibm.h index bb97766..1d80282 100644 --- a/scilab/modules/elementary_functions/src/c/fdlibm/fdlibm.h +++ b/scilab/modules/elementary_functions/src/c/fdlibm/fdlibm.h | |||
@@ -26,7 +26,7 @@ | |||
26 | 26 | ||
27 | #if defined(i386) || defined(i486) || \ | 27 | #if defined(i386) || defined(i486) || \ |
28 | defined(intel) || defined(x86) || defined(i86pc) || \ | 28 | defined(intel) || defined(x86) || defined(i86pc) || \ |
29 | defined(__alpha) || defined(__osf__) | 29 | defined(__alpha) || defined(__osf__) || defined(__x86_64__) |
30 | #define __LITTLE_ENDIAN | 30 | #define __LITTLE_ENDIAN |
31 | #endif | 31 | #endif |
32 | 32 | ||
diff --git a/scilab/modules/elementary_functions/src/c/fdlibm/fdlibm.vcxproj b/scilab/modules/elementary_functions/src/c/fdlibm/fdlibm.vcxproj index 7e1a891..692877b 100644 --- a/scilab/modules/elementary_functions/src/c/fdlibm/fdlibm.vcxproj +++ b/scilab/modules/elementary_functions/src/c/fdlibm/fdlibm.vcxproj | |||
@@ -82,7 +82,7 @@ | |||
82 | <AdditionalOptions>/Oi- %(AdditionalOptions)</AdditionalOptions> | 82 | <AdditionalOptions>/Oi- %(AdditionalOptions)</AdditionalOptions> |
83 | <Optimization>Disabled</Optimization> | 83 | <Optimization>Disabled</Optimization> |
84 | <AdditionalIncludeDirectories>.</AdditionalIncludeDirectories> | 84 | <AdditionalIncludeDirectories>.</AdditionalIncludeDirectories> |
85 | <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;__STDC__;_DEBUG;_WINDOWS;_USRDLL;FDLIBM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 85 | <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;__STDC__;_IEEE_LIBM;__LITTLE_ENDIAN;_DEBUG;_WINDOWS;_USRDLL;FDLIBM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
86 | <MinimalRebuild>true</MinimalRebuild> | 86 | <MinimalRebuild>true</MinimalRebuild> |
87 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> | 87 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> |
88 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | 88 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> |
@@ -121,7 +121,7 @@ | |||
121 | <ClCompile> | 121 | <ClCompile> |
122 | <Optimization>Disabled</Optimization> | 122 | <Optimization>Disabled</Optimization> |
123 | <AdditionalIncludeDirectories>.</AdditionalIncludeDirectories> | 123 | <AdditionalIncludeDirectories>.</AdditionalIncludeDirectories> |
124 | <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;__STDC__;_DEBUG;_WINDOWS;_USRDLL;FDLIBM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 124 | <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;__STDC__;_IEEE_LIBM;__LITTLE_ENDIAN;_DEBUG;_WINDOWS;_USRDLL;FDLIBM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
125 | <MinimalRebuild>true</MinimalRebuild> | 125 | <MinimalRebuild>true</MinimalRebuild> |
126 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> | 126 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> |
127 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | 127 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> |
@@ -161,7 +161,7 @@ | |||
161 | <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> | 161 | <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> |
162 | <WholeProgramOptimization>false</WholeProgramOptimization> | 162 | <WholeProgramOptimization>false</WholeProgramOptimization> |
163 | <AdditionalIncludeDirectories>.</AdditionalIncludeDirectories> | 163 | <AdditionalIncludeDirectories>.</AdditionalIncludeDirectories> |
164 | <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;__STDC__;NDEBUG;_WINDOWS;_USRDLL;FDLIBM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 164 | <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;__STDC__;_IEEE_LIBM;__LITTLE_ENDIAN;NDEBUG;_WINDOWS;_USRDLL;FDLIBM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
165 | <StringPooling>true</StringPooling> | 165 | <StringPooling>true</StringPooling> |
166 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | 166 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> |
167 | <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet> | 167 | <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet> |
@@ -207,7 +207,7 @@ | |||
207 | <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> | 207 | <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed> |
208 | <WholeProgramOptimization>false</WholeProgramOptimization> | 208 | <WholeProgramOptimization>false</WholeProgramOptimization> |
209 | <AdditionalIncludeDirectories>.</AdditionalIncludeDirectories> | 209 | <AdditionalIncludeDirectories>.</AdditionalIncludeDirectories> |
210 | <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;__STDC__;NDEBUG;_WINDOWS;_USRDLL;FDLIBM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 210 | <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;__STDC__;_IEEE_LIBM;__LITTLE_ENDIAN;NDEBUG;_WINDOWS;_USRDLL;FDLIBM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
211 | <StringPooling>true</StringPooling> | 211 | <StringPooling>true</StringPooling> |
212 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | 212 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> |
213 | <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet> | 213 | <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet> |