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/])
 AC_PREREQ(2.62)
 AC_CONFIG_MACRO_DIR([m4/])
 
-AC_PROG_RANLIB
-
 SCI_BUILDDIR="`pwd`"
 SCI_SRCDIR="$srcdir"
 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
 CHECK_SRC= $(ELEMENTARIES_FUNCTIONS_C_SOURCES) $(GATEWAY_C_SOURCES)
 INCLUDE_FLAGS = $(libscielementary_functions_la_CFLAGS)
 
-libscielementary_functions_la_LIBADD = libdummy-elementary_functions.la libscielementary_functions-algo.la
+libscielementary_functions_la_LIBADD = libdummy-elementary_functions.la libscielementary_functions-algo.la $(srcdir)/src/c/fdlibm/libfdlibm.la
 
 # Commented because it is one of the first module to be compiled
 #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 \
         s_log1p.c s_logb.c s_matherr.c s_modf.c s_nextafter.c \
         s_rint.c s_scalbn.c s_signgam.c s_significand.c s_sin.c \
         s_tan.c s_tanh.c
-libfdlibm_la_CFLAGS= -D_IEEE_LIBM
+libfdlibm_la_CFLAGS= -D_IEEE_LIBM -fno-strict-aliasing
 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 @@
 
 #if defined(i386) || defined(i486) || \
         defined(intel) || defined(x86) || defined(i86pc) || \
-        defined(__alpha) || defined(__osf__)
+        defined(__alpha) || defined(__osf__) || defined(__x86_64__)
 #define __LITTLE_ENDIAN
 #endif
 
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 @@
       <AdditionalOptions>/Oi- %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;__STDC__;_DEBUG;_WINDOWS;_USRDLL;FDLIBM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;__STDC__;_IEEE_LIBM;__LITTLE_ENDIAN;_DEBUG;_WINDOWS;_USRDLL;FDLIBM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -121,7 +121,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <AdditionalIncludeDirectories>.</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;__STDC__;_DEBUG;_WINDOWS;_USRDLL;FDLIBM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;__STDC__;_IEEE_LIBM;__LITTLE_ENDIAN;_DEBUG;_WINDOWS;_USRDLL;FDLIBM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>Default</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -161,7 +161,7 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>.</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;__STDC__;NDEBUG;_WINDOWS;_USRDLL;FDLIBM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;__STDC__;_IEEE_LIBM;__LITTLE_ENDIAN;NDEBUG;_WINDOWS;_USRDLL;FDLIBM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>
@@ -207,7 +207,7 @@
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <WholeProgramOptimization>false</WholeProgramOptimization>
       <AdditionalIncludeDirectories>.</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;__STDC__;NDEBUG;_WINDOWS;_USRDLL;FDLIBM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_DEPRECATE;__STDC__;_IEEE_LIBM;__LITTLE_ENDIAN;NDEBUG;_WINDOWS;_USRDLL;FDLIBM_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <EnableEnhancedInstructionSet>NotSet</EnableEnhancedInstructionSet>