1*4882a593Smuzhiyunfuse: Fix linking issues with gold linker 2*4882a593Smuzhiyun 3*4882a593Smuzhiyunfuse has problems when linking with gold since it uses version 4*4882a593Smuzhiyunscripts in a way thats so perticular to bfd ld 5*4882a593Smuzhiyun 6*4882a593Smuzhiyun/home/kraj/work/angstrom/build/tmp-angstrom_2010_x-eglibc/sysroots/x86_64-linux/usr/libexec/armv5te-angstrom-linux-gnueabi/gcc/arm-angstro 7*4882a593Smuzhiyunerror: symbol __fuse_exited has undefined version 8*4882a593Smuzhiyun| collect2: ld returned 1 exit status 9*4882a593Smuzhiyun| make[1]: *** [libfuse.la] Error 1 10*4882a593Smuzhiyun| make[1]: *** Waiting for unfinished jobs.... 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunFor more details 13*4882a593Smuzhiyun 14*4882a593Smuzhiyunhttp://blog.flameeyes.eu/2011/06/01/gold-readiness-obstacle-2-base-versioning 15*4882a593Smuzhiyunhttp://sources.redhat.com/bugzilla/show_bug.cgi?id=10861 16*4882a593Smuzhiyunhttp://comments.gmane.org/gmane.comp.file-systems.fuse.devel/9524 17*4882a593Smuzhiyunhttp://www.airs.com/blog/archives/300 18*4882a593Smuzhiyun 19*4882a593SmuzhiyunUpstream-Status: Pending 20*4882a593SmuzhiyunSigned-off-by: Khem Raj <raj.khem@gmail.com> 21*4882a593SmuzhiyunSigned-off-by: Koen Kooi <koen@dominion.thruhere.net> 22*4882a593SmuzhiyunSigned-off-by: Hongxu Jia <hongxu.jia@windriver.com> 23*4882a593Smuzhiyun--- 24*4882a593Smuzhiyun lib/fuse.c | 10 +++++----- 25*4882a593Smuzhiyun lib/fuse_mt.c | 2 +- 26*4882a593Smuzhiyun lib/fuse_versionscript | 3 +++ 27*4882a593Smuzhiyun lib/helper.c | 6 +++--- 28*4882a593Smuzhiyun 4 files changed, 12 insertions(+), 9 deletions(-) 29*4882a593Smuzhiyun 30*4882a593Smuzhiyundiff --git a/lib/fuse.c b/lib/fuse.c 31*4882a593Smuzhiyunindex 067d0dc..6d27711 100644 32*4882a593Smuzhiyun--- a/lib/fuse.c 33*4882a593Smuzhiyun+++ b/lib/fuse.c 34*4882a593Smuzhiyun@@ -4873,11 +4873,11 @@ struct fuse *fuse_new_compat1(int fd, int flags, 35*4882a593Smuzhiyun 11); 36*4882a593Smuzhiyun } 37*4882a593Smuzhiyun 38*4882a593Smuzhiyun-FUSE_SYMVER(".symver fuse_exited,__fuse_exited@"); 39*4882a593Smuzhiyun-FUSE_SYMVER(".symver fuse_process_cmd,__fuse_process_cmd@"); 40*4882a593Smuzhiyun-FUSE_SYMVER(".symver fuse_read_cmd,__fuse_read_cmd@"); 41*4882a593Smuzhiyun-FUSE_SYMVER(".symver fuse_set_getcontext_func,__fuse_set_getcontext_func@"); 42*4882a593Smuzhiyun-FUSE_SYMVER(".symver fuse_new_compat2,fuse_new@"); 43*4882a593Smuzhiyun+FUSE_SYMVER(".symver fuse_exited,__fuse_exited@FUSE_UNVERSIONED"); 44*4882a593Smuzhiyun+FUSE_SYMVER(".symver fuse_process_cmd,__fuse_process_cmd@FUSE_UNVERSIONED"); 45*4882a593Smuzhiyun+FUSE_SYMVER(".symver fuse_read_cmd,__fuse_read_cmd@FUSE_UNVERSIONED"); 46*4882a593Smuzhiyun+FUSE_SYMVER(".symver fuse_set_getcontext_func,__fuse_set_getcontext_func@FUSE_UNVERSIONED"); 47*4882a593Smuzhiyun+FUSE_SYMVER(".symver fuse_new_compat2,fuse_new@FUSE_UNVERSIONED"); 48*4882a593Smuzhiyun FUSE_SYMVER(".symver fuse_new_compat22,fuse_new@FUSE_2.2"); 49*4882a593Smuzhiyun 50*4882a593Smuzhiyun #endif /* __FreeBSD__ || __NetBSD__ */ 51*4882a593Smuzhiyundiff --git a/lib/fuse_mt.c b/lib/fuse_mt.c 52*4882a593Smuzhiyunindex f6dbe71..fd5ac23 100644 53*4882a593Smuzhiyun--- a/lib/fuse_mt.c 54*4882a593Smuzhiyun+++ b/lib/fuse_mt.c 55*4882a593Smuzhiyun@@ -119,4 +119,4 @@ int fuse_loop_mt(struct fuse *f) 56*4882a593Smuzhiyun return res; 57*4882a593Smuzhiyun } 58*4882a593Smuzhiyun 59*4882a593Smuzhiyun-FUSE_SYMVER(".symver fuse_loop_mt_proc,__fuse_loop_mt@"); 60*4882a593Smuzhiyun+FUSE_SYMVER(".symver fuse_loop_mt_proc,__fuse_loop_mt@FUSE_UNVERSIONED"); 61*4882a593Smuzhiyundiff --git a/lib/fuse_versionscript b/lib/fuse_versionscript 62*4882a593Smuzhiyunindex 8d91887..de16ab2 100644 63*4882a593Smuzhiyun--- a/lib/fuse_versionscript 64*4882a593Smuzhiyun+++ b/lib/fuse_versionscript 65*4882a593Smuzhiyun@@ -1,3 +1,6 @@ 66*4882a593Smuzhiyun+FUSE_UNVERSIONED { 67*4882a593Smuzhiyun+}; 68*4882a593Smuzhiyun+ 69*4882a593Smuzhiyun FUSE_2.2 { 70*4882a593Smuzhiyun global: 71*4882a593Smuzhiyun fuse_destroy; 72*4882a593Smuzhiyundiff --git a/lib/helper.c b/lib/helper.c 73*4882a593Smuzhiyunindex b644012..c5349bf 100644 74*4882a593Smuzhiyun--- a/lib/helper.c 75*4882a593Smuzhiyun+++ b/lib/helper.c 76*4882a593Smuzhiyun@@ -436,10 +436,10 @@ int fuse_mount_compat1(const char *mountpoint, const char *args[]) 77*4882a593Smuzhiyun return fuse_mount_compat22(mountpoint, NULL); 78*4882a593Smuzhiyun } 79*4882a593Smuzhiyun 80*4882a593Smuzhiyun-FUSE_SYMVER(".symver fuse_setup_compat2,__fuse_setup@"); 81*4882a593Smuzhiyun+FUSE_SYMVER(".symver fuse_setup_compat2,__fuse_setup@FUSE_UNVERSIONED"); 82*4882a593Smuzhiyun FUSE_SYMVER(".symver fuse_setup_compat22,fuse_setup@FUSE_2.2"); 83*4882a593Smuzhiyun-FUSE_SYMVER(".symver fuse_teardown,__fuse_teardown@"); 84*4882a593Smuzhiyun-FUSE_SYMVER(".symver fuse_main_compat2,fuse_main@"); 85*4882a593Smuzhiyun+FUSE_SYMVER(".symver fuse_teardown,__fuse_teardown@FUSE_UNVERSIONED"); 86*4882a593Smuzhiyun+FUSE_SYMVER(".symver fuse_main_compat2,fuse_main@FUSE_UNVERSIONED"); 87*4882a593Smuzhiyun FUSE_SYMVER(".symver fuse_main_real_compat22,fuse_main_real@FUSE_2.2"); 88*4882a593Smuzhiyun 89*4882a593Smuzhiyun #endif /* __FreeBSD__ || __NetBSD__ */ 90*4882a593Smuzhiyun-- 91*4882a593Smuzhiyun1.8.1.2 92*4882a593Smuzhiyun 93