Details

Reviewers

rakuco
mat

Group Reviewers

O5: Ports Framework	(Owns No Changed Paths)
portmgr

Commits

rP442740: Fix qt4 ports on armv6.

Summary

Due to a misspelling in GCC [1] (probably) the check for the ARMv6KZ platform
used ARM_ARCH_6ZK instead of ARM_ARCH_6KZ.

Append the correct spellings to the checks for ARM_ARCH_6ZK.

Patch slightly modified from PR 210027 [2]

[1] https://gcc.gnu.org/ml/gcc-patches/2015-06/msg01679.html
[2] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=210027

Test Plan

I have no armv6 platfrom to properly test.

Diff Detail

Repository

rP FreeBSD ports repository

Lint

No Lint Coverage

Unit

No Test Coverage

Build Status

Buildable 9634
Build 10076: arc lint + arc unit

Event Timeline

tcberner updated this revision to Diff 21611.Oct 22 2016, 7:41 AM

tcberner retitled this revision from to Add __ARM_ARCH_6KZ__ to devel/qt4-corelib.

tcberner updated this object.

tcberner edited the test plan for this revision. (Show Details)

tcberner added reviewers: rakuco, mat.

tcberner added a subscriber: adridg.

FWIW, the gcc patch did get committed: https://github.com/gcc-mirror/gcc/commit/ab2874bae238c48204394aac7b235f78cc107f8d

With that said, are you sure patching qt4-corelib is the right option? It doesn't install the wtf/Platform.h, so to me it looks like qt4-script and qt4-webkit won't be fixed at all.

mikael added a subscriber: mikael.Oct 24 2016, 7:01 AM

