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.am | |
| parent | fbb7f7a8b40767af09d7ab0e745aa160595a7f0c (diff) | |
| download | gcc-f28c8d0d31eba663fa44eadff55559b95a56ea61.tar.gz | |
* 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.am')
| -rw-r--r-- | libssp/Makefile.am | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/libssp/Makefile.am b/libssp/Makefile.am index 7b6e9465084..e25bd8458ce 100644 --- a/libssp/Makefile.am +++ b/libssp/Makefile.am @@ -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 = |