From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id 863463858D37 for ; Sat, 12 Feb 2022 10:24:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 863463858D37 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 9E13F3431CA; Sat, 12 Feb 2022 10:24:20 +0000 (UTC) From: Mike Frysinger To: newlib@sourceware.org Subject: [PATCH] libgloss: sparc: merge libsys/ up a level Date: Sat, 12 Feb 2022 05:24:23 -0500 Message-Id: <20220212102423.23295-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.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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:24:23 -0000 The libsys/configure script isn't doing anything useful, so merge the logic up to the parent dir. --- libgloss/sparc/configure | 156 +- libgloss/sparc/configure.ac | 4 +- libgloss/sparc/libsys/Makefile.in | 9 +- libgloss/sparc/libsys/aclocal.m4 | 383 --- libgloss/sparc/libsys/configure | 3718 ---------------------------- libgloss/sparc/libsys/configure.ac | 44 - 6 files changed, 9 insertions(+), 4305 deletions(-) delete mode 100644 libgloss/sparc/libsys/aclocal.m4 delete mode 100755 libgloss/sparc/libsys/configure delete mode 100644 libgloss/sparc/libsys/configure.ac diff --git a/libgloss/sparc/configure.ac b/libgloss/sparc/configure.ac index 56049d5b9b33..4a5b9ef4b76a 100644 --- a/libgloss/sparc/configure.ac +++ b/libgloss/sparc/configure.ac @@ -39,11 +39,11 @@ AC_SUBST(CPU) case ${target_cpu} in sparc64*) CYGMONLDSCRIPTTEMPL=${srcdir}/cygmon-sparc64-ld.src ;; -sparclet-*-aout*) CYGMONLDSCRIPTTEMPL-${srcdir}/cygmon.ld.src; AC_CONFIG_SUBDIRS(libsys) ;; +sparclet-*-aout*) CYGMONLDSCRIPTTEMPL-${srcdir}/cygmon.ld.src; AC_CONFIG_FILES([libsys/Makefile]) ;; *) CYGMONLDSCRIPTTEMPL=${srcdir}/cygmon.ld.src esac -host_makefile_frag=${srcdir}/../config/default.mh +host_makefile_frag=`cd $srcdir/../config;pwd`/default.mh target_makefile_frag=${srcdir}/../config/default.mt dnl We have to assign the same value to other variables because autoconf diff --git a/libgloss/sparc/libsys/Makefile.in b/libgloss/sparc/libsys/Makefile.in index b732137c5f08..34f95507cfc5 100644 --- a/libgloss/sparc/libsys/Makefile.in +++ b/libgloss/sparc/libsys/Makefile.in @@ -106,13 +106,10 @@ clean mostlyclean: rm -f *.o *.a *.s stamp-srcs distclean maintainer-clean realclean: clean - rm -f Makefile config.status + rm -f Makefile -Makefile: Makefile.in config.status @host_makefile_frag_path@ - $(SHELL) config.status - -config.status: configure - $(SHELL) config.status --recheck +Makefile: Makefile.in ../config.status + cd .. && $(SHELL) config.status stamp-srcs: Makefile template.S template_r.S for f in $(TEMPLATE_SFILES:_=) ; \ diff --git a/libgloss/sparc/libsys/configure.ac b/libgloss/sparc/libsys/configure.ac deleted file mode 100644 index 4a2afb1fd4de..000000000000 --- a/libgloss/sparc/libsys/configure.ac +++ /dev/null @@ -1,44 +0,0 @@ -# Configure.in for libgloss/sparc/libsys -# Copyright (c) 1996 Cygnus Support -# All rights reserved. -# -# Redistribution and use in source and binary forms are permitted -# provided that the above copyright notice and this paragraph are -# duplicated in all such forms and that any documentation, -# and/or other materials related to such -# distribution and use acknowledge that the software was developed -# at Cygnus Support, Inc. Cygnus Support, Inc. may not be used to -# endorse or promote products derived from this software without -# specific prior written permission. -# THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - -dnl Process this file with autoconf to produce a configure script. -AC_INIT(libsys-crt0.S) - -AC_CONFIG_AUX_DIR(../../..) - -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) - -AC_OUTPUT(Makefile) -- 2.34.1