Skip to content

Commit

Permalink
patch from Joseph Koshy for FreeBSD on amd64.
Browse files Browse the repository at this point in the history
  • Loading branch information
Matt Harren committed Aug 6, 2006
1 parent c44af07 commit 63fbce2
Show file tree
Hide file tree
Showing 5 changed files with 70 additions and 14 deletions.
2 changes: 0 additions & 2 deletions Makefile.in
Expand Up @@ -456,8 +456,6 @@ distrib-nocheck: $(DISTRIB_ROOT) doc
$(TOP_DIR)/obj/.depend \ $(TOP_DIR)/obj/.depend \
$(TOP_DIR)/obj/x86_WIN32 \ $(TOP_DIR)/obj/x86_WIN32 \
$(TOP_DIR)/obj/x86_LINUX \ $(TOP_DIR)/obj/x86_LINUX \
$(TOP_DIR)/obj/ppc_DARWIN \
$(TOP_DIR)/obj/sparc_SOLARIS \
$(TOP_DIR)/test \ $(TOP_DIR)/test \
$(TOP_DIR)/test/small1 \ $(TOP_DIR)/test/small1 \
$(TOP_DIR)/ocamlutil $(TOP_DIR)/ocamlutil
Expand Down
4 changes: 2 additions & 2 deletions config.guess
Expand Up @@ -771,8 +771,8 @@ EOF
case ${UNAME_MACHINE} in case ${UNAME_MACHINE} in
pc98) pc98)
echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
amd64) # amd64)
echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; # echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
*) *)
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
esac esac
Expand Down
37 changes: 33 additions & 4 deletions configure
Expand Up @@ -4201,15 +4201,42 @@ done
# ----------- platform-specific code ------------- # ----------- platform-specific code -------------
# $target is typically processor-vendor-os # $target is typically processor-vendor-os
case "$target" in case "$target" in
# linux
*86*linux*|*86*freebsd*|*86*openbsd*|*86*darwin*) *86*linux*)
echo "$as_me:$LINENO: result: configuring for linux/x86" >&5 echo "$as_me:$LINENO: result: configuring for linux/x86" >&5
echo "${ECHO_T}configuring for linux/x86" >&6 echo "${ECHO_T}configuring for linux/x86" >&6
ARCHOS=x86_LINUX ARCHOS=x86_LINUX
;; ;;
*86*openbsd*)
echo "$as_me:$LINENO: result: configuring for OpenBSD/x86" >&5
echo "${ECHO_T}configuring for OpenBSD/x86" >&6
ARCHOS=x86_OPENBSD
;;
*i386*freebsd*|*amd64*freebsd*)
if test x"${ARCH}" = x""; then
ARCH=`uname -p`
fi
echo "$as_me:$LINENO: result: configuring for freebsd/${ARCH}" >&5
echo "${ECHO_T}configuring for freebsd/${ARCH}" >&6
ARCHOS=${ARCH}_FREEBSD
;;
# Mac OS X # Mac OS X
*86*darwin*)
echo "$as_me:$LINENO: result: configuring for darwin/x86" >&5
echo "${ECHO_T}configuring for darwin/x86" >&6
ARCHOS=x86_DARWIN
;;
*powerpc*darwin*) *powerpc*darwin*)
echo "$as_me:$LINENO: result: configuring for powerpc/darwin" >&5 echo "$as_me:$LINENO: result: configuring for powerpc/darwin" >&5
echo "${ECHO_T}configuring for powerpc/darwin" >&6 echo "${ECHO_T}configuring for powerpc/darwin" >&6
Expand Down Expand Up @@ -4247,14 +4274,16 @@ echo "${ECHO_T}configuring for SPARC/Solaris" >&6
{ { echo "$as_me:$LINENO: error: { { echo "$as_me:$LINENO: error:
Unsupported platform $target -- sorry. Unsupported platform $target -- sorry.
./configure supports these platforms: ./configure supports these platforms:
on x86: Linux, Win32(with Cygwin), freeBSD, openBSD, and Mac OS X on x86: Linux, Win32(with Cygwin), FreeBSD, OpenBSD, and Mac OS X
on amd64: FreeBSD
on PowerPC: Mac OS X on PowerPC: Mac OS X
on SPARC: Solaris on SPARC: Solaris
" >&5 " >&5
echo "$as_me: error: echo "$as_me: error:
Unsupported platform $target -- sorry. Unsupported platform $target -- sorry.
./configure supports these platforms: ./configure supports these platforms:
on x86: Linux, Win32(with Cygwin), freeBSD, openBSD, and Mac OS X on x86: Linux, Win32(with Cygwin), FreeBSD, OpenBSD, and Mac OS X
on amd64: FreeBSD
on PowerPC: Mac OS X on PowerPC: Mac OS X
on SPARC: Solaris on SPARC: Solaris
" >&2;} " >&2;}
Expand Down
31 changes: 28 additions & 3 deletions configure.in
Expand Up @@ -384,14 +384,38 @@ AC_CHECK_FUNCS(mkdir select socket __sysv_signal)
# ----------- platform-specific code ------------- # ----------- platform-specific code -------------
# $target is typically processor-vendor-os # $target is typically processor-vendor-os
case "$target" in case "$target" in
# linux
*86*linux*|*86*freebsd*|*86*openbsd*|*86*darwin*) *86*linux*)
AC_MSG_RESULT(configuring for linux/x86) AC_MSG_RESULT(configuring for linux/x86)


