adam authored 6 years ago and Ben Gamari committed 6 years ago

Also updates the windows gitlab ci to use the new configure variables.

Sergei Trofimovich authored 6 years ago and Ben Gamari committed 6 years ago

Summary:
Initially -fno-stack-protector was added for openbsd specifically for ghc-6.5:
    changeset:f638fdfe (2006)
and later it was extended to cover osx:
    changeset:c2cd83e7 (2009)

None of the reports hint at exact breakage. I guess both happened
in -fvia-C mode where GHC's Evil Mangler had a chance to mangle
stack canaries generated by fstack-protector.

ghc has no evil mangler anymore and the change is not needed
at least for C codegen.

validated the patch on OpenBSD-6.4. No new failures compared to
clean master branch.

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>

Test Plan: validated on OpenBSD

Reviewers: bgamari

Subscribers: rwbarton, erikd, carter

GHC Trac Issues: #16046

Differential Revision: https://phabricator.haskell.org/D5465

This is generally terrible: see #16025. In short, we previously just blindly
used an un-prefixed ld for LD_NO_GOLD. This is blatantly wrong. Ideally we would
actually verify that ld.gold is indeed broken (by binutils #22266) before
insisting on using another linker but sadly we cannot do so when cross-compiling
since this would require running host code.

For now we simply disable the LD_NO_GOLD logic when cross-compiling and hope
that the user has verified that their ld.gold isn't affected by #22266.

Simon Jakobi authored 6 years ago and Ben Gamari committed 6 years ago

Current versions of Alex don't seem to produce as many warnings any
more.

In order to silence a warning and to avoid overlong lines, I've taken
the liberty of refactoring 'tok_num'.

Test Plan: ./validate

Reviewers: bgamari, simonmar

Reviewed By: simonmar

Subscribers: erikd, rwbarton, carter

Differential Revision: https://phabricator.haskell.org/D5319

Sylvain Henry authored 6 years ago and Krzysztof Gogolewski committed 6 years ago

When we use a git subtree, .git is a file, not a directory.
The script was already fixed for the commit ID but not for its date.

PR: https://github.com/ghc/ghc/pull/212/

Ondra Pelech authored 6 years ago and Krzysztof Gogolewski committed 6 years ago

PR: https://github.com/ghc/ghc/pull/198/

Sergei Trofimovich authored 6 years ago and Krzysztof Gogolewski committed 6 years ago

Summary:
Reported-by: Evan Laforge
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>

Reviewers: bgamari

Subscribers: rwbarton, erikd, carter

Differential Revision: https://phabricator.haskell.org/D5171

This commit was never properly justified and relies on the existence of
libatomic, which doesn't appear to exist on Darwin.

This reverts commit ec9aacf3.

Sylvain Henry authored 6 years ago and Krzysztof Gogolewski committed 6 years ago

Summary: When using a Git worktree, ".git" is a file, not a directory

Reviewers: bgamari, monoidal

Reviewed By: monoidal

Subscribers: rwbarton, thomie, erikd, carter

Differential Revision: https://phabricator.haskell.org/D5016

Two minor changes:
- 32-bit CPU macro is called riscv32_HOST_ARCH (was riscv_HOST_ARCH)
- shrink understood tuples from riscv* to riscv-* and riscv32*-* as
  a tiny safeguard against riscv128*- in future.

Suggested-by: James Clarke <jrtc27@jrtc27.com>
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>

Tested on riscv64-unknown-linux-gnu tuple.

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>

Test Plan: Tested on armv6, armv7 and aarch64 on FreeBSD 12-CURRENT.

Reviewers: bgamari

Reviewed By: bgamari

Subscribers: rwbarton, thomie, erikd, carter

Differential Revision: https://phabricator.haskell.org/D4810

Ben Gamari authored 6 years ago and Ben Gamari committed 6 years ago

Clang throws a warning instead of an error when it is passed -no-pie,

    clang: warning: argument unused during compilation: '-nopie'
    [-Wunused-command-line-argument]

Consequently configure concludes that it supports -no-pie. However, this
will fail when used with -Werror. The solution is to simply use -Werror
in the configure check.

Thanks to @goldfire for reporting this.

Reviewers: hvr

Subscribers: thomie, carter, goldfire

Differential Revision: https://phabricator.haskell.org/D4557

Alp Mestanogullari authored 6 years ago and Tamar Christina committed 6 years ago

Summary:
This patch affects several files that affect how we detect mingw and perl
on Windows. The initial motivation is:

    https://github.com/snowleopard/hadrian/issues/564

where, with Hadrian building relocatable (non-inplace) GHCs, the current
detection mechanism falls short by e.g only trying $topdir/../mingw. But
in Hadrian, for reasons given in that issue, we would need to store e.g mingw
under $topdir/../../mingw except for binary distributions, where we want
to follow the existing structure, in which case $topdir/../mingw is correct. So
we need to support both, which is what this patch hopefully implements.

Test Plan: ./validate

Reviewers: Phyx, hvr, bgamari, erikd

Reviewed By: Phyx

Subscribers: snowleopard, thomie, carter

Differential Revision: https://phabricator.haskell.org/D4598

Ben Gamari authored 6 years ago and Ben Gamari committed 6 years ago

Test Plan: Try running configure on Windows with msys and mingw
toolchains

Reviewers: Phyx, hvr

Reviewed By: Phyx

Subscribers: rwbarton, thomie, erikd, carter

Differential Revision: https://phabricator.haskell.org/D4526

John Ericson authored 6 years ago and Ben Gamari committed 6 years ago

Reviewers: hvr, bgamari, angerman

Reviewed By: angerman

Subscribers: rwbarton, thomie, erikd, carter, angerman

Differential Revision: https://phabricator.haskell.org/D4513

Ben Gamari authored 7 years ago and Ben Gamari committed 7 years ago

Summary: OpenIndiana apparently reports a triple of i386-pc-solaris2.11.

Reviewers: hvr

Subscribers: rwbarton, thomie, erikd, carter

Differential Revision: https://phabricator.haskell.org/D4487

ghc treats OSUnknown (and GNU/Hurd) as non-ELF target.
This causes panic in native codegenerator when trying
to build PIC code:

```
  ...
  -- all other platforms
  howToAccessLabel dflags _ _ _ _ _
        | not (positionIndependent dflags)
        = AccessDirectly
        | otherwise
        = panic "howToAccessLabel: PIC not defined for this platform"
```

This change declares new 'OSHurd' and marks it as an
ELF target. Fixes building ghc-stage2 on i686-unknown-gnu0.9.

Patch provided by "Pino" via Samuel Thibault and taken from
debian.

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>

Running plain ./configure fails on hurd because
./config.guess reports unrecognised tuple:
    $ ./config.guess
    i686-unknown-gnu0.9

The change makes the following target configure:
$ ./configure --target=i686-unknown-gnu0.9

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>

Ben Gamari authored 7 years ago and Ben Gamari committed 7 years ago

Reviewers: hvr

Subscribers: rwbarton, thomie, erikd, carter

Differential Revision: https://phabricator.haskell.org/D4483

Ben Gamari authored 7 years ago and Ben Gamari committed 7 years ago

Test Plan: `./configure --disable-ld-override; make; make install`

Reviewers: trofi, hvr

Reviewed By: trofi

Subscribers: rwbarton, thomie, erikd, carter, simonmar

GHC Trac Issues: #14675

Differential Revision: https://phabricator.haskell.org/D4448

Summary:
ld.gold is buggy when using -r and a linker script.  See upstream bug
https://sourceware.org/bugzilla/show_bug.cgi?id=22266

This has been causing various brokenness for the GHC runtime linker,
where we load these broken object files.

Test Plan: Test program from #14675

Reviewers: bgamari, RyanGlScott, alpmestan, hvr, erikd

Subscribers: rwbarton, thomie, erikd, carter

GHC Trac Issues: #14328, #14675, #14291

Differential Revision: https://phabricator.haskell.org/D4431

Reviewers: bgamari, hvr

Reviewed By: bgamari

Subscribers: erikd, hvr, rwbarton, thomie, carter

Differential Revision: https://phabricator.haskell.org/D4378

Ben Gamari authored 7 years ago and Ben Gamari committed 7 years ago

GCC's __sync primitives apparently "usually" imply a full barrier,
meaning they can be used to emulate the more precise C11 atomics albeit
with a loss of efficiency. This restores compatibility with GCC 4.4.

This partially reverts commit 59de2909.

Test Plan: Validate on Centos

Reviewers: hvr, simonmar, trommler

Subscribers: rwbarton, thomie, erikd, carter

GHC Trac Issues: #14244

Differential Revision: https://phabricator.haskell.org/D4364

With this change unregisterised port can already produce minimal
executables:
    ELF 32-bit LSB executable, Altera Nios II, version 1 (SYSV),
    dynamically linked, interpreter /lib/ld-linux-nios2.so.1

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>

Ben Gamari authored 7 years ago and Ben Gamari committed 7 years ago

FP_PROG_AR_ARGS appears to be probing for what flags to use to build an
archive with an index. However, none of the flags that it probed
previously were valid as they all started with `c`, which isn't a mode
character. This went unnoticed until someone attempted to use LLVM ar
since we have a special case for gnu ar.

Additionally, we work around a bug in llvm-ar 5.0 where ar will exit
with code 0 even if it fails to parse the command line. Silliness.

I believe these should rather all be mode `q` however I'll need to test
this on a few platforms to be certain.

Test Plan: Validate on OS X, BSD, and Linux with binutils and llvm ar

Reviewers: hvr

Subscribers: rwbarton, thomie, erikd

Differential Revision: https://phabricator.haskell.org/D4214

Moritz Angermann authored 7 years ago and Ben Gamari committed 7 years ago

This is in preparation for cabalification of the `rts`. To be actually
able to parse this file, a rather recent Cabal is required. One after
commit 357d49d of haskell/cabal. The relevant PR to support the new
`asm-sources` and `cmm-sources` is haskell/cabal/pull/4857.

Not that this does *not* allow cabal to build the RTS. It does however
provide enough information such that cabal can `copy` and `register`
the package properly in the package database, if all the build
artifacts have been build properly.

As such it does not require any custom handling of the `rts` package.
As the rts as well as all the other packages built by the GHC built
system are built outside of cabal anyway.

Reviewers: bgamari, hvr, erikd, simonmar

Reviewed By: bgamari

Subscribers: rwbarton, thomie, erikd

Differential Revision: https://phabricator.haskell.org/D4174

Peter Trommler authored 7 years ago and Ben Gamari committed 7 years ago

Fixing #14244 required the newer gcc atomic built-ins that are provided
from 4.7 and up. This updates the test to check for minimum gcc version
4.7.

The version tests for 3.4 (!), 4.4, and 4.6 are no longer needed and can
be removed. This makes the build system simpler.

Test Plan: validate

Reviewers: austin, bgamari, hvr, simonmar

Reviewed By: bgamari

Subscribers: rwbarton, thomie, erikd

Differential Revision: https://phabricator.haskell.org/D4165

Ben Gamari authored 7 years ago and Ben Gamari committed 7 years ago

It seems that some Apple LLVM wrappers emit multiple messages containing
the string "version", which we previously used to find the version
number.  For instance,

    Configured with: --prefix=/Applications/Xcode.app/Contents/...
    Apple LLVM version 9.0.0 (clang-900.0.37)
    Target: x86_64-apple-darwin16.7.0
    Thread model: posix
    InstalledDir: /Applications/Xcode.app/Contents/Developer/...
    Found CUDA installation: /usr/local/cuda, version 8.0

We now take care to only look at the first occurrence of this string.

New `sed` command due to @merijn.

Test Plan: Validate on all the compilers

Reviewers: austin, hvr

Subscribers: rwbarton, thomie, merijn, erikd

Differential Revision: https://phabricator.haskell.org/D4069

Summary:
For some reson, the `*`, that was supposed to be in D4031
got lost in the diff.

Reviewers: bgamari, austin, hvr, dfeuer

Reviewed By: dfeuer

Subscribers: rwbarton, thomie, erikd

Differential Revision: https://phabricator.haskell.org/D4044

Ben Gamari authored 7 years ago and Ben Gamari committed 7 years ago

Previously if we had both ld.lld and ld.gold installed but a gcc which
didn't support -fuse-ld=lld we would fail when trying ld.lld and fall
immediately back to plain ld. Now we will try ld.gold as well. This was
brought to light by #14280, where using ld.bfd resulted in a broken
stage2 compiler.

Test Plan: Configure

Reviewers: angerman, hvr, austin

Reviewed By: angerman

Subscribers: rwbarton, thomie, erikd

GHC Trac Issues: #14280

Differential Revision: https://phabricator.haskell.org/D4038

Summary:
Our usual GHC_CONVERT_OS macro, will turn any andoird* into android.
This however drops the essential androideabi part. As such for the
GHC_LLVM_TARGET we only convert the VENDOR, not the OS.

Reviewers: bgamari, austin, hvr

Reviewed By: bgamari

Subscribers: rwbarton, thomie, erikd

Differential Revision: https://phabricator.haskell.org/D4031

Ben Gamari authored 7 years ago and Ben Gamari committed 7 years ago

Previously we didn't specify the prog-not-found value passed to
AC_CHECK_TOOLS.  Reported by @snowleopard in
https://github.com/snowleopard/hadrian/issues/415.

Test Plan: validate

Reviewers: austin, hvr

Subscribers: rwbarton, thomie, snowleopard, erikd

Differential Revision: https://phabricator.haskell.org/D3992

Moritz Angermann authored 7 years ago and Tamar Christina committed 7 years ago

Summary:
This fixes hadrian#420 (https://github.com/snowleopard/hadrian/issues/420)

specifically the "Unknown OS mingw64".

Reviewers: austin, hvr, bgamari, Phyx

Reviewed By: Phyx

Subscribers: rwbarton, thomie, erikd

Differential Revision: https://phabricator.haskell.org/D4016

Summary:
Ar was being checked twice prior to D3883 where I removed one of the checks
because the converted path was being overridden after the check because of
the second check for Ar. However the one in configure.ac was a target check
so I'm changing the path check to a target check now.

Test Plan: ./configure

Reviewers: angerman, austin, hvr, bgamari

Reviewed By: bgamari

Subscribers: rwbarton, thomie, erikd

GHC Trac Issues: #14274

Differential Revision: https://phabricator.haskell.org/D4020

Summary:
This should help resolve the
compilcation that came up in Trac #14261

Test Plan: validate on various platforms

Reviewers: trofi, bgamari, austin, hvr

Reviewed By: trofi

Subscribers: rwbarton, thomie, erikd

GHC Trac Issues: #14261

Differential Revision: https://phabricator.haskell.org/D4004

The only reason I noticed is warning these lines on linux:

```
$ ./configure --target=sparc-unknown-linux-gnu
...
./configure: line 9708: cygpath: command not found
./configure: line 9708: ArCmd: command not found
```

POSIX shell syntax requires no spaces in assignments.
Fixed guarding condition while at it.

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>

Moritz Angermann authored 7 years ago and Ben Gamari committed 7 years ago

Hopefully we can get rid of libtool, by using ar only

Depends on:  D3579

Test Plan: validate

Reviewers: austin, hvr, bgamari, erikd

Reviewed By: bgamari

Subscribers: rwbarton, thomie, erikd

Differential Revision: https://phabricator.haskell.org/D3721