summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--csu/Makefile15
-rw-r--r--csu/version.c1
-rw-r--r--libidn/Banner1
-rw-r--r--manual/contrib.texi3
5 files changed, 13 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog
index d3c4468389..e4f304e366 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2017-09-22 Joseph Myers <joseph@codesourcery.com>
+
+ * csu/Makefile (generated): Do not add version-info.h.
+ (before-compile): Likewise.
+ (all-Banner-files): Remove variable.
+ ($(objpfx)version-info.h): Remove rule.
+ * csu/version.c (banner): Do not include "version-info.h".
+ * libidn/Banner: Remove.
+ * manual/contrib.texi (Simon Josefsson): New entry.
+
2017-09-21 Gabriel F. T. Gomes <gabriel@inconstante.eti.br>
* sysdeps/ieee754/ldbl-128/e_lgammal_r.c (__ieee754_lgammal_r):
diff --git a/csu/Makefile b/csu/Makefile
index 490d0b0f3b..fd668a5d00 100644
--- a/csu/Makefile
+++ b/csu/Makefile
@@ -39,8 +39,6 @@ omit-deps = $(patsubst %.o,%,$(start-installed-name) g$(start-installed-name) \
b$(start-installed-name) $(csu-dummies) \
S$(start-installed-name))
install-lib = $(start-installed-name) g$(start-installed-name) $(csu-dummies)
-generated += version-info.h
-before-compile += $(objpfx)version-info.h
# No tests are allowed in the csu/ subdirectory because the startup
# code is compiled with special flags.
@@ -149,16 +147,3 @@ $(objpfx)abi-tag.h: $(..)abi-tags
done
if test -r $@.new; then mv -f $@.new $@; \
else echo >&2 'This configuration not matched in $<'; exit 1; fi
-
-all-Banner-files = $(wildcard $(addsuffix /Banner,\
- $(sort $(subdir-srcdirs) \
- $(sysdeps-srcdirs))))
-$(objpfx)version-info.h: $(common-objpfx)config.make $(all-Banner-files)
- $(make-target-directory)
- (files="$(all-Banner-files)"; \
- if test -n "$$files"; then \
- printf '"Available extensions:\\n"\n'; \
- sed -e '/^#/d' -e 's/^[[:space:]]*/ /' \
- -e 's/^\(.*\)$$/\"\1\\n\"/' $$files; \
- fi) > $@T
- mv -f $@T $@
diff --git a/csu/version.c b/csu/version.c
index f3992ab6c8..8e86d495c5 100644
--- a/csu/version.c
+++ b/csu/version.c
@@ -30,7 +30,6 @@ This is free software; see the source for copying conditions.\n\
There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n\
PARTICULAR PURPOSE.\n\
Compiled by GNU CC version "__VERSION__".\n"
-#include "version-info.h"
#ifdef LIBC_ABIS_STRING
LIBC_ABIS_STRING
#endif
diff --git a/libidn/Banner b/libidn/Banner
deleted file mode 100644
index c31e75722d..0000000000
--- a/libidn/Banner
+++ /dev/null
@@ -1 +0,0 @@
-GNU Libidn by Simon Josefsson
diff --git a/manual/contrib.texi b/manual/contrib.texi
index 62798b091c..fbf42db31d 100644
--- a/manual/contrib.texi
+++ b/manual/contrib.texi
@@ -176,6 +176,9 @@ software floating-point support and for
his direction as part of @theglibc{} steering committee.
@item
+Simon Josefsson for the @code{libidn} add-on.
+
+@item
Geoffrey Keating for the port to Linux on PowerPC
(@code{powerpc-@var{anything}-linux}).