diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2023-12-29 08:00:11 +0300 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2024-01-20 06:23:47 +0300 |
| commit | 8c5bb84b6b505be3dbcea97ed2c879d2df81249f (patch) | |
| tree | aa739b3802a81d3fa9c6891d06e606d39b1b91ab /libgloss/configure | |
| parent | 22257fc68191c5a95373191798c59390ebf7388b (diff) | |
libgloss: merge or1k into top-level Makefile
Avoid a recursive make to speed things up a bit.
A or1k-elf build shows installed objects & libs produce same code.
Diffstat (limited to 'libgloss/configure')
| -rwxr-xr-x | libgloss/configure | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/libgloss/configure b/libgloss/configure index cee8a1b83..089d5471b 100755 --- a/libgloss/configure +++ b/libgloss/configure @@ -660,6 +660,8 @@ CONFIG_RL78_FALSE CONFIG_RL78_TRUE CONFIG_RISCV_FALSE CONFIG_RISCV_TRUE +CONFIG_OR1K_FALSE +CONFIG_OR1K_TRUE CONFIG_NIOS2_FALSE CONFIG_NIOS2_TRUE CONFIG_NDS32_FALSE @@ -2984,9 +2986,7 @@ case "${target}" in config_iq2000=true ;; or1k-*-* | or1knd-*-* ) - ac_config_files="$ac_config_files or1k/Makefile" - - subdirs="$subdirs or1k" + config_or1k=true ;; pru-*-*) ac_config_files="$ac_config_files pru/Makefile" @@ -3167,6 +3167,14 @@ else CONFIG_NIOS2_FALSE= fi + if test x$config_or1k = xtrue; then + CONFIG_OR1K_TRUE= + CONFIG_OR1K_FALSE='#' +else + CONFIG_OR1K_TRUE='#' + CONFIG_OR1K_FALSE= +fi + if test x$config_riscv = xtrue; then CONFIG_RISCV_TRUE= CONFIG_RISCV_FALSE='#' @@ -5782,6 +5790,10 @@ if test -z "${CONFIG_NIOS2_TRUE}" && test -z "${CONFIG_NIOS2_FALSE}"; then as_fn_error $? "conditional \"CONFIG_NIOS2\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${CONFIG_OR1K_TRUE}" && test -z "${CONFIG_OR1K_FALSE}"; then + as_fn_error $? "conditional \"CONFIG_OR1K\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${CONFIG_RISCV_TRUE}" && test -z "${CONFIG_RISCV_FALSE}"; then as_fn_error $? "conditional \"CONFIG_RISCV\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -6481,7 +6493,6 @@ do "m32c/Makefile") CONFIG_FILES="$CONFIG_FILES m32c/Makefile" ;; "spu/Makefile") CONFIG_FILES="$CONFIG_FILES spu/Makefile" ;; "tic6x/Makefile") CONFIG_FILES="$CONFIG_FILES tic6x/Makefile" ;; - "or1k/Makefile") CONFIG_FILES="$CONFIG_FILES or1k/Makefile" ;; "pru/Makefile") CONFIG_FILES="$CONFIG_FILES pru/Makefile" ;; "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "sparc/libsys/Makefile") CONFIG_FILES="$CONFIG_FILES sparc/libsys/Makefile" ;; |