Add gcc-init-pragmas branch

diff --git a/.topdeps b/.topdeps
new file mode 100644 (file)
index 0000000..1f7391f
--- /dev/null
+++ b/.topdeps
@@ -0,0 +1 @@
+master

diff --git a/.topmsg b/.topmsg
new file mode 100644 (file)
index 0000000..704245f
--- /dev/null
+++ b/.topmsg
@@ -0,0 +1,9 @@
+From: Brian Behlendorf <behlendorf1@llnl.gov>
+Subject: [PATCH] gcc-init-pragmas
+
+Use constructor attribute on non-Solaris platforms.
+
+The #pragma init/fini ->__attribute__((constructor/destructor))
+conversions, these should go upstream.
+
+Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>

diff --git a/zfs/lib/libuutil/uu_misc.c b/zfs/lib/libuutil/uu_misc.c
index 0ead166e70e58c068a7e5ca143872a5b93b620a3..14110312342d4bcb2ebab833de958be75f5ac332 100644 (file)
--- a/zfs/lib/libuutil/uu_misc.c
+++ b/zfs/lib/libuutil/uu_misc.c
@@ -247,7 +247,13 @@ uu_release_child(void)
        uu_release();
 }
 
+#ifdef __GNUC__
+static void
+uu_init(void) __attribute__((constructor));
+#else
 #pragma init(uu_init)
+#endif
+
 static void
 uu_init(void)
 {

diff --git a/zfs/lib/libzfs/libzfs_mount.c b/zfs/lib/libzfs/libzfs_mount.c
index 35a2cea7a7b536b4726bbaac01e9788d3761c804..f31a209e7e05f44ac2efcca1e9de04a04c496f3a 100644 (file)
--- a/zfs/lib/libzfs/libzfs_mount.c
+++ b/zfs/lib/libzfs/libzfs_mount.c
@@ -128,7 +128,13 @@ zfs_share_proto_t share_all_proto[] = {
        PROTO_END
 };
 
+#ifdef __GNUC__
+static void
+zfs_iscsi_init(void) __attribute__((constructor));
+#else
 #pragma init(zfs_iscsi_init)
+#endif
+
 static void
 zfs_iscsi_init(void)
 {
@@ -548,8 +554,12 @@ static void (*_sa_update_sharetab_ts)(sa_handle_t);
  * values to be used later. This is triggered by the runtime loader.
  * Make sure the correct ISA version is loaded.
  */
-
+#ifdef __GNUC__
+static void
+_zfs_init_libshare(void) __attribute__((constructor));
+#else
 #pragma init(_zfs_init_libshare)
+#endif
 static void
 _zfs_init_libshare(void)
 {