diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2022-12-26 22:08:08 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2023-01-10 01:15:25 -0500 |
| commit | 1f1afa43f5ec535449d0be22abfbeffaa93952a0 (patch) | |
| tree | 0a3e2cbeeba674395527cb5f338a5bce5287cd68 /sim/configure | |
| parent | a6ead8401a356dadc86aff01788a27db2325f174 (diff) | |
| download | fsf-binutils-gdb-1f1afa43f5ec535449d0be22abfbeffaa93952a0.zip fsf-binutils-gdb-1f1afa43f5ec535449d0be22abfbeffaa93952a0.tar.gz fsf-binutils-gdb-1f1afa43f5ec535449d0be22abfbeffaa93952a0.tar.bz2 | |
sim: mips: move libsim.a creation to top-level
The objects are still compiled in the subdir, but the creation of the
archive itself is in the top-level. This is a required step before we
can move compilation itself up, and makes it easier to review.
The downside is that each object compile is a recursive make instead of
a single one. On my 4 core system, it adds ~100msec to the build per
port, so it's not great, but it shouldn't be a big deal. This will go
away of course once the top-level compiles objects.
The mips code is a little more tricky than others because, for multi-run
targets, it generates the list of sources & objects on the fly in the
configure script.
Diffstat (limited to 'sim/configure')
| -rwxr-xr-x | sim/configure | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sim/configure b/sim/configure index bcbe473..0fdb11d 100755 --- a/sim/configure +++ b/sim/configure @@ -16582,22 +16582,22 @@ __EOF__ *:*mips16*:*) : ws="m32 m16" - as_fn_append SIM_MIPS_MULTI_SRC " m16${name}_run.c" - as_fn_append SIM_MIPS_MULTI_OBJ " m16${name}_run.o" + as_fn_append SIM_MIPS_MULTI_SRC " mips/m16${name}_run.c" + as_fn_append SIM_MIPS_MULTI_OBJ " mips/m16${name}_run.o" as_fn_append SIM_MIPS_IGEN_ITABLE_FLAGS " -F 16" ;; #( *:*micromips32*:*) : ws="micromips_m32 micromips16 micromips32" - as_fn_append SIM_MIPS_MULTI_SRC " micromips${name}_run.c" - as_fn_append SIM_MIPS_MULTI_OBJ " micromips${name}_run.o" + as_fn_append SIM_MIPS_MULTI_SRC " mips/micromips${name}_run.c" + as_fn_append SIM_MIPS_MULTI_OBJ " mips/micromips${name}_run.o" as_fn_append SIM_MIPS_IGEN_ITABLE_FLAGS " -F 16,32" ;; #( *:*micromips64*:*) : ws="micromips_m64 micromips16 micromips64" - as_fn_append SIM_MIPS_MULTI_SRC " micromips${name}_run.c" - as_fn_append SIM_MIPS_MULTI_OBJ " micromips${name}_run.o" + as_fn_append SIM_MIPS_MULTI_SRC " mips/micromips${name}_run.c" + as_fn_append SIM_MIPS_MULTI_OBJ " mips/micromips${name}_run.o" as_fn_append SIM_MIPS_IGEN_ITABLE_FLAGS " -F 16,32,64" ;; #( *) : @@ -16606,9 +16606,9 @@ esac for w in ${ws}; do for base in engine icache idecode model semantics support; do - as_fn_append SIM_MIPS_MULTI_SRC " ${w}${name}_${base}.c" - as_fn_append SIM_MIPS_MULTI_SRC " ${w}${name}_${base}.h" - as_fn_append SIM_MIPS_MULTI_OBJ " ${w}${name}_${base}.o" + as_fn_append SIM_MIPS_MULTI_SRC " mips/${w}${name}_${base}.c" + as_fn_append SIM_MIPS_MULTI_SRC " mips/${w}${name}_${base}.h" + as_fn_append SIM_MIPS_MULTI_OBJ " mips/${w}${name}_${base}.o" done as_fn_append SIM_MIPS_MULTI_IGEN_CONFIGS " ${w}${c}" done @@ -16638,7 +16638,7 @@ fi __EOF__ else - SIM_MIPS_MULTI_SRC=doesnt-exist.c + SIM_MIPS_MULTI_SRC=mips/doesnt-exist.c SIM_MIPS_IGEN_ITABLE_FLAGS='$(SIM_MIPS_SINGLE_FLAGS)' if test "x$SIM_MIPS_GEN" = x"M16"; then : as_fn_append SIM_MIPS_IGEN_ITABLE_FLAGS ' $(SIM_MIPS_M16_FLAGS)' |