git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH] config.mak.dev: fix DEVELOPER=1 on FreeBSD with -std=gnu99

From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date
Jan 18, 2022, 15:14 UTC
Message-ID
<patch-1.1-06cc12be94d-20220118T151234Z-avarab@gmail.com>
In-Reply-To
<220113.86tue7vr6d.gmgdl@evledraar.gmail.com>

Since the addition of -std=gnu99 to CFLAGS under DEVELOPER=1 in 5f46385309b (config.mak.dev: specify -std=gnu99 for gcc/clang, 2021-12-08) the compilation has been broken on newer FreeBSD systems. E.g. on FreeBSD 13 we'll now get this when compiling archive.o:

    archive.c:337:35: error: '_Generic' is a C11 extension [-Werror,-Wc11-extensions]
                    strbuf_addstr(&path_in_archive, basename(path));
                                                    ^
    /usr/include/libgen.h:61:21: note: expanded from macro 'basename'
    #define basename(x)     __generic(x, const char *, __old_basename, basename)(x)
                            ^
    /usr/include/sys/cdefs.h:325:2: note: expanded from macro '__generic'
            _Generic(expr, t: yes, default: no)
            ^

This issue is a bug in FreeBSD introduced in freebsd/freebsd-src@62b7f85d4749 (Leave the C11 keywords alone when we have a recent version of GCC., 2014-09-03)[1].

That commit started conditionally using the C11 _Generic() keyword as a function of either a __STDC_VERSION__ check, or __has_extension(c_generic_selections). The current FreeBSD code in sys/cdefs.h being (slightly modified since that commit):

    #if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) || \
        __has_extension(c_generic_selections)
    [...]

The inherent problem is that __has_extension() is a way to ask Clang (and GCC) whether the compiler supports that feature, but the -Wc11-extensions warning will be issued on the basis of the selected __STDC_VERSION__. With -std=gnu99 the __has_extension() built-in will return true, but the warning will still fire.

Let's narrowly work around this by checking whether:
 A. We are under FreeBSD
 B. We are using a C standard older than C11

In that case we'll include sys/cdefs.h, and undefine FreeBSD's __generic() wrapper if it's been defined. We'll then load libgen.h, and restore whatever __generic definition we temporarily undefined earlier.

An alternate solution would be to simply define NO_LIBGEN_H=Y in config.mak.uname for FreeBSD, but this way we'll use its OS-provided basename() and dirname(), and in the general case ensure that nothing changes outside of DEVELOPER=1 builds.

