bpo-42598: Fix implicit function declarations in configure (GH-23690) (GH-23756)

miss-islington · jmroot · web-flow · commit 3dcdbdeb4833 · 2020-12-13T17:01:00.000-05:00
This is invalid in C99 and later and is an error with some compilers (e.g. clang in Xcode 12), and can thus cause configure checks to produce incorrect results. (cherry picked from commit 674fa0a) Co-authored-by: Joshua Root <jmr@macports.org>
diff --git a/Misc/NEWS.d/next/Build/2020-12-13-14-43-10.bpo-42598.7ipr5H.rst b/Misc/NEWS.d/next/Build/2020-12-13-14-43-10.bpo-42598.7ipr5H.rst
@@ -0,0 +1,2 @@
+Fix implicit function declarations in configure which could have resulted in
+incorrect configuration checks.  Patch contributed by Joshua Root.
diff --git a/configure b/configure
@@ -11072,10 +11072,10 @@ else
       main() {
         pthread_attr_t attr;
         pthread_t id;
-        if (pthread_attr_init(&attr)) exit(-1);
-        if (pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM)) exit(-1);
-        if (pthread_create(&id, &attr, foo, NULL)) exit(-1);
-        exit(0);
+        if (pthread_attr_init(&attr)) return (-1);
+        if (pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM)) return (-1);
+        if (pthread_create(&id, &attr, foo, NULL)) return (-1);
+        return (0);
       }
 _ACEOF
 if ac_fn_c_try_run "$LINENO"; then :
@@ -15083,7 +15083,7 @@ else
   int main()
   {
 	/* Success: exit code 0 */
-        exit((((wchar_t) -1) < ((wchar_t) 0)) ? 0 : 1);
+        return ((((wchar_t) -1) < ((wchar_t) 0)) ? 0 : 1);
   }
 
 _ACEOF
@@ -15464,7 +15464,7 @@ else
 
 int main()
 {
-	exit(((-1)>>3 == -1) ? 0 : 1);
+	return (((-1)>>3 == -1) ? 0 : 1);
 }
 
 _ACEOF
@@ -15934,6 +15934,7 @@ else
 /* end confdefs.h.  */
 
 #include <poll.h>
+#include <unistd.h>
 
 int main()
 {
diff --git a/configure.ac b/configure.ac
@@ -3313,10 +3313,10 @@ if test "$posix_threads" = "yes"; then
       main() {
         pthread_attr_t attr;
         pthread_t id;
-        if (pthread_attr_init(&attr)) exit(-1);
-        if (pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM)) exit(-1);
-        if (pthread_create(&id, &attr, foo, NULL)) exit(-1);
-        exit(0);
+        if (pthread_attr_init(&attr)) return (-1);
+        if (pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM)) return (-1);
+        if (pthread_create(&id, &attr, foo, NULL)) return (-1);
+        return (0);
       }]])],
       [ac_cv_pthread_system_supported=yes],
       [ac_cv_pthread_system_supported=no],
@@ -4725,7 +4725,7 @@ then
   int main()
   {
 	/* Success: exit code 0 */
-        exit((((wchar_t) -1) < ((wchar_t) 0)) ? 0 : 1);
+        return ((((wchar_t) -1) < ((wchar_t) 0)) ? 0 : 1);
   }
   ]])],
   [ac_cv_wchar_t_signed=yes],
@@ -4847,7 +4847,7 @@ AC_CACHE_VAL(ac_cv_rshift_extends_sign, [
 AC_RUN_IFELSE([AC_LANG_SOURCE([[
 int main()
 {
-	exit(((-1)>>3 == -1) ? 0 : 1);
+	return (((-1)>>3 == -1) ? 0 : 1);
 }
 ]])],
 [ac_cv_rshift_extends_sign=yes],
@@ -4994,6 +4994,7 @@ AC_MSG_CHECKING(for broken poll())
 AC_CACHE_VAL(ac_cv_broken_poll,
 AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <poll.h>
+#include <unistd.h>
 
 int main()
 {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Fix implicit function declarations in configure which could have resulted in`
	`2`	`+incorrect configuration checks. Patch contributed by Joshua Root.`
Original file line number	Diff line number	Diff line change
`@@ -11072,10 +11072,10 @@ else`
`11072`	`11072`	`main() {`
`11073`	`11073`	`pthread_attr_t attr;`
`11074`	`11074`	`pthread_t id;`
`11075`		`- if (pthread_attr_init(&attr)) exit(-1);`
`11076`		`- if (pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM)) exit(-1);`
`11077`		`- if (pthread_create(&id, &attr, foo, NULL)) exit(-1);`
`11078`		`- exit(0);`
	`11075`	`+ if (pthread_attr_init(&attr)) return (-1);`
	`11076`	`+ if (pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM)) return (-1);`
	`11077`	`+ if (pthread_create(&id, &attr, foo, NULL)) return (-1);`
	`11078`	`+ return (0);`
`11079`	`11079`	`}`
`11080`	`11080`	`_ACEOF`
`11081`	`11081`	`if ac_fn_c_try_run "$LINENO"; then :`
`@@ -15083,7 +15083,7 @@ else`
`15083`	`15083`	`int main()`
`15084`	`15084`	`{`
`15085`	`15085`	`/* Success: exit code 0 */`
`15086`		`- exit((((wchar_t) -1) < ((wchar_t) 0)) ? 0 : 1);`
	`15086`	`+ return ((((wchar_t) -1) < ((wchar_t) 0)) ? 0 : 1);`
`15087`	`15087`	`}`
`15088`	`15088`
`15089`	`15089`	`_ACEOF`
`@@ -15464,7 +15464,7 @@ else`
`15464`	`15464`
`15465`	`15465`	`int main()`
`15466`	`15466`	`{`
`15467`		`- exit(((-1)>>3 == -1) ? 0 : 1);`
	`15467`	`+ return (((-1)>>3 == -1) ? 0 : 1);`
`15468`	`15468`	`}`
`15469`	`15469`
`15470`	`15470`	`_ACEOF`
`@@ -15934,6 +15934,7 @@ else`
`15934`	`15934`	`/* end confdefs.h. */`
`15935`	`15935`
`15936`	`15936`	`#include <poll.h>`
	`15937`	`+#include <unistd.h>`
`15937`	`15938`
`15938`	`15939`	`int main()`
`15939`	`15940`	`{`