Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f94ca351988c^
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cbb446e44d69
Choose a head ref
  • 2 commits
  • 6 files changed
  • 1 contributor

Commits on Sep 26, 2019

  1. ghc: compile with DWARF support by default 

    This allows our GHCs to build programs with DWARF debug information
when -g is passed, see https://ghc.haskell.org/trac/ghc/wiki/DWARF.

Compiling with debug symbols is off by default until GHC ticket
https://gitlab.haskell.org/ghc/ghc/issues/15960
(Using -g causes differences in generated core) is fixed.
    @domenkozar
    domenkozar committed Sep 26, 2019
    Copy the full SHA
    f94ca35 View commit details

Commits on Sep 27, 2019

  1. WIP patch for linking with dwarf

    @domenkozar
    domenkozar committed Sep 27, 2019
    Copy the full SHA
    cbb446e View commit details
12 changes: 11 additions & 1 deletion pkgs/development/compilers/ghc/8.4.4.nix
View file
Original file line number Diff line number Diff line change
@@ -7,6 +7,9 @@

, libiconv ? null, ncurses

, enableDwarf ? !stdenv.targetPlatform.isDarwin &&
!stdenv.targetPlatform.isWindows, elfutils # for DWARF support

, useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform)
, # LLVM is conceptually a run-time-only depedendency, but for
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
@@ -71,7 +74,8 @@ let
# Splicer will pull out correct variations
libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
++ stdenv.lib.optional (!enableIntegerSimple) gmp
++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv
++ stdenv.lib.optional enableDwarf elfutils;

