re PR go/64595 (go programs abort when debug info is stripped)

	PR go/64595
	* go.1, gofmt.1: New files.
	* Makefile.am (man_MANS): New variable.
	* Makefile.in: Rebuild.

From-SVN: r220022

diff --git a/gotools/ChangeLog b/gotools/ChangeLog
index 6e9e026a9632f134892de07076e7f27ff0b1e9b1..aad9561680a84c25e67d30973e62d5cb8bb2600d 100644 (file)
--- a/gotools/ChangeLog
+++ b/gotools/ChangeLog
@@ -1,3 +1,10 @@
+2015-01-22  Ian Lance Taylor  <iant@google.com>
+
+       PR go/64595
+       * go.1, gofmt.1: New files.
+       * Makefile.am (man_MANS): New variable.
+       * Makefile.in: Rebuild.
+
 2015-01-21  Ian Lance Taylor  <iant@google.com>
 
        * Makefile.am (noinst_PROGRAMS): New variable.

diff --git a/gotools/Makefile.am b/gotools/Makefile.am
index 5bc084aaed07bed17d14a0a9f50e1ecdc1d349d4..8bee836a0360fe1f72e03a2c3797893793ced2c5 100644 (file)
--- a/gotools/Makefile.am
+++ b/gotools/Makefile.am
@@ -106,6 +106,7 @@ if NATIVE
 
 bin_PROGRAMS = go$(EXEEXT) gofmt$(EXEEXT)
 noinst_PROGRAMS = cgo$(EXEEXT)
+man_MANS = go.1 gofmt.1
 
 go$(EXEEXT): $(go_cmd_go_files) zdefaultcc.go $(LIBGODEP)
        $(GOLINK) $(go_cmd_go_files) zdefaultcc.go $(LIBS) $(NET_LIBS)

diff --git a/gotools/Makefile.in b/gotools/Makefile.in
index eb625d03c07c89f9dd0cbf479cfcc9cbee078c6e..e37d131c1d242574d164b0ff66a0c7ec639caa0d 100644 (file)
--- a/gotools/Makefile.in
+++ b/gotools/Makefile.in
@@ -69,7 +69,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
 cgo_SOURCES = cgo.c
 cgo_OBJECTS = cgo.$(OBJEXT)
@@ -89,6 +89,30 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = cgo.c go.c gofmt.c
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+man1dir = $(mandir)/man1
+NROFF = nroff
+MANS = $(man_MANS)
 ETAGS = etags
 CTAGS = ctags
 ACLOCAL = @ACLOCAL@
@@ -259,6 +283,7 @@ MOSTLYCLEANFILES = zdefaultcc.go s-zdefaultcc
 # and install them as regular programs.
 @NATIVE_TRUE@bin_PROGRAMS = go$(EXEEXT) gofmt$(EXEEXT)
 @NATIVE_TRUE@noinst_PROGRAMS = cgo$(EXEEXT)
+@NATIVE_TRUE@man_MANS = go.1 gofmt.1
 all: all-am
 
 .SUFFIXES:
@@ -370,6 +395,44 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(COMPILE) -c `$(CYGPATH_W) '$<'`
+install-man1: $(man_MANS)
+       @$(NORMAL_INSTALL)
+       test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+       @list=''; test -n "$(man1dir)" || exit 0; \
+       { for i in $$list; do echo "$$i"; done; \
+       l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+         sed -n '/\.1[a-z]*$$/p'; \
+       } | while read p; do \
+         if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+         echo "$$d$$p"; echo "$$p"; \
+       done | \
+       sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+             -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+       sed 'N;N;s,\n, ,g' | { \
+       list=; while read file base inst; do \
+         if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+           echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+           $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
+         fi; \
+       done; \
+       for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+       while read files; do \
+         test -z "$$files" || { \
+           echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
+           $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
+       done; }
+
+uninstall-man1:
+       @$(NORMAL_UNINSTALL)
+       @list=''; test -n "$(man1dir)" || exit 0; \
+       files=`{ for i in $$list; do echo "$$i"; done; \
+       l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+         sed -n '/\.1[a-z]*$$/p'; \
+       } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+             -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+       test -z "$$files" || { \
+         echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+         cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
        list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -424,9 +487,9 @@ distclean-tags:
        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 check-am: all-am
 check: check-am
-all-am: Makefile $(PROGRAMS)
+all-am: Makefile $(PROGRAMS) $(MANS)
 installdirs:
-       for dir in "$(DESTDIR)$(bindir)"; do \
+       for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
          test -z "$$dir" || $(MKDIR_P) "$$dir"; \
        done
 install: install-am
@@ -481,7 +544,7 @@ info: info-am
 
 info-am:
 
-install-data-am:
+install-data-am: install-man
 
 install-dvi: install-dvi-am
 
@@ -497,7 +560,7 @@ install-info: install-info-am
 
 install-info-am:
 
-install-man:
+install-man: install-man1
 
 install-pdf: install-pdf-am
 
@@ -528,7 +591,9 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-local
+uninstall-am: uninstall-binPROGRAMS uninstall-local uninstall-man
+
+uninstall-man: uninstall-man1
 
 .MAKE: install-am install-strip
 
@@ -539,12 +604,12 @@ uninstall-am: uninstall-binPROGRAMS uninstall-local
        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-info install-info-am \
-       install-man install-pdf install-pdf-am install-ps \
+       install-man install-man1 install-pdf install-pdf-am install-ps \
        install-ps-am install-strip installcheck installcheck-am \
        installdirs maintainer-clean maintainer-clean-generic \
        mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
        ps ps-am tags uninstall uninstall-am uninstall-binPROGRAMS \
-       uninstall-local
+       uninstall-local uninstall-man uninstall-man1
 
 
 zdefaultcc.go: s-zdefaultcc; @true

diff --git a/gotools/go.1 b/gotools/go.1
new file mode 100644 (file)
index 0000000..165c8ec
--- /dev/null
+++ b/gotools/go.1
@@ -0,0 +1,12 @@
+.TH go "1" "January 2015" "Go" "User Commands"
+.SH NAME
+go \- build, test, install Go programs
+.SH SYNOPSIS
+.B go
+\fIcommand\fR [\fIarguments\fR]
+.SH DESCRIPTION
+.PP
+A tool for managing Go source code.  For full documentation run
+\fBgo help\fR or see \fBhttp://golang.org/cmd/go\fR.
+.SH "SEE ALSO"
+.IR gofmt (1)

diff --git a/gotools/gofmt.1 b/gotools/gofmt.1
new file mode 100644 (file)
index 0000000..984d325
--- /dev/null
+++ b/gotools/gofmt.1
@@ -0,0 +1,12 @@
+.TH gofmt "1" "January 2015" "Go" "User Commands"
+.SH NAME
+gofmt \- format Go code
+.SH SYNOPSIS
+.B gofmt
+[\fIflags\fR] [\fIpath\fR]...
+.SH DESCRIPTION
+.PP
+A tool for formatting Go source code.  For full documentation run
+\fBgofmt -help\fR or see \fBhttp://golang.org/cmd/gofmt\fR.
+.SH "SEE ALSO"
+.IR go (1)