Patchwork s%funcs%ifuncs typo in libatomic/acinclude.m4

login
register
mail settings
Submitter Thomas Schwinge
Date May 29, 2012, 3:23 p.m.
Message ID <87hauz9fjy.fsf@schwinge.name>
Download mbox | patch
Permalink /patch/161758/
State Accepted, archived
Headers show

Comments

Thomas Schwinge - May 29, 2012, 3:23 p.m.
Hi!

On Tue, 29 May 2012 16:35:31 +0200, I wrote:
> The subject already says it all.  It got me confused what »funcs« that
> might be.
> 
> OK to commit with regenerating configure?
> 
> diff --git a/libatomic/acinclude.m4 b/libatomic/acinclude.m4
> index 282a992..a236a6d 100644
> --- a/libatomic/acinclude.m4
> +++ b/libatomic/acinclude.m4
> @@ -188,7 +188,7 @@ dnl
>  dnl Check whether the target supports ifuncs.
>  dnl
>  AC_DEFUN([LIBAT_CHECK_IFUNC], [
> -  AC_CACHE_CHECK([whether the target supports funcs], libat_cv_have_ifunc, [
> +  AC_CACHE_CHECK([whether the target supports ifuncs], libat_cv_have_ifunc, [
>    save_CFLAGS="$CFLAGS"
>    CFLAGS="$CFLAGS -Werror"
>    AC_TRY_LINK([

Actually, I'm getting additional/unrelated changes in configure --
probably someone forgot to regenerated this earlier on, or used a version
different from 2.64?  Anyway, OK to commit all this?



Grüße,
 Thomas
Thomas Schwinge - Nov. 4, 2012, 11:19 p.m.
Hi!

On Tue, 29 May 2012 17:23:45 +0200, I wrote:
> Actually, I'm getting additional/unrelated changes in configure --
> probably someone forgot to regenerated this earlier on, or used a version
> different from 2.64?  Anyway, OK to commit all this?

I now committed this, as obvious, in r193144.

libatomic/
	* configure: Regenerate.

libitm/
	* configure: Regenerate.


Grüße,
 Thomas

Patch

diff --git a/libatomic/configure b/libatomic/configure
index 9a7e5a5..c936ece 100755
--- a/libatomic/configure
+++ b/libatomic/configure
@@ -655,7 +655,6 @@  CCAS
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
-am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@ -3044,11 +3043,11 @@  MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
-# Always define AMTAR for backward compatibility.  Yes, it's still used
-# in the wild :-(  We should find a proper way to deprecate it ...
-AMTAR='$${TAR-tar}'
+# Always define AMTAR for backward compatibility.
 
-am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
+AMTAR=${AMTAR-"${am_missing_run}tar"}
+
+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
 
 
 
@@ -3946,7 +3945,6 @@  fi
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
-  am__nodep='_no'
 fi
  if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
@@ -3971,7 +3969,6 @@  else
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
-  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -4031,7 +4028,7 @@  else
 	break
       fi
       ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+    msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -4106,7 +4103,6 @@  else
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
-  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -4164,7 +4160,7 @@  else
 	break
       fi
       ;;
-    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
+    msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -11015,7 +11011,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11018 "configure"
+#line 11014 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11121,7 +11117,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11124 "configure"
+#line 11120 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14540,8 +14536,8 @@  $as_echo "#define HAVE_ATTRIBUTE_ALIAS 1" >>confdefs.h
   fi
 if test x$try_ifunc = xyes; then
 
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the target supports funcs" >&5
-$as_echo_n "checking whether the target supports funcs... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the target supports ifuncs" >&5
+$as_echo_n "checking whether the target supports ifuncs... " >&6; }
 if test "${libat_cv_have_ifunc+set}" = set; then :
   $as_echo_n "(cached) " >&6
 else