The important part of the patch is the change to qatomic; the wtf part might make more sense in the qt4-webkit and -script ports (simply duplicating the patch to the affected ports? it's all the same distfile, after all)

In D8322#227899, @groot_kde.org wrote:

The important part of the patch is the change to qatomic

This part looks fine to me. I think you need to bump PORTREVISION though, as I guess qt4-corelib currently builds fine on ARM, but the ports depending on it need to pick up the new header version.

the wtf part might make more sense in the qt4-webkit and -script ports (simply duplicating the patch to the affected ports? it's all the same distfile, after all)

I think it only makes sense in those ports: these headers are not installed, so you need to patch them during qt4-webkit/qt4-script's build for the changes to be picked up.

I'll try to look at all the arm-prs this weekend, and update the diff then.

Add extrapatch to qt4/files and include it for all qt4 ports.

Owners added a reviewer: O5: Ports Framework.Jun 2 2017, 6:13 PM

Herald added a reviewer: portmgr. · View Herald TranscriptJun 2 2017, 6:13 PM

Harbormaster completed remote builds in B9632: Diff 29152.Jun 2 2017, 6:13 PM

... remove the webkit hunk

Bump revision in qt4-corelib

Actually, probably only the bump to qt4-corelib is required, as the other stuff did not build anyways.

mikael added inline comments.Jun 2 2017, 6:50 PM

Mk/bsd.qt.mk
177	Can we name it armv6 please

Call the path -armv6

Harbormaster completed remote builds in B9635: Diff 29156.Jun 2 2017, 6:54 PM

tcberner marked an inline comment as done.Jun 2 2017, 6:54 PM

@mikael.urankar_gmail.com did any of the qt4-* ports apart from qt4-corelib actually build? Or did they all fail during build?

In D8322#228514, @tcberner wrote:

@mikael.urankar_gmail.com did any of the qt4-* ports apart from qt4-corelib actually build? Or did they all fail during build?

A lot of qt4 ports build successfully but have their runtime broken, the exhaustive list is here https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=210027#c8

In D8322#228515, @mikael.urankar_gmail.com wrote:

In D8322#228514, @tcberner wrote:

@mikael.urankar_gmail.com did any of the qt4-* ports apart from qt4-corelib actually build? Or did they all fail during build?

A lot of qt4 ports build successfully but have their runtime broken, the exhaustive list is here https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=210027#c8

Ok, then I probably should bump all these.

Bump revisions in the mentioned ports.

Harbormaster completed remote builds in B9636: Diff 29157.Jun 2 2017, 7:27 PM

All the qt4 ports build fine on armv6, thanks.

OK, then if @rakuco and Co is fine with the bumps I will commit it tonight.

In D8322#228515, @mikael.urankar_gmail.com wrote:

A lot of qt4 ports build successfully but have their runtime broken, the exhaustive list is here https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=210027#c8

What does "broken runtime" mean? Do they just crash when those instructions are reached instead of failing to build due to type mismatches?

In D8322#228815, @rakuco wrote:

In D8322#228515, @mikael.urankar_gmail.com wrote:

A lot of qt4 ports build successfully but have their runtime broken, the exhaustive list is here https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=210027#c8

What does "broken runtime" mean? Do they just crash when those instructions are reached instead of failing to build due to type mismatches?

They build fine but the binary (or library) contains invalid atomic ops (the linux one: ffff0fc0) and they crash. Here is an example of qdbusxml2cpp crashing (R15=ffff0fc0):
http://beefy8.nyi.freebsd.org/data/head-armv6-default/p441125_s318432/logs/errors/qtkeychain-qt4-0.7.0.log

There is no type mismatch.

In D8322#228824, @mikael.urankar_gmail.com wrote:

They build fine but the binary (or library) contains invalid atomic ops (the linux one: ffff0fc0) and they crash. Here is an example of qdbusxml2cpp crashing (R15=ffff0fc0):
http://beefy8.nyi.freebsd.org/data/head-armv6-default/p441125_s318432/logs/errors/qtkeychain-qt4-0.7.0.log

Thanks for the clarification. @tcberner, please go ahead.

Closed by commit rP442740: Fix qt4 ports on armv6. (authored by tcberner). · Explain WhyJun 6 2017, 5:01 AM

This revision was automatically updated to reflect the committed changes.

Diff 29154

View Options

Mk/bsd.qt.mk

	Show First 20 Lines • Show All 82 Lines • ▼ Show 20 Lines
	static bool ia_need_loopback_route(const struct in_ifaddr *);			static bool ia_need_loopback_route(const struct in_ifaddr *);

	VNET_DEFINE_STATIC(int, nosameprefix);			VNET_DEFINE_STATIC(int, nosameprefix);
	#define V_nosameprefix VNET(nosameprefix)			#define V_nosameprefix VNET(nosameprefix)
	SYSCTL_INT(_net_inet_ip, OID_AUTO, no_same_prefix, CTLFLAG_VNET \| CTLFLAG_RW,			SYSCTL_INT(_net_inet_ip, OID_AUTO, no_same_prefix, CTLFLAG_VNET \| CTLFLAG_RW,
	&VNET_NAME(nosameprefix), 0,			&VNET_NAME(nosameprefix), 0,
	"Refuse to create same prefixes on different interfaces");			"Refuse to create same prefixes on different interfaces");

				VNET_DEFINE_STATIC(bool, broadcast_lowest);
				#define V_broadcast_lowest VNET(broadcast_lowest)
				SYSCTL_BOOL(_net_inet_ip, OID_AUTO, broadcast_lowest, CTLFLAG_VNET \| CTLFLAG_RW,
				&VNET_NAME(broadcast_lowest), 0,
				"Treat lowest address on a subnet (host 0) as broadcast");

	VNET_DECLARE(struct inpcbinfo, ripcbinfo);			VNET_DECLARE(struct inpcbinfo, ripcbinfo);
	#define V_ripcbinfo VNET(ripcbinfo)			#define V_ripcbinfo VNET(ripcbinfo)

	static struct sx in_control_sx;			static struct sx in_control_sx;
	SX_SYSINIT(in_control_sx, &in_control_sx, "in_control");			SX_SYSINIT(in_control_sx, &in_control_sx, "in_control");

	/*			/*
	* Return 1 if an internet address is for a ``local'' host			* Return 1 if an internet address is for a ``local'' host
	▲ Show 20 Lines • Show All 1,066 Lines • ▼ Show 20 Lines
	}			}

	int			int
	in_ifaddr_broadcast(struct in_addr in, struct in_ifaddr *ia)			in_ifaddr_broadcast(struct in_addr in, struct in_ifaddr *ia)
	{			{

	return ((in.s_addr == ia->ia_broadaddr.sin_addr.s_addr \|\|			return ((in.s_addr == ia->ia_broadaddr.sin_addr.s_addr \|\|
	/*			/*
	* Check for old-style (host 0) broadcast, but			* Optionally check for old-style (host 0) broadcast, but
	* taking into account that RFC 3021 obsoletes it.			* taking into account that RFC 3021 obsoletes it.
	*/			*/
	(ia->ia_subnetmask != IN_RFC3021_MASK &&			(V_broadcast_lowest && ia->ia_subnetmask != IN_RFC3021_MASK &&
				rgrimesUnsubmitted Not Done Inline Actions There might be a micro optimization here to do the V_broadcast_zero test LAST, that way the additional test in the fast path only occurs after the tests we have been doing all along. rgrimes: There might be a micro optimization here to do the V_broadcast_zero test LAST, that way the…
				karelsAuthorUnsubmitted Done Inline Actions Actually, I put it first as a micro-optimization. As it is false by default, the test fails immediately and we don't have to evaluate the rest. karels: Actually, I put it first as a micro-optimization. As it is false by default, the test fails…
	ntohl(in.s_addr) == ia->ia_subnet)) &&			ntohl(in.s_addr) == ia->ia_subnet)) &&
	/*			/*
	* Check for an all one subnetmask. These			* Check for an all one subnetmask. These
	* only exist when an interface gets a secondary			* only exist when an interface gets a secondary
	* address.			* address.
	*/			*/
	ia->ia_subnetmask != (u_long)0xffffffff);			ia->ia_subnetmask != (u_long)0xffffffff);
	}			}
	▲ Show 20 Lines • Show All 521 Lines • Show Last 20 Lines

