mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-01-30 12:44:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

sim: m32r: merge with common configure script

Browse Source 
Now that the traps code has been unified, the configure script has no
unique logic in it, so it can be merged into the single common one.
This commit is contained in:
Mike Frysinger 2021-07-01 00:50:17 -04:00
parent 54af62279c
commit 313c332ff2
8 changed files with 35 additions and 2902 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sim/ChangeLog
View File

@ -1,3 +1,8 @@
2021-07-01 Mike Frysinger <vapier@gentoo.org>
* configure.ac: Remove [true] from m32r SIM_TARGET call.
* configure, Makefile.in: Regenerate.
2021-06-30 Mike Frysinger <vapier@gentoo.org>
* configure.ac: Remove [true] from cris, frv, iq2000, and lm32

4
sim/Makefile.in
View File

@ -234,7 +234,7 @@ CONFIG_CLEAN_FILES = Make-common.sim aarch64/Makefile.sim \
cr16/Makefile.sim cris/Makefile.sim d10v/Makefile.sim \
frv/Makefile.sim ft32/Makefile.sim h8300/Makefile.sim \
iq2000/Makefile.sim lm32/Makefile.sim m32c/Makefile.sim \
m68hc11/Makefile.sim mcore/Makefile.sim \
m32r/Makefile.sim m68hc11/Makefile.sim mcore/Makefile.sim \
microblaze/Makefile.sim moxie/Makefile.sim msp430/Makefile.sim \
pru/Makefile.sim rl78/Makefile.sim rx/Makefile.sim \
sh/Makefile.sim erc32/Makefile.sim \
@ -976,6 +976,8 @@ lm32/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/lm32/Makefile.in
cd $(top_builddir) && $(SHELL) ./config.status $@
m32c/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/m32c/Makefile.in
cd $(top_builddir) && $(SHELL) ./config.status $@
m32r/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/m32r/Makefile.in
cd $(top_builddir) && $(SHELL) ./config.status $@
m68hc11/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/m68hc11/Makefile.in
cd $(top_builddir) && $(SHELL) ./config.status $@
mcore/Makefile.sim: $(top_builddir)/config.status $(top_srcdir)/mcore/Makefile.in

24
sim/configure vendored
View File

@ -864,7 +864,6 @@ PKG_CONFIG_LIBDIR
SDL_CFLAGS
SDL_LIBS'
ac_subdirs_all='bpf
m32r
mips
mn10300
or1k
@ -12180,7 +12179,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 12183 "configure"
#line 12182 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -12286,7 +12285,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 12289 "configure"
#line 12288 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@ -13976,8 +13975,11 @@ subdirs="$subdirs bpf"
if test "${targ}" = "${target}"; then
SIM_PRIMARY_TARGET=m32r
fi
subdirs="$subdirs m32r"
ac_config_files="$ac_config_files m32r/Makefile.sim:m32r/Makefile.in"
ac_config_commands="$ac_config_commands m32r/Makefile"
as_fn_append SIM_SUBDIRS " m32r"
ac_config_commands="$ac_config_commands depdir-m32r"
@ -15832,6 +15834,8 @@ do
"m32c/Makefile.sim") CONFIG_FILES="$CONFIG_FILES m32c/Makefile.sim:m32c/Makefile.in" ;;
"m32c/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS m32c/Makefile" ;;
"depdir-m32c") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-m32c" ;;
"m32r/Makefile.sim") CONFIG_FILES="$CONFIG_FILES m32r/Makefile.sim:m32r/Makefile.in" ;;
"m32r/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS m32r/Makefile" ;;
"depdir-m32r") CONFIG_COMMANDS="$CONFIG_COMMANDS depdir-m32r" ;;
"m68hc11/Makefile.sim") CONFIG_FILES="$CONFIG_FILES m68hc11/Makefile.sim:m68hc11/Makefile.in" ;;
"m68hc11/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS m68hc11/Makefile" ;;
@ -17371,6 +17375,18 @@ $as_echo X"$file" |
rm -f m32c/Makesim1.tmp m32c/Makesim2.tmp
;;
"depdir-m32c":C) $SHELL $ac_aux_dir/mkinstalldirs m32c/$DEPDIR ;;
"m32r/Makefile":C) sed -n \
-e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ {
/^srcdir = / s:$:/m32r:
p
}' \
<Make-common.sim >m32r/Makesim1.tmp
sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' <Make-common.sim >m32r/Makesim2.tmp
sed -e '/^## COMMON_PRE_/ r m32r/Makesim1.tmp' \
-e '/^## COMMON_POST_/ r m32r/Makesim2.tmp' \
<m32r/Makefile.sim >m32r/Makefile
rm -f m32r/Makesim1.tmp m32r/Makesim2.tmp
;;
"depdir-m32r":C) $SHELL $ac_aux_dir/mkinstalldirs m32r/$DEPDIR ;;
"m68hc11/Makefile":C) sed -n \
-e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ {

2
sim/configure.ac
View File

@ -125,7 +125,7 @@ if test "${enable_sim}" != no; then
SIM_TARGET([iq2000-*-*], [iq2000])
SIM_TARGET([lm32-*-*], [lm32])
SIM_TARGET([m32c-*-*], [m32c])
SIM_TARGET([m32r-*-*], [m32r], [true])
SIM_TARGET([m32r-*-*], [m32r])
SIM_TARGET([m68hc11-*-*|m6811-*-*], [m68hc11])
SIM_TARGET([mcore-*-*], [mcore])
SIM_TARGET([microblaze-*-*], [microblaze])

6
sim/m32r/ChangeLog
View File

@ -1,3 +1,9 @@
2021-07-01 Mike Frysinger <vapier@gentoo.org>
* configure.ac: Removed.
* aclocal.m4: Removed.
* configure: Removed.
2021-07-01 Mike Frysinger <vapier@gentoo.org>
* traps.c (m32r_trap): Reformat indentation to GNU style.

15
sim/m32r/aclocal.m4 vendored
View File

@ -1,15 +0,0 @@
# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
# Copyright (C) 1996-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.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
m4_include([../m4/sim_ac_output.m4])

2876
sim/m32r/configure vendored
View File

File diff suppressed because it is too large Load Diff

5
sim/m32r/configure.ac
View File

@ -1,5 +0,0 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(Makefile.in)
AC_CONFIG_MACRO_DIRS([../m4 ../.. ../../config])
SIM_AC_OUTPUT