Module Name: src
Committed By: yamt
Date: Thu May 22 16:37:05 UTC 2014
Modified Files:
src/external/gpl3/gcc/dist/libssp [yamt-pagecache]: ChangeLog
Makefile.am Makefile.in aclocal.m4 config.h.in configure
configure.ac memmove-chk.c ssp.map strncat-chk.c
Log Message:
sync with head.
for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.
this commit was splitted into small chunks to avoid
a limitation of cvs. ("Protocol error: too many arguments")
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2 \
src/external/gpl3/gcc/dist/libssp/ChangeLog
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.2.1 \
src/external/gpl3/gcc/dist/libssp/Makefile.am \
src/external/gpl3/gcc/dist/libssp/Makefile.in \
src/external/gpl3/gcc/dist/libssp/aclocal.m4 \
src/external/gpl3/gcc/dist/libssp/config.h.in \
src/external/gpl3/gcc/dist/libssp/configure \
src/external/gpl3/gcc/dist/libssp/configure.ac \
src/external/gpl3/gcc/dist/libssp/memmove-chk.c \
src/external/gpl3/gcc/dist/libssp/ssp.map \
src/external/gpl3/gcc/dist/libssp/strncat-chk.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/libssp/ChangeLog
diff -u src/external/gpl3/gcc/dist/libssp/ChangeLog:1.1.1.1.2.1 src/external/gpl3/gcc/dist/libssp/ChangeLog:1.1.1.1.2.2
--- src/external/gpl3/gcc/dist/libssp/ChangeLog:1.1.1.1.2.1 Tue Oct 30 18:57:33 2012
+++ src/external/gpl3/gcc/dist/libssp/ChangeLog Thu May 22 16:37:05 2014
@@ -1,22 +1,95 @@
-2012-07-02 Release Manager
+2013-10-16 Release Manager
- * GCC 4.5.4 released.
+ * GCC 4.8.2 released.
-2011-04-28 Release Manager
+2013-05-31 Release Manager
- * GCC 4.5.3 released.
+ * GCC 4.8.1 released.
-2010-12-16 Release Manager
+2013-03-22 Release Manager
- * GCC 4.5.2 released.
+ * GCC 4.8.0 released.
-2010-07-31 Release Manager
+2013-02-06 Richard Sandiford <rdsandif...@googlemail.com>
- * GCC 4.5.1 released.
+ Revert previous patch.
-2010-04-14 Release Manager
+2013-02-03 Richard Sandiford <rdsandif...@googlemail.com>
- * GCC 4.5.0 released.
+ Update copyright years.
+
+2013-01-15 Paul Pluzhnikov <ppluzhni...@google.com>
+
+ PR 55982
+ * strncat-chk.c (__strncat_chk): Fix loop unroll.
+
+2012-09-14 David Edelsohn <dje....@gmail.com>
+
+ * configure: Regenerated.
+
+2012-05-29 Benjamin Kosnik <b...@redhat.com>
+
+ PR libstdc++/51007
+ * configure.ac: Allow gnu, gnu* variants for --enable-symvers argument.
+ * configure: Regenerated.
+
+2012-05-16 H.J. Lu <hongjiu...@intel.com>
+
+ * configure: Regenerated.
+
+2011-11-21 Andreas Tobler <andre...@fgznet.ch>
+
+ * configure: Regenerate.
+
+2011-03-21 Rainer Orth <r...@cebitec.uni-bielefeld.de>
+
+ PR bootstrap/48135
+ * configure.ac (ssp_use_symver): Handle --disable-symvers.
+ * configure: Regenerate.
+
+2011-02-13 Ralf Wildenhues <ralf.wildenh...@gmx.de>
+
+ * Makefile.in: Regenerate.
+ * aclocal.m4: Likewise.
+ * configure: Likewise.
+
+2010-12-06 Dave Korn <dave.korn.cyg...@gmail.com>
+
+ PR target/40125
+ PR lto/46695
+ * configure.ac: Invoke ACX_LT_HOST_FLAGS.
+ * Makefile.am (libssp_la_LDFLAGS): Use lt_host_flags.
+ * aclocal.m4: Regenerate.
+ * configure: Regenerate.
+ * Makefile.in: Regenerate.
+
+2010-07-02 Rainer Orth <r...@cebitec.uni-bielefeld.de>
+
+ * configure.ac (ssp_use_symver): Only check for Sun-style symbol
+ versioning on Solaris 2.
+ * configure: Regenerate.
+
+2010-07-02 Rainer Orth <r...@cebitec.uni-bielefeld.de>
+
+ * configure.ac: Check for Sun symbol versioning.
+ Check for memmove.
+ * configure: Regenerate.
+ * config.h.in: Regenerate.
+
+ * Makefile.am [LIBSSP_USE_SYMVER]: Protect version_arg,
+ version_dep with LIBSSP_USE_SYMVER_GNU.
+ [LIBSSP_USE_SYMVER_SUN]: Handle Sun symbol versioning.
+ * Makefile.in: Regenerate.
+
+ * ssp.map: Reformat.
+
+ * memmove-chk.c: Change guard to HAVE_MEMMOVE.
+
+2010-05-04 Ralf Wildenhues <ralf.wildenh...@gmx.de>
+
+ PR other/43620
+ * configure.ac (AM_INIT_AUTOMAKE): Add no-dist.
+ * Makefile.in: Regenerate.
2010-04-02 Ralf Wildenhues <ralf.wildenh...@gmx.de>
Index: src/external/gpl3/gcc/dist/libssp/Makefile.am
diff -u src/external/gpl3/gcc/dist/libssp/Makefile.am:1.1.1.1 src/external/gpl3/gcc/dist/libssp/Makefile.am:1.1.1.1.2.1
--- src/external/gpl3/gcc/dist/libssp/Makefile.am:1.1.1.1 Tue Jun 21 01:23:33 2011
+++ src/external/gpl3/gcc/dist/libssp/Makefile.am Thu May 22 16:37:05 2014
@@ -1,6 +1,6 @@
## Makefile for the toplevel directory of the libssp library.
##
-## Copyright (C) 2005
+## Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010
## Free Software Foundation, Inc.
##
@@ -12,8 +12,23 @@ MAINT_CHARSET = latin1
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
if LIBSSP_USE_SYMVER
+if LIBSSP_USE_SYMVER_GNU
version_arg = -Wl,--version-script=$(srcdir)/ssp.map
version_dep = $(srcdir)/ssp.map
+endif
+if LIBSSP_USE_SYMVER_SUN
+version_arg = -Wl,-M,ssp.map-sun
+version_dep = ssp.map-sun
+ssp.map-sun : $(srcdir)/ssp.map \
+ $(top_srcdir)/../contrib/make_sunver.pl \
+ $(libssp_la_OBJECTS) $(libssp_la_LIBADD)
+ perl $(top_srcdir)/../contrib/make_sunver.pl \
+ $(srcdir)/ssp.map \
+ $(libssp_la_OBJECTS:%.lo=.libs/%.o) \
+ `echo $(libssp_la_LIBADD) | \
+ sed 's,/\([^/.]*\)\.la,/.libs/\1.a,g'` \
+ > $@ || (rm -f $@ ; exit 1)
+endif
else
version_arg =
version_dep =
@@ -35,7 +50,7 @@ libssp_la_SOURCES = \
libssp_la_LIBADD =
libssp_la_DEPENDENCIES = $(version_dep) $(libssp_la_LIBADD)
libssp_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` \
- $(version_arg) -no-undefined -bindir "$(bindir)"
+ $(version_arg) $(lt_host_flags)
libssp_nonshared_la_SOURCES = \
ssp-local.c
Index: src/external/gpl3/gcc/dist/libssp/Makefile.in
diff -u src/external/gpl3/gcc/dist/libssp/Makefile.in:1.1.1.1 src/external/gpl3/gcc/dist/libssp/Makefile.in:1.1.1.1.2.1
--- src/external/gpl3/gcc/dist/libssp/Makefile.in:1.1.1.1 Tue Jun 21 01:23:34 2011
+++ src/external/gpl3/gcc/dist/libssp/Makefile.in Thu May 22 16:37:05 2014
@@ -37,17 +37,16 @@ build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
subdir = .
-DIST_COMMON = $(am__configure_deps) $(nobase_libsubinclude_HEADERS) \
- $(srcdir)/../config.guess $(srcdir)/../config.sub \
- $(srcdir)/../depcomp $(srcdir)/../install-sh \
- $(srcdir)/../ltmain.sh $(srcdir)/../missing \
- $(srcdir)/../mkinstalldirs $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(srcdir)/config.h.in \
- $(top_srcdir)/configure $(top_srcdir)/ssp/ssp.h.in ChangeLog
+DIST_COMMON = ChangeLog $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/configure $(am__configure_deps) \
+ $(srcdir)/config.h.in $(srcdir)/../mkinstalldirs \
+ $(top_srcdir)/ssp/ssp.h.in $(srcdir)/../depcomp \
+ $(nobase_libsubinclude_HEADERS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
$(top_srcdir)/../config/depstand.m4 \
$(top_srcdir)/../config/lead-dot.m4 \
+ $(top_srcdir)/../config/lthostflags.m4 \
$(top_srcdir)/../config/multi.m4 \
$(top_srcdir)/../config/no-executables.m4 \
$(top_srcdir)/../config/override.m4 \
@@ -114,7 +113,6 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLF
--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
SOURCES = $(libssp_la_SOURCES) $(libssp_nonshared_la_SOURCES)
-DIST_SOURCES = $(libssp_la_SOURCES) $(libssp_nonshared_la_SOURCES)
MULTISRCTOP =
MULTIBUILDTOP =
MULTIDIRS =
@@ -124,17 +122,6 @@ MULTICLEAN = true
HEADERS = $(nobase_libsubinclude_HEADERS)
ETAGS = etags
CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
- { test ! -d "$(distdir)" \
- || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
- && rm -fr "$(distdir)"; }; }
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
AR = @AR@
@@ -233,6 +220,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
+lt_host_flags = @lt_host_flags@
mandir = @mandir@
mkdir_p = @mkdir_p@
multi_basedir = @multi_basedir@
@@ -264,9 +252,11 @@ MAINT_CHARSET = latin1
# May be used by various substitution variables.
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
@LIBSSP_USE_SYMVER_FALSE@version_arg =
-@LIBSSP_USE_SYMVER_TRUE@version_arg = -Wl,--version-script=$(srcdir)/ssp.map
+@LIBSSP_USE_SYMVER_GNU_TRUE@@LIBSSP_USE_SYMVER_TRUE@version_arg = -Wl,--version-script=$(srcdir)/ssp.map
+@LIBSSP_USE_SYMVER_SUN_TRUE@@LIBSSP_USE_SYMVER_TRUE@version_arg = -Wl,-M,ssp.map-sun
@LIBSSP_USE_SYMVER_FALSE@version_dep =
-@LIBSSP_USE_SYMVER_TRUE@version_dep = $(srcdir)/ssp.map
+@LIBSSP_USE_SYMVER_GNU_TRUE@@LIBSSP_USE_SYMVER_TRUE@version_dep = $(srcdir)/ssp.map
+@LIBSSP_USE_SYMVER_SUN_TRUE@@LIBSSP_USE_SYMVER_TRUE@version_dep = ssp.map-sun
AM_CFLAGS = -Wall
toolexeclib_LTLIBRARIES = libssp.la libssp_nonshared.la
libsubincludedir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/include
@@ -280,7 +270,7 @@ libssp_la_SOURCES = \
libssp_la_LIBADD =
libssp_la_DEPENDENCIES = $(version_dep) $(libssp_la_LIBADD)
libssp_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` \
- $(version_arg) -no-undefined -bindir "$(bindir)"
+ $(version_arg) $(lt_host_flags)
libssp_nonshared_la_SOURCES = \
ssp-local.c
@@ -579,154 +569,6 @@ GTAGS:
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
- $(am__remove_distdir)
- test -d "$(distdir)" || mkdir "$(distdir)"
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
- if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d "$(distdir)/$$file"; then \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
- find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
- fi; \
- cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
- else \
- test -f "$(distdir)/$$file" \
- || cp -p $$d/$$file "$(distdir)/$$file" \
- || exit 1; \
- fi; \
- done
- -test -n "$(am__skip_mode_fix)" \
- || find "$(distdir)" -type d ! -perm -755 \
- -exec chmod u+rwx,go+rx {} \; -o \
- ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
- || chmod -R a+r "$(distdir)"
-dist-gzip: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
-
-dist-bzip2: distdir
- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
- $(am__remove_distdir)
-
-dist-lzma: distdir
- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
- $(am__remove_distdir)
-
-dist-xz: distdir
- tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
- $(am__remove_distdir)
-
-dist-tarZ: distdir
- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- $(am__remove_distdir)
-
-dist-shar: distdir
- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
- $(am__remove_distdir)
-
-dist-zip: distdir
- -rm -f $(distdir).zip
- zip -rq $(distdir).zip $(distdir)
- $(am__remove_distdir)
-
-dist dist-all: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
- $(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration. Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
- case '$(DIST_ARCHIVES)' in \
- *.tar.gz*) \
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
- *.tar.bz2*) \
- bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lzma*) \
- lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
- *.tar.xz*) \
- xz -dc $(distdir).tar.xz | $(am__untar) ;;\
- *.tar.Z*) \
- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- *.shar.gz*) \
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
- *.zip*) \
- unzip $(distdir).zip ;;\
- esac
- chmod -R a-w $(distdir); chmod a+w $(distdir)
- mkdir $(distdir)/_build
- mkdir $(distdir)/_inst
- chmod a-w $(distdir)
- test -d $(distdir)/_build || exit 0; \
- dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
- && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
- && am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build \
- && ../configure --srcdir=.. --prefix="$$dc_install_base" \
- $(DISTCHECK_CONFIGURE_FLAGS) \
- && $(MAKE) $(AM_MAKEFLAGS) \
- && $(MAKE) $(AM_MAKEFLAGS) dvi \
- && $(MAKE) $(AM_MAKEFLAGS) check \
- && $(MAKE) $(AM_MAKEFLAGS) install \
- && $(MAKE) $(AM_MAKEFLAGS) installcheck \
- && $(MAKE) $(AM_MAKEFLAGS) uninstall \
- && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
- distuninstallcheck \
- && chmod -R a-w "$$dc_install_base" \
- && ({ \
- (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
- && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
- distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
- } || { rm -rf "$$dc_destdir"; exit 1; }) \
- && rm -rf "$$dc_destdir" \
- && $(MAKE) $(AM_MAKEFLAGS) dist \
- && rm -rf $(DIST_ARCHIVES) \
- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
- && cd "$$am__cwd" \
- || exit 1
- $(am__remove_distdir)
- @(echo "$(distdir) archives ready for distribution: "; \
- list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
- sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-distuninstallcheck:
- @$(am__cd) '$(distuninstallcheck_dir)' \
- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
- || { echo "ERROR: files left after uninstall:" ; \
- if test -n "$(DESTDIR)"; then \
- echo " (check DESTDIR support)"; \
- fi ; \
- $(distuninstallcheck_listfiles) ; \
- exit 1; } >&2
-distcleancheck: distclean
- @if test '$(srcdir)' = . ; then \
- echo "ERROR: distcleancheck can only run from a VPATH build" ; \
- exit 1 ; \
- fi
- @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
- || { echo "ERROR: files left in build directory after distclean:" ; \
- $(distcleancheck_listfiles) ; \
- exit 1; } >&2
check-am: all-am
check: check-am
all-am: Makefile $(LTLIBRARIES) all-multi $(HEADERS) config.h
@@ -840,25 +682,31 @@ uninstall-am: uninstall-nobase_libsubinc
.PHONY: CTAGS GTAGS all all-am all-multi am--refresh check check-am \
clean clean-generic clean-libtool clean-multi \
- clean-toolexeclibLTLIBRARIES ctags dist dist-all dist-bzip2 \
- dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
- distcheck distclean distclean-compile distclean-generic \
- distclean-hdr distclean-libtool distclean-multi distclean-tags \
- distcleancheck distdir distuninstallcheck dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-multi \
- install-nobase_libsubincludeHEADERS install-pdf install-pdf-am \
- install-ps install-ps-am install-strip \
- install-toolexeclibLTLIBRARIES installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- maintainer-clean-multi mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool mostlyclean-multi pdf \
- pdf-am ps ps-am tags uninstall uninstall-am \
- uninstall-nobase_libsubincludeHEADERS \
+ clean-toolexeclibLTLIBRARIES ctags distclean distclean-compile \
+ distclean-generic distclean-hdr distclean-libtool \
+ distclean-multi distclean-tags dvi dvi-am html html-am info \
+ info-am install install-am install-data install-data-am \
+ install-dvi install-dvi-am install-exec install-exec-am \
+ install-html install-html-am install-info install-info-am \
+ install-man install-multi install-nobase_libsubincludeHEADERS \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip install-toolexeclibLTLIBRARIES installcheck \
+ installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic maintainer-clean-multi mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ mostlyclean-multi pdf pdf-am ps ps-am tags uninstall \
+ uninstall-am uninstall-nobase_libsubincludeHEADERS \
uninstall-toolexeclibLTLIBRARIES
+@LIBSSP_USE_SYMVER_SUN_TRUE@@libssp_use_symver_t...@ssp.map-sun : $(srcdir)/ssp.map \
+@LIBSSP_USE_SYMVER_SUN_TRUE@@LIBSSP_USE_SYMVER_TRUE@ $(top_srcdir)/../contrib/make_sunver.pl \
+@LIBSSP_USE_SYMVER_SUN_TRUE@@LIBSSP_USE_SYMVER_TRUE@ $(libssp_la_OBJECTS) $(libssp_la_LIBADD)
+@LIBSSP_USE_SYMVER_SUN_TRUE@@LIBSSP_USE_SYMVER_TRUE@ perl $(top_srcdir)/../contrib/make_sunver.pl \
+@LIBSSP_USE_SYMVER_SUN_TRUE@@LIBSSP_USE_SYMVER_TRUE@ $(srcdir)/ssp.map \
+@LIBSSP_USE_SYMVER_SUN_TRUE@@LIBSSP_USE_SYMVER_TRUE@ $(libssp_la_OBJECTS:%.lo=.libs/%.o) \
+@LIBSSP_USE_SYMVER_SUN_TRUE@@LIBSSP_USE_SYMVER_TRUE@ `echo $(libssp_la_LIBADD) | \
+@LIBSSP_USE_SYMVER_SUN_TRUE@@LIBSSP_USE_SYMVER_TRUE@ sed 's,/\([^/.]*\)\.la,/.libs/\1.a,g'` \
+@LIBSSP_USE_SYMVER_SUN_TRUE@@LIBSSP_USE_SYMVER_TRUE@ > $@ || (rm -f $@ ; exit 1)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
Index: src/external/gpl3/gcc/dist/libssp/aclocal.m4
diff -u src/external/gpl3/gcc/dist/libssp/aclocal.m4:1.1.1.1 src/external/gpl3/gcc/dist/libssp/aclocal.m4:1.1.1.1.2.1
--- src/external/gpl3/gcc/dist/libssp/aclocal.m4:1.1.1.1 Tue Jun 21 01:23:34 2011
+++ src/external/gpl3/gcc/dist/libssp/aclocal.m4 Thu May 22 16:37:05 2014
@@ -971,6 +971,7 @@ AC_SUBST([am__untar])
m4_include([../config/acx.m4])
m4_include([../config/depstand.m4])
m4_include([../config/lead-dot.m4])
+m4_include([../config/lthostflags.m4])
m4_include([../config/multi.m4])
m4_include([../config/no-executables.m4])
m4_include([../config/override.m4])
Index: src/external/gpl3/gcc/dist/libssp/config.h.in
diff -u src/external/gpl3/gcc/dist/libssp/config.h.in:1.1.1.1 src/external/gpl3/gcc/dist/libssp/config.h.in:1.1.1.1.2.1
--- src/external/gpl3/gcc/dist/libssp/config.h.in:1.1.1.1 Tue Jun 21 01:23:34 2011
+++ src/external/gpl3/gcc/dist/libssp/config.h.in Thu May 22 16:37:05 2014
@@ -21,6 +21,9 @@
/* Define to 1 if you have the <malloc.h> header file. */
#undef HAVE_MALLOC_H
+/* Define to 1 if you have the `memmove' function. */
+#undef HAVE_MEMMOVE
+
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
Index: src/external/gpl3/gcc/dist/libssp/configure
diff -u src/external/gpl3/gcc/dist/libssp/configure:1.1.1.1 src/external/gpl3/gcc/dist/libssp/configure:1.1.1.1.2.1
--- src/external/gpl3/gcc/dist/libssp/configure:1.1.1.1 Tue Jun 21 01:23:34 2011
+++ src/external/gpl3/gcc/dist/libssp/configure Thu May 22 16:37:05 2014
@@ -606,6 +606,7 @@ toolexeclibdir
toolexecdir
enable_static
enable_shared
+lt_host_flags
OTOOL64
OTOOL
LIPO
@@ -625,6 +626,10 @@ LIBTOOL
ssp_have_usable_vsnprintf
EGREP
GREP
+LIBSSP_USE_SYMVER_SUN_FALSE
+LIBSSP_USE_SYMVER_SUN_TRUE
+LIBSSP_USE_SYMVER_GNU_FALSE
+LIBSSP_USE_SYMVER_GNU_TRUE
LIBSSP_USE_SYMVER_FALSE
LIBSSP_USE_SYMVER_TRUE
CPP
@@ -729,6 +734,7 @@ enable_version_specific_runtime_libs
enable_maintainer_mode
enable_multilib
enable_dependency_tracking
+enable_symvers
enable_shared
enable_static
with_pic
@@ -1367,6 +1373,7 @@ Optional Features:
--enable-multilib build many library versions (default)
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
+ --disable-symvers disable symbol versioning for libssp
--enable-shared[=PKGS] build shared libraries [default=yes]
--enable-static[=PKGS] build static libraries [default=yes]
--enable-fast-install[=PKGS]
@@ -2180,7 +2187,7 @@ for ac_dir in "$srcdir" "$srcdir/.." "$s
for ac_t in install-sh install.sh shtool; do
if test -f "$ac_dir/$ac_t"; then
ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/$ac_t -c"
+ ac_install_sh="$SHELL $ac_aux_dir/$ac_t -c"
break 2
fi
done
@@ -4093,19 +4100,59 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether symbol versioning is supported" >&5
$as_echo_n "checking whether symbol versioning is supported... " >&6; }
-cat > conftest.map <<EOF
+# Check whether --enable-symvers was given.
+if test "${enable_symvers+set}" = set; then :
+ enableval=$enable_symvers; ssp_use_symver=$enableval
+else
+ ssp_use_symver=yes
+fi
+
+if test "x$ssp_use_symver" != xno; then
+ if test x$gcc_no_link = xyes; then
+ # If we cannot link, we cannot build shared libraries, so do not use
+ # symbol versioning.
+ ssp_use_symver=no
+ else
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS -fPIC -shared -Wl,--version-script,./conftest.map"
+ cat > conftest.map <<EOF
FOO_1.0 {
global: *foo*; bar; local: *;
};
EOF
-save_LDFLAGS="$LDFLAGS"
-LDFLAGS="$LDFLAGS -fPIC -shared -Wl,--version-script,./conftest.map"
-if test x$gcc_no_link = xyes; then
- # If we cannot link, we cannot build shared libraries, so do not use
- # symbol versioning.
- ssp_use_symver=no
+ if test x$gcc_no_link = xyes; then
+ as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
+fi
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+int foo;
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+ ssp_use_symver=gnu
else
- if test x$gcc_no_link = xyes; then
+ ssp_use_symver=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+ if test x$ssp_use_symver = xno; then
+ case "$target_os" in
+ solaris2*)
+ LDFLAGS="$save_LDFLAGS"
+ LDFLAGS="$LDFLAGS -fPIC -shared -Wl,-M,./conftest.map"
+ # Sun ld cannot handle wildcards and treats all entries as undefined.
+ cat > conftest.map <<EOF
+FOO_1.0 {
+ global: foo; local: *;
+};
+EOF
+ if test x$gcc_no_link = xyes; then
as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
fi
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4120,17 +4167,21 @@ main ()
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
- ssp_use_symver=yes
+ ssp_use_symver=sun
else
ssp_use_symver=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
+ ;;
+ esac
+ fi
+ LDFLAGS="$save_LDFLAGS"
+ fi
fi
-LDFLAGS="$save_LDFLAGS"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ssp_use_symver" >&5
$as_echo "$ssp_use_symver" >&6; }
- if test "x$ssp_use_symver" = xyes; then
+ if test "x$ssp_use_symver" != xno; then
LIBSSP_USE_SYMVER_TRUE=
LIBSSP_USE_SYMVER_FALSE='#'
else
@@ -4138,6 +4189,22 @@ else
LIBSSP_USE_SYMVER_FALSE=
fi
+ if test "x$ssp_use_symver" = xgnu; then
+ LIBSSP_USE_SYMVER_GNU_TRUE=
+ LIBSSP_USE_SYMVER_GNU_FALSE='#'
+else
+ LIBSSP_USE_SYMVER_GNU_TRUE='#'
+ LIBSSP_USE_SYMVER_GNU_FALSE=
+fi
+
+ if test "x$ssp_use_symver" = xsun; then
+ LIBSSP_USE_SYMVER_SUN_TRUE=
+ LIBSSP_USE_SYMVER_SUN_FALSE='#'
+else
+ LIBSSP_USE_SYMVER_SUN_TRUE='#'
+ LIBSSP_USE_SYMVER_SUN_FALSE=
+fi
+
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
@@ -4423,7 +4490,7 @@ if test x$gcc_no_link = xyes; then
$as_echo "#define HAVE_STRNCAT 1" >>confdefs.h
else
- for ac_func in mempcpy strncpy strncat
+ for ac_func in memmove mempcpy strncpy strncat
do :
as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -6334,7 +6401,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)
- LD="${LD-ld} -m elf_i386"
+ case `/usr/bin/file conftest.o` in
+ *x86-64*)
+ LD="${LD-ld} -m elf32_x86_64"
+ ;;
+ *)
+ LD="${LD-ld} -m elf_i386"
+ ;;
+ esac
;;
ppc64-*linux*|powerpc64-*linux*)
LD="${LD-ld} -m elf32ppclinux"
@@ -7610,6 +7684,7 @@ $as_echo_n "checking for $compiler optio
# AIX 5 now supports IA64 processor
lt_prog_compiler_static='-Bstatic'
fi
+ lt_prog_compiler_pic='-fPIC'
;;
amigaos*)
@@ -8785,10 +8860,6 @@ if test -z "$aix_libpath"; then aix_libp
hardcode_shlibpath_var=no
;;
- freebsd1*)
- ld_shlibs=no
- ;;
-
# FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
# support. Future versions do this automatically, but an explicit c++rt0.o
# does not break anything, and helps significantly (at the cost of a little
@@ -8801,7 +8872,7 @@ if test -z "$aix_libpath"; then aix_libp
;;
# Unfortunately, older versions of FreeBSD 2 do not have this feature.
- freebsd2*)
+ freebsd2.*)
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
hardcode_direct=yes
hardcode_minus_L=yes
@@ -9710,10 +9781,6 @@ dgux*)
shlibpath_var=LD_LIBRARY_PATH
;;
-freebsd1*)
- dynamic_linker=no
- ;;
-
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
@@ -9721,7 +9788,7 @@ freebsd* | dragonfly*)
objformat=`/usr/bin/objformat`
else
case $host_os in
- freebsd[123]*) objformat=aout ;;
+ freebsd[23].*) objformat=aout ;;
*) objformat=elf ;;
esac
fi
@@ -9739,7 +9806,7 @@ freebsd* | dragonfly*)
esac
shlibpath_var=LD_LIBRARY_PATH
case $host_os in
- freebsd2*)
+ freebsd2.*)
shlibpath_overrides_runpath=yes
;;
freebsd3.[01]* | freebsdelf3.[01]*)
@@ -10591,7 +10658,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10594 "configure"
+#line 10661 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10697,7 +10764,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 10700 "configure"
+#line 10767 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10937,6 +11004,28 @@ CC="$lt_save_CC"
+case $host in
+ *-cygwin* | *-mingw*)
+ # 'host' will be top-level target in the case of a target lib,
+ # we must compare to with_cross_host to decide if this is a native
+ # or cross-compiler and select where to install dlls appropriately.
+ if test -n "$with_cross_host" &&
+ test x"$with_cross_host" != x"no"; then
+ lt_host_flags='-no-undefined -bindir "$(toolexeclibdir)"';
+ else
+ lt_host_flags='-no-undefined -bindir "$(bindir)"';
+ fi
+ ;;
+ *)
+ lt_host_flags=
+ ;;
+esac
+
+
+
+
+
+
# Calculate toolexeclibdir
# Also toolexecdir, though it's only used in toolexeclibdir
case ${version_specific_libs} in
@@ -11096,6 +11185,14 @@ if test -z "${LIBSSP_USE_SYMVER_TRUE}" &
as_fn_error "conditional \"LIBSSP_USE_SYMVER\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${LIBSSP_USE_SYMVER_GNU_TRUE}" && test -z "${LIBSSP_USE_SYMVER_GNU_FALSE}"; then
+ as_fn_error "conditional \"LIBSSP_USE_SYMVER_GNU\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${LIBSSP_USE_SYMVER_SUN_TRUE}" && test -z "${LIBSSP_USE_SYMVER_SUN_FALSE}"; then
+ as_fn_error "conditional \"LIBSSP_USE_SYMVER_SUN\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
: ${CONFIG_STATUS=./config.status}
ac_write_fail=0
Index: src/external/gpl3/gcc/dist/libssp/configure.ac
diff -u src/external/gpl3/gcc/dist/libssp/configure.ac:1.1.1.1 src/external/gpl3/gcc/dist/libssp/configure.ac:1.1.1.1.2.1
--- src/external/gpl3/gcc/dist/libssp/configure.ac:1.1.1.1 Tue Jun 21 01:23:34 2011
+++ src/external/gpl3/gcc/dist/libssp/configure.ac Thu May 22 16:37:05 2014
@@ -8,7 +8,7 @@ AC_CONFIG_SRCDIR(ssp.c)
AC_CANONICAL_SYSTEM
ACX_NONCANONICAL_TARGET
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([no-dist])
AC_MSG_CHECKING([for --enable-version-specific-runtime-libs])
AC_ARG_ENABLE(version-specific-runtime-libs,
@@ -72,23 +72,47 @@ if test x$ssp_hidden = xyes; then
fi
AC_MSG_CHECKING([whether symbol versioning is supported])
-cat > conftest.map <<EOF
+AC_ARG_ENABLE(symvers,
+AS_HELP_STRING([--disable-symvers],
+ [disable symbol versioning for libssp]),
+ssp_use_symver=$enableval,
+ssp_use_symver=yes)
+if test "x$ssp_use_symver" != xno; then
+ if test x$gcc_no_link = xyes; then
+ # If we cannot link, we cannot build shared libraries, so do not use
+ # symbol versioning.
+ ssp_use_symver=no
+ else
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS -fPIC -shared -Wl,--version-script,./conftest.map"
+ cat > conftest.map <<EOF
FOO_1.0 {
global: *foo*; bar; local: *;
};
EOF
-save_LDFLAGS="$LDFLAGS"
-LDFLAGS="$LDFLAGS -fPIC -shared -Wl,--version-script,./conftest.map"
-if test x$gcc_no_link = xyes; then
- # If we cannot link, we cannot build shared libraries, so do not use
- # symbol versioning.
- ssp_use_symver=no
-else
- AC_TRY_LINK([int foo;],[],[ssp_use_symver=yes],[ssp_use_symver=no])
+ AC_TRY_LINK([int foo;],[],[ssp_use_symver=gnu],[ssp_use_symver=no])
+ if test x$ssp_use_symver = xno; then
+ case "$target_os" in
+ solaris2*)
+ LDFLAGS="$save_LDFLAGS"
+ LDFLAGS="$LDFLAGS -fPIC -shared -Wl,-M,./conftest.map"
+ # Sun ld cannot handle wildcards and treats all entries as undefined.
+ cat > conftest.map <<EOF
+FOO_1.0 {
+ global: foo; local: *;
+};
+EOF
+ AC_TRY_LINK([int foo;],[],[ssp_use_symver=sun],[ssp_use_symver=no])
+ ;;
+ esac
+ fi
+ LDFLAGS="$save_LDFLAGS"
+ fi
fi
-LDFLAGS="$save_LDFLAGS"
AC_MSG_RESULT($ssp_use_symver)
-AM_CONDITIONAL(LIBSSP_USE_SYMVER, [test "x$ssp_use_symver" = xyes])
+AM_CONDITIONAL(LIBSSP_USE_SYMVER, [test "x$ssp_use_symver" != xno])
+AM_CONDITIONAL(LIBSSP_USE_SYMVER_GNU, [test "x$ssp_use_symver" = xgnu])
+AM_CONDITIONAL(LIBSSP_USE_SYMVER_SUN, [test "x$ssp_use_symver" = xsun])
AC_CHECK_HEADERS(alloca.h malloc.h paths.h syslog.h string.h unistd.h fcntl.h stdio.h limits.h)
@@ -98,7 +122,7 @@ if test x$gcc_no_link = xyes; then
AC_DEFINE(HAVE_STRNCPY)
AC_DEFINE(HAVE_STRNCAT)
else
- AC_CHECK_FUNCS(mempcpy strncpy strncat)
+ AC_CHECK_FUNCS(memmove mempcpy strncpy strncat)
fi
AC_MSG_CHECKING([whether vsnprintf is usable])
@@ -131,6 +155,7 @@ fi
AC_SUBST(ssp_have_usable_vsnprintf)
AM_PROG_LIBTOOL
+ACX_LT_HOST_FLAGS
AC_SUBST(enable_shared)
AC_SUBST(enable_static)
Index: src/external/gpl3/gcc/dist/libssp/memmove-chk.c
diff -u src/external/gpl3/gcc/dist/libssp/memmove-chk.c:1.1.1.1 src/external/gpl3/gcc/dist/libssp/memmove-chk.c:1.1.1.1.2.1
--- src/external/gpl3/gcc/dist/libssp/memmove-chk.c:1.1.1.1 Tue Jun 21 01:23:34 2011
+++ src/external/gpl3/gcc/dist/libssp/memmove-chk.c Thu May 22 16:37:05 2014
@@ -1,5 +1,5 @@
/* Checking memmove.
- Copyright (C) 2005, 2009 Free Software Foundation, Inc.
+ Copyright (C) 2005, 2009, 2010 Free Software Foundation, Inc.
This file is part of GCC.
@@ -40,7 +40,7 @@ see the files COPYING3 and COPYING.RUNTI
extern void __chk_fail (void) __attribute__((__noreturn__));
-#ifdef HAVE_MEMPCPY
+#ifdef HAVE_MEMMOVE
void *
__memmove_chk (void *dest, const void *src, size_t len, size_t slen)
{
Index: src/external/gpl3/gcc/dist/libssp/ssp.map
diff -u src/external/gpl3/gcc/dist/libssp/ssp.map:1.1.1.1 src/external/gpl3/gcc/dist/libssp/ssp.map:1.1.1.1.2.1
--- src/external/gpl3/gcc/dist/libssp/ssp.map:1.1.1.1 Tue Jun 21 01:23:33 2011
+++ src/external/gpl3/gcc/dist/libssp/ssp.map Thu May 22 16:37:05 2014
@@ -1,9 +1,22 @@
LIBSSP_1.0 {
global:
- __stack_chk_fail; __stack_chk_guard; __chk_fail;
- __gets_chk; __memcpy_chk; __memmove_chk; __mempcpy_chk; __memset_chk;
- __snprintf_chk; __sprintf_chk; __stpcpy_chk; __strcat_chk; __strcpy_chk;
- __strncat_chk; __strncpy_chk; __vsnprintf_chk; __vsprintf_chk;
+ __stack_chk_fail;
+ __stack_chk_guard;
+ __chk_fail;
+ __gets_chk;
+ __memcpy_chk;
+ __memmove_chk;
+ __mempcpy_chk;
+ __memset_chk;
+ __snprintf_chk;
+ __sprintf_chk;
+ __stpcpy_chk;
+ __strcat_chk;
+ __strcpy_chk;
+ __strncat_chk;
+ __strncpy_chk;
+ __vsnprintf_chk;
+ __vsprintf_chk;
local:
*;
};
Index: src/external/gpl3/gcc/dist/libssp/strncat-chk.c
diff -u src/external/gpl3/gcc/dist/libssp/strncat-chk.c:1.1.1.1 src/external/gpl3/gcc/dist/libssp/strncat-chk.c:1.1.1.1.2.1
--- src/external/gpl3/gcc/dist/libssp/strncat-chk.c:1.1.1.1 Tue Jun 21 01:23:34 2011
+++ src/external/gpl3/gcc/dist/libssp/strncat-chk.c Thu May 22 16:37:05 2014
@@ -87,12 +87,6 @@ __strncat_chk (char *__restrict__ dest,
*++dest = c;
if (c == '\0')
return s;
- if (slen-- == 0)
- __chk_fail ();
- c = *src++;
- *++dest = c;
- if (c == '\0')
- return s;
} while (--n4 > 0);
n &= 3;
}
