summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVicente Olivert Riera <Vincent.Riera@imgtec.com>2014-12-05 11:17:02 +0000
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2014-12-07 22:09:44 +0100
commit3f985a262854df70dcf0fc3be0b261a9b7e56518 (patch)
tree7874b27dc96cdb28295764b3b0627e17af3175d3
parentdab47af5d9504b325d791bbda48fa9249a139f90 (diff)
xserver_xorg-server: disable libunwind on MIPS with 32-bit pointers
libunwind support in xorg-server is not only broken for MIPS64 n32 but for all MIPS variants with 32-bit pointers. The reason is exactly the same one. libunwind defines a uint64 variable to store the words. Then, xorg-server casts that variable (64-bit) into a pointer (32-bit), and the compilation fails: backtrace.c:98:13: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast] Related: https://bugs.freedesktop.org/show_bug.cgi?id=79939 Fixes: http://autobuild.buildroot.net/results/87b/87be2c95957f9925c1258812e536df72689fc5da/ Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/x11r7/xserver_xorg-server/xserver_xorg-server.mk5
1 files changed, 3 insertions, 2 deletions
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 4164ccfa5..91b4f03db 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -144,10 +144,11 @@ ifeq ($(BR2_PACKAGE_FREETYPE),y)
XSERVER_XORG_SERVER_DEPENDENCIES += freetype
endif
-# libunwind support is broken on MIPS64 n32
+# libunwind support is broken on all MIPS variants with 32-bit pointers
# https://bugs.freedesktop.org/show_bug.cgi?id=79939
-ifeq ($(BR2_PACKAGE_LIBUNWIND)-$(BR2_MIPS_NABI32),y-)
+ifeq ($(BR2_PACKAGE_LIBUNWIND)-$(BR2_MIPS_OABI32)-$(BR2_MIPS_NABI32),y--)
XSERVER_XORG_SERVER_DEPENDENCIES += libunwind
+XSERVER_XORG_SERVER_CONF_OPTS += --enable-libunwind
else
XSERVER_XORG_SERVER_CONF_OPTS += --disable-libunwind
endif