Issue %3003 - Move fdlibm to libs/

62 files changed, 4 insertions, 12 deletions

diff --git a/js/src/make-source-package.sh b/js/src/make-source-package.sh
index e6d3f6df5..d3075e9e9 100755
--- a/js/src/make-source-package.sh
+++ b/js/src/make-source-package.sh
@@ -126,8 +126,8 @@ case $cmd in
         ${tgtpath}/testing
     ${MKDIR} -p ${tgtpath}/modules
     cp -pPR \
-       ${TOPSRCDIR}/modules/fdlibm \
-       ${tgtpath}/modules/fdlibm
+       ${TOPSRCDIR}/libs/fdlibm \
+       ${tgtpath}/libs/fdlibm
     cp -pPR \
         ${TOPSRCDIR}/modules/zlib/src/ \
         ${tgtpath}/modules/zlib
diff --git a/modules/fdlibm/README.mozilla b/libs/fdlibm/README.mozilla
index d25ef8b8e..d25ef8b8e 100644
--- a/modules/fdlibm/README.mozilla
+++ b/libs/fdlibm/README.mozilla
diff --git a/modules/fdlibm/import.sh b/libs/fdlibm/import.sh
index 11acb064b..11acb064b 100644
--- a/modules/fdlibm/import.sh
+++ b/libs/fdlibm/import.sh
diff --git a/config/external/fdlibm/moz.build b/libs/fdlibm/moz.build
index 401cac4ad..ec679bd89 100644
--- a/config/external/fdlibm/moz.build
+++ b/libs/fdlibm/moz.build
@@ -6,6 +6,4 @@
 with Files('**'):
     BUG_COMPONENT = ('Core', 'JavaScript Engine')
 
