diff mbox series

[01/45] *: Regenerate autoconf and aclocal files

Message ID 20230807111029.2320238-2-arsen@aarsen.me
State New
Headers
Series Synchronize shared build infrastructure with GCC tree |

Commit Message

Arsen Arsenović Aug. 7, 2023, 11:07 a.m. UTC 
  bfd/ChangeLog:

	* aclocal.m4: Regenerate.

gold/ChangeLog:

	* aclocal.m4: Regenerate.

intl/ChangeLog:

	* aclocal.m4: Regenerate.
---
 bfd/aclocal.m4     |  4 ++--
 gold/aclocal.m4    |  2 +-
 gprofng/aclocal.m4 | 22 +++-------------------
 gprofng/configure  |  7 +++++--
 intl/configure     |  3 +++
 5 files changed, 14 insertions(+), 24 deletions(-)

Comments

Alan Modra Aug. 9, 2023, 1:43 p.m. UTC | #1 
On Mon, Aug 07, 2023 at 01:07:04PM +0200, Arsen Arsenović via Binutils wrote:
> bfd/ChangeLog:
> 
> 	* aclocal.m4: Regenerate.
> 
> gold/ChangeLog:
> 
> 	* aclocal.m4: Regenerate.
> 
> intl/ChangeLog:
> 
> 	* aclocal.m4: Regenerate.

Hmm, these three and the gprofng changes are *not* regeneration,
because the files don't need regenerating at the start of a patch
series.  What's more, if I apply your patch series then when I
regenerate at the end I get different generated files..

Maybe it would be better if changes to generated files are left to a
final patch that does a bulk regeneration.  It would certainly be
easier to review.
Arsen Arsenović Aug. 10, 2023, 9:13 a.m. UTC | #2 
Alan Modra <amodra@gmail.com> writes:

> On Mon, Aug 07, 2023 at 01:07:04PM +0200, Arsen Arsenović via Binutils wrote:
>> bfd/ChangeLog:
>> 
>> 	* aclocal.m4: Regenerate.
>> 
>> gold/ChangeLog:
>> 
>> 	* aclocal.m4: Regenerate.
>> 
>> intl/ChangeLog:
>> 
>> 	* aclocal.m4: Regenerate.
>
> Hmm, these three and the gprofng changes are *not* regeneration,
> because the files don't need regenerating at the start of a patch
> series.

Without this base commit, this diff would be inadvertently merged into
subsequent patches, so I decided to separate it out at the start to get
more self-contained patches.

> What's more, if I apply your patch series then when I regenerate at
> the end I get different generated files..

Yes, I also found this odd.  I couldn't find the cause at the time of
writing.

> Maybe it would be better if changes to generated files are left to a
> final patch that does a bulk regeneration.  It would certainly be
> easier to review.

Hmm, my impression is that it'd be easier to handle these patches if
each commit had accurate generated files.  I can switch to a
regeneration after the fact if so desired.
diff mbox series

Patch

diff --git a/bfd/aclocal.m4 b/bfd/aclocal.m4
index 09b849dfc87..50e39795063 100644
--- a/bfd/aclocal.m4
+++ b/bfd/aclocal.m4
@@ -1167,6 +1167,8 @@  AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
+m4_include([bfd.m4])
+m4_include([warning.m4])
 m4_include([../config/acx.m4])
 m4_include([../config/bfd64.m4])
 m4_include([../config/depstand.m4])
@@ -1187,6 +1189,4 @@  m4_include([../ltoptions.m4])
 m4_include([../ltsugar.m4])
 m4_include([../ltversion.m4])
 m4_include([../lt~obsolete.m4])
-m4_include([bfd.m4])
-m4_include([warning.m4])
 m4_include([acinclude.m4])
diff --git a/gold/aclocal.m4 b/gold/aclocal.m4
index e4bdc46e153..cc51f9f6b5a 100644
--- a/gold/aclocal.m4
+++ b/gold/aclocal.m4
@@ -1196,6 +1196,7 @@  AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
+m4_include([../bfd/warning.m4])
 m4_include([../config/ax_pthread.m4])
 m4_include([../config/depstand.m4])
 m4_include([../config/gettext-sister.m4])
@@ -1209,4 +1210,3 @@  m4_include([../config/po.m4])
 m4_include([../config/progtest.m4])
 m4_include([../config/zlib.m4])
 m4_include([../config/zstd.m4])
-m4_include([../bfd/warning.m4])
diff --git a/gprofng/aclocal.m4 b/gprofng/aclocal.m4
index 02b07b91597..ce17f68902d 100644
--- a/gprofng/aclocal.m4
+++ b/gprofng/aclocal.m4
@@ -686,25 +686,6 @@  if test x"${install_sh+set}" != xset; then
 fi
 AC_SUBST([install_sh])])
 
-# Copyright (C) 2003-2017 Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
@@ -1246,6 +1227,9 @@  AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
 
+m4_include([../config/depstand.m4])
+m4_include([../config/lead-dot.m4])
+m4_include([../config/override.m4])
 m4_include([../libtool.m4])
 m4_include([../ltoptions.m4])
 m4_include([../ltsugar.m4])
diff --git a/gprofng/configure b/gprofng/configure
index c39dc8535f7..34950c98e3c 100755
--- a/gprofng/configure
+++ b/gprofng/configure
@@ -2427,6 +2427,9 @@  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
+
+
+
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
   if test -f "$ac_dir/install-sh"; then
@@ -12221,7 +12224,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12224 "configure"
+#line 12227 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12327,7 +12330,7 @@  else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12330 "configure"
+#line 12333 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
diff --git a/intl/configure b/intl/configure
index e75f072f8fa..9b1f6d0828b 100755
--- a/intl/configure
+++ b/intl/configure
@@ -6857,6 +6857,9 @@  case "${host}" in
 	# sets the default TLS model and affects inlining.
 	PICFLAG=-fPIC
 	;;
+    loongarch*-*-*)
+	PICFLAG=-fpic
+	;;
     mips-sgi-irix6*)
 	# PIC is the default.
 	;;