Commit cda0b14
authored
build: bring the _Generic-from-glibc-2.43 patch in line with upstream (#6242)
Upstream has landed Patrick Steinhardt's patch [build: tolerate use of
_Generic from glibc 2.43 with
Clang](https://lore.kernel.org/git/xmqqecjischc.fsf@gitster.g) in a form
that differs from what we currently carry as 74c3ea9 (a cherry-pick
of Patrick's v1). The upstream variant on `next` (commit 0a6d290)
carries the trailer `[jc: replaced Makefile side with Shardul's
approach]` and is signed off by Junio.
Concretely, instead of dropping `-std=gnu99` for Clang in
`config.mak.dev`, the upstream variant keeps `-std=gnu99` and adds
`-Wno-c11-extensions` for Clang in a dedicated top-level block,
mirroring what Patrick already did on the Meson side. Keeping
`-std=gnu99` is desirable because it still lets us catch accidental use
of newer-than-C99 features in Git's own code.
This PR is the amend! commit that brings our downstream pick in line
with that upstream landing. Autosquashing onto the parent of 74c3ea9
produces a single commit whose tree state is identical to 0a6d290
(modulo our USE_MIMALLOC carry inside the gcc6/clang7 block on the
Makefile side). The intended merge strategy is
autosquash-then-force-push to `main`, not a regular merge commit, so the
history mirrors what landed upstream.
Junio's confirmation that he is fast-tracking the topic to `next` and
`master` is at https://lore.kernel.org/git/xmqqecjischc.fsf@gitster.g.1 file changed
Lines changed: 8 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
| 24 | + | |
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
30 | | - | |
31 | | - | |
32 | | - | |
33 | 30 | | |
34 | 31 | | |
35 | 32 | | |
| |||
101 | 98 | | |
102 | 99 | | |
103 | 100 | | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
104 | 108 | | |
105 | 109 | | |
106 | 110 | | |
| |||
0 commit comments