diff options
author | Mike Frysinger <vapier@gentoo.org> | 2024-01-20 23:47:12 -0500 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2024-01-23 08:19:54 -0500 |
commit | 752489c76e2a3c8f4b658597ff7956466366961c (patch) | |
tree | a65a321c9ecfe993936c773216e25dff637befcb /libgloss/configure | |
parent | 90d6966b88392dbcef01c64766eb452c645a7bfe (diff) | |
download | newlib-752489c76e2a3c8f4b658597ff7956466366961c.zip newlib-752489c76e2a3c8f4b658597ff7956466366961c.tar.gz newlib-752489c76e2a3c8f4b658597ff7956466366961c.tar.bz2 |
libgloss: merge cr16 into top-level Makefile
Avoid a recursive make to speed things up a bit.
A cr16-elf build shows installed objects & libs produce same code.
The test targets were dropped as they didn't actually work -- there
is no test.o rule in here.
Diffstat (limited to 'libgloss/configure')
-rwxr-xr-x | libgloss/configure | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/libgloss/configure b/libgloss/configure index 722106a..a49f586 100755 --- a/libgloss/configure +++ b/libgloss/configure @@ -716,6 +716,8 @@ CONFIG_D30V_FALSE CONFIG_D30V_TRUE CONFIG_CSKY_FALSE CONFIG_CSKY_TRUE +CONFIG_CR16_FALSE +CONFIG_CR16_TRUE CONFIG_BFIN_FALSE CONFIG_BFIN_TRUE CONFIG_ARM_FALSE @@ -792,7 +794,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -871,7 +872,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1124,15 +1124,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1270,7 +1261,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1423,7 +1414,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -2905,9 +2895,7 @@ case "${target}" in config_bfin=true ;; cr16-*-*) - ac_config_files="$ac_config_files cr16/Makefile" - - subdirs="$subdirs cr16" + config_cr16=true ;; cris-*-* | crisv32-*-*) ac_config_files="$ac_config_files cris/Makefile" @@ -3043,6 +3031,14 @@ else CONFIG_BFIN_FALSE= fi + if test x$config_cr16 = xtrue; then + CONFIG_CR16_TRUE= + CONFIG_CR16_FALSE='#' +else + CONFIG_CR16_TRUE='#' + CONFIG_CR16_FALSE= +fi + if test x$config_csky = xtrue; then CONFIG_CSKY_TRUE= CONFIG_CSKY_FALSE='#' @@ -5815,6 +5811,10 @@ if test -z "${CONFIG_BFIN_TRUE}" && test -z "${CONFIG_BFIN_FALSE}"; then as_fn_error $? "conditional \"CONFIG_BFIN\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${CONFIG_CR16_TRUE}" && test -z "${CONFIG_CR16_FALSE}"; then + as_fn_error $? "conditional \"CONFIG_CR16\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${CONFIG_CSKY_TRUE}" && test -z "${CONFIG_CSKY_FALSE}"; then as_fn_error $? "conditional \"CONFIG_CSKY\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -6612,7 +6612,6 @@ do "pa/Makefile") CONFIG_FILES="$CONFIG_FILES pa/Makefile" ;; "mips/Makefile") CONFIG_FILES="$CONFIG_FILES mips/Makefile" ;; "rs6000/Makefile") CONFIG_FILES="$CONFIG_FILES rs6000/Makefile" ;; - "cr16/Makefile") CONFIG_FILES="$CONFIG_FILES cr16/Makefile" ;; "cris/Makefile") CONFIG_FILES="$CONFIG_FILES cris/Makefile" ;; "crx/Makefile") CONFIG_FILES="$CONFIG_FILES crx/Makefile" ;; "mep/Makefile") CONFIG_FILES="$CONFIG_FILES mep/Makefile" ;; |