[hurd] 84/87: Fix optional definitions in static binaries

[Samuel Thibault]

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch upstream
in repository hurd.

commit 89abef408f02e463cfe9d462fa10be64a94b3b36
Author: Samuel Thibault <address@hidden>
Date:   Mon Nov 3 01:53:17 2014 +0100

    Fix optional definitions in static binaries
    
    * libcons/extra-version.c (cons_extra_version): Add weak attribute.
    * libcons/vcons-add.c (cons_vcons_add): Likewise.
    * libcons/vcons-remove.c (cons_vcons_remove): Likewise.
    * libdiskfs/extra-version.c (diskfs_extra_version): Likewise.
    * libdiskfs/get-source.c (diskfs_get_source): Likewise.
    * libdiskfs/readonly-changed.c (diskfs_readonly_changed): Likewise.
    * libdiskfs/sync-default.c (diskfs_default_sync_interval): Likewise.
    * libdiskfs/validate-author.c (diskfs_validate_author_change): Likewise.
    * libdiskfs/validate-flags.c (diskfs_validate_flags_change): Likewise.
    * libdiskfs/validate-group.c (diskfs_validate_group_change): Likewise.
    * libdiskfs/validate-mode.c (diskfs_validate_mode_change): Likewise.
    * libdiskfs/validate-owner.c (diskfs_validate_owner_change): Likewise.
    * libdiskfs/validate-rdev.c (diskfs_validate_rdev_change): Likewise.
    * libnetfs/file-get-storage-info-default.c (netfs_file_get_storage_info):
    Likewise.
    * libnetfs/get-source.c (netfs_get_source): Likewise.
    * libnetfs/set-get-trans.c (netfs_set_translator, netfs_get_translator):
    Likewise.
    * libtrivfs/get-source.c (trivfs_get_source): Likewise.
---
 libcons/extra-version.c                  | 2 +-
 libcons/vcons-add.c                      | 2 +-
 libcons/vcons-remove.c                   | 2 +-
 libdiskfs/extra-version.c                | 2 +-
 libdiskfs/get-source.c                   | 2 +-
 libdiskfs/readonly-changed.c             | 2 +-
 libdiskfs/sync-default.c                 | 2 +-
 libdiskfs/validate-author.c              | 2 +-
 libdiskfs/validate-flags.c               | 2 +-
 libdiskfs/validate-group.c               | 2 +-
 libdiskfs/validate-mode.c                | 2 +-
 libdiskfs/validate-owner.c               | 2 +-
 libdiskfs/validate-rdev.c                | 2 +-
 libnetfs/file-get-storage-info-default.c | 2 +-
 libnetfs/get-source.c                    | 2 +-
 libnetfs/set-get-trans.c                 | 4 ++--
 libtrivfs/get-source.c                   | 2 +-
 17 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/libcons/extra-version.c b/libcons/extra-version.c
index 4ff54d8..1021c87 100644
--- a/libcons/extra-version.c
+++ b/libcons/extra-version.c
@@ -21,4 +21,4 @@
 
 #include "priv.h"
 
-char *cons_extra_version = "";
+char *cons_extra_version __attribute__ ((weak)) = "";
diff --git a/libcons/vcons-add.c b/libcons/vcons-add.c
index 1a6eb20..c46f5e0 100644
--- a/libcons/vcons-add.c
+++ b/libcons/vcons-add.c
@@ -24,7 +24,7 @@
 
 /* The virtual console entry VCONS_ENTRY was just added.  CONS is
    locked.  */
-void
+void __attribute__ ((weak))
 cons_vcons_add (cons_t cons, vcons_list_t vcons_entry)
 {
 }
diff --git a/libcons/vcons-remove.c b/libcons/vcons-remove.c
index 34b31d6..273c5a0 100644
--- a/libcons/vcons-remove.c
+++ b/libcons/vcons-remove.c
@@ -24,7 +24,7 @@
 
 /* The virtual console VCONS_ENTRY is going to be removed.
    VCONS_ENTRY->cons is locked.  */
