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 706603858D32 for ; Wed, 27 Dec 2023 01:48:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 706603858D32 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 706603858D32 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=140.211.166.183 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703641696; cv=none; b=RJlmW1S5gtlceiKyJQhf52pTZaO7TMQY5sO0x7iSF5xA3qUqfxkVDxxSd8zncASnofly65ZHH6aBwKQnWWUvm7e+qmo/OKHVvfSB4bKHR3Gwnabjo/RAMEwFS7TYYmaloqCrgOpNzBGKqGQv8BSSGCNgq3oLImVkYWaeBJePa0Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703641696; c=relaxed/simple; bh=yaIkuZ2YtWvBnLxtndXH4+YAs9pEo83F4UdEbV6IVRs=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=v0Dn/et4K55jrOVs9V40ga8CfcKzwCu72KtxIxATjzdxGXrr0Gkf+/XsNQV85kIiueVsGQsP2Zyp10CGao90s7xrloTJAYnlLW6Ib8hf2VJ7v7e1Qq4aK7vgRV42vQQvvFLJWG9BmfleQFBfITcSv6LzhnMKMRg/RuLFiTJ3xX8= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by smtp.gentoo.org (Postfix, from userid 559) id 0892034069F; Wed, 27 Dec 2023 01:48:14 +0000 (UTC) From: Mike Frysinger To: newlib@sourceware.org Subject: [PATCH] libgloss: merge v850 into top-level Makefile Date: Tue, 26 Dec 2023 20:48:11 -0500 Message-ID: <20231227014811.20562-1-vapier@gentoo.org> X-Mailer: git-send-email 2.43.0 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.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Avoid a recursive make to speed things up a bit. A v850-elf build shows installed objects & libs produce same code. --- libgloss/Makefile.am | 3 + libgloss/Makefile.in | 219 +++++++++++++++++++++++++++++++------ libgloss/configure | 19 +++- libgloss/configure.ac | 6 +- libgloss/v850/Makefile.in | 151 ------------------------- libgloss/v850/Makefile.inc | 44 ++++++++ 6 files changed, 250 insertions(+), 192 deletions(-) delete mode 100644 libgloss/v850/Makefile.in create mode 100644 libgloss/v850/Makefile.inc diff --git a/libgloss/Makefile.am b/libgloss/Makefile.am index b6f12735ce4c..476db4742d76 100644 --- a/libgloss/Makefile.am +++ b/libgloss/Makefile.am @@ -102,6 +102,9 @@ endif if CONFIG_WINCE include wince/Makefile.inc endif +if CONFIG_V850 +include v850/Makefile.inc +endif if CONFIG_XTENSA include xtensa/Makefile.inc endif diff --git a/libgloss/configure.ac b/libgloss/configure.ac index 7f6aaf0e147a..1e0d74325b78 100644 --- a/libgloss/configure.ac +++ b/libgloss/configure.ac @@ -177,8 +177,7 @@ case "${target}" in subdirs="$subdirs mt" ;; v850*-*-*) - AC_CONFIG_FILES([v850/Makefile]) - subdirs="$subdirs v850" + config_v850=true ;; visium-*-*) AC_CONFIG_FILES([visium/Makefile]) @@ -249,7 +248,8 @@ AC_SUBST(subdirs) dnl These subdirs have converted to non-recursive make. Hopefully someday all dnl the ports above will too! m4_foreach_w([SUBDIR], [ - aarch64 arc arm bfin csky d30v iq2000 libnosys lm32 moxie nios2 riscv wince xtensa + aarch64 arc arm bfin csky d30v iq2000 libnosys lm32 moxie nios2 riscv v850 + wince xtensa ], [dnl AM_CONDITIONAL([CONFIG_]m4_toupper(SUBDIR), [test x$config_]SUBDIR = xtrue) ]) diff --git a/libgloss/v850/Makefile.in b/libgloss/v850/Makefile.in deleted file mode 100644 index dd507be59506..000000000000 --- a/libgloss/v850/Makefile.in +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright (c) 2002 Red Hat, Inc -# -# The authors hereby grant permission to use, copy, modify, distribute, -# and license this software and its documentation for any purpose, provided -# that existing copyright notices are retained in all copies and that this -# notice is included verbatim in any distributions. No written agreement, -# license, or royalty fee is required for any of the authorized uses. -# Modifications to this software may be copyrighted by their authors -# and need not follow the licensing terms described here, provided that -# the new terms are clearly indicated on the first page of each file where -# they apply. - -# Makefile for libgloss/frv. This is the board support -# code for the various frv targets. - -DESTDIR = -VPATH = @srcdir@ @srcdir@/.. -srcdir = @srcdir@ -objdir = . -srcroot = $(srcdir)/../.. -objroot = $(objdir)/../.. - -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -host_alias = @host_alias@ -target_alias = @target_alias@ - -bindir = @bindir@ -libdir = @libdir@ -tooldir = $(exec_prefix)/$(target_alias) - -# Multilib support variables. -# TOP is used instead of MULTI{BUILD,SRC}TOP. -MULTIDIRS = -MULTISUBDIR = -MULTIDO = true -MULTICLEAN = true - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ - -SHELL = /bin/sh - -mkinstalldirs = $(SHELL) $(srcroot)/mkinstalldirs - -CC = @CC@ - -AS = @AS@ -AR = @AR@ -LD = @LD@ -RANLIB = @RANLIB@ -AR_FLAGS = rc - -OBJDUMP = `if [ -f ${objroot}/../binutils/objdump ] ; \ - then echo ${objroot}/../binutils/objdump ; \ - else t='$(program_transform_name)'; echo objdump | sed -e $$t ; fi` -OBJCOPY = `if [ -f ${objroot}/../binutils/objcopy ] ; \ - then echo ${objroot}/../binutils/objcopy ; \ - else t='$(program_transform_name)'; echo objcopy | sed -e $$t ; fi` - -CRT0 = crt0.o -SIM_BSP = libsim.a -SIM_OBJS = _exit.o \ - access.o \ - chmod.o \ - chown.o \ - close.o \ - creat.o \ - crt1.o \ - execv.o \ - execve.o \ - fork.o \ - fstat.o \ - getpid.o \ - gettime.o \ - isatty.o \ - kill.o \ - link.o \ - lseek.o \ - open.o \ - pipe.o \ - read.o \ - sbrk.o \ - stat.o \ - time.o \ - times.o \ - trap.o \ - unlink.o \ - utime.o \ - wait.o \ - write.o - -#### Host specific Makefile fragment comes in here. -@host_makefile_frag@ - -all: $(CRT0) $(SIM_BSP) - -$(SIM_BSP): $(SIM_OBJS) - $(AR) $(ARFLAGS) $@ $? - $(RANLIB) $@ - -_exit.o: $(srcdir)/_exit.c -access.o: $(srcdir)/access.c -chmod.o: $(srcdir)/chmod.c -chown.o: $(srcdir)/chown.c -close.o: $(srcdir)/close.c -creat.o: $(srcdir)/creat.c -crt1.o: $(srcdir)/crt1.c -execv.o: $(srcdir)/execv.c -execve.o: $(srcdir)/execve.c -fork.o: $(srcdir)/fork.c -fstat.o: $(srcdir)/fstat.c -getpid.o: $(srcdir)/getpid.c -gettime.o: $(srcdir)/gettime.c -isatty.o: $(srcdir)/isatty.c -kill.o: $(srcdir)/kill.c -link.o: $(srcdir)/link.c -lseek.o: $(srcdir)/lseek.c -open.o: $(srcdir)/open.c -pipe.o: $(srcdir)/pipe.c -read.o: $(srcdir)/read.c -sbrk.o: $(srcdir)/sbrk.c -stat.o: $(srcdir)/stat.c -time.o: $(srcdir)/time.c -times.o: $(srcdir)/times.c -trap.o: $(srcdir)/trap.S -unlink.o: $(srcdir)/unlink.c -utime.o: $(srcdir)/utime.c -wait.o: $(srcdir)/wait.c -write.o: $(srcdir)/write.c - -install: $($(CPU)_INSTALL) - ${mkinstalldirs} ${DESTDIR}${tooldir}/lib${MULTISUBDIR} - $(INSTALL_DATA) $(CRT0) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(CRT0) - $(INSTALL_DATA) $(SIM_BSP) $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$(SIM_BSP) - -clean mostlyclean: - rm -f *.o *.a - -distclean maintainer-clean realclean: clean - rm -f Makefile - -.PHONY: info dvi doc install-info clean-info -info doc dvi: -install-info: -clean-info: - -Makefile: Makefile.in ../config.status - cd .. && $(SHELL) config.status diff --git a/libgloss/v850/Makefile.inc b/libgloss/v850/Makefile.inc new file mode 100644 index 000000000000..65cdb32c2c4b --- /dev/null +++ b/libgloss/v850/Makefile.inc @@ -0,0 +1,44 @@ +## Copyright (c) 2002 Red Hat, Inc +## +## The authors hereby grant permission to use, copy, modify, distribute, +## and license this software and its documentation for any purpose, provided +## that existing copyright notices are retained in all copies and that this +## notice is included verbatim in any distributions. No written agreement, +## license, or royalty fee is required for any of the authorized uses. +## Modifications to this software may be copyrighted by their authors +## and need not follow the licensing terms described here, provided that +## the new terms are clearly indicated on the first page of each file where +## they apply. + +multilibtool_DATA += %D%/crt0.o +multilibtool_LIBRARIES += %D%/libsim.a +%C%_libsim_a_SOURCES = \ + %D%/_exit.c \ + %D%/access.c \ + %D%/chmod.c \ + %D%/chown.c \ + %D%/close.c \ + %D%/creat.c \ + %D%/crt1.c \ + %D%/execv.c \ + %D%/execve.c \ + %D%/fork.c \ + %D%/fstat.c \ + %D%/getpid.c \ + %D%/gettime.c \ + %D%/isatty.c \ + %D%/kill.c \ + %D%/link.c \ + %D%/lseek.c \ + %D%/open.c \ + %D%/pipe.c \ + %D%/read.c \ + %D%/sbrk.c \ + %D%/stat.c \ + %D%/time.c \ + %D%/times.c \ + %D%/trap.S \ + %D%/unlink.c \ + %D%/utime.c \ + %D%/wait.c \ + %D%/write.c -- 2.43.0