View Options

devel/qt4-corelib/Makefile

	Show First 20 Lines • Show All 82 Lines • ▼ Show 20 Lines
	static bool ia_need_loopback_route(const struct in_ifaddr *);			static bool ia_need_loopback_route(const struct in_ifaddr *);

	VNET_DEFINE_STATIC(int, nosameprefix);			VNET_DEFINE_STATIC(int, nosameprefix);
	#define V_nosameprefix VNET(nosameprefix)			#define V_nosameprefix VNET(nosameprefix)
	SYSCTL_INT(_net_inet_ip, OID_AUTO, no_same_prefix, CTLFLAG_VNET \| CTLFLAG_RW,			SYSCTL_INT(_net_inet_ip, OID_AUTO, no_same_prefix, CTLFLAG_VNET \| CTLFLAG_RW,
	&VNET_NAME(nosameprefix), 0,			&VNET_NAME(nosameprefix), 0,
	"Refuse to create same prefixes on different interfaces");			"Refuse to create same prefixes on different interfaces");

				VNET_DEFINE_STATIC(bool, broadcast_lowest);
				#define V_broadcast_lowest VNET(broadcast_lowest)
				SYSCTL_BOOL(_net_inet_ip, OID_AUTO, broadcast_lowest, CTLFLAG_VNET \| CTLFLAG_RW,
				&VNET_NAME(broadcast_lowest), 0,
				"Treat lowest address on a subnet (host 0) as broadcast");

	VNET_DECLARE(struct inpcbinfo, ripcbinfo);			VNET_DECLARE(struct inpcbinfo, ripcbinfo);
	#define V_ripcbinfo VNET(ripcbinfo)			#define V_ripcbinfo VNET(ripcbinfo)

	static struct sx in_control_sx;			static struct sx in_control_sx;
	SX_SYSINIT(in_control_sx, &in_control_sx, "in_control");			SX_SYSINIT(in_control_sx, &in_control_sx, "in_control");

	/*			/*
	* Return 1 if an internet address is for a ``local'' host			* Return 1 if an internet address is for a ``local'' host
	▲ Show 20 Lines • Show All 1,066 Lines • ▼ Show 20 Lines
	}			}

	int			int
	in_ifaddr_broadcast(struct in_addr in, struct in_ifaddr *ia)			in_ifaddr_broadcast(struct in_addr in, struct in_ifaddr *ia)
	{			{

	return ((in.s_addr == ia->ia_broadaddr.sin_addr.s_addr \|\|			return ((in.s_addr == ia->ia_broadaddr.sin_addr.s_addr \|\|
	/*			/*
	* Check for old-style (host 0) broadcast, but			* Optionally check for old-style (host 0) broadcast, but
	* taking into account that RFC 3021 obsoletes it.			* taking into account that RFC 3021 obsoletes it.
	*/			*/
	(ia->ia_subnetmask != IN_RFC3021_MASK &&			(V_broadcast_lowest && ia->ia_subnetmask != IN_RFC3021_MASK &&
				rgrimesUnsubmitted Not Done Inline Actions There might be a micro optimization here to do the V_broadcast_zero test LAST, that way the additional test in the fast path only occurs after the tests we have been doing all along. rgrimes: There might be a micro optimization here to do the V_broadcast_zero test LAST, that way the…
				karelsAuthorUnsubmitted Done Inline Actions Actually, I put it first as a micro-optimization. As it is false by default, the test fails immediately and we don't have to evaluate the rest. karels: Actually, I put it first as a micro-optimization. As it is false by default, the test fails…
	ntohl(in.s_addr) == ia->ia_subnet)) &&			ntohl(in.s_addr) == ia->ia_subnet)) &&
	/*			/*
	* Check for an all one subnetmask. These			* Check for an all one subnetmask. These
	* only exist when an interface gets a secondary			* only exist when an interface gets a secondary
	* address.			* address.
	*/			*/
	ia->ia_subnetmask != (u_long)0xffffffff);			ia->ia_subnetmask != (u_long)0xffffffff);
	}			}
	▲ Show 20 Lines • Show All 521 Lines • Show Last 20 Lines

