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/nix
base: bbdf08bc0fac
Choose a base ref
...
head repository: NixOS/nix
compare: fe38fce2d843
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 31, 2017

  1. src/libmain/stack.cc: fix 'ucontext' usage on glibc-2.26

    Build fails as:
    
    $ make
      CXX    src/libmain/stack.o
    src/libmain/stack.cc: In function 'void nix::sigsegvHandler(int, siginfo_t*, void*)':
    src/libmain/stack.cc:21:21: error: 'ucontext' was not declared in this scope
         sp = (char *) ((ucontext *) ctx)->uc_mcontext.gregs[REG_RSP];
                         ^~~~~~~~
    src/libmain/stack.cc:21:21: note: suggested alternative: 'ucontext_t'
         sp = (char *) ((ucontext *) ctx)->uc_mcontext.gregs[REG_RSP];
                         ^~~~~~~~
                         ucontext_t
    
    It's caused by upstream rename:
    https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=251287734e89a52da3db682a8241eb6bccc050c9
    
    which basically changes
        typedef struct ucontext {} ucontext_t;
    to
        typedef struct ucontext_t {} ucontext_t;
    
    The change uses ucontext_t.
    
    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
    Sergei Trofimovich committed Aug 31, 2017
    Configuration menu
    Copy the full SHA
    c9857ef View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2017

  1. Merge pull request #1545 from trofi/glibc-2.26

    src/libmain/stack.cc: fix 'ucontext' usage on glibc-2.26
    edolstra committed Sep 1, 2017
    Configuration menu
    Copy the full SHA
    fe38fce View commit details
    Browse the repository at this point in the history