-DIRS += [
-    '../../../modules/fdlibm',
-]
+DIRS += ['src']
diff --git a/modules/fdlibm/patches/01_remove_unused_declarations_from_fdlibm_h.patch b/libs/fdlibm/patches/01_remove_unused_declarations_from_fdlibm_h.patch
index 4e5774ff0..4e5774ff0 100644
--- a/modules/fdlibm/patches/01_remove_unused_declarations_from_fdlibm_h.patch
+++ b/libs/fdlibm/patches/01_remove_unused_declarations_from_fdlibm_h.patch
diff --git a/modules/fdlibm/patches/02_change_include_guard_in_fdlibm_h.patch b/libs/fdlibm/patches/02_change_include_guard_in_fdlibm_h.patch
index f103af128..f103af128 100644
--- a/modules/fdlibm/patches/02_change_include_guard_in_fdlibm_h.patch
+++ b/libs/fdlibm/patches/02_change_include_guard_in_fdlibm_h.patch
diff --git a/modules/fdlibm/patches/03_put_fdlibm_functions_into_fdlibm_namespace.patch b/libs/fdlibm/patches/03_put_fdlibm_functions_into_fdlibm_namespace.patch
index b6cd7ab7f..b6cd7ab7f 100644
--- a/modules/fdlibm/patches/03_put_fdlibm_functions_into_fdlibm_namespace.patch
+++ b/libs/fdlibm/patches/03_put_fdlibm_functions_into_fdlibm_namespace.patch
diff --git a/modules/fdlibm/patches/04_include_fdlibm_h_from_math_private_h.patch b/libs/fdlibm/patches/04_include_fdlibm_h_from_math_private_h.patch
index 153018902..153018902 100644
--- a/modules/fdlibm/patches/04_include_fdlibm_h_from_math_private_h.patch
+++ b/libs/fdlibm/patches/04_include_fdlibm_h_from_math_private_h.patch
diff --git a/modules/fdlibm/patches/05_include_stdint_h_in_math_private_h.patch b/libs/fdlibm/patches/05_include_stdint_h_in_math_private_h.patch
index 46355478f..46355478f 100644
--- a/modules/fdlibm/patches/05_include_stdint_h_in_math_private_h.patch
+++ b/libs/fdlibm/patches/05_include_stdint_h_in_math_private_h.patch
diff --git a/modules/fdlibm/patches/06_use_mfbt_endian_h_in_math_private_h.patch b/libs/fdlibm/patches/06_use_mfbt_endian_h_in_math_private_h.patch
index bd41b919a..bd41b919a 100644
--- a/modules/fdlibm/patches/06_use_mfbt_endian_h_in_math_private_h.patch
+++ b/libs/fdlibm/patches/06_use_mfbt_endian_h_in_math_private_h.patch
diff --git a/modules/fdlibm/patches/07_add_fdlibm_namespace_to_functions_defined_and_used_in_fdlibm.patch b/libs/fdlibm/patches/07_add_fdlibm_namespace_to_functions_defined_and_used_in_fdlibm.patch
index 07d3a500a..07d3a500a 100644
--- a/modules/fdlibm/patches/07_add_fdlibm_namespace_to_functions_defined_and_used_in_fdlibm.patch
+++ b/libs/fdlibm/patches/07_add_fdlibm_namespace_to_functions_defined_and_used_in_fdlibm.patch
diff --git a/modules/fdlibm/patches/08_remove_weak_reference_macro.patch b/libs/fdlibm/patches/08_remove_weak_reference_macro.patch
index 0b55bbd84..0b55bbd84 100644
--- a/modules/fdlibm/patches/08_remove_weak_reference_macro.patch
+++ b/libs/fdlibm/patches/08_remove_weak_reference_macro.patch
diff --git a/modules/fdlibm/patches/09_comment_out_rcsid_variable.patch b/libs/fdlibm/patches/09_comment_out_rcsid_variable.patch
index d520d9257..d520d9257 100644
--- a/modules/fdlibm/patches/09_comment_out_rcsid_variable.patch
+++ b/libs/fdlibm/patches/09_comment_out_rcsid_variable.patch
diff --git a/modules/fdlibm/patches/10_remove_unused_function_from_k_exp_cpp.patch b/libs/fdlibm/patches/10_remove_unused_function_from_k_exp_cpp.patch
index 36aee9bb6..36aee9bb6 100644
--- a/modules/fdlibm/patches/10_remove_unused_function_from_k_exp_cpp.patch
+++ b/libs/fdlibm/patches/10_remove_unused_function_from_k_exp_cpp.patch
diff --git a/modules/fdlibm/patches/11_include_cfloat_to_use_flt_eval_method.patch b/libs/fdlibm/patches/11_include_cfloat_to_use_flt_eval_method.patch
index a5ddcb1ca..a5ddcb1ca 100644
--- a/modules/fdlibm/patches/11_include_cfloat_to_use_flt_eval_method.patch
+++ b/libs/fdlibm/patches/11_include_cfloat_to_use_flt_eval_method.patch
diff --git a/modules/fdlibm/patches/12_define_u_int32_t_and_u_int64_t_on_windows.patch b/libs/fdlibm/patches/12_define_u_int32_t_and_u_int64_t_on_windows.patch
index 106d64dbc..106d64dbc 100644
--- a/modules/fdlibm/patches/12_define_u_int32_t_and_u_int64_t_on_windows.patch
+++ b/libs/fdlibm/patches/12_define_u_int32_t_and_u_int64_t_on_windows.patch
diff --git a/modules/fdlibm/patches/13_define_strict_assign_even_if_flt_eval_method_is_not_defined.patch b/libs/fdlibm/patches/13_define_strict_assign_even_if_flt_eval_method_is_not_defined.patch
index a6117e24b..a6117e24b 100644
--- a/modules/fdlibm/patches/13_define_strict_assign_even_if_flt_eval_method_is_not_defined.patch
+++ b/libs/fdlibm/patches/13_define_strict_assign_even_if_flt_eval_method_is_not_defined.patch
diff --git a/modules/fdlibm/patches/14_do_not_use_hexadecimal_floating_point_number.patch b/libs/fdlibm/patches/14_do_not_use_hexadecimal_floating_point_number.patch
index 85f511882..85f511882 100644
--- a/modules/fdlibm/patches/14_do_not_use_hexadecimal_floating_point_number.patch
+++ b/libs/fdlibm/patches/14_do_not_use_hexadecimal_floating_point_number.patch
diff --git a/modules/fdlibm/patches/15_remove_unused_rintl_function_from_s_nearbyint_cpp.patch b/libs/fdlibm/patches/15_remove_unused_rintl_function_from_s_nearbyint_cpp.patch
index b64e281aa..b64e281aa 100644
--- a/modules/fdlibm/patches/15_remove_unused_rintl_function_from_s_nearbyint_cpp.patch
+++ b/libs/fdlibm/patches/15_remove_unused_rintl_function_from_s_nearbyint_cpp.patch
diff --git a/modules/fdlibm/patches/16_use_safer_strict_assign_on_visual_studio.patch b/libs/fdlibm/patches/16_use_safer_strict_assign_on_visual_studio.patch
index 855f91a0d..855f91a0d 100644
--- a/modules/fdlibm/patches/16_use_safer_strict_assign_on_visual_studio.patch
+++ b/libs/fdlibm/patches/16_use_safer_strict_assign_on_visual_studio.patch
diff --git a/modules/fdlibm/patches/17_exp_exact_result_for_positive_one.patch b/libs/fdlibm/patches/17_exp_exact_result_for_positive_one.patch
index 9cda2beef..9cda2beef 100644
--- a/modules/fdlibm/patches/17_exp_exact_result_for_positive_one.patch
+++ b/libs/fdlibm/patches/17_exp_exact_result_for_positive_one.patch
diff --git a/modules/fdlibm/patches/18_use_stdlib_sqrt.patch b/libs/fdlibm/patches/18_use_stdlib_sqrt.patch
index 1f87dd73b..1f87dd73b 100644
--- a/modules/fdlibm/patches/18_use_stdlib_sqrt.patch
+++ b/libs/fdlibm/patches/18_use_stdlib_sqrt.patch
diff --git a/modules/fdlibm/patches/19_remove_unneeded_round_to_integer_helpers.patch b/libs/fdlibm/patches/19_remove_unneeded_round_to_integer_helpers.patch
index 6d1baa23a..6d1baa23a 100644
--- a/modules/fdlibm/patches/19_remove_unneeded_round_to_integer_helpers.patch
+++ b/libs/fdlibm/patches/19_remove_unneeded_round_to_integer_helpers.patch
diff --git a/modules/fdlibm/src/e_acos.cpp b/libs/fdlibm/src/e_acos.cpp
index 4f497b3b3..4f497b3b3 100644
--- a/modules/fdlibm/src/e_acos.cpp
+++ b/libs/fdlibm/src/e_acos.cpp
diff --git a/modules/fdlibm/src/e_acosh.cpp b/libs/fdlibm/src/e_acosh.cpp
index ce52d5aaa..ce52d5aaa 100644
--- a/modules/fdlibm/src/e_acosh.cpp
+++ b/libs/fdlibm/src/e_acosh.cpp
diff --git a/modules/fdlibm/src/e_asin.cpp b/libs/fdlibm/src/e_asin.cpp
index e896bde9e..e896bde9e 100644
--- a/modules/fdlibm/src/e_asin.cpp
+++ b/libs/fdlibm/src/e_asin.cpp
diff --git a/modules/fdlibm/src/e_atan2.cpp b/libs/fdlibm/src/e_atan2.cpp
index f45ad187f..f45ad187f 100644
--- a/modules/fdlibm/src/e_atan2.cpp
+++ b/libs/fdlibm/src/e_atan2.cpp
diff --git a/modules/fdlibm/src/e_atanh.cpp b/libs/fdlibm/src/e_atanh.cpp
index a8f0f8deb..a8f0f8deb 100644
--- a/modules/fdlibm/src/e_atanh.cpp
+++ b/libs/fdlibm/src/e_atanh.cpp
diff --git a/modules/fdlibm/src/e_cosh.cpp b/libs/fdlibm/src/e_cosh.cpp
index 42cb277d4..42cb277d4 100644
--- a/modules/fdlibm/src/e_cosh.cpp
+++ b/libs/fdlibm/src/e_cosh.cpp
diff --git a/modules/fdlibm/src/e_exp.cpp b/libs/fdlibm/src/e_exp.cpp
index 92af819ce..92af819ce 100644
--- a/modules/fdlibm/src/e_exp.cpp
+++ b/libs/fdlibm/src/e_exp.cpp
diff --git a/modules/fdlibm/src/e_hypot.cpp b/libs/fdlibm/src/e_hypot.cpp
index a23571150..a23571150 100644
--- a/modules/fdlibm/src/e_hypot.cpp
+++ b/libs/fdlibm/src/e_hypot.cpp
diff --git a/modules/fdlibm/src/e_log.cpp b/libs/fdlibm/src/e_log.cpp
index fa2da8fcb..fa2da8fcb 100644
--- a/modules/fdlibm/src/e_log.cpp
+++ b/libs/fdlibm/src/e_log.cpp
diff --git a/modules/fdlibm/src/e_log10.cpp b/libs/fdlibm/src/e_log10.cpp
index ed6879885..ed6879885 100644
--- a/modules/fdlibm/src/e_log10.cpp
+++ b/libs/fdlibm/src/e_log10.cpp
diff --git a/modules/fdlibm/src/e_log2.cpp b/libs/fdlibm/src/e_log2.cpp
index 5649fec44..5649fec44 100644
--- a/modules/fdlibm/src/e_log2.cpp
+++ b/libs/fdlibm/src/e_log2.cpp
diff --git a/modules/fdlibm/src/e_pow.cpp b/libs/fdlibm/src/e_pow.cpp
index c18226b8a..c18226b8a 100644
--- a/modules/fdlibm/src/e_pow.cpp
+++ b/libs/fdlibm/src/e_pow.cpp
diff --git a/modules/fdlibm/src/e_sinh.cpp b/libs/fdlibm/src/e_sinh.cpp
index c3418e687..c3418e687 100644
--- a/modules/fdlibm/src/e_sinh.cpp
+++ b/libs/fdlibm/src/e_sinh.cpp
diff --git a/modules/fdlibm/src/fdlibm.h b/libs/fdlibm/src/fdlibm.h
index 324e5d0b0..324e5d0b0 100644
--- a/modules/fdlibm/src/fdlibm.h
+++ b/libs/fdlibm/src/fdlibm.h
diff --git a/modules/fdlibm/src/k_exp.cpp b/libs/fdlibm/src/k_exp.cpp
index 9394c8fd8..9394c8fd8 100644
--- a/modules/fdlibm/src/k_exp.cpp
+++ b/libs/fdlibm/src/k_exp.cpp
diff --git a/modules/fdlibm/src/k_log.h b/libs/fdlibm/src/k_log.h
index 0efa020f6..0efa020f6 100644
--- a/modules/fdlibm/src/k_log.h
+++ b/libs/fdlibm/src/k_log.h
diff --git a/modules/fdlibm/src/math_private.h b/libs/fdlibm/src/math_private.h
index d9ec44817..d9ec44817 100644
--- a/modules/fdlibm/src/math_private.h
+++ b/libs/fdlibm/src/math_private.h
diff --git a/modules/fdlibm/src/moz.build b/libs/fdlibm/src/moz.build
index 541f84039..541f84039 100644
--- a/modules/fdlibm/src/moz.build
+++ b/libs/fdlibm/src/moz.build
diff --git a/modules/fdlibm/src/s_asinh.cpp b/libs/fdlibm/src/s_asinh.cpp
index 7ecc396bb..7ecc396bb 100644
--- a/modules/fdlibm/src/s_asinh.cpp
+++ b/libs/fdlibm/src/s_asinh.cpp
diff --git a/modules/fdlibm/src/s_atan.cpp b/libs/fdlibm/src/s_atan.cpp
index 21bc0d820..21bc0d820 100644
--- a/modules/fdlibm/src/s_atan.cpp
+++ b/libs/fdlibm/src/s_atan.cpp
diff --git a/modules/fdlibm/src/s_cbrt.cpp b/libs/fdlibm/src/s_cbrt.cpp
index fe3747e81..fe3747e81 100644
--- a/modules/fdlibm/src/s_cbrt.cpp
+++ b/libs/fdlibm/src/s_cbrt.cpp
diff --git a/modules/fdlibm/src/s_ceil.cpp b/libs/fdlibm/src/s_ceil.cpp
index 67e9c1679..67e9c1679 100644
--- a/modules/fdlibm/src/s_ceil.cpp
+++ b/libs/fdlibm/src/s_ceil.cpp
diff --git a/modules/fdlibm/src/s_ceilf.cpp b/libs/fdlibm/src/s_ceilf.cpp
index 7b52deeed..7b52deeed 100644
--- a/modules/fdlibm/src/s_ceilf.cpp
+++ b/libs/fdlibm/src/s_ceilf.cpp
diff --git a/modules/fdlibm/src/s_copysign.cpp b/libs/fdlibm/src/s_copysign.cpp
index b150106fb..b150106fb 100644
--- a/modules/fdlibm/src/s_copysign.cpp
+++ b/libs/fdlibm/src/s_copysign.cpp
diff --git a/modules/fdlibm/src/s_expm1.cpp b/libs/fdlibm/src/s_expm1.cpp
index 90ebc1698..90ebc1698 100644
--- a/modules/fdlibm/src/s_expm1.cpp
+++ b/libs/fdlibm/src/s_expm1.cpp
diff --git a/modules/fdlibm/src/s_fabs.cpp b/libs/fdlibm/src/s_fabs.cpp
index 6ca84d71b..6ca84d71b 100644
--- a/modules/fdlibm/src/s_fabs.cpp
+++ b/libs/fdlibm/src/s_fabs.cpp
diff --git a/modules/fdlibm/src/s_floor.cpp b/libs/fdlibm/src/s_floor.cpp
index da57fc828..da57fc828 100644
--- a/modules/fdlibm/src/s_floor.cpp
+++ b/libs/fdlibm/src/s_floor.cpp
diff --git a/modules/fdlibm/src/s_floorf.cpp b/libs/fdlibm/src/s_floorf.cpp
index 88511f209..88511f209 100644
--- a/modules/fdlibm/src/s_floorf.cpp
+++ b/libs/fdlibm/src/s_floorf.cpp
diff --git a/modules/fdlibm/src/s_log1p.cpp b/libs/fdlibm/src/s_log1p.cpp
index afc6919c6..afc6919c6 100644
--- a/modules/fdlibm/src/s_log1p.cpp
+++ b/libs/fdlibm/src/s_log1p.cpp
diff --git a/modules/fdlibm/src/s_nearbyint.cpp b/libs/fdlibm/src/s_nearbyint.cpp
index 6c04212d3..6c04212d3 100644
--- a/modules/fdlibm/src/s_nearbyint.cpp
+++ b/libs/fdlibm/src/s_nearbyint.cpp
diff --git a/modules/fdlibm/src/s_rint.cpp b/libs/fdlibm/src/s_rint.cpp
index 19171f87f..19171f87f 100644
--- a/modules/fdlibm/src/s_rint.cpp
+++ b/libs/fdlibm/src/s_rint.cpp
diff --git a/modules/fdlibm/src/s_rintf.cpp b/libs/fdlibm/src/s_rintf.cpp
index 3a729b005..3a729b005 100644
--- a/modules/fdlibm/src/s_rintf.cpp
+++ b/libs/fdlibm/src/s_rintf.cpp
diff --git a/modules/fdlibm/src/s_scalbn.cpp b/libs/fdlibm/src/s_scalbn.cpp
index dfbcf5c57..dfbcf5c57 100644
--- a/modules/fdlibm/src/s_scalbn.cpp
+++ b/libs/fdlibm/src/s_scalbn.cpp
diff --git a/modules/fdlibm/src/s_tanh.cpp b/libs/fdlibm/src/s_tanh.cpp
index 238973fce..238973fce 100644
--- a/modules/fdlibm/src/s_tanh.cpp
+++ b/libs/fdlibm/src/s_tanh.cpp
diff --git a/modules/fdlibm/src/s_trunc.cpp b/libs/fdlibm/src/s_trunc.cpp
index d2294a272..d2294a272 100644
--- a/modules/fdlibm/src/s_trunc.cpp
+++ b/libs/fdlibm/src/s_trunc.cpp
diff --git a/modules/fdlibm/src/s_truncf.cpp b/libs/fdlibm/src/s_truncf.cpp
index 4853a4450..4853a4450 100644
--- a/modules/fdlibm/src/s_truncf.cpp
+++ b/libs/fdlibm/src/s_truncf.cpp
diff --git a/modules/fdlibm/update.sh b/libs/fdlibm/update.sh
index 90d417862..90d417862 100644
--- a/modules/fdlibm/update.sh
+++ b/libs/fdlibm/update.sh
diff --git a/modules/fdlibm/moz.build b/modules/fdlibm/moz.build
deleted file mode 100644
index f8d8f81d0..000000000
--- a/modules/fdlibm/moz.build
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DIRS += ['src']
diff --git a/moz.build b/moz.build
index a251a8f0e..1289b00c4 100644
--- a/moz.build
+++ b/moz.build
@@ -51,7 +51,7 @@ if not CONFIG['MOZ_DISABLE_PLATFORM']:
         ]
 
     DIRS += [
-        'config/external/fdlibm',
+        'libs/fdlibm',
         'config/external/nspr',
         'config/external/zlib',
         'memory',