View Options

devel/qt4-qmake/Makefile

	Show First 20 Lines • Show All 82 Lines • ▼ Show 20 Lines
	static bool ia_need_loopback_route(const struct in_ifaddr *);			static bool ia_need_loopback_route(const struct in_ifaddr *);

	VNET_DEFINE_STATIC(int, nosameprefix);			VNET_DEFINE_STATIC(int, nosameprefix);
	#define V_nosameprefix VNET(nosameprefix)			#define V_nosameprefix VNET(nosameprefix)
	SYSCTL_INT(_net_inet_ip, OID_AUTO, no_same_prefix, CTLFLAG_VNET \| CTLFLAG_RW,			SYSCTL_INT(_net_inet_ip, OID_AUTO, no_same_prefix, CTLFLAG_VNET \| CTLFLAG_RW,
	&VNET_NAME(nosameprefix), 0,			&VNET_NAME(nosameprefix), 0,
	"Refuse to create same prefixes on different interfaces");			"Refuse to create same prefixes on different interfaces");

				VNET_DEFINE_STATIC(bool, broadcast_lowest);
				#define V_broadcast_lowest VNET(broadcast_lowest)
				SYSCTL_BOOL(_net_inet_ip, OID_AUTO, broadcast_lowest, CTLFLAG_VNET \| CTLFLAG_RW,
				&VNET_NAME(broadcast_lowest), 0,
				"Treat lowest address on a subnet (host 0) as broadcast");

	VNET_DECLARE(struct inpcbinfo, ripcbinfo);			VNET_DECLARE(struct inpcbinfo, ripcbinfo);
	#define V_ripcbinfo VNET(ripcbinfo)			#define V_ripcbinfo VNET(ripcbinfo)

	static struct sx in_control_sx;			static struct sx in_control_sx;
	SX_SYSINIT(in_control_sx, &in_control_sx, "in_control");			SX_SYSINIT(in_control_sx, &in_control_sx, "in_control");

	/*			/*
	* Return 1 if an internet address is for a ``local'' host			* Return 1 if an internet address is for a ``local'' host
	▲ Show 20 Lines • Show All 1,066 Lines • ▼ Show 20 Lines
	}			}

	int			int
	in_ifaddr_broadcast(struct in_addr in, struct in_ifaddr *ia)			in_ifaddr_broadcast(struct in_addr in, struct in_ifaddr *ia)
	{			{

	return ((in.s_addr == ia->ia_broadaddr.sin_addr.s_addr \|\|			return ((in.s_addr == ia->ia_broadaddr.sin_addr.s_addr \|\|
	/*			/*
	* Check for old-style (host 0) broadcast, but			* Optionally check for old-style (host 0) broadcast, but
	* taking into account that RFC 3021 obsoletes it.			* taking into account that RFC 3021 obsoletes it.
	*/			*/
	(ia->ia_subnetmask != IN_RFC3021_MASK &&			(V_broadcast_lowest && ia->ia_subnetmask != IN_RFC3021_MASK &&
				rgrimesUnsubmitted Not Done Inline Actions There might be a micro optimization here to do the V_broadcast_zero test LAST, that way the additional test in the fast path only occurs after the tests we have been doing all along. rgrimes: There might be a micro optimization here to do the V_broadcast_zero test LAST, that way the…
				karelsAuthorUnsubmitted Done Inline Actions Actually, I put it first as a micro-optimization. As it is false by default, the test fails immediately and we don't have to evaluate the rest. karels: Actually, I put it first as a micro-optimization. As it is false by default, the test fails…
	ntohl(in.s_addr) == ia->ia_subnet)) &&			ntohl(in.s_addr) == ia->ia_subnet)) &&
	/*			/*
	* Check for an all one subnetmask. These			* Check for an all one subnetmask. These
	* only exist when an interface gets a secondary			* only exist when an interface gets a secondary
	* address.			* address.
	*/			*/
	ia->ia_subnetmask != (u_long)0xffffffff);			ia->ia_subnetmask != (u_long)0xffffffff);
	}			}
	▲ Show 20 Lines • Show All 521 Lines • Show Last 20 Lines

