[LTP] [PATCH] utils: sctp: Fix build for prefixed architectures

[LTP] [PATCH] utils: sctp: Fix build for prefixed architectures

[Markos Chandras]

Commit 6f22494d19b605ded308dc0fa713e91cb873f44a
"Move sctp to utils and bump it to 1.0.15"

introduced a build failure for the prefixed architectures.
We need to take into consideration the __USER_LABEL_PREFIX__
for architectures that define it when creating symbol aliases.

Fixes the build for the Meta(metag) architecture

[...]
utils/sctp/func_tests/test_connectx.c:151: undefined reference to `_sctp_connectx'
utils/sctp/func_tests/test_connectx.c:163: undefined reference to `_sctp_connectx'
[...]

Build tested on x86_64 and metag.

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
---
 utils/sctp/lib/connectx.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/utils/sctp/lib/connectx.c b/utils/sctp/lib/connectx.c
index 50cf4c8..8e5a1f8 100644
--- a/utils/sctp/lib/connectx.c
+++ b/utils/sctp/lib/connectx.c
@@ -179,7 +179,10 @@ int sctp_connectx3(int fd, struct sockaddr *addrs, int addrcnt,
 	return __connectx(fd, addrs, addrs_size, id);
 }
 
-__asm__(".symver __sctp_connectx, sctp_connectx@");
-__asm__(".symver sctp_connectx_orig, sctp_connectx@VERS_1");
-__asm__(".symver sctp_connectx2, sctp_connectx@VERS_2");
-__asm__(".symver sctp_connectx3, sctp_connectx@@VERS_3");
+#define _STR(X) #X
+#define STR(X)  _STR(X)
+#define __UPREF STR(__USER_LABEL_PREFIX__)
+__asm__(".symver "__UPREF "__sctp_connectx," __UPREF "sctp_connectx@");
+__asm__(".symver "__UPREF "sctp_connectx_orig," __UPREF "sctp_connectx@VERS_1");
+__asm__(".symver "__UPREF "sctp_connectx2," __UPREF "sctp_connectx@VERS_2");
+__asm__(".symver "__UPREF "sctp_connectx3," __UPREF "sctp_connectx@@VERS_3");
-- 
1.8.5.1



------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT 
organizations don't have a clear picture of how application performance 
affects their revenue. With AppDynamics, you get 100% visibility into your 
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [PATCH] utils: sctp: Fix build for prefixed architectures

[chrubis]

Hi!
> Commit 6f22494d19b605ded308dc0fa713e91cb873f44a
> "Move sctp to utils and bump it to 1.0.15"
> 
> introduced a build failure for the prefixed architectures.
> We need to take into consideration the __USER_LABEL_PREFIX__
> for architectures that define it when creating symbol aliases.
> 
> Fixes the build for the Meta(metag) architecture
> 
> [...]
> utils/sctp/func_tests/test_connectx.c:151: undefined reference to `_sctp_connectx'
> utils/sctp/func_tests/test_connectx.c:163: undefined reference to `_sctp_connectx'
> [...]
> 
> Build tested on x86_64 and metag.

The sctp utils has upstream at:

https://github.com/borkmann/lksctp-tools

Are these fixes included there?

-- 
Cyril Hrubis
chrubis@suse.cz

------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT 
organizations don't have a clear picture of how application performance 
affects their revenue. With AppDynamics, you get 100% visibility into your 
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list

Re: [LTP] [PATCH] utils: sctp: Fix build for prefixed architectures

[chrubis]

Hi!
> >> Fixes the build for the Meta(metag) architecture
> >>
> >> [...]
> >> utils/sctp/func_tests/test_connectx.c:151: undefined reference to `_sctp_connectx'
> >> utils/sctp/func_tests/test_connectx.c:163: undefined reference to `_sctp_connectx'
> >> [...]
> >>
> >> Build tested on x86_64 and metag.
> >
> > The sctp utils has upstream at:
> >
> > https://github.com/borkmann/lksctp-tools
> >
> > Are these fixes included there?
> >
> Nope sorry. I will send a pull request. Thanks

No need to apologize, LTP needs to be fixed to build too but the fix
should get to the upstream as well.

I guess that best course of action for LTP would be ignore build
failures of third party tools and advice user to report the problem both
to LTP ML and the upstream project. I will add this to my TODO.

-- 
Cyril Hrubis
chrubis@suse.cz

------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT 
organizations don't have a clear picture of how application performance 
affects their revenue. With AppDynamics, you get 100% visibility into your 
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list