public inbox for newlib-cvs@sourceware.org
help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org>
To: newlib-cvs@sourceware.org
Subject: [newlib-cygwin] libgloss: riscv: Install machine/syscall.h
Date: Thu, 20 Oct 2022 14:53:29 +0000 (GMT) [thread overview]
Message-ID: <20221020145329.C496F3850854@sourceware.org> (raw)
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=8c87ffd372232476ac5d1705dd32ddda54134c2b
commit 8c87ffd372232476ac5d1705dd32ddda54134c2b
Author: Simon Cook <simon.cook@embecosm.com>
Date: Tue Oct 18 21:48:56 2022 +0200
libgloss: riscv: Install machine/syscall.h
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.
Signed-off-by: Simon Cook <simon.cook@embecosm.com>
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 = { \
$(am__cd) "$$dir" && rm -f $$files; }; \
}
am__installdirs = "$(DESTDIR)$(multilibtooldir)" "$(DESTDIR)$(bindir)" \
- "$(DESTDIR)$(infodir)" "$(DESTDIR)$(includesystooldir)" \
- "$(DESTDIR)$(includetooldir)" "$(DESTDIR)$(multilibtooldir)"
+ "$(DESTDIR)$(infodir)" "$(DESTDIR)$(includemachinetooldir)" \
+ "$(DESTDIR)$(includesystooldir)" "$(DESTDIR)$(includetooldir)" \
+ "$(DESTDIR)$(multilibtooldir)"
LIBRARIES = $(multilibtool_LIBRARIES) $(noinst_LIBRARIES)
ARFLAGS = cru
AM_V_AR = $(am__v_AR_@AM_V@)
@@ -471,7 +472,8 @@ am__can_run_installinfo = \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
-DATA = $(includesystool_DATA) $(includetool_DATA) $(multilibtool_DATA)
+DATA = $(includemachinetool_DATA) $(includesystool_DATA) \
+ $(includetool_DATA) $(multilibtool_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
am__recursive_targets = \
@@ -610,7 +612,6 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
-runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
@@ -791,6 +792,8 @@ TEXINFO_TEX = ../texinfo/texinfo.tex
@CONFIG_RISCV_TRUE@ riscv/semihost-sys_unlink.c \
@CONFIG_RISCV_TRUE@ riscv/semihost-sys_write.c
+@CONFIG_RISCV_TRUE@includemachinetooldir = $(tooldir)/include/machine
+@CONFIG_RISCV_TRUE@includemachinetool_DATA = riscv/machine/syscall.h
@CONFIG_WINCE_TRUE@gdbdir = ${dir ${patsubst %/,%,${dir @srcdir@}}}gdb
@CONFIG_WINCE_TRUE@wince_stub_exe_SOURCES = wince-stub.c
@CONFIG_WINCE_TRUE@wince_stub_exe_CPPFLAGS = $(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='$(includemachinetool_DATA)'; test -n "$(includemachinetooldir)" || list=; \
+ 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=; else d="$(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='$(includemachinetool_DATA)'; test -n "$(includemachinetooldir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ dir='$(DESTDIR)$(includemachinetooldir)'; $(am__uninstall_files_from_dir)
install-includesystoolDATA: $(includesystool_DATA)
@$(NORMAL_INSTALL)
@list='$(includesystool_DATA)'; test -n "$(includesystooldir)" || list=; \
@@ -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)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(includesystooldir)" "$(DESTDIR)$(includetooldir)" "$(DESTDIR)$(multilibtooldir)"; do \
+ for dir in "$(DESTDIR)$(multilibtooldir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(includemachinetooldir)" "$(DESTDIR)$(includesystooldir)" "$(DESTDIR)$(includetooldir)" "$(DESTDIR)$(multilibtooldir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-recursive
@@ -2750,7 +2774,8 @@ info: info-recursive
info-am: $(INFO_DEPS)
-install-data-am: install-includesystoolDATA install-includetoolDATA \
+install-data-am: install-includemachinetoolDATA \
+ install-includesystoolDATA install-includetoolDATA \
install-info-am install-multilibtoolDATA \
install-multilibtoolLIBRARIES
@@ -2893,10 +2918,10 @@ ps: ps-recursive
ps-am: $(PSS)
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
.MAKE: $(am__recursive_targets) all check-am install-am install-strip
@@ -2910,17 +2935,18 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dvi-am 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 += %D%/libsemihost.a
%D%/semihost-sys_stat_common.c \
%D%/semihost-sys_unlink.c \
%D%/semihost-sys_write.c
+
+includemachinetooldir = $(tooldir)/include/machine
+includemachinetool_DATA = %D%/machine/syscall.h
reply other threads:[~2022-10-20 14:53 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221020145329.C496F3850854@sourceware.org \
--to=corinna@sourceware.org \
--cc=newlib-cvs@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).