View Options

devel/qt4-script/Makefile

	Show First 20 Lines • Show All 82 Lines • ▼ Show 20 Lines
	static bool ia_need_loopback_route(const struct in_ifaddr *);			static bool ia_need_loopback_route(const struct in_ifaddr *);

	VNET_DEFINE_STATIC(int, nosameprefix);			VNET_DEFINE_STATIC(int, nosameprefix);
	#define V_nosameprefix VNET(nosameprefix)			#define V_nosameprefix VNET(nosameprefix)
	SYSCTL_INT(_net_inet_ip, OID_AUTO, no_same_prefix, CTLFLAG_VNET \| CTLFLAG_RW,			SYSCTL_INT(_net_inet_ip, OID_AUTO, no_same_prefix, CTLFLAG_VNET \| CTLFLAG_RW,
	&VNET_NAME(nosameprefix), 0,			&VNET_NAME(nosameprefix), 0,
	"Refuse to create same prefixes on different interfaces");			"Refuse to create same prefixes on different interfaces");

				VNET_DEFINE_STATIC(bool, broadcast_lowest);
				#define V_broadcast_lowest VNET(broadcast_lowest)
				SYSCTL_BOOL(_net_inet_ip, OID_AUTO, broadcast_lowest, CTLFLAG_VNET \| CTLFLAG_RW,
				&VNET_NAME(broadcast_lowest), 0,
				"Treat lowest address on a subnet (host 0) as broadcast");

	VNET_DECLARE(struct inpcbinfo, ripcbinfo);			VNET_DECLARE(struct inpcbinfo, ripcbinfo);
	#define V_ripcbinfo VNET(ripcbinfo)			#define V_ripcbinfo VNET(ripcbinfo)

	static struct sx in_control_sx;			static struct sx in_control_sx;
	SX_SYSINIT(in_control_sx, &in_control_sx, "in_control");			SX_SYSINIT(in_control_sx, &in_control_sx, "in_control");

	/*			/*
	* Return 1 if an internet address is for a ``local'' host			* Return 1 if an internet address is for a ``local'' host
	▲ Show 20 Lines • Show All 1,066 Lines • ▼ Show 20 Lines
	}			}

	int			int
	in_ifaddr_broadcast(struct in_addr in, struct in_ifaddr *ia)			in_ifaddr_broadcast(struct in_addr in, struct in_ifaddr *ia)
	{			{

	return ((in.s_addr == ia->ia_broadaddr.sin_addr.s_addr \|\|			return ((in.s_addr == ia->ia_broadaddr.sin_addr.s_addr \|\|
	/*			/*
	* Check for old-style (host 0) broadcast, but			* Optionally check for old-style (host 0) broadcast, but
	* taking into account that RFC 3021 obsoletes it.			* taking into account that RFC 3021 obsoletes it.
	*/			*/
	(ia->ia_subnetmask != IN_RFC3021_MASK &&			(V_broadcast_lowest && ia->ia_subnetmask != IN_RFC3021_MASK &&
				rgrimesUnsubmitted Not Done Inline Actions There might be a micro optimization here to do the V_broadcast_zero test LAST, that way the additional test in the fast path only occurs after the tests we have been doing all along. rgrimes: There might be a micro optimization here to do the V_broadcast_zero test LAST, that way the…
				karelsAuthorUnsubmitted Done Inline Actions Actually, I put it first as a micro-optimization. As it is false by default, the test fails immediately and we don't have to evaluate the rest. karels: Actually, I put it first as a micro-optimization. As it is false by default, the test fails…
	ntohl(in.s_addr) == ia->ia_subnet)) &&			ntohl(in.s_addr) == ia->ia_subnet)) &&
	/*			/*
	* Check for an all one subnetmask. These			* Check for an all one subnetmask. These
	* only exist when an interface gets a secondary			* only exist when an interface gets a secondary
	* address.			* address.
	*/			*/
	ia->ia_subnetmask != (u_long)0xffffffff);			ia->ia_subnetmask != (u_long)0xffffffff);
	}			}
	▲ Show 20 Lines • Show All 521 Lines • Show Last 20 Lines

View Options

devel/qt4/files/extrapatch-arm6

View Options

Add __ARM_ARCH_6KZ__ to devel/qt4-corelib
ClosedPublic
Actions

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 29154

Mk/bsd.qt.mk

devel/qt4-corelib/Makefile

devel/qt4-qmake/Makefile

devel/qt4-script/Makefile

devel/qt4/files/extrapatch-arm6

www/qt4-webkit/Makefile

Add __ARM_ARCH_6KZ__ to devel/qt4-corelibClosedPublicActions

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 29154

Mk/bsd.qt.mk

devel/qt4-corelib/Makefile

devel/qt4-qmake/Makefile

devel/qt4-script/Makefile

devel/qt4/files/extrapatch-arm6

www/qt4-webkit/Makefile

Add __ARM_ARCH_6KZ__ to devel/qt4-corelib
ClosedPublic
Actions

Revision Contents
Changeset List