From 179bd7a89d85a1d7b67c641778eac7df849b8d09 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 1 Jan 2024 15:26:21 -0500
Subject: [PATCH] sim: ppc: drop build-config.h usage

This header is only used by the igen tool, and none of the igen code
depends on the configure-time checks.  Delete the logic to simplify
to prepare for moving it to the local.mk code.
---
 sim/ppc/configure    | 34 ----------------------------------
 sim/ppc/configure.ac | 31 -------------------------------
 sim/ppc/filter.c     |  2 --
 sim/ppc/igen.c       |  1 -
 sim/ppc/lf.c         |  1 -
 sim/ppc/misc.c       |  1 -
 sim/ppc/misc.h       |  2 --
 sim/ppc/table.c      |  1 -
 8 files changed, 73 deletions(-)

diff --git a/sim/ppc/configure b/sim/ppc/configure
index 04d0956..59c4d17 100755
--- a/sim/ppc/configure
+++ b/sim/ppc/configure
@@ -4147,38 +4147,6 @@ _ACEOF
 fi
 
 
-# Since we run commands on the build system, we have to create a
-# separate config header for the build system if build != host.
-if test x$host = x$build; then
-  ac_config_commands="$ac_config_commands build-config.h"
-
-else
-  tempdir=build.$$
-  rm -rf $tempdir
-  mkdir $tempdir
-  cd $tempdir
-  case ${srcdir} in
-  /* | A-Za-z:\\/* ) realsrcdir=${srcdir};;
-  *) realsrcdir=../${srcdir};;
-  esac
-  saved_CFLAGS="${CFLAGS}"
-  # Put a plausible default for CC_FOR_BUILD in Makefile.
-  if test "x$cross_compiling" = "xno"; then
-    CC_FOR_BUILD='$(CC)'
-  else
-    CC_FOR_BUILD=gcc
-  fi
-  CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD-${CFLAGS}}" \
-  LDFLAGS="${LDFLAGS_FOR_BUILD}" \
-  ${realsrcdir}/configure \
-    --enable-languages=${enable_languages-all} \
-    --target=$target_alias --host=$build_alias --build=$build_alias
-  CFLAGS="${saved_CFLAGS}"
-  mv config.h ../build-config.h
-  cd ..
-  rm -rf $tempdir
-fi
-
 
 
 
@@ -4900,7 +4868,6 @@ for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;;
-    "build-config.h") CONFIG_COMMANDS="$CONFIG_COMMANDS build-config.h" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
 
@@ -5458,7 +5425,6 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
 
 
   case $ac_file$ac_mode in
-    "build-config.h":C) cp config.h build-config.h ;;
     "default":C) case x$CONFIG_HEADERS in xconfig.h:config.in) echo > stamp-h ;; esac ;;
 
   esac
diff --git a/sim/ppc/configure.ac b/sim/ppc/configure.ac
index 290cdd1..adb4fc0 100644
--- a/sim/ppc/configure.ac
+++ b/sim/ppc/configure.ac
@@ -480,37 +480,6 @@ fi
 
 AC_CHECK_TYPES(long long)
 
-# Since we run commands on the build system, we have to create a
-# separate config header for the build system if build != host.
-if test x$host = x$build; then
-  AC_CONFIG_COMMANDS([build-config.h],[cp config.h build-config.h])
-else
-  tempdir=build.$$
-  rm -rf $tempdir
-  mkdir $tempdir
-  cd $tempdir
-  case ${srcdir} in
-  /* | [A-Za-z]:[\\/]* ) realsrcdir=${srcdir};;
-  *) realsrcdir=../${srcdir};;
-  esac
-  saved_CFLAGS="${CFLAGS}"
-  # Put a plausible default for CC_FOR_BUILD in Makefile.
-  if test "x$cross_compiling" = "xno"; then
-    CC_FOR_BUILD='$(CC)'
-  else
-    CC_FOR_BUILD=gcc
-  fi
-  CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD-${CFLAGS}}" \
-  LDFLAGS="${LDFLAGS_FOR_BUILD}" \
-  ${realsrcdir}/configure \
-    --enable-languages=${enable_languages-all} \
-    --target=$target_alias --host=$build_alias --build=$build_alias
-  CFLAGS="${saved_CFLAGS}"
-  mv config.h ../build-config.h
-  cd ..
-  rm -rf $tempdir
-fi
-
 AC_SUBST(sim_line_nr)
 AC_SUBST(sim_opcode)
 AC_SUBST(sim_switch)
diff --git a/sim/ppc/filter.c b/sim/ppc/filter.c
index f1da310..c2f28ea 100644
--- a/sim/ppc/filter.c
+++ b/sim/ppc/filter.c
@@ -20,8 +20,6 @@
 
 #include <stdio.h>
 
-#include "build-config.h"
-
 #include <string.h>
 
 #include "misc.h"
diff --git a/sim/ppc/igen.c b/sim/ppc/igen.c
index 9f64244..4de7469 100644
--- a/sim/ppc/igen.c
+++ b/sim/ppc/igen.c
@@ -23,7 +23,6 @@
 #include "misc.h"
 #include "lf.h"
 #include "table.h"
-#include "build-config.h"
 
 #include "filter.h"
 
diff --git a/sim/ppc/lf.c b/sim/ppc/lf.c
index e170a47..9a9d615 100644
--- a/sim/ppc/lf.c
+++ b/sim/ppc/lf.c
@@ -22,7 +22,6 @@
 #include <stdarg.h>
 #include <ctype.h>
 
-#include "build-config.h"
 #include "misc.h"
 #include "lf.h"
 
diff --git a/sim/ppc/misc.c b/sim/ppc/misc.c
index 8f2581e..a281d62 100644
--- a/sim/ppc/misc.c
+++ b/sim/ppc/misc.c
@@ -22,7 +22,6 @@
 #include <stdarg.h>
 #include <ctype.h>
 
-#include "build-config.h"
 #include "misc.h"
 
 #include <stdlib.h>
diff --git a/sim/ppc/misc.h b/sim/ppc/misc.h
index 0830913..a9e97a0 100644
--- a/sim/ppc/misc.h
+++ b/sim/ppc/misc.h
@@ -20,8 +20,6 @@
 
 /* Frustrating header junk */
 
-#include "build-config.h"
-
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
diff --git a/sim/ppc/table.c b/sim/ppc/table.c
index da16967..cb9a73a 100644
--- a/sim/ppc/table.c
+++ b/sim/ppc/table.c
@@ -24,7 +24,6 @@
 #include <fcntl.h>
 #include <ctype.h>
 
-#include "build-config.h"
 #include "misc.h"
 #include "lf.h"
 #include "table.h"
-- 
2.7.4