public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
* [binutils-gdb] sim: arm: move build logic to source files
@ 2021-05-01 16:55 Michael Frysinger
0 siblings, 0 replies; only message in thread
From: Michael Frysinger @ 2021-05-01 16:55 UTC (permalink / raw)
To: gdb-cvs
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=163cb761224879c8a148fa512e80c488fdbac0a5
commit 163cb761224879c8a148fa512e80c488fdbac0a5
Author: Mike Frysinger <vapier@gentoo.org>
Date: Sat Apr 24 12:51:46 2021 -0400
sim: arm: move build logic to source files
This simplifies the build logic a bit by just having source file
inputs. It also simplifies code that assumes there's a source
file for each object.
Diff:
---
sim/arm/ChangeLog | 6 ++++++
sim/arm/Makefile.in | 10 +---------
sim/arm/armemu32.c | 18 ++++++++++++++++++
3 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog
index c466deb6fef..b60287f7631 100644
--- a/sim/arm/ChangeLog
+++ b/sim/arm/ChangeLog
@@ -1,3 +1,9 @@
+2021-05-01 Mike Frysinger <vapier@gentoo.org>
+
+ * Makefile.in (SIM_OBJS): Change armemu26.o to armemu.o.
+ (armemu26.o, armemu32.o): Delete targets.
+ * armemu32.c: New file.
+
2021-04-26 Mike Frysinger <vapier@gentoo.org>
* aclocal.m4, config.in, configure: Regenerate.
diff --git a/sim/arm/Makefile.in b/sim/arm/Makefile.in
index 29166952ce1..f339e799b9e 100644
--- a/sim/arm/Makefile.in
+++ b/sim/arm/Makefile.in
@@ -23,16 +23,8 @@ SIM_EXTRA_LIBS = -lm
SIM_OBJS = \
wrapper.o \
$(SIM_NEW_COMMON_OBJS) \
- armemu26.o armemu32.o arminit.o armos.o armsupp.o \
+ armemu.o armemu32.o arminit.o armos.o armsupp.o \
armvirt.o thumbemu.o \
armcopro.o maverick.o iwmmxt.o
## COMMON_POST_CONFIG_FRAG
-
-armemu26.o: armemu.c
- $(COMPILE) $(srcdir)/armemu.c
- $(POSTCOMPILE)
-
-armemu32.o: armemu.c
- $(COMPILE) -DMODE32 $(srcdir)/armemu.c
- $(POSTCOMPILE)
diff --git a/sim/arm/armemu32.c b/sim/arm/armemu32.c
new file mode 100644
index 00000000000..adf0bd9c0b5
--- /dev/null
+++ b/sim/arm/armemu32.c
@@ -0,0 +1,18 @@
+/* Build armemu.c with ARM32 support.
+ Copyright (C) 1995-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 <https://www.gnu.org/licenses/>. */
+
+#define MODE32
+#include "armemu.c"
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-05-01 16:55 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-01 16:55 [binutils-gdb] sim: arm: move build logic to source files Michael Frysinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).