[commit: ghc] master: Unbreak the build on FreeBSD/i386, where the default target arch is i486. (7aabfa6)

git at git.haskell.org git at git.haskell.org
Mon Jul 21 20:28:39 UTC 2014


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/7aabfa6292c2469cf3250e006869273fb1b356ce/ghc

>---------------------------------------------------------------

commit 7aabfa6292c2469cf3250e006869273fb1b356ce
Author: Gabor Pali <pali.gabor at gmail.com>
Date:   Mon Jul 21 22:13:24 2014 +0200

    Unbreak the build on FreeBSD/i386, where the default target arch is i486.
    
    The recent version of ghc-prim assumes a more modern processor as it
    exploits built-in atomic operations, and some of them are not yet
    present on i486.  Hence the -march flag is explicitly set to i686 for the
    C compiler -- just to be in sync with the default of other distributions.


>---------------------------------------------------------------

7aabfa6292c2469cf3250e006869273fb1b356ce
 aclocal.m4 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/aclocal.m4 b/aclocal.m4
index 42f760c..394e405 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -529,6 +529,9 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS],
     i386-unknown-mingw32)
         $2="$$2 -march=i686"
         ;;
+    i386-portbld-freebsd*)
+        $2="$$2 -march=i686"
+        ;;
     i386-apple-darwin)
         $2="$$2 -m32"
         $3="$$3 -m32"



More information about the ghc-commits mailing list