Pull in GCC and ELF alternatives for RCSID() if available.

Idea from: sys/cdefs.h on FreeBSD.

svn path=/trunk/yasm/; revision=197

diff --git a/libyasm/util.h b/libyasm/util.h
index d5984ea0351e733a664494dc03435715aeb8dd94..0d56e213996e37f8ae799724c8409f96b832985f 100644 (file)
--- a/libyasm/util.h
+++ b/libyasm/util.h
@@ -61,7 +61,15 @@ int strncasecmp(const char *s1, const char *s2, size_t n);
 #ifdef __RCSID
 # define RCSID(s)      __RCSID(s)
 #else
-# define RCSID(s)      static const char rcsid[] = s
+# ifdef __GNUC__
+#  ifdef __ELF__
+#   define RCSID(s)    __asm__(".ident\t\"" s "\"")
+#  else
+#   define RCSID(s)    static const char rcsid[] __unused = s
+#  endif
+# else
+#  define RCSID(s)     static const char rcsid[] = s
+# endif
 #endif
 
 #endif

diff --git a/src/util.h b/src/util.h
index d5984ea0351e733a664494dc03435715aeb8dd94..0d56e213996e37f8ae799724c8409f96b832985f 100644 (file)
--- a/src/util.h
+++ b/src/util.h
@@ -61,7 +61,15 @@ int strncasecmp(const char *s1, const char *s2, size_t n);
 #ifdef __RCSID
 # define RCSID(s)      __RCSID(s)
 #else
-# define RCSID(s)      static const char rcsid[] = s
+# ifdef __GNUC__
+#  ifdef __ELF__
+#   define RCSID(s)    __asm__(".ident\t\"" s "\"")
+#  else
+#   define RCSID(s)    static const char rcsid[] __unused = s
+#  endif
+# else
+#  define RCSID(s)     static const char rcsid[] = s
+# endif
 #endif
 
 #endif

diff --git a/util.h b/util.h
index d5984ea0351e733a664494dc03435715aeb8dd94..0d56e213996e37f8ae799724c8409f96b832985f 100644 (file)
--- a/util.h
+++ b/util.h
@@ -61,7 +61,15 @@ int strncasecmp(const char *s1, const char *s2, size_t n);
 #ifdef __RCSID
 # define RCSID(s)      __RCSID(s)
 #else
-# define RCSID(s)      static const char rcsid[] = s
+# ifdef __GNUC__
+#  ifdef __ELF__
+#   define RCSID(s)    __asm__(".ident\t\"" s "\"")
+#  else
+#   define RCSID(s)    static const char rcsid[] __unused = s
+#  endif
+# else
+#  define RCSID(s)     static const char rcsid[] = s
+# endif
 #endif
 
 #endif