From 700a6e9a7f585ce47a81c0ce63ca494f79f18e75 Mon Sep 17 00:00:00 2001 From: Albert Chin-A-Young Date: Tue, 24 Apr 2001 22:20:08 +0000 Subject: [PATCH] * ltconfig.in: Handle case where /bin/nm -p outputs multiple symbol types (like under HP-UX 11.00). --- ChangeLog | 5 +++++ ltconfig.in | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8b3879957..54b061a37 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-04-24 Albert Chin-A-Young + + * ltconfig.in: Handle case where /bin/nm -p outputs multiple + symbol types (like under HP-UX 11.00). + 2001-04-24 Ossama Othman * ltcf-cxx.sh (output_verbose_link_cmds): Renamed this variable to diff --git a/ltconfig.in b/ltconfig.in index 33d3e85c0..d97e90655 100755 --- a/ltconfig.in +++ b/ltconfig.in @@ -1376,7 +1376,7 @@ cygwin* | mingw* | pw32*) symcode='[ABCDGISTW]' ;; hpux*) # Its linker distinguishes data from code symbols - global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^. .* \(.*\)$/extern char \1;/p'" + global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" ;; irix*) symcode='[BCDEGRST]' @@ -1406,7 +1406,7 @@ fi for ac_symprfx in "" "_"; do # Write the raw and C identifiers. -global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode\)[ ][ ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" + global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'" # Check to see that the pipe works correctly. pipe_works=no @@ -1464,7 +1464,7 @@ const struct { lt_preloaded_symbols[] = { EOF - sed 's/^. \(.*\) \(.*\)$/ {"\2", (lt_ptr_t) \&\2},/' < "$nlist" >> conftest.$ac_ext + sed "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" >> conftest.$ac_ext cat <<\EOF >> conftest.$ac_ext {0, (lt_ptr_t) 0} }; -- 2.47.3