1. https://github.com/freebsd/freebsd-src/commit/62b7f85d4749
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 git-compat-util.h | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
diff --git a/git-compat-util.h b/git-compat-util.h
index 1229c8296b9..69d9b5f202f 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -318,7 +318,25 @@ static inline int setitimer(int which, const struct itimerval *value, struct iti
 #endif
 
 #ifndef NO_LIBGEN_H
+/*
+ * FreeBSD's libgen.h inadvertently requires C11 features, due to its
+ * sys/cdefs.h using _Generic() if
+ * __has_extension(c_generic_selections) is true, regardless of
+ * __STDC_VERSION__....
+ */
+#if defined(__FreeBSD__) && __STDC_VERSION__ - 0 < 201112L
+#include <sys/cdefs.h>
+#ifdef __generic
+#define __fbsd_generic __generic
+#endif
+#undef __generic
+#endif
 #include <libgen.h>
+/* ...continue FreeBSD-specific hack above */
+#ifdef __fbsd_generic
+#define __generic __fbsd_generic
+#undef __fbsd_generic
+#endif
 #else
 #define basename gitbasename
 char *gitbasename(char *);
-- 
2.35.0.rc1.862.gadd77378860
Previous: Junio C HamanoNext: Junio C Hamano
Message 192 of 194 in “Reftable coverity fixes”
  1. 00/10 Reftable coverity fixesHan-Wen Nienhuys via GitGitGadget, Dec 7, 2021
  2. 01/10 reftable: fix OOB stack write in print functionsHan-Wen Nienhuys via GitGitGadget, Dec 7, 2021
  3. 02/10 reftable: fix resource leak in error pathHan-Wen Nienhuys via GitGitGadget, Dec 7, 2021
  4. Derrick StoleeDec 8, 2021
  5. 03/10 reftable: fix resource leak blocksource.cHan-Wen Nienhuys via GitGitGadget, Dec 7, 2021
  6. 04/10 reftable: check reftable_stack_auto_compact() return valueHan-Wen Nienhuys via GitGitGadget, Dec 7, 2021
  7. 05/10 reftable: ignore remove() return value in stack_test.cHan-Wen Nienhuys via GitGitGadget, Dec 7, 2021
  8. 06/10 reftable: fix resource warningHan-Wen Nienhuys via GitGitGadget, Dec 7, 2021
  9. 07/10 reftable: fix NULL derefs in error pathsHan-Wen Nienhuys via GitGitGadget, Dec 7, 2021
  10. 08/10 reftable: order unittests by complexityHan-Wen Nienhuys via GitGitGadget, Dec 7, 2021
  11. Derrick StoleeDec 8, 2021
  12. 09/10 reftable: drop stray printf in readwrite_testHan-Wen Nienhuys via GitGitGadget, Dec 7, 2021
  13. 10/10 reftable: make reftable_record a tagged unionHan-Wen Nienhuys via GitGitGadget, Dec 7, 2021
  14. Junio C HamanoDec 7, 2021
  15. Jeff KingDec 8, 2021
  16. Junio C HamanoDec 8, 2021
  17. Han-Wen NienhuysDec 8, 2021
  18. Junio C HamanoDec 8, 2021
  19. config.mak.dev: specify -std=gnu99 for gcc/clangJeff King, Dec 8, 2021
  20. Ævar Arnfjörð BjarmasonDec 9, 2021
  21. Jeff KingDec 10, 2021
  22. Derrick StoleeDec 8, 2021
  23. Han-Wen NienhuysDec 8, 2021
  24. Derrick StoleeDec 8, 2021
  25. Han-Wen NienhuysDec 23, 2021
  26. Junio C HamanoDec 8, 2021
  27. Han-Wen NienhuysDec 8, 2021
  28. 00/11 Reftable coverity fixesHan-Wen Nienhuys via GitGitGadget, Dec 8, 2021
  29. 01/11 reftable: fix OOB stack write in print functionsHan-Wen Nienhuys via GitGitGadget, Dec 8, 2021
  30. 02/11 reftable: fix resource leak in error pathHan-Wen Nienhuys via GitGitGadget, Dec 8, 2021
  31. 03/11 reftable: fix resource leak blocksource.cHan-Wen Nienhuys via GitGitGadget, Dec 8, 2021
  32. 04/11 reftable: check reftable_stack_auto_compact() return valueHan-Wen Nienhuys via GitGitGadget, Dec 8, 2021
  33. 05/11 reftable: ignore remove() return value in stack_test.cHan-Wen Nienhuys via GitGitGadget, Dec 8, 2021
  34. 06/11 reftable: fix resource warningHan-Wen Nienhuys via GitGitGadget, Dec 8, 2021
  35. 07/11 reftable: fix NULL derefs in error pathsHan-Wen Nienhuys via GitGitGadget, Dec 8, 2021
  36. 08/11 reftable: order unittests by complexityHan-Wen Nienhuys via GitGitGadget, Dec 8, 2021
  37. 09/11 reftable: drop stray printf in readwrite_testHan-Wen Nienhuys via GitGitGadget, Dec 8, 2021
  38. 10/11 reftable: handle null refnames in reftable_ref_record_equalHan-Wen Nienhuys via GitGitGadget, Dec 8, 2021
  39. 11/11 reftable: make reftable_record a tagged unionHan-Wen Nienhuys via GitGitGadget, Dec 8, 2021
  40. Jeff KingDec 9, 2021
  41. 00/11 Reftable coverity fixesHan-Wen Nienhuys via GitGitGadget, Dec 13, 2021
  42. 01/11 reftable: fix OOB stack write in print functionsHan-Wen Nienhuys via GitGitGadget, Dec 13, 2021
  43. 02/11 reftable: fix resource leak in error pathHan-Wen Nienhuys via GitGitGadget, Dec 13, 2021
  44. Ævar Arnfjörð BjarmasonDec 13, 2021
  45. Han-Wen NienhuysDec 13, 2021
  46. Junio C HamanoDec 13, 2021
  47. 03/11 reftable: fix resource leak blocksource.cHan-Wen Nienhuys via GitGitGadget, Dec 13, 2021
  48. 05/11 reftable: ignore remove() return value in stack_test.cHan-Wen Nienhuys via GitGitGadget, Dec 13, 2021
  49. 04/11 reftable: check reftable_stack_auto_compact() return valueHan-Wen Nienhuys via GitGitGadget, Dec 13, 2021
  50. 06/11 reftable: fix resource warningHan-Wen Nienhuys via GitGitGadget, Dec 13, 2021
  51. 07/11 reftable: fix NULL derefs in error pathsHan-Wen Nienhuys via GitGitGadget, Dec 13, 2021
  52. Ævar Arnfjörð BjarmasonDec 13, 2021
  53. 08/11 reftable: order unittests by complexityHan-Wen Nienhuys via GitGitGadget, Dec 13, 2021
  54. Ævar Arnfjörð BjarmasonDec 13, 2021
  55. Han-Wen NienhuysDec 13, 2021
  56. Junio C HamanoDec 13, 2021
  57. 10/11 reftable: handle null refnames in reftable_ref_record_equalHan-Wen Nienhuys via GitGitGadget, Dec 13, 2021
  58. 09/11 reftable: drop stray printf in readwrite_testHan-Wen Nienhuys via GitGitGadget, Dec 13, 2021
  59. Ævar Arnfjörð BjarmasonDec 13, 2021
  60. Han-Wen NienhuysDec 13, 2021
  61. 11/11 reftable: make reftable_record a tagged unionHan-Wen Nienhuys via GitGitGadget, Dec 13, 2021
  62. 00/11 Reftable coverity fixesHan-Wen Nienhuys via GitGitGadget, Dec 14, 2021
  63. 01/11 reftable: fix OOB stack write in print functionsHan-Wen Nienhuys via GitGitGadget, Dec 14, 2021
  64. 02/11 reftable: fix resource leak in block.c error pathHan-Wen Nienhuys via GitGitGadget, Dec 14, 2021
  65. 04/11 reftable: check reftable_stack_auto_compact() return valueHan-Wen Nienhuys via GitGitGadget, Dec 14, 2021
  66. 03/11 reftable: fix resource leak blocksource.cHan-Wen Nienhuys via GitGitGadget, Dec 14, 2021
  67. 05/11 reftable: ignore remove() return value in stack_test.cHan-Wen Nienhuys via GitGitGadget, Dec 14, 2021
  68. 06/11 reftable: fix resource warningHan-Wen Nienhuys via GitGitGadget, Dec 14, 2021
  69. 07/11 reftable: all xxx_free() functions accept NULL argumentsHan-Wen Nienhuys via GitGitGadget, Dec 14, 2021
  70. 08/11 reftable: order unittests by complexityHan-Wen Nienhuys via GitGitGadget, Dec 14, 2021
  71. 09/11 reftable: drop stray printf in readwrite_testHan-Wen Nienhuys via GitGitGadget, Dec 14, 2021
  72. 10/11 reftable: handle null refnames in reftable_ref_record_equalHan-Wen Nienhuys via GitGitGadget, Dec 14, 2021
  73. 11/11 reftable: make reftable_record a tagged unionHan-Wen Nienhuys via GitGitGadget, Dec 14, 2021
  74. 00/16 Reftable coverity fixesHan-Wen Nienhuys via GitGitGadget, Dec 22, 2021
  75. 01/16 reftable: fix OOB stack write in print functionsHan-Wen Nienhuys via GitGitGadget, Dec 22, 2021
  76. Junio C HamanoDec 22, 2021
  77. Han-Wen NienhuysDec 23, 2021
  78. 02/16 reftable: fix resource leak in block.c error pathHan-Wen Nienhuys via GitGitGadget, Dec 22, 2021
  79. Junio C HamanoDec 22, 2021
  80. Han-Wen NienhuysDec 23, 2021
  81. Junio C HamanoDec 24, 2021
  82. Han-Wen NienhuysJan 12, 2022
  83. René ScharfeJan 12, 2022
  84. Junio C HamanoJan 13, 2022
  85. Ævar Arnfjörð BjarmasonJan 13, 2022
  86. Han-Wen NienhuysJan 13, 2022
  87. 03/16 reftable: fix resource leak blocksource.cHan-Wen Nienhuys via GitGitGadget, Dec 22, 2021
  88. 04/16 reftable: check reftable_stack_auto_compact() return valueHan-Wen Nienhuys via GitGitGadget, Dec 22, 2021
  89. 05/16 reftable: ignore remove() return value in stack_test.cHan-Wen Nienhuys via GitGitGadget, Dec 22, 2021
  90. 06/16 reftable: fix resource warningHan-Wen Nienhuys via GitGitGadget, Dec 22, 2021
  91. 08/16 reftable: order unittests by complexityHan-Wen Nienhuys via GitGitGadget, Dec 22, 2021
  92. 07/16 reftable: all xxx_free() functions accept NULL argumentsHan-Wen Nienhuys via GitGitGadget, Dec 22, 2021
  93. 09/16 reftable: drop stray printf in readwrite_testHan-Wen Nienhuys via GitGitGadget, Dec 22, 2021
  94. 10/16 reftable: handle null refnames in reftable_ref_record_equalHan-Wen Nienhuys via GitGitGadget, Dec 22, 2021
  95. Junio C HamanoDec 22, 2021
  96. 11/16 reftable: make reftable-record.h function signatures const correctHan-Wen Nienhuys via GitGitGadget, Dec 22, 2021
  97. 12/16 reftable: implement record equality genericallyHan-Wen Nienhuys via GitGitGadget, Dec 22, 2021
  98. 13/16 reftable: remove outdated file reftable.cHan-Wen Nienhuys via GitGitGadget, Dec 22, 2021
  99. Junio C HamanoDec 22, 2021
  100. Ævar Arnfjörð BjarmasonDec 24, 2021
  101. 15/16 reftable: add print functions to the record typesHan-Wen Nienhuys via GitGitGadget, Dec 22, 2021
  102. 16/16 reftable: be more paranoid about 0-length memcpy callsHan-Wen Nienhuys via GitGitGadget, Dec 22, 2021
  103. Junio C HamanoDec 22, 2021
  104. René ScharfeDec 23, 2021
  105. Junio C HamanoDec 23, 2021
  106. René ScharfeDec 26, 2021
  107. Ævar Arnfjörð BjarmasonDec 26, 2021
  108. Han-Wen NienhuysDec 23, 2021
  109. Junio C HamanoDec 24, 2021
  110. Han-Wen NienhuysJan 12, 2022
  111. Han-Wen NienhuysJan 12, 2022
  112. 14/16 reftable: make reftable_record a tagged unionHan-Wen Nienhuys via GitGitGadget, Dec 22, 2021
  113. Junio C HamanoDec 22, 2021
  114. 00/15 Reftable coverity fixesHan-Wen Nienhuys via GitGitGadget, Jan 20, 2022
  115. 01/15 reftable: fix OOB stack write in print functionsHan-Wen Nienhuys via GitGitGadget, Jan 20, 2022
  116. Ævar Arnfjörð BjarmasonJan 21, 2022
  117. Han-Wen NienhuysJan 24, 2022
  118. 02/15 reftable: fix resource leak in block.c error pathHan-Wen Nienhuys via GitGitGadget, Jan 20, 2022
  119. Ævar Arnfjörð BjarmasonJan 21, 2022
  120. Junio C HamanoJan 22, 2022
  121. 03/15 reftable: fix resource leak blocksource.cHan-Wen Nienhuys via GitGitGadget, Jan 20, 2022
  122. 04/15 reftable: check reftable_stack_auto_compact() return valueHan-Wen Nienhuys via GitGitGadget, Jan 20, 2022
  123. Ævar Arnfjörð BjarmasonJan 21, 2022
  124. 06/15 reftable: fix resource warningHan-Wen Nienhuys via GitGitGadget, Jan 20, 2022
  125. 05/15 reftable: ignore remove() return value in stack_test.cHan-Wen Nienhuys via GitGitGadget, Jan 20, 2022
  126. Ævar Arnfjörð BjarmasonJan 21, 2022
  127. 07/15 reftable: all xxx_free() functions accept NULL argumentsHan-Wen Nienhuys via GitGitGadget, Jan 20, 2022
  128. 09/15 reftable: drop stray printf in readwrite_testHan-Wen Nienhuys via GitGitGadget, Jan 20, 2022
  129. 10/15 reftable: handle null refnames in reftable_ref_record_equalHan-Wen Nienhuys via GitGitGadget, Jan 20, 2022
  130. 08/15 reftable: order unittests by complexityHan-Wen Nienhuys via GitGitGadget, Jan 20, 2022
  131. 11/15 reftable: make reftable-record.h function signatures const correctHan-Wen Nienhuys via GitGitGadget, Jan 20, 2022
  132. 12/15 reftable: implement record equality genericallyHan-Wen Nienhuys via GitGitGadget, Jan 20, 2022
  133. Ævar Arnfjörð BjarmasonJan 21, 2022
  134. 15/15 reftable: add print functions to the record typesHan-Wen Nienhuys via GitGitGadget, Jan 20, 2022
  135. Ævar Arnfjörð BjarmasonJan 21, 2022
  136. Han-Wen NienhuysJan 24, 2022
  137. 13/15 reftable: remove outdated file reftable.cHan-Wen Nienhuys via GitGitGadget, Jan 20, 2022
  138. Ævar Arnfjörð BjarmasonJan 21, 2022
  139. 14/15 reftable: make reftable_record a tagged unionHan-Wen Nienhuys via GitGitGadget, Jan 20, 2022
  140. Ævar Arnfjörð BjarmasonJan 21, 2022
  141. Han-Wen NienhuysJan 24, 2022
  142. 00/16 Reftable coverity fixesHan-Wen Nienhuys via GitGitGadget, Jan 24, 2022
  143. 04/16 reftable: check reftable_stack_auto_compact() return valueHan-Wen Nienhuys via GitGitGadget, Jan 24, 2022
  144. 12/16 reftable: implement record equality genericallyHan-Wen Nienhuys via GitGitGadget, Jan 24, 2022
  145. 13/16 reftable: remove outdated file reftable.cHan-Wen Nienhuys via GitGitGadget, Jan 24, 2022
  146. 09/16 reftable: drop stray printf in readwrite_testHan-Wen Nienhuys via GitGitGadget, Jan 24, 2022
  147. 16/16 reftable: rename typ to typeHan-Wen Nienhuys via GitGitGadget, Jan 24, 2022
  148. 02/16 reftable: fix resource leak in block.c error pathHan-Wen Nienhuys via GitGitGadget, Jan 24, 2022
  149. 03/16 reftable: fix resource leak blocksource.cHan-Wen Nienhuys via GitGitGadget, Jan 24, 2022
  150. 01/16 reftable: fix OOB stack write in print functionsHan-Wen Nienhuys via GitGitGadget, Jan 24, 2022
  151. Ævar Arnfjörð BjarmasonJan 24, 2022
  152. 05/16 reftable: ignore remove() return value in stack_test.cHan-Wen Nienhuys via GitGitGadget, Jan 24, 2022
  153. 06/16 reftable: fix resource warningHan-Wen Nienhuys via GitGitGadget, Jan 24, 2022
  154. 07/16 reftable: all xxx_free() functions accept NULL argumentsHan-Wen Nienhuys via GitGitGadget, Jan 24, 2022
  155. 08/16 reftable: order unittests by complexityHan-Wen Nienhuys via GitGitGadget, Jan 24, 2022
  156. 10/16 reftable: handle null refnames in reftable_ref_record_equalHan-Wen Nienhuys via GitGitGadget, Jan 24, 2022
  157. 11/16 reftable: make reftable-record.h function signatures const correctHan-Wen Nienhuys via GitGitGadget, Jan 24, 2022
  158. 15/16 reftable: add print functions to the record typesHan-Wen Nienhuys via GitGitGadget, Jan 24, 2022
  159. 14/16 reftable: make reftable_record a tagged unionHan-Wen Nienhuys via GitGitGadget, Jan 24, 2022
  160. Ævar Arnfjörð BjarmasonJan 24, 2022
  161. Han-Wen NienhuysJan 24, 2022
  162. Ævar Arnfjörð BjarmasonJan 24, 2022
  163. master doesn't compile on xlc 21.01 anymore (old AIX compiler) (was: [PATCH v7 14/16] reftable: make reftable_record a tagged union)Ævar Arnfjörð Bjarmason, Feb 19, 2022
  164. René ScharfeFeb 19, 2022
  165. reftable: make assignments portable to AIX xlc v12.01Ævar Arnfjörð Bjarmason, Mar 28, 2022
  166. Junio C HamanoMar 28, 2022
  167. Han-Wen NienhuysMar 29, 2022
  168. Junio C HamanoMar 29, 2022
  169. Ævar Arnfjörð BjarmasonJan 24, 2022
  170. brian m. carlsonJan 14, 2022
  171. Ævar Arnfjörð BjarmasonJan 14, 2022
  172. Junio C HamanoJan 14, 2022
  173. Ævar Arnfjörð BjarmasonJan 14, 2022
  174. Junio C HamanoJan 14, 2022
  175. Junio C HamanoJan 14, 2022
  176. Junio C HamanoJan 14, 2022
  177. Ævar Arnfjörð BjarmasonJan 14, 2022
  178. Junio C HamanoJan 15, 2022
  179. Ævar Arnfjörð BjarmasonJan 15, 2022
  180. Junio C HamanoJan 15, 2022
  181. Johannes SchindelinJan 18, 2022
  182. Ævar Arnfjörð BjarmasonJan 18, 2022
  183. Junio C HamanoJan 18, 2022
  184. Ævar Arnfjörð BjarmasonJan 19, 2022
  185. Junio C HamanoJan 19, 2022
  186. Ævar Arnfjörð BjarmasonJan 19, 2022
  187. Junio C HamanoJan 19, 2022
  188. Makefile: FreeBSD cannot do C99-or-below buildJunio C Hamano, Jan 18, 2022
  189. Neeraj SinghJan 18, 2022
  190. Ævar Arnfjörð BjarmasonJan 18, 2022
  191. Junio C HamanoJan 19, 2022
  192. config.mak.dev: fix DEVELOPER=1 on FreeBSD with -std=gnu99Ævar Arnfjörð Bjarmason, Jan 18, 2022
  193. Junio C HamanoJan 18, 2022
  194. Ævar Arnfjörð BjarmasonJan 19, 2022

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.