[PATCH 07/10] gen-version-script: parse Solaris "nm" output (Solaris support)
Blake Jones
blakej at foo.net
Sat Nov 3 20:15:59 PDT 2012
The output of "nm" on Solaris is substantially different from that on
Linux, and the current version of gen-version-script is tied to the
Linux "nm" output. This patch separates the parts of "nm" processing
which are dependent on the output format into a couple shell functions,
and makes another shell function to use the appropriate version of
"c++filt" to demangle symbols. It also modifies lib/Makefile.local
to pass the generated symbol table correctly to the Solaris linker.
---
lib/Makefile.local | 4 ++++
lib/gen-version-script.sh | 50 ++++++++++++++++++++++++++++++++++++++++-----
2 files changed, 49 insertions(+), 5 deletions(-)
diff --git a/lib/Makefile.local b/lib/Makefile.local
index 0c6b258..2068e4a 100644
--- a/lib/Makefile.local
+++ b/lib/Makefile.local
@@ -30,7 +30,11 @@ LIBRARY_SUFFIX = so
LINKER_NAME = libnotmuch.$(LIBRARY_SUFFIX)
SONAME = $(LINKER_NAME).$(LIBNOTMUCH_VERSION_MAJOR)
LIBNAME = $(SONAME).$(LIBNOTMUCH_VERSION_MINOR).$(LIBNOTMUCH_VERSION_RELEASE)
+ifeq ($(PLATFORM),SOLARIS)
+LIBRARY_LINK_FLAG = -shared -Wl,-M notmuch.sym -Wl,-soname=$(SONAME) -Wl,--no-undefined -lc
+else
LIBRARY_LINK_FLAG = -shared -Wl,--version-script=notmuch.sym,-soname=$(SONAME) -Wl,--no-undefined
+endif
ifeq ($(PLATFORM),OPENBSD)
LIBRARY_LINK_FLAG += -lc
endif
diff --git a/lib/gen-version-script.sh b/lib/gen-version-script.sh
index 76670d5..d7d96da 100644
--- a/lib/gen-version-script.sh
+++ b/lib/gen-version-script.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
# we go through a bit of work to get the unmangled names of the
# typeinfo symbols because of
@@ -11,10 +12,44 @@ fi
HEADER=$1
shift
+if [ `uname -s` == SunOS ] ; then
+ #
+ # Using Solaris "nm", a defined symbol looks like this:
+ #
+ # [Index] Value Size Type Bind Other Shndx Name
+ # [15] | 128| 16|FUNC |GLOB |0 |1 |notmuch_tags_get
+ #
+ # and an undefined symbol looks like this:
+ #
+ # [Index] Value Size Type Bind Other Shndx Name
+ # [35] | 0| 0|NOTY |GLOB |0 |UNDEF |notmuch_tags_get
+ #
+ find_xapian_error() {
+ nawk -F'\|' '$7 !~ "UNDEF" && $8 ~ "Xapian.*Error" { print $8 }'
+ }
+ find_compat_syms() {
+ nawk -F'\|' '$7 !~ "UNDEF" && $8 ~ "get(line|delim)" { print $8 ";" }'
+ }
+ demangle() {
+ gc++filt "$@"
+ }
+else
+ find_xapian_error() {
+ awk '$1 ~ "^[0-9a-fA-F][0-9a-fA-F]*$" && $3 ~ "Xapian.*Error" {print $3}'
+ }
+ find_compat_syms() {
+ awk '$1 ~ "^[0-9a-fA-F][0-9a-fA-F]*$" && $2 == "T" && $3 ~ "^get(line|delim)$" {print $3 ";"}'
+ }
+ demangle() {
+ c++filt "$@"
+ }
+fi
+
printf '{\nglobal:\n'
-nm $* | awk '$1 ~ "^[0-9a-fA-F][0-9a-fA-F]*$" && $3 ~ "Xapian.*Error" {print $3}' | sort | uniq | \
-while read sym; do
- demangled=$(c++filt $sym)
+
+# Find the typeinfo for "Xapian::*Error"s.
+nm $* | find_xapian_error | sort | uniq | while read sym; do
+ demangled=$(demangle $sym)
case $demangled in
typeinfo*)
printf "\t$sym;\n"
@@ -23,6 +58,11 @@ while read sym; do
;;
esac
done
-nm $* | awk '$1 ~ "^[0-9a-fA-F][0-9a-fA-F]*$" && $2 == "T" && $3 ~ "^get(line|delim)$" {print $3 ";"}'
-sed -n 's/^[[:space:]]*\(notmuch_[a-z_]*\)[[:space:]]*(.*/ \1;/p' $HEADER
+
+# Find the "compat" syms that we need to export.
+nm $* | find_compat_syms
+
+# Finally, get the real notmuch symbols.
+sed -n 's/^[ ]*\(notmuch_[a-z_]*\)[ ]*(.*/ \1;/p' $HEADER
+
printf "local: *;\n};\n"
--
1.7.9.2
More information about the notmuch
mailing list