+39 -39

aclocal.m4

reviewed

··· 164 164 165 165 AC_DEFUN([OCAML_AS_HAS_CFI_DIRECTIVES], [ 166 166 AC_MSG_CHECKING([whether the assembler supports CFI directives]) 167 167 + AS_IF([test "x$enable_cfi" != xno], 168 168 + [AC_CACHE_VAL([ocaml_cv_prog_as_cfi_directives], 169 169 + [ocaml_cv_prog_as_cfi_directives=no 170 170 + OCAML_CC_SAVE_VARIABLES 171 171 + # Modify C-compiler variables to use the assembler 172 172 + CC="$ASPP" 173 173 + CFLAGS="-o conftest.$ac_objext" 174 174 + CPPFLAGS="" 175 175 + ac_ext="S" 176 176 + ac_compile='$CC $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 167 177 168 168 - AS_IF([test x"$enable_cfi" = "xno"], 169 169 - [AC_MSG_RESULT([disabled])], 170 170 - [OCAML_CC_SAVE_VARIABLES 171 171 - 172 172 - # Modify C-compiler variables to use the assembler 173 173 - CC="$ASPP" 174 174 - CFLAGS="-o conftest.$ac_objext" 175 175 - CPPFLAGS="" 176 176 - ac_ext="S" 177 177 - ac_compile='$CC $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 178 178 - 179 179 - AC_COMPILE_IFELSE( 180 180 - [AC_LANG_SOURCE([ 181 181 - camlPervasives__loop_1128: 182 182 - .file 1 "pervasives.ml" 183 183 - .loc 1 193 184 184 - .cfi_startproc 185 185 - .cfi_adjust_cfa_offset 8 186 186 - .cfi_endproc 187 187 - ])], 188 188 - [aspp_ok=true], 189 189 - [aspp_ok=false]) 178 178 + AC_COMPILE_IFELSE( 179 179 + [AC_LANG_SOURCE([ 180 180 + camlPervasives__loop_1128: 181 181 + .file 1 "pervasives.ml" 182 182 + .loc 1 193 183 183 + .cfi_startproc 184 184 + .cfi_adjust_cfa_offset 8 185 185 + .cfi_endproc 186 186 + ])], 187 187 + [prog_aspp_ok=true], 188 188 + [prog_aspp_ok=false]) 190 189 191 191 - AS_IF([test "$AS" = "$ASPP"], 192 192 - [as_ok="$aspp_ok"], 193 193 - [CC="$AS" 194 194 - ac_compile='$CC $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 195 195 - AC_COMPILE_IFELSE( 196 196 - [AC_LANG_SOURCE([ 190 190 + AS_IF([test "$AS" = "$ASPP"], 191 191 + [prog_as_ok="$prog_aspp_ok"], 192 192 + [CC="$AS" 193 193 + ac_compile='$CC $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 194 194 + AC_COMPILE_IFELSE( 195 195 + [AC_LANG_SOURCE([ 197 196 camlPervasives__loop_1128: 198 197 .file 1 "pervasives.ml" 199 198 .loc 1 193 200 199 .cfi_startproc 201 200 .cfi_adjust_cfa_offset 8 202 201 .cfi_endproc 203 203 - ])], 204 204 - [as_ok=true], 205 205 - [as_ok=false])]) 202 202 + ])], 203 203 + [prog_as_ok=true], 204 204 + [prog_as_ok=false])]) 206 205 207 207 - OCAML_CC_RESTORE_VARIABLES 206 206 + OCAML_CC_RESTORE_VARIABLES 208 207 209 209 - AS_IF([$aspp_ok && $as_ok], 208 208 + AS_IF([$prog_aspp_ok && $prog_as_ok], 209 209 + [ocaml_cv_prog_as_cfi_directives=yes])]) 210 210 + AS_IF([test "x$ocaml_cv_prog_as_cfi_directives" = xyes], 210 211 [asm_cfi_supported=true 211 212 AC_DEFINE([ASM_CFI_SUPPORTED], [1]) 212 213 AC_MSG_RESULT([yes])], 213 213 - [AS_IF([test x"$enable_cfi" = "xyes"], 214 214 - [AC_MSG_RESULT([requested but not available 215 215 - AC_MSG_ERROR([exiting])])], 216 216 - [asm_cfi_supported=false 217 217 - AC_MSG_RESULT([no])])]) 218 218 - ])]) 214 214 + [AC_MSG_RESULT([requested but not available 215 215 + AC_MSG_ERROR([exiting])])])], 216 216 + [asm_cfi_supported=false 217 217 + AC_MSG_RESULT([disabled])]) 218 218 + ]) 219 219 220 220 AC_DEFUN([OCAML_MMAP_SUPPORTS_MAP_STACK], [ 221 221 AC_MSG_CHECKING([whether mmap supports MAP_STACK])

+40 -37

configure

reviewed

··· 23689 23689 esac 23690 23690 23691 23691 ## Does the assembler support debug prefix map and CFI directives 23692 23692 - asm_cfi_supported=false 23693 23692 if $native_compiler 23694 23693 then : 23695 23694 case $target in #( ··· 23756 23755 23757 23756 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the assembler supports CFI directives" >&5 23758 23757 printf %s "checking whether the assembler supports CFI directives... " >&6; } 23759 23759 - 23760 23760 - if test x"$enable_cfi" = "xno" 23758 23758 + if test "x$enable_cfi" != xno 23759 23759 + then : 23760 23760 + if test ${ocaml_cv_prog_as_cfi_directives+y} 23761 23761 then : 23762 23762 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 23763 23763 - printf "%s\n" "disabled" >&6; } 23762 23762 + printf %s "(cached) " >&6 23764 23763 else $as_nop 23764 23764 + ocaml_cv_prog_as_cfi_directives=no 23765 23765 23766 23766 saved_CC="$CC" 23767 23767 saved_CFLAGS="$CFLAGS" ··· 23774 23774 mv confdefs.h confdefs.h.bak 23775 23775 touch confdefs.h 23776 23776 23777 23777 - 23778 23778 - # Modify C-compiler variables to use the assembler 23779 23779 - CC="$ASPP" 23780 23780 - CFLAGS="-o conftest.$ac_objext" 23781 23781 - CPPFLAGS="" 23782 23782 - ac_ext="S" 23783 23783 - ac_compile='$CC $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 23777 23777 + # Modify C-compiler variables to use the assembler 23778 23778 + CC="$ASPP" 23779 23779 + CFLAGS="-o conftest.$ac_objext" 23780 23780 + CPPFLAGS="" 23781 23781 + ac_ext="S" 23782 23782 + ac_compile='$CC $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 23784 23783 23785 23785 - cat confdefs.h - <<_ACEOF >conftest.$ac_ext 23784 23784 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext 23786 23785 /* end confdefs.h. */ 23787 23786 23788 23788 - camlPervasives__loop_1128: 23789 23789 - .file 1 "pervasives.ml" 23790 23790 - .loc 1 193 23791 23791 - .cfi_startproc 23792 23792 - .cfi_adjust_cfa_offset 8 23793 23793 - .cfi_endproc 23787 23787 + camlPervasives__loop_1128: 23788 23788 + .file 1 "pervasives.ml" 23789 23789 + .loc 1 193 23790 23790 + .cfi_startproc 23791 23791 + .cfi_adjust_cfa_offset 8 23792 23792 + .cfi_endproc 23794 23793 23795 23794 _ACEOF 23796 23795 if ac_fn_c_try_compile "$LINENO" 23797 23796 then : 23798 23798 - aspp_ok=true 23797 23797 + prog_aspp_ok=true 23799 23798 else $as_nop 23800 23800 - aspp_ok=false 23799 23799 + prog_aspp_ok=false 23801 23800 fi 23802 23801 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext 23803 23802 23804 23804 - if test "$AS" = "$ASPP" 23803 23803 + if test "$AS" = "$ASPP" 23805 23804 then : 23806 23806 - as_ok="$aspp_ok" 23805 23805 + prog_as_ok="$prog_aspp_ok" 23807 23806 else $as_nop 23808 23807 CC="$AS" 23809 23809 - ac_compile='$CC $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 23810 23810 - cat confdefs.h - <<_ACEOF >conftest.$ac_ext 23808 23808 + ac_compile='$CC $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 23809 23809 + cat confdefs.h - <<_ACEOF >conftest.$ac_ext 23811 23810 /* end confdefs.h. */ 23812 23811 23813 23812 camlPervasives__loop_1128: ··· 23820 23819 _ACEOF 23821 23820 if ac_fn_c_try_compile "$LINENO" 23822 23821 then : 23823 23823 - as_ok=true 23822 23822 + prog_as_ok=true 23824 23823 else $as_nop 23825 23825 - as_ok=false 23824 23824 + prog_as_ok=false 23826 23825 fi 23827 23826 rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext 23828 23827 fi ··· 23838 23837 LIBS="$saved_LIBS" 23839 23838 23840 23839 23841 23841 - if $aspp_ok && $as_ok 23840 23840 + if $prog_aspp_ok && $prog_as_ok 23841 23841 + then : 23842 23842 + ocaml_cv_prog_as_cfi_directives=yes 23843 23843 + fi 23844 23844 + fi 23845 23845 + 23846 23846 + if test "x$ocaml_cv_prog_as_cfi_directives" = xyes 23842 23847 then : 23843 23848 asm_cfi_supported=true 23844 23849 printf "%s\n" "#define ASM_CFI_SUPPORTED 1" >>confdefs.h ··· 23846 23851 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 23847 23852 printf "%s\n" "yes" >&6; } 23848 23853 else $as_nop 23849 23849 - if test x"$enable_cfi" = "xyes" 23850 23850 - then : 23851 23854 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: requested but not available 23852 23852 - as_fn_error $? "exiting" "$LINENO" 5" >&5 23855 23855 + as_fn_error $? "exiting" "$LINENO" 5" >&5 23853 23856 printf "%s\n" "requested but not available 23854 23854 - as_fn_error $? "exiting" "$LINENO" 5" >&6; } 23857 23857 + as_fn_error $? "exiting" "$LINENO" 5" >&6; } 23858 23858 + fi 23855 23859 else $as_nop 23856 23860 asm_cfi_supported=false 23857 23857 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 23858 23858 - printf "%s\n" "no" >&6; } 23861 23861 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 23862 23862 + printf "%s\n" "disabled" >&6; } 23859 23863 fi 23860 23860 - fi 23861 23861 - 23862 23862 - fi ;; 23864 23864 + ;; 23863 23865 esac 23864 23866 fi 23865 23867 # Always assign a valid default OCaml value 23866 23868 : ${ocaml_cv_prog_as_debug_prefix_map:=false} 23869 23869 + : ${asm_cfi_supported:=false} 23867 23870 23868 23871 ## Frame pointers 23869 23872

+1 -1

configure.ac

reviewed

··· 2771 2771 AC_MSG_NOTICE([the threads library is supported])]) 2772 2772 2773 2773 ## Does the assembler support debug prefix map and CFI directives 2774 2774 - asm_cfi_supported=false 2775 2774 AS_IF([$native_compiler], 2776 2775 [AS_CASE([$target], 2777 2776 [*-w64-mingw32*|*-pc-windows], [], ··· 2779 2778 OCAML_AS_HAS_CFI_DIRECTIVES])]) 2780 2779 # Always assign a valid default OCaml value 2781 2780 : ${ocaml_cv_prog_as_debug_prefix_map:=false} 2781 2781 + : ${asm_cfi_supported:=false} 2782 2782 2783 2783 ## Frame pointers 2784 2784