From 6cc733bc35a962ec726cdc0326d2a6c64fc38763 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Thu, 23 Sep 2004 12:26:40 +0000 Subject: [PATCH] * m4/libtool.m4 (_LT_CMD_GLOBAL_SYMBOLS): move symcode calculation to correct place. * doc/libtool.texi (libtool script contents): update description of global_symbol_to_cdecl. --- ChangeLog | 9 ++++++++- doc/libtool.texi | 11 +++++------ m4/libtool.m4 | 12 ++++++------ 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 098fbf546..a53b81040 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,11 @@ -2004-09-23 Gary V. Vaughan +2004-09-23 Ralf Wildenhues + + * m4/libtool.m4 (_LT_CMD_GLOBAL_SYMBOLS): move symcode calculation + to correct place. + * doc/libtool.texi (libtool script contents): update description + of global_symbol_to_cdecl. + +04-09-23 Gary V. Vaughan * configure.ac (M4SH): AC_SUBST m4sh expander. * config/general.m4sh, config/getopt.m4sh: New files with factored diff --git a/doc/libtool.texi b/doc/libtool.texi index 1fc1402a3..978ed7988 100644 --- a/doc/libtool.texi +++ b/doc/libtool.texi @@ -5062,16 +5062,15 @@ C @var{symbol3} @var{C-symbol3} $ @end example -The first column contains the symbol type (used to tell data from code -on some platforms), but its meaning is system dependent. +The first column contains the symbol type (used to tell data from code) +but its meaning is system dependent. @end defvar @defvar global_symbol_to_cdecl A pipeline that translates the output of @var{global_symbol_pipe} into -proper C declarations. On platforms whose linkers differentiate code -from data, such as HP/UX, data symbols will be declared as such, and -code symbols will be declared as functions. On platforms that don't -care, everything is assumed to be data. +proper C declarations. Since some platforms, such as HP/UX, have +linkers that differentiate code from data, data symbols are declared +as data, and code symbols are declared as functions. @end defvar @defvar hardcode_action diff --git a/m4/libtool.m4 b/m4/libtool.m4 index 5252ff5d4..f5229b269 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -2720,6 +2720,12 @@ sysv4) ;; esac +# If we're using GNU nm, then use its standard symbol codes. +case `$NM -V 2>&1` in +*GNU* | *'with BFD'*) + symcode='[[ABCDGIRSTW]]' ;; +esac + # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symols differently, # so use this general approach. @@ -2736,12 +2742,6 @@ mingw*) ;; esac -# If we're using GNU nm, then use its standard symbol codes. -case `$NM -V 2>&1` in -*GNU* | *'with BFD'*) - symcode='[[ABCDGIRSTW]]' ;; -esac - # Try without a prefix undercore, then with it. for ac_symprfx in "" "_"; do -- 2.47.2