From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) by sourceware.org (Postfix) with ESMTP id 20DF63858C56 for ; Wed, 27 Dec 2023 03:25:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 20DF63858C56 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 20DF63858C56 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2001:470:ea4a:1:5054:ff:fec7:86e4 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703647508; cv=none; b=J8/pGaI2IhYIBysCFMXdu1AZC3ca3J7aBUGX4GUFojuIlNR0n5oW8z5Qherpwe8vT20I3lo9L1sOpmi/rP/7H2TNtymIpMLrud2/awWsEJmx1S2sWdx5m699gAafKnplgxLbXpNNnHaizQNOlLIPeI23zhCYBjOv8DHL3S09Q2w= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1703647508; c=relaxed/simple; bh=hEuIC2q6xbbczlZmDiq3p7/BTmrGknWNUMuPk2BMkms=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=ZGKlSQ++gXSkVr8oPKhUud/BDaVbqhyih0BUTaNKKQ815r1/XLLBiJQqgTx9sYKFNfdmu5or3LBb8Zam3wdTwfJTkvfIrgfdxbmm6j5pO7gBEyU2TygocHgpuZB5SfevBFzC8deXPWLI0Tze60Sa6zYrWzKkdKqEs2onizLe/3k= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by smtp.gentoo.org (Postfix, from userid 559) id A6F3934072E; Wed, 27 Dec 2023 03:25:04 +0000 (UTC) From: Mike Frysinger To: newlib@sourceware.org Subject: [PATCH 5/5] libgloss: merge msp430 into top-level Makefile Date: Tue, 26 Dec 2023 22:24:53 -0500 Message-ID: <20231227032453.13546-5-vapier@gentoo.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231227032453.13546-1-vapier@gentoo.org> References: <20231227032453.13546-1-vapier@gentoo.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.2 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.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 msp430-elf build shows installed objects & libs produce same code. --- libgloss/Makefile.am | 3 + libgloss/Makefile.in | 259 +++++++++++++++++++++++++++-------- libgloss/configure | 19 ++- libgloss/configure.ac | 7 +- libgloss/msp430/Makefile.in | 166 ---------------------- libgloss/msp430/Makefile.inc | 52 +++++++ 6 files changed, 276 insertions(+), 230 deletions(-) delete mode 100644 libgloss/msp430/Makefile.in create mode 100644 libgloss/msp430/Makefile.inc diff --git a/libgloss/Makefile.am b/libgloss/Makefile.am index 92da21efd2ef..6bfff4bd2e1e 100644 --- a/libgloss/Makefile.am +++ b/libgloss/Makefile.am @@ -96,6 +96,9 @@ endif if CONFIG_MOXIE include moxie/Makefile.inc endif +if CONFIG_MSP430 +include msp430/Makefile.inc +endif if CONFIG_NIOS2 include nios2/Makefile.inc endif diff --git a/libgloss/configure.ac b/libgloss/configure.ac index bc4421393d5c..a3b191a71e18 100644 --- a/libgloss/configure.ac +++ b/libgloss/configure.ac @@ -200,8 +200,7 @@ case "${target}" in subdirs="$subdirs m32c" ;; msp430-*-elf*) - AC_CONFIG_FILES([msp430/Makefile]) - subdirs="$subdirs msp430" + config_msp430=true config_libnosys=false ;; rl78*-*-elf) @@ -247,8 +246,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 i960 iq2000 libnosys lm32 moxie nios2 riscv - v850 wince xtensa + aarch64 arc arm bfin csky d30v i960 iq2000 libnosys lm32 moxie msp430 nios2 + riscv v850 wince xtensa ], [dnl AM_CONDITIONAL([CONFIG_]m4_toupper(SUBDIR), [test x$config_]SUBDIR = xtrue) ]) diff --git a/libgloss/msp430/Makefile.in b/libgloss/msp430/Makefile.in deleted file mode 100644 index 62c8a280bcaa..000000000000 --- a/libgloss/msp430/Makefile.in +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright (c) 2008-2014 Red Hat, Inc. All rights reserved. -# -# This copyrighted material is made available to anyone wishing to use, modify, -# copy, or redistribute it subject to the terms and conditions of the BSD -# License. This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY expressed or implied, including the implied warranties -# of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. A copy of this license -# is available at http://www.opensource.org/licenses. Any Red Hat trademarks that -# are incorporated in the source code or documentation are not subject to the BSD -# License and may only be used or replicated with the express permission of -# Red Hat, Inc. - -# Makefile for libgloss/msp430. - -DESTDIR = -VPATH = @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 - -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` - -SCRIPTS = $(srcdir)/msp430-sim.ld -SCRIPTS += $(srcdir)/msp430xl-sim.ld -SCRIPTS += $(srcdir)/intr_vectors.ld - -CRT = gcrt0.o crt0.o -SIM_BSP = libsim.a -LIB_NOSYS = libnosys.a -LIB_CRT = libcrt.a - -SIM_OBJS = syscalls.o \ - cio.o \ - write.o \ - unlink.o \ - sbrk.o - -NOSYS_OBJS = ciosyscalls.o \ - cio.o \ - write.o \ - unlink.o \ - sbrk.o - -CRT_OBJS = \ - crt_bss.o \ - crt_high_bss.o \ - crt_movedata.o \ - crt_move_highdata.o \ - crt_main.o \ - crt_callexit.o \ - crt_run_init_array.o \ - crt_run_preinit_array.o \ - crt_run_fini_array.o \ - crt_run_array.o - -#### Host specific Makefile fragment comes in here. -@host_makefile_frag@ - - -all: $(CRT) $(SIM_BSP) $(LIB_NOSYS) $(LIB_CRT) copy_scripts_to_objdir - -$(SIM_BSP): $(SIM_OBJS) - $(AR) $(ARFLAGS) $@ $? - $(RANLIB) $@ - -$(LIB_NOSYS): $(NOSYS_OBJS) - $(AR) $(ARFLAGS) $@ $? - $(RANLIB) $@ - -$(LIB_CRT): $(CRT_OBJS) - $(AR) $(ARFLAGS) $@ $? - $(RANLIB) $@ - -copy_scripts_to_objdir: $(SCRIPTS) - cp $(SCRIPTS) $(objdir) - -# Dependencies - -SDEPS = $(srcdir)/cio.h - -abort.o : $(SDEPS) -argv.o : $(SDEPS) -argvlen.o : $(SDEPS) -chdir.o : $(SDEPS) -chmod.o : $(SDEPS) -close.o : $(SDEPS) -exit.o : $(SDEPS) -fstat.o : $(SDEPS) -getpid.o : $(SDEPS) -gettimeofday.o : $(SDEPS) -gcrt0.o: gcrt0.S crt0.S -kill.o : $(SDEPS) -link.o : $(SDEPS) -lseek.o : $(SDEPS) -mcount.o : $(SDEPS) -open.o : $(SDEPS) -read.o : $(SDEPS) -sigprocmask.o : $(SDEPS) -sleep.o : $(SDEPS) -stat.o : $(SDEPS) -time.o : $(SDEPS) -times.o : $(SDEPS) -unlink.o : $(SDEPS) -utime.o : $(SDEPS) -write.o : $(SDEPS) - -install: $(CRT) $(SIM_BSP) $(LIB_NOSYS) $(LIB_CRT) $(SCRIPTS) - mkdir -p $(DESTDIR)$(tooldir)/lib${MULTISUBDIR} - for c in $(CRT) $(SIM_BSP) $(LIB_NOSYS) $(LIB_CRT); do \ - $(INSTALL_DATA) $$c $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$$c ;\ - done - for c in $(SCRIPTS); do \ - b=`basename $$c`; \ - $(INSTALL_DATA) $$c $(DESTDIR)$(tooldir)/lib${MULTISUBDIR}/$$b ;\ - done - -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/msp430/Makefile.inc b/libgloss/msp430/Makefile.inc new file mode 100644 index 000000000000..38355343ad9f --- /dev/null +++ b/libgloss/msp430/Makefile.inc @@ -0,0 +1,52 @@ +## Copyright (c) 2008-2014 Red Hat, Inc. All rights reserved. +## +## This copyrighted material is made available to anyone wishing to use, modify, +## copy, or redistribute it subject to the terms and conditions of the BSD +## License. This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY expressed or implied, including the implied warranties +## of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. A copy of this license +## is available at http://www.opensource.org/licenses. Any Red Hat trademarks that +## are incorporated in the source code or documentation are not subject to the BSD +## License and may only be used or replicated with the express permission of +## Red Hat, Inc. + +multilibtool_DATA += \ + %D%/msp430-sim.ld \ + %D%/msp430xl-sim.ld \ + %D%/intr_vectors.ld + +multilibtool_DATA += \ + %D%/gcrt0.o \ + %D%/crt0.o +libobjs_a_SOURCES += \ + %D%/gcrt0.S \ + %D%/crt0.S + +multilibtool_LIBRARIES += %D%/libsim.a +%C%_libsim_a_SOURCES = \ + %D%/syscalls.S \ + %D%/cio.S \ + %D%/write.c \ + %D%/unlink.c \ + %D%/sbrk.c + +multilibtool_LIBRARIES += %D%/libnosys.a +%C%_libnosys_a_SOURCES = \ + %D%/ciosyscalls.S \ + %D%/cio.S \ + %D%/write.c \ + %D%/unlink.c \ + %D%/sbrk.c + +multilibtool_LIBRARIES += %D%/libcrt.a +%C%_libcrt_a_SOURCES = \ + %D%/crt_bss.S \ + %D%/crt_high_bss.S \ + %D%/crt_movedata.S \ + %D%/crt_move_highdata.S \ + %D%/crt_main.S \ + %D%/crt_callexit.S \ + %D%/crt_run_init_array.S \ + %D%/crt_run_preinit_array.S \ + %D%/crt_run_fini_array.S \ + %D%/crt_run_array.S -- 2.43.0