diff options
| author | Pan Li <pan2.li@intel.com> | 2023-11-17 17:14:16 +0800 |
|---|---|---|
| committer | Pan Li <pan2.li@intel.com> | 2023-11-17 17:28:24 +0800 |
| commit | c1ec5800da994d9d532efcaf372b526a52b2434a (patch) | |
| tree | 24e59523dc43b3f22d6fa11190d05c5450621cc4 /Makefile.in | |
| parent | 9b2ad263050085543a1ad57c13039e49a79a7def (diff) | |
| download | riscv-gnu-toolchain-c1ec5800da994d9d532efcaf372b526a52b2434a.zip riscv-gnu-toolchain-c1ec5800da994d9d532efcaf372b526a52b2434a.tar.gz riscv-gnu-toolchain-c1ec5800da994d9d532efcaf372b526a52b2434a.tar.bz2 | |
Extend semantic for option '--with-extra-multilib-test'
The `--with-extra-multilib-test` take the format like below for now.
"<arch>-<abi>-[code-model][;<arch>-<abi>-[code-model]*"
This patch would like to extend the sematic to support additional buil
options for each combination. Aka:
"<arch>-<abi>-[code-model][:opts]*[;<arch>-<abi>-[code-model][:opts]*]*"
opts can be one or more build options splited by ':'. For example as
below:
* --param=riscv-autovec-lmul=m1
* --param=riscv-autovec-lmul=dynamic:--param=riscv-autovec-preference=fixed-vlmax
Thus the full example of the option `--with-extra-multilib-test` will be:
`rv64gcv_zvl128b-lp64d:--param=riscv-autovec-lmul=m1;rv64gcv_zvl256b-lp64d:-
-param=riscv-autovec-lmul=dynamic:--param=riscv-autovec-preference=fixed-vlmax`
Signed-off-by: Pan Li <pan2.li@intel.com>
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 7d6bed0..aa239ae 100644 --- a/Makefile.in +++ b/Makefile.in @@ -93,12 +93,25 @@ GDB_NATIVE_FLAGS := $(GDB_NATIVE_FLAGS_EXTRA) GLIBC_TARGET_FLAGS := $(GLIBC_TARGET_FLAGS_EXTRA) GLIBC_CC_FOR_TARGET ?= $(LINUX_TUPLE)-gcc GLIBC_CXX_FOR_TARGET ?= $(LINUX_TUPLE)-g++ -GLIBC_TARGET_BOARDS ?= $(shell echo "$(GLIBC_MULTILIB_NAMES) $(EXTRA_MULTILIB_TEST)" | sed 's!\([_a-z0-9]*\)-\([_a-z0-9]*\)!riscv-sim/-march=\1/-mabi=\2/@cmodel@!g') +GLIBC_TARGET_BOARDS ?= $(shell set -x && $(srcdir)/scripts/generate_target_board \ + --sim-name riscv-sim \ + --cmodel $(shell echo @cmodel@ | cut -d '=' -f2) \ + --build-arch-abi $(GLIBC_MULTILIB_NAMES) \ + --extra-test-arch-abi-flags-list $(subst ;,\;,$(EXTRA_MULTILIB_TEST))) NEWLIB_CC_FOR_TARGET ?= $(NEWLIB_TUPLE)-gcc NEWLIB_CXX_FOR_TARGET ?= $(NEWLIB_TUPLE)-g++ -NEWLIB_TARGET_BOARDS ?= $(shell echo "$(NEWLIB_MULTILIB_NAMES) $(EXTRA_MULTILIB_TEST)" | sed 's!\([_a-z0-9]*\)-\([_a-z0-9]*\)!riscv-sim/-march=\1/-mabi=\2/@cmodel@!g') -NEWLIB_NANO_TARGET_BOARDS ?= $(shell echo "$(NEWLIB_MULTILIB_NAMES) $(EXTRA_MULTILIB_TEST)" | sed 's!\([_a-z0-9]*\)-\([_a-z0-9]*\)!riscv-sim-nano/-march=\1/-mabi=\2/@cmodel@!g') +NEWLIB_TARGET_BOARDS ?= $(shell set -x && $(srcdir)/scripts/generate_target_board \ + --sim-name riscv-sim \ + --cmodel $(shell echo @cmodel@ | cut -d '=' -f2) \ + --build-arch-abi $(NEWLIB_MULTILIB_NAMES) \ + --extra-test-arch-abi-flags-list $(subst ;,\;,$(EXTRA_MULTILIB_TEST))) + +NEWLIB_NANO_TARGET_BOARDS ?= $(shell set -x && $(srcdir)/scripts/generate_target_board \ + --sim-name riscv-sim-nano \ + --cmodel $(shell echo @cmodel@ | cut -d '=' -f2) \ + --build-arch-abi $(NEWLIB_MULTILIB_NAMES) \ + --extra-test-arch-abi-flags-list $(subst ;,\;,$(EXTRA_MULTILIB_TEST))) NEWLIB_CC_FOR_MULTILIB_INFO := $(NEWLIB_CC_FOR_TARGET) MUSL_TARGET_FLAGS := $(MUSL_TARGET_FLAGS_EXTRA) |