ARCHOS=x86_LINUX ARCHOS=x86_LINUX
;; ;;


*86*openbsd*)
AC_MSG_RESULT(configuring for OpenBSD/x86)

ARCHOS=x86_OPENBSD
;;

*i386*freebsd*|*amd64*freebsd*)

if test x"${ARCH}" = x""; then
ARCH=`uname -p`
fi

AC_MSG_RESULT(configuring for freebsd/${ARCH})

ARCHOS=${ARCH}_FREEBSD
;;


# Mac OS X # Mac OS X
*86*darwin*)
AC_MSG_RESULT(configuring for darwin/x86)

ARCHOS=x86_DARWIN
;;

*powerpc*darwin*) *powerpc*darwin*)
AC_MSG_RESULT(configuring for powerpc/darwin, which we treat like linux/x86) AC_MSG_RESULT(configuring for powerpc/darwin, which we treat like linux/x86)


Expand Down Expand Up @@ -426,7 +450,8 @@ case "$target" in
AC_MSG_ERROR([ AC_MSG_ERROR([
Unsupported platform $target -- sorry. Unsupported platform $target -- sorry.
./configure supports these platforms: ./configure supports these platforms:
on x86: Linux, Win32(with Cygwin), freeBSD, openBSD, and Mac OS X on x86: Linux, Win32(with Cygwin), FreeBSD, OpenBSD, and Mac OS X
on amd64: FreeBSD
on PowerPC: Mac OS X on PowerPC: Mac OS X
on SPARC: Solaris on SPARC: Solaris
]) ])
Expand Down
10 changes: 7 additions & 3 deletions doc/cil.tex
Expand Up @@ -282,9 +282,11 @@ \section{Installation}
\item On Linux, using \t{gcc} version 2.95.3, 3.0, 3.2, 3.3, and 4.0. \item On Linux, using \t{gcc} version 2.95.3, 3.0, 3.2, 3.3, and 4.0.
\end{itemize} \end{itemize}


Others have successfully used CIL with Mac OS X (on both PowerPC and Others have successfully used CIL on x86 processors with Mac OS X,
x86), Solaris, and *BSD. If you make any changes to the build FreeBSD and OpenBSD; on amd64 processors with FreeBSD; on SPARC
system in order to run CIL on your platform, please send us a patch. processors with Solaris; and on PowerPC processors with Mac OS X. If
you make any changes to the build system in order to run CIL on your
platform, please send us a patch.


\subsection{Building CIL on Windows with Microsoft Visual C} \subsection{Building CIL on Windows with Microsoft Visual C}


Expand Down Expand Up @@ -3121,6 +3123,8 @@ \section{Bug reports}


\section{Changes}\label{sec-changes}\cutname{changes.html} \section{Changes}\label{sec-changes}\cutname{changes.html}
\begin{itemize} \begin{itemize}
\item {\bf August 6, 2006}: Joseph Koshy patched \t{./configure} for
FreeBSD on amd64.
\item {\bf July 27, 2006}: CIL files now include the prototypes of \item {\bf July 27, 2006}: CIL files now include the prototypes of
builtin functions (such as \t{\_\_builtin\_va\_arg}). This builtin functions (such as \t{\_\_builtin\_va\_arg}). This
preserves the invariant that every function call has a corresponding preserves the invariant that every function call has a corresponding
Expand Down

0 comments on commit 63fbce2

Please sign in to comment.