[commit: ghc] wip/ghc710-aix: WIP: local random AIX hacks (3c2fb6b)

[git at git.haskell.org]

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

On branch  : wip/ghc710-aix
Link       : http://ghc.haskell.org/trac/ghc/changeset/3c2fb6bbb5d5ae6dd6f22ac669e35c08d1d65ae2/ghc

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

commit 3c2fb6bbb5d5ae6dd6f22ac669e35c08d1d65ae2
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Nov 16 10:19:37 2015 +0100

    WIP: local random AIX hacks


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

3c2fb6bbb5d5ae6dd6f22ac669e35c08d1d65ae2
 aclocal.m4                               |  4 ++--
 ghc.mk                                   |  5 +++++
 mk/build.mk-aix                          | 32 ++++++++++++++++++++++++++++++++
 utils/deriveConstants/DeriveConstants.hs |  2 +-
 4 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index 65ee2cd..11df1de 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -588,8 +588,8 @@ AC_DEFUN([FPTOOLS_SET_C_LD_FLAGS],
         ;;
 
     powerpc-ibm-aix*)
-        $2="$$2 -mminimal-toc -D_THREAD_SAFE"
-        $3="$$3 -mminimal-toc -D_THREAD_SAFE"
+        $2="$$2 -mcpu=power7 -mminimal-toc -D_THREAD_SAFE"
+        $3="$$3 -mcpu=power7 -mminimal-toc -D_THREAD_SAFE"
         $5="$$5 -D_THREAD_SAFE"
         ;;
 
diff --git a/ghc.mk b/ghc.mk
index 9aa0dc3..23bda65 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -556,6 +556,11 @@ endif
 BOOT_LIBS = $(foreach lib,$(PACKAGES_STAGE0),$(libraries/$(lib)_dist-boot_v_LIB))
 
 # ----------------------------------------
+# magic / HVR HACK XXX
+libraries/base_CONFIGURE_OPTS += --configure-option=--disable-largefile
+libraries/unix_CONFIGURE_OPTS += --configure-option=--disable-largefile
+
+# ----------------------------------------
 # Special magic for the ghc-prim package
 
 # We want the ghc-prim package to include the GHC.Prim module when it
diff --git a/mk/build.mk-aix b/mk/build.mk-aix
new file mode 100644
index 0000000..d0464a2
--- /dev/null
+++ b/mk/build.mk-aix
@@ -0,0 +1,32 @@
+GhcLibWays = v
+
+GhcUnregisterised    = YES
+GhcWithNativeCodeGen = NO
+GhcThreaded          = NO
+
+INTEGER_LIBRARY    = integer-simple
+Stage1Only         = YES
+#stage=1
+
+DYNAMIC_BY_DEFAULT   = NO
+DYNAMIC_GHC_PROGRAMS = NO
+
+SRC_HC_OPTS          = -O -H64m
+GhcStage1HcOpts      = -O
+GhcStage2HcOpts      = -O
+GhcHcOpts            = -Rghc-timing
+GhcLibHcOpts         = -O
+
+SplitObjs            = NO
+HADDOCK_DOCS         = NO
+BUILD_DOCBOOK_HTML   = NO
+BUILD_DOCBOOK_PS     = NO
+BUILD_DOCBOOK_PDF    = NO
+#GhcLibWays     += p
+
+# NoFib settings
+NoFibWays =
+STRIP_CMD = :
+
+#
+#compiler/stage2/build/Parser_HC_OPTS += -optc-mfull-toc
diff --git a/utils/deriveConstants/DeriveConstants.hs b/utils/deriveConstants/DeriveConstants.hs
index ccf9028..c2eef33 100644
--- a/utils/deriveConstants/DeriveConstants.hs
+++ b/utils/deriveConstants/DeriveConstants.hs
@@ -662,7 +662,7 @@ getWanted verbose tmpdir gccProgram gccFlags nmProgram
          execute verbose gccProgram (gccFlags ++ ["-c", cFile, "-o", oFile])
          xs <- case os of
                  "openbsd" -> readProcess "/usr/bin/objdump" ["--syms", oFile] ""
-                 _         -> readProcess nmProgram ["-P", oFile] ""
+                 _         -> readProcess (nmProgram ++ "2") ["-P", oFile] ""
 
          let ls = lines xs
              ms = map parseNmLine ls