From 25f6d8772ec7f6305d59224d2043dd312e2f99e5 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Tue, 26 Dec 2023 23:13:37 -0500
Subject: libgloss: merge mn10300 into top-level Makefile

Avoid a recursive make to speed things up a bit.
A mn10300-elf build shows installed objects & libs produce same code.
---
 libgloss/configure | 52 +++++++++++++++++++++++++++++++++-------------------
 1 file changed, 33 insertions(+), 19 deletions(-)

(limited to 'libgloss/configure')

diff --git a/libgloss/configure b/libgloss/configure
index 2a1005304..777200372 100755
--- a/libgloss/configure
+++ b/libgloss/configure
@@ -600,8 +600,8 @@ SPARC_CYGMONLDSCRIPTTEMPL
 SPARC_CPU
 MOXIE_BUILD_CRT0_FALSE
 MOXIE_BUILD_CRT0_TRUE
-MN10300_BSP_LIST
-MN10300_SCRIPT_LIST
+MN10300_BUILD_LIBCYGMON_FALSE
+MN10300_BUILD_LIBCYGMON_TRUE
 MIPS_CRT0
 MIPS_BSP_LIST
 MIPS_SCRIPT_LIST
@@ -655,6 +655,8 @@ CONFIG_MSP430_FALSE
 CONFIG_MSP430_TRUE
 CONFIG_MOXIE_FALSE
 CONFIG_MOXIE_TRUE
+CONFIG_MN10300_FALSE
+CONFIG_MN10300_TRUE
 CONFIG_LM32_FALSE
 CONFIG_LM32_TRUE
 CONFIG_LIBNOSYS_FALSE
@@ -2856,10 +2858,7 @@ case "${target}" in
 	target_makefile_frag=${srcdir}/config/mn10200.mt
 	;;
   mn10300-*-*)
-	ac_config_files="$ac_config_files mn10300/Makefile"
-
-	subdirs="$subdirs mn10300"
-	target_makefile_frag=${srcdir}/config/mn10300.mt
+	config_mn10300=true
 	;;
   bfin-*-*)
 	config_bfin=true
@@ -3095,6 +3094,14 @@ else
   CONFIG_LM32_FALSE=
 fi
 
+   if test x$config_mn10300 = xtrue; then
+  CONFIG_MN10300_TRUE=
+  CONFIG_MN10300_FALSE='#'
+else
+  CONFIG_MN10300_TRUE='#'
+  CONFIG_MN10300_FALSE=
+fi
+
    if test x$config_moxie = xtrue; then
   CONFIG_MOXIE_TRUE=
   CONFIG_MOXIE_FALSE='#'
@@ -5316,19 +5323,19 @@ esac
 
 
 
-MN10300_SCRIPT_LIST=
-MN10300_BSP_LIST=
-case "${target}" in
-  mn10300-*elf)
-    MN10300_SCRIPT_LIST="eval sim asb2303 asb2305"
-    MN10300_BSP_LIST="libeval.a libcygmon.a"
-    ;;
-  *)
-    MN10300_SCRIPT_LIST="eval sim"
-    MN10300_BSP_LIST="libeval.a"
-    ;;
+case ${target} in #(
+  mn10300-*elf) :
+    MN10300_BUILD_LIBCYGMON=true ;; #(
+  *) :
+    MN10300_BUILD_LIBCYGMON=false ;;
 esac
-
+ if $MN10300_BUILD_LIBCYGMON; then
+  MN10300_BUILD_LIBCYGMON_TRUE=
+  MN10300_BUILD_LIBCYGMON_FALSE='#'
+else
+  MN10300_BUILD_LIBCYGMON_TRUE='#'
+  MN10300_BUILD_LIBCYGMON_FALSE=
+fi
 
 
 case ${target} in #(
@@ -5650,6 +5657,10 @@ if test -z "${CONFIG_LM32_TRUE}" && test -z "${CONFIG_LM32_FALSE}"; then
   as_fn_error $? "conditional \"CONFIG_LM32\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${CONFIG_MN10300_TRUE}" && test -z "${CONFIG_MN10300_FALSE}"; then
+  as_fn_error $? "conditional \"CONFIG_MN10300\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${CONFIG_MOXIE_TRUE}" && test -z "${CONFIG_MOXIE_FALSE}"; then
   as_fn_error $? "conditional \"CONFIG_MOXIE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -5690,6 +5701,10 @@ if test -z "${am__fastdepCCAS_TRUE}" && test -z "${am__fastdepCCAS_FALSE}"; then
   as_fn_error $? "conditional \"am__fastdepCCAS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${MN10300_BUILD_LIBCYGMON_TRUE}" && test -z "${MN10300_BUILD_LIBCYGMON_FALSE}"; then
+  as_fn_error $? "conditional \"MN10300_BUILD_LIBCYGMON\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${MOXIE_BUILD_CRT0_TRUE}" && test -z "${MOXIE_BUILD_CRT0_FALSE}"; then
   as_fn_error $? "conditional \"MOXIE_BUILD_CRT0\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -6325,7 +6340,6 @@ do
     "mips/Makefile") CONFIG_FILES="$CONFIG_FILES mips/Makefile" ;;
     "rs6000/Makefile") CONFIG_FILES="$CONFIG_FILES rs6000/Makefile" ;;
     "mn10200/Makefile") CONFIG_FILES="$CONFIG_FILES mn10200/Makefile" ;;
-    "mn10300/Makefile") CONFIG_FILES="$CONFIG_FILES mn10300/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" ;;
-- 
cgit v1.2.3