-void
+void __attribute__ ((weak))
 cons_vcons_remove (cons_t cons, vcons_list_t vcons_entry)
 {
   assert (!vcons_entry->vcons);
diff --git a/libdiskfs/extra-version.c b/libdiskfs/extra-version.c
index b1d7808..51920aa 100644
--- a/libdiskfs/extra-version.c
+++ b/libdiskfs/extra-version.c
@@ -21,4 +21,4 @@
 
 #include "priv.h"
 
-char *diskfs_extra_version = "";
+char *diskfs_extra_version __attribute__ ((weak)) = "";
diff --git a/libdiskfs/get-source.c b/libdiskfs/get-source.c
index 4399446..2ef8ebc 100644
--- a/libdiskfs/get-source.c
+++ b/libdiskfs/get-source.c
@@ -21,7 +21,7 @@
 
 #include "priv.h"
 
-error_t
+error_t __attribute__ ((weak))
 diskfs_get_source (struct protid *cred, char *source, size_t source_len)
 {
   if (diskfs_disk_name == NULL)
diff --git a/libdiskfs/readonly-changed.c b/libdiskfs/readonly-changed.c
index 44ee922..7a1c03e 100644
--- a/libdiskfs/readonly-changed.c
+++ b/libdiskfs/readonly-changed.c
@@ -24,7 +24,7 @@
    changed from read-only to read-write mode or vice-versa.  READONLY is the
    new state (which is also reflected in DISKFS_READONLY).  This function is
    also called during initial startup if the filesystem is to be writable.  */
-void
+void __attribute__ ((weak))
 diskfs_readonly_changed (int readonly)
 {
   /* By default do nothing at all.  */
diff --git a/libdiskfs/sync-default.c b/libdiskfs/sync-default.c
index 0d1fd93..9646dd6 100644
--- a/libdiskfs/sync-default.c
+++ b/libdiskfs/sync-default.c
@@ -20,4 +20,4 @@
 
 #include "priv.h"
 
-int diskfs_default_sync_interval = DEFAULT_SYNC_INTERVAL;
+int diskfs_default_sync_interval __attribute__ ((weak)) = 
DEFAULT_SYNC_INTERVAL;
diff --git a/libdiskfs/validate-author.c b/libdiskfs/validate-author.c
index d7dacab..cacfbfa 100644
--- a/libdiskfs/validate-author.c
+++ b/libdiskfs/validate-author.c
@@ -20,7 +20,7 @@
 
 #include "priv.h"
 
-error_t
+error_t __attribute__ ((weak))
 diskfs_validate_author_change (struct node *np, uid_t author)
 {
   return 0;
diff --git a/libdiskfs/validate-flags.c b/libdiskfs/validate-flags.c
index bb54dad..0673ad8 100644
--- a/libdiskfs/validate-flags.c
+++ b/libdiskfs/validate-flags.c
@@ -20,7 +20,7 @@
 
 #include "priv.h"
 
-error_t
+error_t __attribute__ ((weak))
 diskfs_validate_flags_change (struct node *np, int flags)
 {
   return 0;
diff --git a/libdiskfs/validate-group.c b/libdiskfs/validate-group.c
index 556c5aa..ef296ce 100644
--- a/libdiskfs/validate-group.c
+++ b/libdiskfs/validate-group.c
@@ -20,7 +20,7 @@
 
 #include "priv.h"
 
-error_t
+error_t __attribute__ ((weak))
 diskfs_validate_group_change (struct node *np, gid_t group)
 {
   return 0;
diff --git a/libdiskfs/validate-mode.c b/libdiskfs/validate-mode.c
index 1cf150e..bfcc942 100644
--- a/libdiskfs/validate-mode.c
+++ b/libdiskfs/validate-mode.c
@@ -20,7 +20,7 @@
 
 #include "priv.h"
 
-error_t
+error_t __attribute__ ((weak))
 diskfs_validate_mode_change (struct node *np, mode_t mode)
 {
   return 0;
diff --git a/libdiskfs/validate-owner.c b/libdiskfs/validate-owner.c
index 0cbe296..7bb3040 100644
--- a/libdiskfs/validate-owner.c
+++ b/libdiskfs/validate-owner.c
@@ -20,7 +20,7 @@
 
 #include "priv.h"
 
-error_t
+error_t __attribute__ ((weak))
 diskfs_validate_owner_change (struct node *np, uid_t uid)
 {
   return 0;
diff --git a/libdiskfs/validate-rdev.c b/libdiskfs/validate-rdev.c
index 2d76634..0d50667 100644
--- a/libdiskfs/validate-rdev.c
+++ b/libdiskfs/validate-rdev.c
@@ -20,7 +20,7 @@
 
 #include "priv.h"
 
-error_t
+error_t __attribute__ ((weak))
 diskfs_validate_rdev_change (struct node *np, dev_t rdev)
 {
   return 0;
diff --git a/libnetfs/file-get-storage-info-default.c 
b/libnetfs/file-get-storage-info-default.c
index 0ca68c9..4339c7b 100644
--- a/libnetfs/file-get-storage-info-default.c
+++ b/libnetfs/file-get-storage-info-default.c
@@ -23,7 +23,7 @@
 #include <sys/mman.h>
 
 
-error_t
+error_t __attribute__ ((weak))
 netfs_file_get_storage_info (struct iouser *cred,
                             struct node *np,
                             mach_port_t **ports,
diff --git a/libnetfs/get-source.c b/libnetfs/get-source.c
index 73e48be..5a234bc 100644
--- a/libnetfs/get-source.c
+++ b/libnetfs/get-source.c
@@ -21,7 +21,7 @@
 
 #include "priv.h"
 
-error_t
+error_t __attribute__ ((weak))
 netfs_get_source (struct protid *cred, char *source, size_t source_len)
 {
   return EOPNOTSUPP;
diff --git a/libnetfs/set-get-trans.c b/libnetfs/set-get-trans.c
index b58668d..c0a4370 100644
--- a/libnetfs/set-get-trans.c
+++ b/libnetfs/set-get-trans.c
@@ -28,7 +28,7 @@
 /* The user may define this function.  Attempt to set the passive
    translator record for FILE to ARGZ (of length ARGZLEN) for user
    CRED. */
-error_t
+error_t __attribute__ ((weak))
 netfs_set_translator (struct iouser *cred, struct node *np,
                      char *argz, size_t argzlen)
 {
@@ -40,7 +40,7 @@ netfs_set_translator (struct iouser *cred, struct node *np,
    mode, look up the name of its translator.  Store the name into newly
    malloced storage, and return it in *ARGZ; set *ARGZ_LEN to the total
    length.  */
-error_t
+error_t __attribute__ ((weak))
 netfs_get_translator (struct node *node, char **argz, size_t *argz_len)
 {
   return EOPNOTSUPP;
diff --git a/libtrivfs/get-source.c b/libtrivfs/get-source.c
index 2605dac..1b3ce11 100644
--- a/libtrivfs/get-source.c
+++ b/libtrivfs/get-source.c
@@ -21,7 +21,7 @@
 
 #include "priv.h"
 
-error_t
+error_t __attribute__ ((weak))
 trivfs_get_source (struct trivfs_protid *cred, char *source, size_t source_len)
 {
   return EOPNOTSUPP;

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/hurd.git