From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: jens persson <jens@persson.cx>
Cc: git <git@vger.kernel.org>
Subject: Re: [PATCH] sha1dc: fix for compiling on AIX using IBM XLC compiler
Date: Wed, 09 May 2018 14:11:43 +0200 [thread overview]
Message-ID: <87603xxc3k.fsf@evledraar.gmail.com> (raw)
In-Reply-To: <CAEoyyNJPZXUKi3W=Gs=3v8i4YnTL47G9oaHDoV5pvCLx78jUVQ@mail.gmail.com>
On Wed, May 09 2018, jens persson wrote:
> Hello, first patch. I'm having trouble compiling on AIX using IBMs
> compiler, leading to
> unusable binaries. The following patch solved the problem for 2.17.0.
> The patch below is cut&pasted via gmail to allow for firewalls, but
> exists in an unmolested form on github:
> https://github.com/MrShark/git/commit/44bfcaca6637e24548ec06f46fb6035a846b14af
>
> Best regards
> /jp
>
> Building on AIX using XLC every checkout gives an error:
> fatal: pack is corrupted (SHA1 mismatch)
> fatal: index-pack failed
>
> Back tracking it was introduced in 2.13.2, most likely in [1]
>
> Add a #ifdef guard based on macros defined at [2] and [3].
>
> Should perhaps __xlc__ should should be changed to or combined with _AIX
> based on the behavour of GCC on AIX or XL C on Linux.
>
> 1. https://github.com/git/git/commit/6b851e536b05e0c8c61f77b9e4c3e7cedea39ff8
> 2. https://www.ibm.com/support/knowledgecenter/SSGH2K_13.1.3/com.ibm.xlc1313.aix.doc/compiler_ref/macros_platform.html
> 3. https://www.ibm.com/support/knowledgecenter/SSGH2K_13.1.3/com.ibm.xlc1313.aix.doc/compiler_ref/xlmacros.html
>
> Signed-off-by: jens persson <jens@persson.cx>
> ---
> sha1dc/sha1.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sha1dc/sha1.c b/sha1dc/sha1.c
> index 25eded139..68a8a0180 100644
> --- a/sha1dc/sha1.c
> +++ b/sha1dc/sha1.c
> @@ -84,7 +84,7 @@
> /* Not under GCC-alike or glibc or *BSD or newlib */
> #elif (defined(__ARMEB__) || defined(__THUMBEB__) ||
> defined(__AARCH64EB__) || \
> defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || \
> - defined(__sparc))
> + defined(__sparc) || (defined(__powerpc) && defined(__xlc__)))
> /*
> * Should define Big Endian for a whitelist of known processors. See
> * https://sourceforge.net/p/predef/wiki/Endianness/ and
This patch looks sane to me, but we don't manage this software but
instead try to pull it as-is from upstream at
https://github.com/cr-marcstevens/sha1collisiondetection
Which we could apply this, it would be much better if you could submit a
pull request with this to upstream, and then we can update our copy as I
did in e.g. 9936c1b52a ("sha1dc: update from upstream", 2017-07-01).
next prev parent reply other threads:[~2018-05-09 12:11 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-09 11:27 [PATCH] sha1dc: fix for compiling on AIX using IBM XLC compiler jens persson
2018-05-09 12:11 ` Ævar Arnfjörð Bjarmason [this message]
2018-05-09 18:30 ` Jonathan Nieder
2018-05-10 23:32 ` Jonathan Nieder
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87603xxc3k.fsf@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=jens@persson.cx \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).