llvm.org GIT mirror llvm / d1d867a
Merging r227574: ------------------------------------------------------------------------ r227574 | geek4civic | 2015-01-30 08:01:19 -0500 (Fri, 30 Jan 2015) | 2 lines [Cygming] Seek also chkstk_ms, or JIT fails with DLL builds. It is fixup for r227519. ------------------------------------------------------------------------ git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_36@236379 91177308-0d34-0410-b5e6-96231b3b80d8 Tom Stellard 4 years ago
6 changed file(s) with 192 addition(s) and 0 deletion(s). Raw diff Collapse all Expand all
17131713 AC_CHECK_LIB(gcc,_alloca,AC_DEFINE([HAVE__ALLOCA],[1],[Have host's _alloca]))
17141714 AC_CHECK_LIB(gcc,__alloca,AC_DEFINE([HAVE___ALLOCA],[1],[Have host's __alloca]))
17151715 AC_CHECK_LIB(gcc,__chkstk,AC_DEFINE([HAVE___CHKSTK],[1],[Have host's __chkstk]))
1716 AC_CHECK_LIB(gcc,__chkstk_ms,AC_DEFINE([HAVE___CHKSTK_MS],[1],[Have host's __chkstk_ms]))
17161717 AC_CHECK_LIB(gcc,___chkstk,AC_DEFINE([HAVE____CHKSTK],[1],[Have host's ___chkstk]))
1718 AC_CHECK_LIB(gcc,___chkstk_ms,AC_DEFINE([HAVE____CHKSTK_MS],[1],[Have host's ___chkstk_ms]))
17171719
17181720 AC_CHECK_LIB(gcc,__ashldi3,AC_DEFINE([HAVE___ASHLDI3],[1],[Have host's __ashldi3]))
17191721 AC_CHECK_LIB(gcc,__ashrdi3,AC_DEFINE([HAVE___ASHRDI3],[1],[Have host's __ashrdi3]))
197197 check_function_exists(_alloca HAVE__ALLOCA)
198198 check_function_exists(__alloca HAVE___ALLOCA)
199199 check_function_exists(__chkstk HAVE___CHKSTK)
200 check_function_exists(__chkstk_ms HAVE___CHKSTK_MS)
200201 check_function_exists(___chkstk HAVE____CHKSTK)
202 check_function_exists(___chkstk_ms HAVE____CHKSTK_MS)
201203
202204 check_function_exists(__ashldi3 HAVE___ASHLDI3)
203205 check_function_exists(__ashrdi3 HAVE___ASHRDI3)
1543715437
1543815438 fi
1543915439
15440 { echo "$as_me:$LINENO: checking for __chkstk_ms in -lgcc" >&5
15441 echo $ECHO_N "checking for __chkstk_ms in -lgcc... $ECHO_C" >&6; }
15442 if test "${ac_cv_lib_gcc___chkstk_ms+set}" = set; then
15443 echo $ECHO_N "(cached) $ECHO_C" >&6
15444 else
15445 ac_check_lib_save_LIBS=$LIBS
15446 LIBS="-lgcc $LIBS"
15447 cat >conftest.$ac_ext <<_ACEOF
15448 /* confdefs.h. */
15449 _ACEOF
15450 cat confdefs.h >>conftest.$ac_ext
15451 cat >>conftest.$ac_ext <<_ACEOF
15452 /* end confdefs.h. */
15453
15454 /* Override any GCC internal prototype to avoid an error.
15455 Use char because int might match the return type of a GCC
15456 builtin and then its argument prototype would still apply. */
15457 #ifdef __cplusplus
15458 extern "C"
15459 #endif
15460 char __chkstk_ms ();
15461 int
15462 main ()
15463 {
15464 return __chkstk_ms ();
15465 ;
15466 return 0;
15467 }
15468 _ACEOF
15469 rm -f conftest.$ac_objext conftest$ac_exeext
15470 if { (ac_try="$ac_link"
15471 case "(($ac_try" in
15472 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15473 *) ac_try_echo=$ac_try;;
15474 esac
15475 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15476 (eval "$ac_link") 2>conftest.er1
15477 ac_status=$?
15478 grep -v '^ *+' conftest.er1 >conftest.err
15479 rm -f conftest.er1
15480 cat conftest.err >&5
15481 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15482 (exit $ac_status); } &&
15483 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15484 { (case "(($ac_try" in
15485 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15486 *) ac_try_echo=$ac_try;;
15487 esac
15488 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15489 (eval "$ac_try") 2>&5
15490 ac_status=$?
15491 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15492 (exit $ac_status); }; } &&
15493 { ac_try='test -s conftest$ac_exeext'
15494 { (case "(($ac_try" in
15495 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15496 *) ac_try_echo=$ac_try;;
15497 esac
15498 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15499 (eval "$ac_try") 2>&5
15500 ac_status=$?
15501 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15502 (exit $ac_status); }; }; then
15503 ac_cv_lib_gcc___chkstk_ms=yes
15504 else
15505 echo "$as_me: failed program was:" >&5
15506 sed 's/^/| /' conftest.$ac_ext >&5
15507
15508 ac_cv_lib_gcc___chkstk_ms=no
15509 fi
15510
15511 rm -f core conftest.err conftest.$ac_objext \
15512 conftest$ac_exeext conftest.$ac_ext
15513 LIBS=$ac_check_lib_save_LIBS
15514 fi
15515 { echo "$as_me:$LINENO: result: $ac_cv_lib_gcc___chkstk_ms" >&5
15516 echo "${ECHO_T}$ac_cv_lib_gcc___chkstk_ms" >&6; }
15517 if test $ac_cv_lib_gcc___chkstk_ms = yes; then
15518
15519 cat >>confdefs.h <<\_ACEOF
15520 #define HAVE___CHKSTK_MS 1
15521 _ACEOF
15522
15523 fi
15524
1544015525 { echo "$as_me:$LINENO: checking for ___chkstk in -lgcc" >&5
1544115526 echo $ECHO_N "checking for ___chkstk in -lgcc... $ECHO_C" >&6; }
1544215527 if test "${ac_cv_lib_gcc____chkstk+set}" = set; then
1551815603
1551915604 cat >>confdefs.h <<\_ACEOF
1552015605 #define HAVE____CHKSTK 1
15606 _ACEOF
15607
15608 fi
15609
15610 { echo "$as_me:$LINENO: checking for ___chkstk_ms in -lgcc" >&5
15611 echo $ECHO_N "checking for ___chkstk_ms in -lgcc... $ECHO_C" >&6; }
15612 if test "${ac_cv_lib_gcc____chkstk_ms+set}" = set; then
15613 echo $ECHO_N "(cached) $ECHO_C" >&6
15614 else
15615 ac_check_lib_save_LIBS=$LIBS
15616 LIBS="-lgcc $LIBS"
15617 cat >conftest.$ac_ext <<_ACEOF
15618 /* confdefs.h. */
15619 _ACEOF
15620 cat confdefs.h >>conftest.$ac_ext
15621 cat >>conftest.$ac_ext <<_ACEOF
15622 /* end confdefs.h. */
15623
15624 /* Override any GCC internal prototype to avoid an error.
15625 Use char because int might match the return type of a GCC
15626 builtin and then its argument prototype would still apply. */
15627 #ifdef __cplusplus
15628 extern "C"
15629 #endif
15630 char ___chkstk_ms ();
15631 int
15632 main ()
15633 {
15634 return ___chkstk_ms ();
15635 ;
15636 return 0;
15637 }
15638 _ACEOF
15639 rm -f conftest.$ac_objext conftest$ac_exeext
15640 if { (ac_try="$ac_link"
15641 case "(($ac_try" in
15642 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15643 *) ac_try_echo=$ac_try;;
15644 esac
15645 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15646 (eval "$ac_link") 2>conftest.er1
15647 ac_status=$?
15648 grep -v '^ *+' conftest.er1 >conftest.err
15649 rm -f conftest.er1
15650 cat conftest.err >&5
15651 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15652 (exit $ac_status); } &&
15653 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
15654 { (case "(($ac_try" in
15655 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15656 *) ac_try_echo=$ac_try;;
15657 esac
15658 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15659 (eval "$ac_try") 2>&5
15660 ac_status=$?
15661 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15662 (exit $ac_status); }; } &&
15663 { ac_try='test -s conftest$ac_exeext'
15664 { (case "(($ac_try" in
15665 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
15666 *) ac_try_echo=$ac_try;;
15667 esac
15668 eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
15669 (eval "$ac_try") 2>&5
15670 ac_status=$?
15671 echo "$as_me:$LINENO: \$? = $ac_status" >&5
15672 (exit $ac_status); }; }; then
15673 ac_cv_lib_gcc____chkstk_ms=yes
15674 else
15675 echo "$as_me: failed program was:" >&5
15676 sed 's/^/| /' conftest.$ac_ext >&5
15677
15678 ac_cv_lib_gcc____chkstk_ms=no
15679 fi
15680
15681 rm -f core conftest.err conftest.$ac_objext \
15682 conftest$ac_exeext conftest.$ac_ext
15683 LIBS=$ac_check_lib_save_LIBS
15684 fi
15685 { echo "$as_me:$LINENO: result: $ac_cv_lib_gcc____chkstk_ms" >&5
15686 echo "${ECHO_T}$ac_cv_lib_gcc____chkstk_ms" >&6; }
15687 if test $ac_cv_lib_gcc____chkstk_ms = yes; then
15688
15689 cat >>confdefs.h <<\_ACEOF
15690 #define HAVE____CHKSTK_MS 1
1552115691 _ACEOF
1552215692
1552315693 fi
422422 /* Have host's __chkstk */
423423 #cmakedefine HAVE___CHKSTK ${HAVE___CHKSTK}
424424
425 /* Have host's __chkstk_ms */
426 #cmakedefine HAVE___CHKSTK_MS ${HAVE___CHKSTK_MS}
427
425428 /* Have host's __cmpdi2 */
426429 #cmakedefine HAVE___CMPDI2 ${HAVE___CMPDI2}
427430
457460
458461 /* Have host's ___chkstk */
459462 #cmakedefine HAVE____CHKSTK ${HAVE____CHKSTK}
463
464 /* Have host's ___chkstk_ms */
465 #cmakedefine HAVE____CHKSTK_MS ${HAVE____CHKSTK_MS}
460466
461467 /* Define if we link Polly to the tools */
462468 #cmakedefine LINK_POLLY_INTO_TOOLS
419419 /* Have host's __chkstk */
420420 #undef HAVE___CHKSTK
421421
422 /* Have host's __chkstk_ms */
423 #undef HAVE___CHKSTK_MS
424
422425 /* Have host's __cmpdi2 */
423426 #undef HAVE___CMPDI2
424427
454457
455458 /* Have host's ___chkstk */
456459 #undef HAVE____CHKSTK
460
461 /* Have host's ___chkstk_ms */
462 #undef HAVE____CHKSTK_MS
457463
458464 /* Linker version detected at compile time. */
459465 #undef HOST_LINK_VERSION
99 #ifdef HAVE___CHKSTK
1010 EXPLICIT_SYMBOL(__chkstk)
1111 #endif
12 #ifdef HAVE___CHKSTK_MS
13 EXPLICIT_SYMBOL(__chkstk_ms)
14 #endif
1215 #ifdef HAVE____CHKSTK
1316 EXPLICIT_SYMBOL(___chkstk)
17 #endif
18 #ifdef HAVE____CHKSTK_MS
19 EXPLICIT_SYMBOL(___chkstk_ms)
1420 #endif
1521 #ifdef HAVE___MAIN
1622 EXPLICIT_SYMBOL(__main) // FIXME: Don't call it.