From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 6F0C93858D37 for ; Sat, 12 Feb 2022 10:07:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6F0C93858D37 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org Received: by smtp.gentoo.org (Postfix, from userid 559) id AAEF6342E5B; Sat, 12 Feb 2022 10:07:24 +0000 (UTC) From: Mike Frysinger To: newlib@sourceware.org Subject: [PATCH] libgloss: aarch64: merge cpu-init/ up a level Date: Sat, 12 Feb 2022 05:07:27 -0500 Message-Id: <20220212100727.20971-1-vapier@gentoo.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: newlib@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Feb 2022 10:07:30 -0000 The cpu-init/configure script isn't doing anything useful, so merge the logic up to the parent dir. This is how the arm/ tree integrates its cpu-init/ subdir too. --- libgloss/aarch64/configure | 157 +- libgloss/aarch64/configure.ac | 6 +- libgloss/aarch64/cpu-init/Makefile.in | 8 +- libgloss/aarch64/cpu-init/aclocal.m4 | 384 --- libgloss/aarch64/cpu-init/configure | 3926 ------------------------ libgloss/aarch64/cpu-init/configure.ac | 34 - 6 files changed, 14 insertions(+), 4501 deletions(-) delete mode 100644 libgloss/aarch64/cpu-init/aclocal.m4 delete mode 100755 libgloss/aarch64/cpu-init/configure delete mode 100644 libgloss/aarch64/cpu-init/configure.ac diff --git a/libgloss/aarch64/configure.ac b/libgloss/aarch64/configure.ac index b26f55ecaca1..1ed0a767bc75 100644 --- a/libgloss/aarch64/configure.ac +++ b/libgloss/aarch64/configure.ac @@ -26,7 +26,7 @@ esac AC_SUBST(objtype) -host_makefile_frag=${srcdir}/../config/default.mh +host_makefile_frag=`cd $srcdir/../config;pwd`/default.mh dnl We have to assign the same value to other variables because autoconf dnl doesn't provide a mechanism to substitute a replacement keyword with @@ -39,7 +39,9 @@ AC_SUBST_FILE(host_makefile_frag) # Configure cpu init plug-ins if test -d "${srcdir}/cpu-init"; then subdirs="${subdirs} cpu-init" - AC_CONFIG_SUBDIRS(cpu-init) + AC_CONFIG_FILES([cpu-init/Makefile], [dnl + ac_file=cpu-init/Makefile . ${srcdir}/../../config-ml.in + ]) AC_SUBST(subdirs) fi diff --git a/libgloss/aarch64/cpu-init/Makefile.in b/libgloss/aarch64/cpu-init/Makefile.in index c96f4ee0e6b9..22648b2af991 100644 --- a/libgloss/aarch64/cpu-init/Makefile.in +++ b/libgloss/aarch64/cpu-init/Makefile.in @@ -103,8 +103,8 @@ info: install-info: clean-info: -Makefile: Makefile.in config.status @host_makefile_frag_path@ - $(SHELL) config.status +Makefile: Makefile.in ../config.status @host_makefile_frag_path@ + $(SHELL) ../config.status --file cpu-init/Makefile -config.status: configure - $(SHELL) config.status --recheck +../config.status: ../configure + $(SHELL) ../config.status --recheck diff --git a/libgloss/aarch64/cpu-init/configure.ac b/libgloss/aarch64/cpu-init/configure.ac deleted file mode 100644 index 91f9c709a18a..000000000000 --- a/libgloss/aarch64/cpu-init/configure.ac +++ /dev/null @@ -1,34 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -AC_INIT(Makefile.in) - -AC_CONFIG_AUX_DIR(../../..) - -AC_CANONICAL_SYSTEM -AC_ARG_PROGRAM - -AC_PROG_INSTALL - -LIB_AC_PROG_CC -AS=${AS-as} -AC_SUBST(AS) -AR=${AR-ar} -AC_SUBST(AR) -LD=${LD-ld} -AC_SUBST(LD) -AC_PROG_RANLIB -LIB_AM_PROG_AS - -host_makefile_frag=${srcdir}/../../config/default.mh - -dnl We have to assign the same value to other variables because autoconf -dnl doesn't provide a mechanism to substitute a replacement keyword with -dnl arbitrary data or pathnames. -dnl -host_makefile_frag_path=$host_makefile_frag -AC_SUBST(host_makefile_frag_path) -AC_SUBST_FILE(host_makefile_frag) - -AM_ENABLE_MULTILIB(, ../../..) - -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT -- 2.34.1