diff options
author | Dimitar Dimitrov <dimitar@dinux.eu> | 2024-01-22 18:11:35 +0200 |
---|---|---|
committer | Corinna Vinschen <corinna@vinschen.de> | 2024-01-23 09:49:02 +0100 |
commit | d5c4edca81c87c784b4420cc194bea07436e0ab7 (patch) | |
tree | 39b3fdde00fb00e23665218f535ada215b7ced52 /libgloss/configure | |
parent | 02572ff089dcefed1e2e25f420be975f1ee7340c (diff) | |
download | newlib-d5c4edca81c87c784b4420cc194bea07436e0ab7.zip newlib-d5c4edca81c87c784b4420cc194bea07436e0ab7.tar.gz newlib-d5c4edca81c87c784b4420cc194bea07436e0ab7.tar.bz2 |
libgloss: merge pru into top-level Makefile
Avoid a recursive make to speed things up a bit. This change was
inspired by the recent similar patch for c6x:
https://sourceware.org/pipermail/newlib/2023/020869.html
While at it, fork crt0-minrt.S into a separate source file instead of
relying on a predefined macro to generate two different object files.
This improves clarity, simplifies the build rules, and would allow
further optimization in crt0-minrt.S to be implemented more cleanly.
Signed-off-by: Dimitar Dimitrov <dimitar@dinux.eu>
Diffstat (limited to 'libgloss/configure')
-rwxr-xr-x | libgloss/configure | 33 |
1 files changed, 28 insertions, 5 deletions
diff --git a/libgloss/configure b/libgloss/configure index fd5d941..722106a 100755 --- a/libgloss/configure +++ b/libgloss/configure @@ -672,6 +672,8 @@ CONFIG_RL78_FALSE CONFIG_RL78_TRUE CONFIG_RISCV_FALSE CONFIG_RISCV_TRUE +CONFIG_PRU_FALSE +CONFIG_PRU_TRUE CONFIG_OR1K_FALSE CONFIG_OR1K_TRUE CONFIG_NIOS2_FALSE @@ -790,6 +792,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -868,6 +871,7 @@ 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}' @@ -1120,6 +1124,15 @@ 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=* \ @@ -1257,7 +1270,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 + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1410,6 +1423,7 @@ 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] @@ -2989,9 +3003,7 @@ case "${target}" in config_or1k=true ;; pru-*-*) - ac_config_files="$ac_config_files pru/Makefile" - - subdirs="$subdirs pru" + config_pru=true ;; nios2-*-*) config_nios2=true @@ -3199,6 +3211,14 @@ else CONFIG_OR1K_FALSE= fi + if test x$config_pru = xtrue; then + CONFIG_PRU_TRUE= + CONFIG_PRU_FALSE='#' +else + CONFIG_PRU_TRUE='#' + CONFIG_PRU_FALSE= +fi + if test x$config_riscv = xtrue; then CONFIG_RISCV_TRUE= CONFIG_RISCV_FALSE='#' @@ -5879,6 +5899,10 @@ 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_PRU_TRUE}" && test -z "${CONFIG_PRU_FALSE}"; then + as_fn_error $? "conditional \"CONFIG_PRU\" 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 @@ -6595,7 +6619,6 @@ do "mt/Makefile") CONFIG_FILES="$CONFIG_FILES mt/Makefile" ;; "m32c/Makefile") CONFIG_FILES="$CONFIG_FILES m32c/Makefile" ;; "spu/Makefile") CONFIG_FILES="$CONFIG_FILES spu/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" ;; "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; |