toolsForTarget = [
pkgsBuildTarget.targetPackages.stdenv.cc
@@ -108,6 +112,10 @@ stdenv.mkDerivation (rec {
name = "D4388.diff";
sha256 = "0w6sdcvnqjlnlzpvnzw20b80v150ijjyjvs9548ildc1928j0w7s";
})
# Combination backport of
# https://git.haskell.org/ghc.git/commitdiff_plain/cb882fc993b4972f7f212b291229ef9e9ade0af9
# https://git.haskell.org/ghc.git/commitdiff_plain/126aa794743b807b7447545697b96dd165ec3e16
++ stdenv.lib.optional enableDwarf ./ghc-Require-libdw-for-enable-dwarf-unwind-fixed-comma.patch
++ stdenv.lib.optional stdenv.isDarwin ./backport-dylib-command-size-limit.patch
++ stdenv.lib.optional (targetPlatform.isAarch32 || targetPlatform.isAarch64) (fetchpatch {
url = "https://git.haskell.org/ghc.git/patch/d8495549ba9d194815c2d0eaee6797fc7c00756a";
@@ -180,6 +188,8 @@ stdenv.mkDerivation (rec {
] ++ stdenv.lib.optionals (targetPlatform.isDarwin && targetPlatform.isAarch64) [
# fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
"--disable-large-address-space"
] ++ stdenv.lib.optional enableDwarf [
"--enable-dwarf-unwind"
];

# Make sure we never relax`$PATH` and hooks support for compatability.
17 changes: 15 additions & 2 deletions pkgs/development/compilers/ghc/8.6.5.nix
View file
Original file line number Diff line number Diff line change
@@ -7,6 +7,9 @@

, libiconv ? null, ncurses

, enableDwarf ? !stdenv.targetPlatform.isDarwin &&
!stdenv.targetPlatform.isWindows, elfutils # for DWARF support

, # GHC can be built with system libffi or a bundled one.
libffi ? null

@@ -76,7 +79,8 @@ let
libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
++ [libffi]
++ stdenv.lib.optional (!enableIntegerSimple) gmp
++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv
++ stdenv.lib.optional enableDwarf elfutils;

toolsForTarget = [
pkgsBuildTarget.targetPackages.stdenv.cc
@@ -111,7 +115,12 @@ stdenv.mkDerivation (rec {
extraPrefix = "utils/haddock/";
stripLen = 1;
})
];
]
# Combination backport of
# https://git.haskell.org/ghc.git/commitdiff_plain/cb882fc993b4972f7f212b291229ef9e9ade0af9
# https://git.haskell.org/ghc.git/commitdiff_plain/126aa794743b807b7447545697b96dd165ec3e16
++ stdenv.lib.optional enableDwarf ./ghc-Require-libdw-for-enable-dwarf-unwind-fixed-comma.patch
;

postPatch = "patchShebangs .";

@@ -137,6 +146,8 @@ stdenv.mkDerivation (rec {
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
'' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
'' + stdenv.lib.optionalString enableDwarf ''
export NIX_LDFLAGS+=" -L${elfutils}/lib"
'' + stdenv.lib.optionalString stdenv.isDarwin ''
export NIX_LDFLAGS+=" -no_dtrace_dof"
'' + stdenv.lib.optionalString targetPlatform.useAndroidPrebuilt ''
@@ -179,6 +190,8 @@ stdenv.mkDerivation (rec {
"CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
"--disable-large-address-space"
] ++ stdenv.lib.optional enableDwarf [
"--enable-dwarf-unwind"
];

# Make sure we never relax`$PATH` and hooks support for compatability.
20 changes: 16 additions & 4 deletions pkgs/development/compilers/ghc/8.8.1.nix
View file
Original file line number Diff line number Diff line change
@@ -2,11 +2,14 @@

# build-tools
, bootPkgs
, autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx
, autoconf, autoreconfHook, automake, coreutils, fetchurl, perl, python3, m4, sphinx
, bash

, libiconv ? null, ncurses

, enableDwarf ? !stdenv.targetPlatform.isDarwin &&
!stdenv.targetPlatform.isWindows, elfutils # for DWARF support

, # GHC can be built with system libffi or a bundled one.
libffi ? null

@@ -76,7 +79,8 @@ let
libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
++ [libffi]
++ stdenv.lib.optional (!enableIntegerSimple) gmp
++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv
++ stdenv.lib.optional enableDwarf elfutils;

toolsForTarget = [
pkgsBuildTarget.targetPackages.stdenv.cc
@@ -150,7 +154,7 @@ stdenv.mkDerivation (rec {
# `--with` flags for libraries needed for RTS linker
configureFlags = [
"--datadir=$doc/share/doc/ghc"
"--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
"--with-curses-libraries=${ncurses.out}/lib"
] ++ stdenv.lib.optionals (libffi != null) ["--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib"
] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [
"--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib"
@@ -164,16 +168,24 @@ stdenv.mkDerivation (rec {
"CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
"--disable-large-address-space"
] ++ stdenv.lib.optional enableDwarf [
"--enable-dwarf-unwind"
"--with-libdw-includes=${stdenv.lib.getDev elfutils}/include"
"--with-libdw-libs=${stdenv.lib.getLib elfutils}/lib"
];

# Make sure we never relax`$PATH` and hooks support for compatability.
strictDeps = true;

patches = [
./ghc-dwarf-with.patch
];

# Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself.
dontAddExtraLibs = true;

nativeBuildInputs = [
perl autoconf automake m4 python3 sphinx
perl autoconf autoreconfHook automake m4 python3 sphinx
ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
];

41 changes: 41 additions & 0 deletions pkgs/development/compilers/ghc/ghc-Require-libdw-for-enable-dwarf-unwind-fixed-comma.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
From: Alec Theriault <alec.theriault@gmail.com>
Date: Sat, 8 Dec 2018 04:18:15 +0000 (-0500)
Subject: Require 'libdw' for '--enable-dwarf-unwind'
X-Git-Url: https://git.haskell.org/ghc.git/commitdiff_plain/cb882fc993b4972f7f212b291229ef9e9ade0af9

Require 'libdw' for '--enable-dwarf-unwind'

This causes './configure --enable-dwarf-unwind' to exit with a helpful
error message when 'libdw' cannot be found (compared to the previous
behaviour of silently pretending the user hadn't requested DWARF support
at all).

Test Plan: ./configure --enable-dwarf-unwind # on systems with/without
libdw

Reviewers: bgamari, nh2

Reviewed By: nh2

Subscribers: nh2, rwbarton, erikd, carter

GHC Trac Issues: #15968

Differential Revision: https://phabricator.haskell.org/D5424
---

diff --git a/configure.ac b/configure.ac
index 88eddca..2cf98a7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1248,7 +1248,9 @@ USE_LIBDW=0
AC_ARG_ENABLE(dwarf-unwind,
[AC_HELP_STRING([--enable-dwarf-unwind],
[Enable DWARF unwinding support in the runtime system via elfutils' libdw [default=no]])],
- [AC_CHECK_LIB(dw, dwfl_attach_state, [UseLibdw=YES], [UseLibdw=NO])],
+ [AC_CHECK_LIB(dw, dwfl_attach_state,
+ [UseLibdw=YES],
+ [AC_MSG_ERROR([Cannot find system libdw (required by --enable-dwarf-unwind)])])],
[UseLibdw=NO]
)
AC_SUBST(UseLibdw)
50 changes: 50 additions & 0 deletions pkgs/development/compilers/ghc/ghc-dwarf-with.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
diff --git a/configure.ac b/configure.ac
index e4c4b02fb4..ddf6d3f27c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1236,16 +1236,38 @@ AC_DEFINE_UNQUOTED([RTS_LINKER_USE_MMAP], [$RtsLinkerUseMmap],

dnl ** Have libdw?
dnl --------------------------------------------------------------
+AC_ARG_WITH([libdw-libs],
+ [AC_HELP_STRING([--with-libdw-libs=ARG],
+ [Find libraries for libdw in ARG [default=system default]])
+ ],
+ [LIBDW_LDFLAGS="-L$withval"])
+
+AC_ARG_WITH([libdw-includes],
+ [AC_HELP_STRING([--with-libdw-includes=ARG],
+ [Find includes for libdw in ARG [default=system default]])
+ ],
+ [LIBDW_CFLAGS="-I$withval"])
+
UseLibdw=NO
USE_LIBDW=0
AC_ARG_ENABLE(dwarf-unwind,
[AC_HELP_STRING([--enable-dwarf-unwind],
- [Enable DWARF unwinding support in the runtime system via elfutils' libdw [default=no]])],
- [AC_CHECK_LIB(dw, dwfl_attach_state,
- [UseLibdw=YES],
- [AC_MSG_ERROR([Cannot find system libdw (required by --enable-dwarf-unwind)])])],
- [UseLibdw=NO]
-)
+ [Enable DWARF unwinding support in the runtime system via elfutils' libdw [default=no]])])
+if test "$enable_dwarf_unwind" = "yes" ; then
+ CFLAGS2="$CFLAGS"
+ CFLAGS="$LIBDW_CFLAGS $CFLAGS"
+ LDFLAGS2="$LDFLAGS"
+ LDFLAGS="$LIBDW_LDFLAGS $LDFLAGS"
+
+ AC_CHECK_LIB(dw, dwfl_attach_state,
+ [AC_CHECK_HEADERS([dw.h], [dwfl_attach_state], [])
+ UseLibdw=YES],
+ [AC_MSG_ERROR([Cannot find system libdw (required by --enable-dwarf-unwind)])])
+
+ CFLAGS="$CFLAGS2"
+ LDFLAGS="$LDFLAGS2"
+fi
+
AC_SUBST(UseLibdw)
if test $UseLibdw = "YES" ; then
USE_LIBDW=1

8 changes: 7 additions & 1 deletion pkgs/development/compilers/ghc/head.nix
View file
Original file line number Diff line number Diff line change
@@ -7,6 +7,9 @@

, libiconv ? null, ncurses

, enableDwarf ? !stdenv.targetPlatform.isDarwin &&
!stdenv.targetPlatform.isWindows, elfutils # for DWARF support

, useLLVM ? !stdenv.targetPlatform.isx86
, # LLVM is conceptually a run-time-only depedendency, but for
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
@@ -73,7 +76,8 @@ let
# Splicer will pull out correct variations
libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
++ stdenv.lib.optional (!enableIntegerSimple) gmp
++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv
++ stdenv.lib.optional enableDwarf elfutils;

toolsForTarget = [
pkgsBuildTarget.targetPackages.stdenv.cc
@@ -176,6 +180,8 @@ stdenv.mkDerivation (rec {
"CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
] ++ stdenv.lib.optionals (disableLargeAddressSpace) [
"--disable-large-address-space"
] ++ stdenv.lib.optional enableDwarf [
"--enable-dwarf-unwind"
];

# Make sure we never relax`$PATH` and hooks support for compatability.