diff options
author | Mike Frysinger <vapier@gentoo.org> | 2023-12-27 04:59:58 +0300 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2024-01-03 11:49:10 +0300 |
commit | 6bbeed74ca571b98af19dc7d52ce286f40c75229 (patch) | |
tree | 651bc873fef8ed009437c4134a8678da9120dc66 /libgloss/configure | |
parent | 6879bfa7c24467a85d3c0aa5b84c2f8f5fb92f33 (diff) |
libgloss: merge i960 into top-level Makefile
Avoid a recursive make to speed things up a bit.
I can't test this as current versions of binutils doesn't support i960.
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 def93ce56..6ba7b9408 100755 --- a/libgloss/configure +++ b/libgloss/configure @@ -657,6 +657,8 @@ CONFIG_LIBNOSYS_FALSE CONFIG_LIBNOSYS_TRUE CONFIG_IQ2000_FALSE CONFIG_IQ2000_TRUE +CONFIG_I960_FALSE +CONFIG_I960_TRUE CONFIG_D30V_FALSE CONFIG_D30V_TRUE CONFIG_CSKY_FALSE @@ -2811,9 +2813,7 @@ case "${target}" in subdirs="$subdirs pa" ;; i960-*-coff) - ac_config_files="$ac_config_files i960/Makefile" - - subdirs="$subdirs i960" + config_i960=true ;; sparc-*leon*-elf* | sparc-*leon*-none*) ac_config_files="$ac_config_files sparc_leon/Makefile" @@ -3045,6 +3045,14 @@ else CONFIG_D30V_FALSE= fi + if test x$config_i960 = xtrue; then + CONFIG_I960_TRUE= + CONFIG_I960_FALSE='#' +else + CONFIG_I960_TRUE='#' + CONFIG_I960_FALSE= +fi + if test x$config_iq2000 = xtrue; then CONFIG_IQ2000_TRUE= CONFIG_IQ2000_FALSE='#' @@ -5408,6 +5416,10 @@ if test -z "${CONFIG_D30V_TRUE}" && test -z "${CONFIG_D30V_FALSE}"; then as_fn_error $? "conditional \"CONFIG_D30V\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${CONFIG_I960_TRUE}" && test -z "${CONFIG_I960_FALSE}"; then + as_fn_error $? "conditional \"CONFIG_I960\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${CONFIG_IQ2000_TRUE}" && test -z "${CONFIG_IQ2000_FALSE}"; then as_fn_error $? "conditional \"CONFIG_IQ2000\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -6087,7 +6099,6 @@ do "nds32/Makefile") CONFIG_FILES="$CONFIG_FILES nds32/Makefile" ;; "m68k/Makefile") CONFIG_FILES="$CONFIG_FILES m68k/Makefile" ;; "pa/Makefile") CONFIG_FILES="$CONFIG_FILES pa/Makefile" ;; - "i960/Makefile") CONFIG_FILES="$CONFIG_FILES i960/Makefile" ;; "sparc_leon/Makefile") CONFIG_FILES="$CONFIG_FILES sparc_leon/Makefile" ;; "sparc/Makefile") CONFIG_FILES="$CONFIG_FILES sparc/Makefile" ;; "mips/Makefile") CONFIG_FILES="$CONFIG_FILES mips/Makefile" ;; |