Bugzilla Bug 106305

With gcc-4 and x11-base/xorg-x11-6.8.2-r3:

x86_64-pc-linux-gnu-gcc -c -mtune=opteron -march=opteron -O2
-fomit-frame-pointer -pipe -fno-strict-aliasing -ansi -pedantic -Wno-return-type
-w    -fno-merge-constants -I../../../programs/Xserver/fb
-I../../../programs/Xserver/mi -I../../../programs/Xserver/include 	     
-I../../../exports/include/X11 	      -I../../../include/fonts
-I../../../programs/Xserver/hw/xfree86/common  	     
-I../../../programs/Xserver/render -I../../../include/extensions
-I../../../programs/Xserver/Xext  -I../../.. -I../../../exports/include  
-Dlinux -D__amd64__ -D_POSIX_C_SOURCE=199309L 				-D_POSIX_SOURCE
-D_XOPEN_SOURCE	-D_BSD_SOURCE -D_SVID_SOURCE 				 -D_GNU_SOURCE 		 -DSHAPE
-DXINPUT -DXKB -DLBX -DXAPPGROUP 	-DXCSECURITY -DTOGCUP  	-DXF86BIGFONT
-DDPMSExtension 	  -DPANORAMIX 	 -DRENDER -DRANDR 	-DXFIXES -DDAMAGE -DCOMPOSITE
-DXEVIE 	 -DGCCUSESGAS -DAVOID_GLYPHBLT -DPIXPRIV -DSINGLEDEPTH -DXFreeXDGA
-DXvExtension 				-DXFree86LOADER  -DXFree86Server 				-DXF86VIDMODE 			
-DXvMCExtension 				-DSMART_SCHEDULE 			 -DXResExtension 			
-DX_BYTE_ORDER=X_LITTLE_ENDIAN -DXORG_VERSION_CURRENT="(((6) * 10000000) + ((8)
* 100000) + ((2) * 1000) + 0)" -D_XSERVER64 -DNDEBUG   -DFUNCPROTO=15
-DNARROWPROTO  -DIN_MODULE -DXFree86Module   -mmmx -Winline --param
inline-unit-growth=10000 	--param large-function-growth=10000 -DUSE_MMX -msse
-DUSE_SSE fbmmx.c
In file included from /usr/include/stdlib.h:436,
                 from
/usr/lib/gcc/x86_64-pc-linux-gnu/4.0.2-pre20050913/include/mm_malloc.h:30,
                 from
/usr/lib/gcc/x86_64-pc-linux-gnu/4.0.2-pre20050913/include/xmmintrin.h:41,
                 from fbmmx.c:37:
/usr/include/sys/types.h:151: error: duplicate 'unsigned'
In file included from
/usr/lib/gcc/x86_64-pc-linux-gnu/4.0.2-pre20050913/include/mm_malloc.h:30,
                 from
/usr/lib/gcc/x86_64-pc-linux-gnu/4.0.2-pre20050913/include/xmmintrin.h:41,
                 from fbmmx.c:37:
/usr/include/stdlib.h:626:24: error: macro "abort" passed 1 arguments, but takes
just 0
make[5]: *** [fbmmx.o] Error 1

Attached below is a simple upstream patch to fix the issue.

Created an attachment (id=68691) [edit]
gcc4 patch

Could you give me the upstream link for the patch?  I'd like to see context
regarding the fix.

http://cvs.freedesktop.org/xorg/xc/programs/Xserver/fb/fbmmx.c?r1=1.9&r2=1.10

I'll be committing this to -r5 shortly.