git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Schindelin <johannes.schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: [PATCH v2 0/5] Fix compile errors with MSys2
Date: Thu, 14 Jan 2016 17:51:14 +0100 (CET)	[thread overview]
Message-ID: <cover.1452790142.git.johannes.schindelin@gmx.de> (raw)
In-Reply-To: <cover.1452691805.git.johannes.schindelin@gmx.de>

Git for Windows 2.x is based on MSys2, and its first official version
was released already almost half a year ago, yet it is still impossible
even to compile Git from the official, platform-independent Git source
code.

This patch series merely fixes the compile errors, and will be followed
by other patch series that fix the compile warnings and test failures.
The idea is to move all Windows-specific patches of Git for Windows'
fork to upstream Git proper.

Relative to v1, I only removed the guards about the "#undef
ReadWriteBarrier".

Johannes Schindelin (5):
  config.mak.uname: support MSys2
  config.mak.uname: supporting 64-bit MSys2
  nedmalloc: allow compiling with MSys2's compiler
  compat/mingw: support MSys2-based MinGW build
  compat/winansi: support compiling with MSys2

 compat/mingw.h              | 24 +++++++++++++++++++++++-
 compat/nedmalloc/malloc.c.h |  4 ++++
 compat/winansi.c            |  2 ++
 config.mak.uname            | 31 ++++++++++++++++++++++++++++---
 4 files changed, 57 insertions(+), 4 deletions(-)

Interdiff vs v1:

 diff --git a/compat/nedmalloc/malloc.c.h b/compat/nedmalloc/malloc.c.h
 index 18634e3..bf70037 100644
 --- a/compat/nedmalloc/malloc.c.h
 +++ b/compat/nedmalloc/malloc.c.h
 @@ -1385,9 +1385,7 @@ LONG __cdecl _InterlockedExchange(LONG volatile *Target, LONG Value);
  
    /*** Atomic operations ***/
    #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100
 -    #ifdef __MINGW64_VERSION_MAJOR
 -      #undef _ReadWriteBarrier
 -    #endif
 +    #undef _ReadWriteBarrier
      #define _ReadWriteBarrier() __sync_synchronize()
    #else
      static __inline__ __attribute__((always_inline)) long __sync_lock_test_and_set(volatile long * const Target, const long Value)

-- 
2.7.0.windows.1.7.g55a05c8

  parent reply	other threads:[~2016-01-14 16:51 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-13 13:30 [PATCH 0/5] Fix compile errors with MSys2 Johannes Schindelin
2016-01-13 13:30 ` [PATCH 1/5] config.mak.uname: support MSys2 Johannes Schindelin
2016-01-13 16:11   ` Jeff King
2016-01-13 16:45     ` Johannes Schindelin
2016-01-13 19:23     ` Dennis Kaarsemaker
2016-01-13 13:31 ` [PATCH 2/5] config.mak.uname: supporting 64-bit MSys2 Johannes Schindelin
2016-01-21 10:36   ` SZEDER Gábor
2016-01-21 13:51     ` Johannes Schindelin
2016-01-13 13:31 ` [PATCH 3/5] nedmalloc: allow compiling with MSys2's compiler Johannes Schindelin
2016-01-13 19:28   ` Junio C Hamano
2016-01-13 13:31 ` [PATCH 4/5] compat/mingw: support MSys2-based MinGW build Johannes Schindelin
2016-01-13 13:31 ` [PATCH 5/5] compat/winansi: support compiling with MSys2 Johannes Schindelin
2016-01-13 19:31 ` [PATCH 0/5] Fix compile errors " Junio C Hamano
2016-01-14  6:53   ` Johannes Schindelin
2016-01-14 16:51 ` Johannes Schindelin [this message]
2016-01-14 16:51   ` [PATCH v2 1/5] config.mak.uname: support MSys2 Johannes Schindelin
2016-01-14 21:45     ` Johannes Sixt
2016-01-14 16:51   ` [PATCH v2 2/5] config.mak.uname: supporting 64-bit MSys2 Johannes Schindelin
2016-01-14 16:51   ` [PATCH v2 3/5] nedmalloc: allow compiling with MSys2's compiler Johannes Schindelin
2016-01-14 16:51   ` [PATCH v2 4/5] compat/mingw: support MSys2-based MinGW build Johannes Schindelin
2016-01-14 16:52   ` [PATCH v2 5/5] compat/winansi: support compiling with MSys2 Johannes Schindelin
2016-01-14 20:21   ` [PATCH v2 0/5] Fix compile errors " Junio C Hamano
2016-01-14 21:57   ` Johannes Sixt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=cover.1452790142.git.johannes.schindelin@gmx.de \
    --to=johannes.schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).