1
1

couple of changes to make Open MPI compile under Cygwin with gcc:

- add the right asm format
  - add checks for some constants / fields that cygwin
    doesn't have in the stacktrace code
  - fix for slightly more verbose libtool 2 betas that
    have multiple lines for link output

This commit was SVN r8501.
Этот коммит содержится в:
Brian Barrett 2005-12-15 00:51:28 +00:00
родитель 8651658816
Коммит e8cca1710f
4 изменённых файлов: 21 добавлений и 2 удалений

Просмотреть файл

@ -50,7 +50,7 @@ ompi_check_linker_flags_work() {
OMPI_LOG_MSG([$cmd], [yes]) OMPI_LOG_MSG([$cmd], [yes])
eval $cmd >&5 2>&5 eval $cmd >&5 2>&5
if test -n "[$]1"; then if test -n "[$]1"; then
output="`eval $cmd 2>/dev/null`" output="`eval $cmd 2>/dev/null | head -n 1`"
fi fi
status="$?" status="$?"
OMPI_LOG_MSG([\$? = $status], [yes]) OMPI_LOG_MSG([\$? = $status], [yes])
@ -80,7 +80,10 @@ eval "set $output"
extra_ldflags= extra_ldflags=
while test -n "[$]1"; do while test -n "[$]1"; do
case "[$]1" in case "[$]1" in
libtool:) ;;
link:) ;;
$CC) ;; $CC) ;;
.libs/bar*) ;;
bar*) ;; bar*) ;;
-I*) ;; -I*) ;;
-L*) ;; -L*) ;;

Просмотреть файл

@ -1124,6 +1124,7 @@ AC_CHECK_MEMBERS([struct dirent.d_type], [], [], [
#include <dirent.h>]) #include <dirent.h>])
AC_CHECK_MEMBERS([siginfo_t.si_fd],,,[#include <signal.h>]) AC_CHECK_MEMBERS([siginfo_t.si_fd],,,[#include <signal.h>])
AC_CHECK_MEMBERS([siginfo_t.si_band],,,[#include <signal.h>])
# checkpoint results # checkpoint results

Просмотреть файл

@ -45,6 +45,7 @@ AMD64 default-.text-.globl-:--.L-@-1-0-1-1 amd64-linux
IA32 default-.text-.globl-:--.L-@-1-0-1-1 ia32-linux IA32 default-.text-.globl-:--.L-@-1-0-1-1 ia32-linux
IA32 default-.text-.globl-:-_-L--0-1-1-1 ia32-osx IA32 default-.text-.globl-:-_-L--0-1-1-1 ia32-osx
IA32 default-.text-.globl-:-_-L--0-0-1-1 ia32-cygwin
###################################################################### ######################################################################

Просмотреть файл

@ -199,12 +199,24 @@ static void opal_show_stackframe (int signo, siginfo_t * info, void * p)
case SIGPOLL: case SIGPOLL:
switch (info->si_code) switch (info->si_code)
{ {
#ifdef POLL_IN
case POLL_IN: str = "POLL_IN"; break; case POLL_IN: str = "POLL_IN"; break;
#endif
#ifdef POLL_OUT
case POLL_OUT: str = "POLL_OUT"; break; case POLL_OUT: str = "POLL_OUT"; break;
#endif
#ifdef POLL_MSG
case POLL_MSG: str = "POLL_MSG"; break; case POLL_MSG: str = "POLL_MSG"; break;
#endif
#ifdef POLL_ERR
case POLL_ERR: str = "POLL_ERR"; break; case POLL_ERR: str = "POLL_ERR"; break;
#endif
#ifdef POLL_PRI
case POLL_PRI: str = "POLL_PRI"; break; case POLL_PRI: str = "POLL_PRI"; break;
#endif
#ifdef POLL_HUP
case POLL_HUP: str = "POLL_HUP"; break; case POLL_HUP: str = "POLL_HUP"; break;
#endif
} }
break; break;
#endif /* SIGPOLL */ #endif /* SIGPOLL */
@ -262,9 +274,11 @@ static void opal_show_stackframe (int signo, siginfo_t * info, void * p)
#ifdef HAVE_SIGINFO_T_SI_FD #ifdef HAVE_SIGINFO_T_SI_FD
ret = snprintf (tmp, size, "si_band:%ld si_fd:%d\n", ret = snprintf (tmp, size, "si_band:%ld si_fd:%d\n",
info->si_band, info->si_fd); info->si_band, info->si_fd);
#else #elif HAVE_SIGINFO_T_SI_BAND
ret = snprintf (tmp, size, "si_band:%ld\n", ret = snprintf (tmp, size, "si_band:%ld\n",
info->si_band); info->si_band);
#else
size = 0;
#endif #endif
size -= ret; size -= ret;
tmp += ret; tmp += ret;