about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFangrui Song <maskray@google.com>2021-09-25 22:03:08 -0700
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2024-04-17 16:12:40 -0300
commite8c753c2288c7cf4f5b7c007549a5c338704882a (patch)
tree46684bd9afa630e2b551fe42624fd35cf917b573
parentc3e44655e442a1c1341898c9427fc371c4b5cf78 (diff)
downloadglibc-e8c753c2288c7cf4f5b7c007549a5c338704882a.tar.gz
glibc-e8c753c2288c7cf4f5b7c007549a5c338704882a.tar.xz
glibc-e8c753c2288c7cf4f5b7c007549a5c338704882a.zip
configure: remove overly restrictive check for clang
-rwxr-xr-xconfigure4
-rw-r--r--configure.ac4
2 files changed, 4 insertions, 4 deletions
diff --git a/configure b/configure
index 361bec7d20..56120b2f93 100755
--- a/configure
+++ b/configure
@@ -5602,7 +5602,7 @@ int
 main (void)
 {
 
-#if !defined __GNUC__ || __GNUC__ < 6 || (__GNUC__ == 6 && __GNUC_MINOR__ < 2)
+#if (__GNUC__ < 6 || (__GNUC__ == 6 && __GNUC_MINOR__ < 2)) && !defined __clang__
 #error insufficient compiler
 #endif
   ;
@@ -7245,7 +7245,7 @@ else $as_nop
 extern char *strstr (const char *, const char *) __asm ("my_strstr");
 char *foo (const char *a, const char *b)
 {
-  return __builtin_strstr (a, b);
+  return strstr (a, b);
 }
 EOF
 if { ac_try='${CC-cc} -O3 -S conftest.c -o - | grep -F "my_strstr" > /dev/null'
diff --git a/configure.ac b/configure.ac
index b30cf667f1..4007e207e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -537,7 +537,7 @@ AC_CHECK_PROG_VER(BISON, bison, --version,
 
 AC_CACHE_CHECK([if $CC is sufficient to build libc], libc_cv_compiler_ok, [
 AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[]], [[
-#if !defined __GNUC__ || __GNUC__ < 6 || (__GNUC__ == 6 && __GNUC_MINOR__ < 2)
+#if (__GNUC__ < 6 || (__GNUC__ == 6 && __GNUC_MINOR__ < 2)) && !defined __clang__
 #error insufficient compiler
 #endif]])],
 	       [libc_cv_compiler_ok=yes],
@@ -1423,7 +1423,7 @@ cat > conftest.c <<\EOF
 extern char *strstr (const char *, const char *) __asm ("my_strstr");
 char *foo (const char *a, const char *b)
 {
-  return __builtin_strstr (a, b);
+  return strstr (a, b);
 }
 EOF
 dnl