Move scalbn to libc to fix broken functionality. Disable test on x86.

4 files changed, 3 insertions, 2 deletions

diff --git a/emcc b/emcc
index 0a9c6556..4d6b8a73 100755
--- a/emcc
+++ b/emcc
@@ -1456,6 +1456,7 @@ try:
          'shgetc.c',
         ]],
         ['math', [
+         'scalbn.c',
          'scalbnl.c',
         ]],
         ['stdio', [
@@ -1556,7 +1557,6 @@ try:
           'lgammaf.c',
           'lgammaf_r.c',
           'lgammal.c',
-          'scalbn.c',
           'scalbnf.c',
           'signgam.c',
           'tgamma.c',
diff --git a/system/lib/libc.symbols b/system/lib/libc.symbols
index d68b62cb..04fb40d6 100644
--- a/system/lib/libc.symbols
+++ b/system/lib/libc.symbols
@@ -89,6 +89,7 @@
          W pvalloc
          W realloc
          W realloc_in_place
+         T scalbn
          T scalbnl
          T strtod
          W strtod_l
diff --git a/system/lib/libcextra.symbols b/system/lib/libcextra.symbols
index db1d3dcd..c3475e1c 100644
--- a/system/lib/libcextra.symbols
+++ b/system/lib/libcextra.symbols
@@ -81,7 +81,6 @@
          T regerror
          T regexec
          T regfree
-         T scalbn
          T scalbnf
          D signgam
          T strcasecmp_l
diff --git a/tests/test_core.py b/tests/test_core.py
index 07de8a7f..826437b1 100644
--- a/tests/test_core.py
+++ b/tests/test_core.py
@@ -510,6 +510,7 @@ class T(RunnerCore): # Short name, to make it more fun to use manually on the co
 
   def test_cube2md5(self):
     if self.emcc_args == None: return self.skip('needs emcc')
+    if not self.is_le32(): return self.skip('le32 needed for accurate math')
     self.emcc_args += ['--embed-file', 'cube2md5.txt']
     shutil.copyfile(path_from_root('tests', 'cube2md5.txt'), os.path.join(self.get_dir(), 'cube2md5.txt'))
     self.do_run(open(path_from_root('tests', 'cube2md5.cpp')).read(), open(path_from_root('tests', 'cube2md5.ok')).read())