[Qemu-commits] [qemu/qemu] 84317d: target/xtensa: fix meson.build rule for xtensa cores

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 84317d57e8c61ff68eeaa1f2de93472fa930a6a4
      
https://github.com/qemu/qemu/commit/84317d57e8c61ff68eeaa1f2de93472fa930a6a4
  Author: Max Filippov <jcmvbkbc@gmail.com>
  Date:   2021-04-03 (Sat, 03 Apr 2021)

  Changed paths:
    M target/xtensa/import_core.sh
    M target/xtensa/meson.build

  Log Message:
  -----------
  target/xtensa: fix meson.build rule for xtensa cores

import_core.sh tries to change Makefile.objs when importing new xtensa
core, but that file no longer exists. Rewrite meson.build rule to pick
up all source files that match core-*.c pattern and drop commands that
change Makefile.objs.

Cc: qemu-stable@nongnu.org # v5.2.0
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>


  Commit: 30c676134eb8f956853a55023d694062062d40d7
      
https://github.com/qemu/qemu/commit/30c676134eb8f956853a55023d694062062d40d7
  Author: Max Filippov <jcmvbkbc@gmail.com>
  Date:   2021-04-03 (Sat, 03 Apr 2021)

  Changed paths:
    M target/xtensa/import_core.sh

  Log Message:
  -----------
  target/xtensa: make xtensa_modules static on import

xtensa_modules variable defined in each xtensa-modules.c.inc is only
used locally by the including file. Make it static.

Reported-by: Yury Gribov <tetra2005@gmail.com>
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: 25d75c99b2e5941c67049ee776efdb226414f4c6
      
https://github.com/qemu/qemu/commit/25d75c99b2e5941c67049ee776efdb226414f4c6
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-04-04 (Sun, 04 Apr 2021)

  Changed paths:
    M target/xtensa/import_core.sh
    M target/xtensa/meson.build

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/xtensa/tags/20210403-xtensa' into 
staging

target/xtensa fixes for v6.0:

- make meson.build pick up all available xtensa core definitions;
- don't modify Makefile.objs in import_core.sh;
- add sed rule to import_core.sh to make xtensa_modules variable static.

# gpg: Signature made Sat 03 Apr 2021 17:08:41 BST
# gpg:                using RSA key 2B67854B98E5327DCDEB17D851F9CC91F83FA044
# gpg:                issuer "jcmvbkbc@gmail.com"
# gpg: Good signature from "Max Filippov <filippov@cadence.com>" [unknown]
# gpg:                 aka "Max Filippov <max.filippov@cogentembedded.com>" 
[full]
# gpg:                 aka "Max Filippov <jcmvbkbc@gmail.com>" [full]
# Primary key fingerprint: 2B67 854B 98E5 327D CDEB  17D8 51F9 CC91 F83F A044

* remotes/xtensa/tags/20210403-xtensa:
  target/xtensa: make xtensa_modules static on import
  target/xtensa: fix meson.build rule for xtensa cores

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/11577d85b1a6...25d75c99b2e5