[PATCH] <shlib-compat.h>: Support compat_symbol_reference for _ISOMAC

[Florian Weimer]

This is helpful for testing compat symbols in cases where _ISOMAC
is activated implicitly due to -DMODULE_NAME=testsuite and cannot
be disabled easily.

---
 include/libc-symbols.h | 8 ++++----
 include/shlib-compat.h | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/libc-symbols.h b/include/libc-symbols.h
index ea126ae70c..f5b7763f6c 100644
--- a/include/libc-symbols.h
+++ b/include/libc-symbols.h
@@ -396,22 +396,22 @@ for linking")
    past the last element in SET.  */
 #define symbol_set_end_p(set, ptr) ((ptr) >= (void *const *) &__stop_##set)
 
-/* Use symbol_version_reference to specify the version a symbol
+/* Use __symbol_version_reference to specify the version a symbol
    reference should link to.  Use symbol_version or
    default_symbol_version for the definition of a versioned symbol.
    The difference is that the latter is a no-op in non-shared
    builds.  */
 #ifdef __ASSEMBLER__
-# define symbol_version_reference(real, name, version) \
+# define __symbol_version_reference(real, name, version) \
      .symver real, name##@##version
 #else  /* !__ASSEMBLER__ */
-# define symbol_version_reference(real, name, version) \
+# define __symbol_version_reference(real, name, version) \
   __asm__ (".symver " #real "," #name "@" #version)
 #endif
 
 #ifdef SHARED
 # define symbol_version(real, name, version) \
-  symbol_version_reference(real, name, version)
+  __symbol_version_reference(real, name, version)
 # define default_symbol_version(real, name, version) \
      _default_symbol_version(real, name, version)
 # ifdef __ASSEMBLER__
diff --git a/include/shlib-compat.h b/include/shlib-compat.h
index 28baef1ea4..e8adef71bf 100644
--- a/include/shlib-compat.h
+++ b/include/shlib-compat.h
@@ -130,7 +130,7 @@
 #define compat_symbol_reference_1(lib, local, symbol, version) \
   compat_symbol_reference_2 (local, symbol, VERSION_##lib##_##version)
 #define compat_symbol_reference_2(local, symbol, name) \
-  symbol_version_reference (local, symbol, name)
+  __symbol_version_reference (local, symbol, name)
 
 /* Export the symbol only for shared-library compatibility.  */
 #define libc_sunrpc_symbol(name, aliasname, version) \