mirrors/binutils-gdb
1
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-11-26 03:24:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

sim: create a makefile fragment to pass common settings down

Browse Source 
As we merge settings from subdirs into the common configure, we
sometimes need to keep the settings working in both dirs.  Create
a makefile fragment to pass them down so we don't have to run the
checks twice.  For now, the file is empty, but we'll start moving
logic in shortly.
This commit is contained in:
Mike Frysinger 2021-06-15 23:01:45 -04:00
parent 162c6aef1f
commit 3f8414df7a
9 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sim/ChangeLog
View File

@ -1,3 +1,9 @@
2021-06-18 Mike Frysinger <vapier@gentoo.org>
* configure.ac: Output arch-subdir.mk.
* Makefile.in, configure: Regenerate.
* arch-subdir.mk.in: New file.
2021-06-17 Mike Frysinger <vapier@gentoo.org>
* configure.ac: Call SIM_AC_OPTION_ENDIAN.

4
sim/Makefile.in
View File

@ -217,7 +217,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_FILES = arch-subdir.mk
CONFIG_CLEAN_VPATH_FILES =
LIBRARIES = $(noinst_LIBRARIES)
ARFLAGS = cru
@ -866,6 +866,8 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
distclean-hdr:
-rm -f config.h stamp-h1
arch-subdir.mk: $(top_builddir)/config.status $(srcdir)/arch-subdir.mk.in
cd $(top_builddir) && $(SHELL) ./config.status $@
clean-noinstLIBRARIES:
-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)

18
sim/arch-subdir.mk.in Normal file
View File

@ -0,0 +1,18 @@
## Fragment to pass common settings into arch subdir builds.
## NB: This should eventually be merged into sim/Makefile.am once there are no
## subdir configure scripts.
#
# Copyright (C) 1993-2021 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

4
sim/common/ChangeLog
View File

@ -1,3 +1,7 @@
2021-06-18 Mike Frysinger <vapier@gentoo.org>
* Make-common.in: Include ../arch-subdir.mk.
2021-06-18 Mike Frysinger <vapier@gentoo.org>
* cgen-run.c: Include sim-signal.h.

3
sim/common/Make-common.in
View File

@ -46,6 +46,9 @@ include $(srcroot)/gdb/silent-rules.mk
GNULIB_PARENT_DIR = ../..
include $(GNULIB_PARENT_DIR)/gnulib/Makefile.gnulib.inc
# Settings from top-level configure.
include ../arch-subdir.mk
prefix = @prefix@
exec_prefix = @exec_prefix@

3
sim/configure vendored
View File

@ -6883,7 +6883,7 @@ _ACEOF
$as_echo "$sim_trace" >&6; }
ac_config_files="$ac_config_files Makefile"
ac_config_files="$ac_config_files arch-subdir.mk Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@ -7622,6 +7622,7 @@ do
case $ac_config_target in
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"arch-subdir.mk") CONFIG_FILES="$CONFIG_FILES arch-subdir.mk" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;

2
sim/configure.ac
View File

@ -118,5 +118,5 @@ SIM_AC_OPTION_PROFILE
SIM_AC_OPTION_STDIO
SIM_AC_OPTION_TRACE
AC_CONFIG_FILES([Makefile])
AC_CONFIG_FILES([arch-subdir.mk Makefile])
AC_OUTPUT

4
sim/ppc/ChangeLog
View File

@ -1,3 +1,7 @@
2021-06-18 Mike Frysinger <vapier@gentoo.org>
* Makefile.in: Include ../arch-subdir.mk.
2021-06-18 Mike Frysinger <vapier@gentoo.org>
* sim-main.h: Delete sim-signal.h include.

3
sim/ppc/Makefile.in
View File

@ -25,6 +25,9 @@ srccom = $(srcdir)/../common
srcroot = $(srcdir)/../..
srcsim = $(srcdir)/..
# Settings from top-level configure.
include ../arch-subdir.mk
prefix = @prefix@
exec_prefix = @exec_prefix@