mesa: f1ab67c13ab97f19c08d99c6ba101edc7d7b80e6 (master)

$ icc -v
icc version 13.1.0 (gcc version 4.6.0 compatibility)

$ scons
[...]
  Compiling src/gallium/state_trackers/xorg/xorg_composite.c ...
/usr/include/xorg/fb.h(98): catastrophic error: #error directive: "GLYPHPADBYTES must be 4"
  #error "GLYPHPADBYTES must be 4"
   ^

The Intel C Compiler defines the macro __x86_64__. It does not define __amd64__  or __amd64. This leads to a build failure as /usr/include/xorg/servermd.h does not check for __x84_64__.

servermd.h use to check for __x86_64__ and the check was removed in this commit.

http://cgit.freedesktop.org/xorg/xserver/commit/include/servermd.h?id=9719354ae04a41e9834ac9ba8fd9e895092ba4f1

commit 9719354ae04a41e9834ac9ba8fd9e895092ba4f1
Author: Adam Jackson <ajax@redhat.com>
Date:   Tue Jun 24 14:37:06 2008 -0400

    Check for __amd64__, not __x86_64__.
    
    Spiritual revert of 1fa4de80fcfc697b5e5879cc351fb3e9dbf6acbe.  Intel's C
    compiler claims to be gcc-compatible; if they're not defining the same
    macros as gcc then that's their bug, not ours.  Even if we were to do
    this aliasing we should do it once and for all in servermd.h.