From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2041) id 691BF3858D28; Wed, 18 Jan 2023 03:15:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 691BF3858D28 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1674011739; bh=iq9sU3e09SG7YiC7tNHD9FkPbdrYF/IlQiRIr6AeQIg=; h=From:To:Subject:Date:From; b=KY6rhgrc2DMTIkAIC7di5HGQo6dY9ZNFksM+7fPKm+MBToI/G6sXJ0dciy/jhcs45 RXfZMQ70HzwCFp43CKWqFC6GFhSGowOAriJ4FRiEzRF1jOB1OtLKUyz4Ynb2bEXJE9 EIuodwJQvBRz+i6lVnGR0zTXE1SbOcz0nUVEjiU8= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Vladimir Mezentsev To: bfd-cvs@sourceware.org, gdb-cvs@sourceware.org Subject: [binutils-gdb] Revert "gprofng: PR29987 bfd/archive.c:1447: undefined reference to `filename_ncmp'" X-Act-Checkin: binutils-gdb X-Git-Author: Vladimir Mezentsev X-Git-Refname: refs/heads/master X-Git-Oldrev: 493ca3758b3622797779af76880ce5843026a24b X-Git-Newrev: 47f72fdba3f8b5d979802303f6d3c0312c931e7d Message-Id: <20230118031539.691BF3858D28@sourceware.org> Date: Wed, 18 Jan 2023 03:15:39 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D47f72fdba3f8= b5d979802303f6d3c0312c931e7d commit 47f72fdba3f8b5d979802303f6d3c0312c931e7d Author: Vladimir Mezentsev Date: Tue Jan 17 18:53:38 2023 -0800 Revert "gprofng: PR29987 bfd/archive.c:1447: undefined reference to `fi= lename_ncmp'" =20 This reverts commit c2a5d74050ea9d7897b4122ef57c627d395683b3. Diff: --- gprofng/Makefile.in | 1 + gprofng/configure | 11 +++++++++-- gprofng/configure.ac | 6 ++++++ gprofng/doc/Makefile.in | 1 + gprofng/gp-display-html/Makefile.in | 1 + gprofng/src/Makefile.am | 2 ++ gprofng/src/Makefile.in | 8 ++++++-- 7 files changed, 26 insertions(+), 4 deletions(-) diff --git a/gprofng/Makefile.in b/gprofng/Makefile.in index 3464b793813..01f7dca3f2a 100644 --- a/gprofng/Makefile.in +++ b/gprofng/Makefile.in @@ -267,6 +267,7 @@ FGREP =3D @FGREP@ GPROFNG_BROKEN_JAVAC =3D @GPROFNG_BROKEN_JAVAC@ GPROFNG_CFLAGS =3D @GPROFNG_CFLAGS@ GPROFNG_CPPFLAGS =3D @GPROFNG_CPPFLAGS@ +GPROFNG_LIBADD =3D @GPROFNG_LIBADD@ GPROFNG_NO_FORMAT_TRUNCATION_CFLAGS =3D @GPROFNG_NO_FORMAT_TRUNCATION_CFLA= GS@ GPROFNG_NO_SWITCH_CFLAGS =3D @GPROFNG_NO_SWITCH_CFLAGS@ GREP =3D @GREP@ diff --git a/gprofng/configure b/gprofng/configure index bcf971b75fa..40604319dc9 100755 --- a/gprofng/configure +++ b/gprofng/configure @@ -665,6 +665,7 @@ BUILD_COLLECTOR_TRUE GPROFNG_NO_SWITCH_CFLAGS gprofng_cflags WERROR +GPROFNG_LIBADD CXXCPP OTOOL64 OTOOL @@ -12220,7 +12221,7 @@ else lt_dlunknown=3D0; lt_dlno_uscore=3D1; lt_dlneed_uscore=3D2 lt_status=3D$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12223 "configure" +#line 12224 "configure" #include "confdefs.h" =20 #if HAVE_DLFCN_H @@ -12326,7 +12327,7 @@ else lt_dlunknown=3D0; lt_dlno_uscore=3D1; lt_dlneed_uscore=3D2 lt_status=3D$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12329 "configure" +#line 12330 "configure" #include "confdefs.h" =20 #if HAVE_DLFCN_H @@ -15570,6 +15571,12 @@ ac_compiler_gnu=3D$ac_cv_c_compiler_gnu =20 =20 =20 +GPROFNG_LIBADD=3D"-L../../libiberty -liberty" +if test "$enable_shared" =3D "yes"; then + GPROFNG_LIBADD=3D"-L../../libiberty/pic -liberty" +fi + + # Figure out what compiler warnings we can enable. # See config/warnings.m4 for details. =20 diff --git a/gprofng/configure.ac b/gprofng/configure.ac index 55312cab3f8..83e60a640cf 100644 --- a/gprofng/configure.ac +++ b/gprofng/configure.ac @@ -37,6 +37,12 @@ fi AC_DISABLE_SHARED LT_INIT =20 +GPROFNG_LIBADD=3D"-L../../libiberty -liberty" +if test "$enable_shared" =3D "yes"; then + GPROFNG_LIBADD=3D"-L../../libiberty/pic -liberty" +fi +AC_SUBST(GPROFNG_LIBADD) + # Figure out what compiler warnings we can enable. # See config/warnings.m4 for details. =20 diff --git a/gprofng/doc/Makefile.in b/gprofng/doc/Makefile.in index fd35f629403..a45018334e8 100644 --- a/gprofng/doc/Makefile.in +++ b/gprofng/doc/Makefile.in @@ -249,6 +249,7 @@ FGREP =3D @FGREP@ GPROFNG_BROKEN_JAVAC =3D @GPROFNG_BROKEN_JAVAC@ GPROFNG_CFLAGS =3D @GPROFNG_CFLAGS@ GPROFNG_CPPFLAGS =3D @GPROFNG_CPPFLAGS@ +GPROFNG_LIBADD =3D @GPROFNG_LIBADD@ GPROFNG_NO_FORMAT_TRUNCATION_CFLAGS =3D @GPROFNG_NO_FORMAT_TRUNCATION_CFLA= GS@ GPROFNG_NO_SWITCH_CFLAGS =3D @GPROFNG_NO_SWITCH_CFLAGS@ GREP =3D @GREP@ diff --git a/gprofng/gp-display-html/Makefile.in b/gprofng/gp-display-html/= Makefile.in index d2b9872fc71..42886f7c645 100644 --- a/gprofng/gp-display-html/Makefile.in +++ b/gprofng/gp-display-html/Makefile.in @@ -212,6 +212,7 @@ FGREP =3D @FGREP@ GPROFNG_BROKEN_JAVAC =3D @GPROFNG_BROKEN_JAVAC@ GPROFNG_CFLAGS =3D @GPROFNG_CFLAGS@ GPROFNG_CPPFLAGS =3D @GPROFNG_CPPFLAGS@ +GPROFNG_LIBADD =3D @GPROFNG_LIBADD@ GPROFNG_NO_FORMAT_TRUNCATION_CFLAGS =3D @GPROFNG_NO_FORMAT_TRUNCATION_CFLA= GS@ GPROFNG_NO_SWITCH_CFLAGS =3D @GPROFNG_NO_SWITCH_CFLAGS@ GREP =3D @GREP@ diff --git a/gprofng/src/Makefile.am b/gprofng/src/Makefile.am index 2278b9a39bb..b802ffd39db 100644 --- a/gprofng/src/Makefile.am +++ b/gprofng/src/Makefile.am @@ -132,6 +132,8 @@ libgprofng_la_LDFLAGS =3D -version-info 0:0:0 # when -nostdlib is passed to libtool. # See bug 29364 - libgprofng.so: needs to link against -pthread libgprofng_la_LIBADD =3D $(top_builddir)/../opcodes/libopcodes.la \ + $(top_builddir)/../bfd/libbfd.la \ + $(GPROFNG_LIBADD) \ -lpthread -ldl =20 dbedir =3D $(SYSCONFDIR) diff --git a/gprofng/src/Makefile.in b/gprofng/src/Makefile.in index 71dccf5f952..4274762334e 100644 --- a/gprofng/src/Makefile.in +++ b/gprofng/src/Makefile.in @@ -158,7 +158,9 @@ am__uninstall_files_from_dir =3D { \ am__installdirs =3D "$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(bindir)" \ "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(dbedir)" LTLIBRARIES =3D $(pkglib_LTLIBRARIES) -libgprofng_la_DEPENDENCIES =3D $(top_builddir)/../opcodes/libopcodes.la +am__DEPENDENCIES_1 =3D +libgprofng_la_DEPENDENCIES =3D $(top_builddir)/../opcodes/libopcodes.la \ + $(top_builddir)/../bfd/libbfd.la $(am__DEPENDENCIES_1) am__objects_1 =3D Application.lo BaseMetric.lo BaseMetricTreeNode.lo \ CallStack.lo CatchOutOfMemory.lo ClassFile.lo Command.lo \ CompCom.lo DataObject.lo DataSpace.lo Data_window.lo \ @@ -190,7 +192,6 @@ libgprofng_la_LINK =3D $(LIBTOOL) $(AM_V_lt) --tag=3DCX= X \ PROGRAMS =3D $(bin_PROGRAMS) am_gp_archive_OBJECTS =3D gp-archive.$(OBJEXT) ArchiveExp.$(OBJEXT) gp_archive_OBJECTS =3D $(am_gp_archive_OBJECTS) -am__DEPENDENCIES_1 =3D gp_archive_DEPENDENCIES =3D $(LIBGPROFNG) $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) am_gp_collect_app_OBJECTS =3D gp-collect-app.$(OBJEXT) checks.$(OBJEXT) \ @@ -335,6 +336,7 @@ FGREP =3D @FGREP@ GPROFNG_BROKEN_JAVAC =3D @GPROFNG_BROKEN_JAVAC@ GPROFNG_CFLAGS =3D @GPROFNG_CFLAGS@ GPROFNG_CPPFLAGS =3D @GPROFNG_CPPFLAGS@ +GPROFNG_LIBADD =3D @GPROFNG_LIBADD@ GPROFNG_NO_FORMAT_TRUNCATION_CFLAGS =3D @GPROFNG_NO_FORMAT_TRUNCATION_CFLA= GS@ GPROFNG_NO_SWITCH_CFLAGS =3D @GPROFNG_NO_SWITCH_CFLAGS@ GREP =3D @GREP@ @@ -554,6 +556,8 @@ libgprofng_la_LDFLAGS =3D -version-info 0:0:0 # when -nostdlib is passed to libtool. # See bug 29364 - libgprofng.so: needs to link against -pthread libgprofng_la_LIBADD =3D $(top_builddir)/../opcodes/libopcodes.la \ + $(top_builddir)/../bfd/libbfd.la \ + $(GPROFNG_LIBADD) \ -lpthread -ldl =20 dbedir =3D $(SYSCONFDIR)