From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id CB2B83858D35; Thu, 3 Nov 2022 08:24:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CB2B83858D35 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1667463874; bh=1AAFXzOHfzFwvhiMECPAOxk/08QBPxk6420CyXJZwPo=; h=From:To:Subject:Date:From; b=dmzQHzuA70LF6UbdkEtmjvp4L2fecqJw9p4bIVOQch5NtG+KlWLDuxtaoLSw6DW67 flr233vXSqXZyPmW38Ezld2/HU30GC7tMUqCz7baDX9ZQiU71rcD6HMseyXp/2F9A+ ZJgE6u4+q9F30ZIFe729rRG8NAaSY+gf6yyNUNm4= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Frysinger To: gdb-cvs@sourceware.org Subject: [binutils-gdb] sim: merge gnulib logic into the top-level X-Act-Checkin: binutils-gdb X-Git-Author: Mike Frysinger X-Git-Refname: refs/heads/master X-Git-Oldrev: ca7b34c5bead0acd3c93670d849081da04f5bcd9 X-Git-Newrev: 46a1e1f20b1192da31104f9ed436ea33328c79d4 Message-Id: <20221103082434.CB2B83858D35@sourceware.org> Date: Thu, 3 Nov 2022 08:24:34 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D46a1e1f20b11= 92da31104f9ed436ea33328c79d4 commit 46a1e1f20b1192da31104f9ed436ea33328c79d4 Author: Mike Frysinger Date: Mon Oct 31 18:31:44 2022 +0545 sim: merge gnulib logic into the top-level =20 We aren't using this just yet, but we will, so make it available to building of common sim files. Diff: --- sim/Makefile.am | 4 ++++ sim/Makefile.in | 6 +++++- sim/configure | 8 ++++++-- sim/configure.ac | 5 +++++ 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/sim/Makefile.am b/sim/Makefile.am index 594c91ff19b..d3125028b90 100644 --- a/sim/Makefile.am +++ b/sim/Makefile.am @@ -18,6 +18,9 @@ AUTOMAKE_OPTIONS =3D dejagnu foreign no-dist subdir-objects ACLOCAL_AMFLAGS =3D -Im4 -I.. -I../config =20 +GNULIB_PARENT_DIR =3D .. +@include_makefile@ $(GNULIB_PARENT_DIR)/gnulib/Makefile.gnulib.inc + srccom =3D $(srcdir)/common srcroot =3D $(srcdir)/.. =20 @@ -39,6 +42,7 @@ MOSTLYCLEANFILES =3D core =20 AM_CFLAGS =3D $(WERROR_CFLAGS) $(WARN_CFLAGS) AM_CPPFLAGS =3D \ + $(INCGNU) \ -I$(srcroot)/include \ $(SIM_INLINE) =20 diff --git a/sim/Makefile.in b/sim/Makefile.in index 36e95cf3046..8e2385ec9ed 100644 --- a/sim/Makefile.in +++ b/sim/Makefile.in @@ -891,6 +891,7 @@ host_cpu =3D @host_cpu@ host_os =3D @host_os@ host_vendor =3D @host_vendor@ htmldir =3D @htmldir@ +include_makefile =3D @include_makefile@ includedir =3D @includedir@ infodir =3D @infodir@ install_sh =3D @install_sh@ @@ -927,6 +928,7 @@ zlibdir =3D @zlibdir@ zlibinc =3D @zlibinc@ AUTOMAKE_OPTIONS =3D dejagnu foreign no-dist subdir-objects ACLOCAL_AMFLAGS =3D -Im4 -I.. -I../config +GNULIB_PARENT_DIR =3D .. srccom =3D $(srcdir)/common srcroot =3D $(srcdir)/.. SUBDIRS =3D @subdirs@ $(SIM_SUBDIRS) @@ -945,7 +947,8 @@ MOSTLYCLEANFILES =3D core $(am__append_5) site-sim-conf= ig.exp \ $(am__append_26) $(am__append_29) $(am__append_31) \ $(am__append_34) $(am__append_37) $(am__append_39) AM_CFLAGS =3D $(WERROR_CFLAGS) $(WARN_CFLAGS) -AM_CPPFLAGS =3D -I$(srcroot)/include $(SIM_INLINE) -I$(srcdir)/common +AM_CPPFLAGS =3D $(INCGNU) -I$(srcroot)/include $(SIM_INLINE) \ + -I$(srcdir)/common AM_CPPFLAGS_FOR_BUILD =3D -I$(srcroot)/include $(SIM_INLINE) \ -I$(srcdir)/common COMPILE_FOR_BUILD =3D $(CC_FOR_BUILD) $(AM_CPPFLAGS_FOR_BUILD) $(CPPFLAGS_= FOR_BUILD) $(CFLAGS_FOR_BUILD) @@ -2423,6 +2426,7 @@ uninstall-am: uninstall-armdocDATA uninstall-dtbDATA \ =20 .PRECIOUS: Makefile =20 +@include_makefile@ $(GNULIB_PARENT_DIR)/gnulib/Makefile.gnulib.inc =20 # Generate target constants for newlib/libgloss from its source tree. # This file is shipped with distributions so we build in the source dir. diff --git a/sim/configure b/sim/configure index 5283ef9c0dc..538e528cb1b 100755 --- a/sim/configure +++ b/sim/configure @@ -638,6 +638,7 @@ enable_option_checking=3Dno ac_subst_vars=3D'am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS +include_makefile SIM_RX_CYCLE_ACCURATE_FLAGS SIM_FRV_TRAPDUMP_FLAGS sim_float @@ -12775,7 +12776,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 12778 "configure" +#line 12779 "configure" #include "confdefs.h" =20 #if HAVE_DLFCN_H @@ -12881,7 +12882,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 12884 "configure" +#line 12885 "configure" #include "confdefs.h" =20 #if HAVE_DLFCN_H @@ -16509,6 +16510,9 @@ fi =20 =20 =20 +include_makefile=3D"include" + + ac_config_files=3D"$ac_config_files arch-subdir.mk Makefile .gdbinit:gdbin= it.in" =20 cat >confcache <<\_ACEOF diff --git a/sim/configure.ac b/sim/configure.ac index be0cfdbea32..30479aebc49 100644 --- a/sim/configure.ac +++ b/sim/configure.ac @@ -198,5 +198,10 @@ dnl Some arches have unique configure flags. m4_include([frv/acinclude.m4]) m4_include([rx/acinclude.m4]) =20 +dnl Hack to output an "include" statement in the Makefile so automake does= n't +dnl try to follow it itself while processing Makefile.am. +include_makefile=3D"include" +AC_SUBST(include_makefile) + AC_CONFIG_FILES([arch-subdir.mk Makefile .gdbinit:gdbinit.in]) AC_OUTPUT