diff options
author | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-07-02 10:15:09 +0000 |
---|---|---|
committer | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-07-02 10:15:09 +0000 |
commit | f28c8d0d31eba663fa44eadff55559b95a56ea61 (patch) | |
tree | 68173ee2d5bd4b1b5fc1a277f153743209eb7dda /libssp/Makefile.in | |
parent | fbb7f7a8b40767af09d7ab0e745aa160595a7f0c (diff) | |
download | ppe42-gcc-f28c8d0d31eba663fa44eadff55559b95a56ea61.tar.gz ppe42-gcc-f28c8d0d31eba663fa44eadff55559b95a56ea61.zip |
* 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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@161699 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libssp/Makefile.in')
-rw-r--r-- | libssp/Makefile.in | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/libssp/Makefile.in b/libssp/Makefile.in index e70d622b3f6..d9f952fd50c 100644 --- a/libssp/Makefile.in +++ b/libssp/Makefile.in @@ -250,9 +250,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 @@ -694,6 +696,15 @@ uninstall-am: uninstall-nobase_libsubincludeHEADERS \ uninstall-am uninstall-nobase_libsubincludeHEADERS \ uninstall-toolexeclibLTLIBRARIES +@LIBSSP_USE_SYMVER_SUN_TRUE@@LIBSSP_USE_SYMVER_TRUE@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. |