diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2023-01-02 14:15:02 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2023-01-14 20:48:49 -0500 |
| commit | eac2fbdc4ba9116693f838d82edb844cccce8dd9 (patch) | |
| tree | fbec633a3da9bc52fd5d424578238f51efdcefc7 /sim/or1k | |
| parent | 0e7c397dbf3b9af7f132963e2ecc52585f1ee7d0 (diff) | |
| download | gdb-eac2fbdc4ba9116693f838d82edb844cccce8dd9.zip gdb-eac2fbdc4ba9116693f838d82edb844cccce8dd9.tar.gz gdb-eac2fbdc4ba9116693f838d82edb844cccce8dd9.tar.bz2 | |
sim: common: move libcommon.a objects to sources
This simplifies the build logic and avoids an Automake bug where the
common_libcommon_a_OBJECTS variable isn't set in the arch libsim.a
DEPENDENCIES for targets that, alphabetically, come before "common".
We aren't affected by that bug with the current code, but as we move
things out of SIM_ALL_RECURSIVE_DEPS and rely on finer dependencies,
we will trip over it.
Diffstat (limited to 'sim/or1k')
| -rw-r--r-- | sim/or1k/local.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sim/or1k/local.mk b/sim/or1k/local.mk index 2a3b129..71a34db 100644 --- a/sim/or1k/local.mk +++ b/sim/or1k/local.mk @@ -17,9 +17,9 @@ AM_CPPFLAGS_%C% = -DWITH_TARGET_WORD_BITSIZE=32 -DWITH_TARGET_WORD_MSB=31 -%C%_libsim_a_SOURCES = +%C%_libsim_a_SOURCES = \ + $(common_libcommon_a_SOURCES) %C%_libsim_a_LIBADD = \ - $(common_libcommon_a_OBJECTS) \ $(patsubst %,%D%/%,$(SIM_NEW_COMMON_OBJS)) \ $(patsubst %,%D%/dv-%.o,$(SIM_HW_DEVICES)) \ %D%/modules.o \ |