From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id C496F3850854; Thu, 20 Oct 2022 14:53:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C496F3850854 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666277609; bh=ICsV9xmB3QJ8ZiIVn2FBPIRnWVSq4KZWxEgRInmfkrc=; h=From:To:Subject:Date:From; b=aKMbBaTHDuXOGqPXT/1g9NVrhXSO+Yr5M0msYDSmgmVYZSl5sZsgvfLIfVXJ9v+MJ E5JBouAKFMCMUOytt9li7RLvUzRAaiD/neiSrMyhjpNe0wtPLaTFNPkLItL2pxMfGg IbKLpyAg2r3jfDhs0KCXqyf5w0CuYp0znmstWmV4= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Corinna Vinschen To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] libgloss: riscv: Install machine/syscall.h X-Act-Checkin: newlib-cygwin X-Git-Author: Simon Cook X-Git-Refname: refs/heads/master X-Git-Oldrev: 5781871775fcba783938bc4ac645eba866711fc5 X-Git-Newrev: 8c87ffd372232476ac5d1705dd32ddda54134c2b Message-Id: <20221020145329.C496F3850854@sourceware.org> Date: Thu, 20 Oct 2022 14:53:29 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D8c87ffd3722= 32476ac5d1705dd32ddda54134c2b commit 8c87ffd372232476ac5d1705dd32ddda54134c2b Author: Simon Cook Date: Tue Oct 18 21:48:56 2022 +0200 libgloss: riscv: Install machine/syscall.h =20 A recent change to the Makefile.in for riscv resulted in the machine/syscall.h header not being installed. This updates the file to install this file again. =20 Signed-off-by: Simon Cook Diff: --- libgloss/Makefile.in | 68 +++++++++++++++++++++++++++++++----------= ---- libgloss/riscv/Makefile.inc | 3 ++ 2 files changed, 50 insertions(+), 21 deletions(-) diff --git a/libgloss/Makefile.in b/libgloss/Makefile.in index 16723dca1..36ab3fbd3 100644 --- a/libgloss/Makefile.in +++ b/libgloss/Makefile.in @@ -212,8 +212,9 @@ am__uninstall_files_from_dir =3D { \ $(am__cd) "$$dir" && rm -f $$files; }; \ } am__installdirs =3D "$(DESTDIR)$(multilibtooldir)" "$(DESTDIR)$(bindir)" \ - "$(DESTDIR)$(infodir)" "$(DESTDIR)$(includesystooldir)" \ - "$(DESTDIR)$(includetooldir)" "$(DESTDIR)$(multilibtooldir)" + "$(DESTDIR)$(infodir)" "$(DESTDIR)$(includemachinetooldir)" \ + "$(DESTDIR)$(includesystooldir)" "$(DESTDIR)$(includetooldir)" \ + "$(DESTDIR)$(multilibtooldir)" LIBRARIES =3D $(multilibtool_LIBRARIES) $(noinst_LIBRARIES) ARFLAGS =3D cru AM_V_AR =3D $(am__v_AR_@AM_V@) @@ -471,7 +472,8 @@ am__can_run_installinfo =3D \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac -DATA =3D $(includesystool_DATA) $(includetool_DATA) $(multilibtool_DATA) +DATA =3D $(includemachinetool_DATA) $(includesystool_DATA) \ + $(includetool_DATA) $(multilibtool_DATA) RECURSIVE_CLEAN_TARGETS =3D mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive am__recursive_targets =3D \ @@ -610,7 +612,6 @@ pdfdir =3D @pdfdir@ prefix =3D @prefix@ program_transform_name =3D @program_transform_name@ psdir =3D @psdir@ -runstatedir =3D @runstatedir@ sbindir =3D @sbindir@ sharedstatedir =3D @sharedstatedir@ srcdir =3D @srcdir@ @@ -791,6 +792,8 @@ TEXINFO_TEX =3D ../texinfo/texinfo.tex @CONFIG_RISCV_TRUE@ riscv/semihost-sys_unlink.c \ @CONFIG_RISCV_TRUE@ riscv/semihost-sys_write.c =20 +@CONFIG_RISCV_TRUE@includemachinetooldir =3D $(tooldir)/include/machine +@CONFIG_RISCV_TRUE@includemachinetool_DATA =3D riscv/machine/syscall.h @CONFIG_WINCE_TRUE@gdbdir =3D ${dir ${patsubst %/,%,${dir @srcdir@}}}gdb @CONFIG_WINCE_TRUE@wince_stub_exe_SOURCES =3D wince-stub.c @CONFIG_WINCE_TRUE@wince_stub_exe_CPPFLAGS =3D $(AM_CPPFLAGS) -I$(gdbdir) @@ -2504,6 +2507,27 @@ maintainer-clean-aminfo: echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]"; \ rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \ done +install-includemachinetoolDATA: $(includemachinetool_DATA) + @$(NORMAL_INSTALL) + @list=3D'$(includemachinetool_DATA)'; test -n "$(includemachinetooldir)" = || list=3D; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(includemachinetooldir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(includemachinetooldir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=3D; else d=3D"$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(includemachinetooldir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(includemachinetooldir)" || exit $$= ?; \ + done + +uninstall-includemachinetoolDATA: + @$(NORMAL_UNINSTALL) + @list=3D'$(includemachinetool_DATA)'; test -n "$(includemachinetooldir)" = || list=3D; \ + files=3D`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir=3D'$(DESTDIR)$(includemachinetooldir)'; $(am__uninstall_files_from_di= r) install-includesystoolDATA: $(includesystool_DATA) @$(NORMAL_INSTALL) @list=3D'$(includesystool_DATA)'; test -n "$(includesystooldir)" || list= =3D; \ @@ -2680,7 +2704,7 @@ all-am: Makefile $(INFO_DEPS) $(LIBRARIES) $(PROGRAMS= ) $(DATA) \ config.h all-local installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(multilibtooldir)" "$(DESTDIR)$(bindir)" "$(DESTDI= R)$(infodir)" "$(DESTDIR)$(includesystooldir)" "$(DESTDIR)$(includetooldir)= " "$(DESTDIR)$(multilibtooldir)"; do \ + for dir in "$(DESTDIR)$(multilibtooldir)" "$(DESTDIR)$(bindir)" "$(DESTDI= R)$(infodir)" "$(DESTDIR)$(includemachinetooldir)" "$(DESTDIR)$(includesyst= ooldir)" "$(DESTDIR)$(includetooldir)" "$(DESTDIR)$(multilibtooldir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -2750,7 +2774,8 @@ info: info-recursive =20 info-am: $(INFO_DEPS) =20 -install-data-am: install-includesystoolDATA install-includetoolDATA \ +install-data-am: install-includemachinetoolDATA \ + install-includesystoolDATA install-includetoolDATA \ install-info-am install-multilibtoolDATA \ install-multilibtoolLIBRARIES =20 @@ -2893,10 +2918,10 @@ ps: ps-recursive ps-am: $(PSS) =20 uninstall-am: uninstall-binPROGRAMS uninstall-dvi-am uninstall-html-am \ - uninstall-includesystoolDATA uninstall-includetoolDATA \ - uninstall-info-am uninstall-multilibtoolDATA \ - uninstall-multilibtoolLIBRARIES uninstall-pdf-am \ - uninstall-ps-am + uninstall-includemachinetoolDATA uninstall-includesystoolDATA \ + uninstall-includetoolDATA uninstall-info-am \ + uninstall-multilibtoolDATA uninstall-multilibtoolLIBRARIES \ + uninstall-pdf-am uninstall-ps-am =20 .MAKE: $(am__recursive_targets) all check-am install-am install-strip =20 @@ -2910,17 +2935,18 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dvi-a= m uninstall-html-am \ html-am info info-am install install-am install-binPROGRAMS \ install-data install-data-am install-dvi install-dvi-am \ install-exec install-exec-am install-exec-local install-html \ - install-html-am install-includesystoolDATA \ - install-includetoolDATA install-info install-info-am \ - install-man install-multilibtoolDATA \ - install-multilibtoolLIBRARIES install-pdf install-pdf-am \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-aminfo maintainer-clean-generic \ - maintainer-clean-local mostlyclean mostlyclean-aminfo \ - mostlyclean-compile mostlyclean-generic mostlyclean-local pdf \ - pdf-am ps ps-am tags tags-am uninstall uninstall-am \ - uninstall-binPROGRAMS uninstall-dvi-am uninstall-html-am \ + install-html-am install-includemachinetoolDATA \ + install-includesystoolDATA install-includetoolDATA \ + install-info install-info-am install-man \ + install-multilibtoolDATA install-multilibtoolLIBRARIES \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-aminfo \ + maintainer-clean-generic maintainer-clean-local mostlyclean \ + mostlyclean-aminfo mostlyclean-compile mostlyclean-generic \ + mostlyclean-local pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-binPROGRAMS uninstall-dvi-am \ + uninstall-html-am uninstall-includemachinetoolDATA \ uninstall-includesystoolDATA uninstall-includetoolDATA \ uninstall-info-am uninstall-multilibtoolDATA \ uninstall-multilibtoolLIBRARIES uninstall-pdf-am \ diff --git a/libgloss/riscv/Makefile.inc b/libgloss/riscv/Makefile.inc index 5341038b3..fafc74374 100644 --- a/libgloss/riscv/Makefile.inc +++ b/libgloss/riscv/Makefile.inc @@ -69,3 +69,6 @@ multilibtool_LIBRARIES +=3D %D%/libsemihost.a %D%/semihost-sys_stat_common.c \ %D%/semihost-sys_unlink.c \ %D%/semihost-sys_write.c + +includemachinetooldir =3D $(tooldir)/include/machine +includemachinetool_DATA =3D %D%/machine/syscall.h