diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2021-04-24 12:51:46 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2021-05-01 12:55:18 -0400 |
| commit | 163cb761224879c8a148fa512e80c488fdbac0a5 (patch) | |
| tree | 4c2c953764b9c9426686863543a7f133178f3933 | |
| parent | ccf2e5927c241c40c680e8681dd961210c791a29 (diff) | |
| download | gdb-163cb761224879c8a148fa512e80c488fdbac0a5.zip gdb-163cb761224879c8a148fa512e80c488fdbac0a5.tar.gz gdb-163cb761224879c8a148fa512e80c488fdbac0a5.tar.bz2 | |
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.
| -rw-r--r-- | sim/arm/ChangeLog | 6 | ||||
| -rw-r--r-- | sim/arm/Makefile.in | 10 | ||||
| -rw-r--r-- | sim/arm/armemu32.c | 18 |
3 files changed, 25 insertions, 9 deletions
diff --git a/sim/arm/ChangeLog b/sim/arm/ChangeLog index c466deb..b60287f 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 2916695..f339e79 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 0000000..adf0bd9 --- /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" |