Bug 15147

Summary: Check for __x86_64__ when we check for __amd64__
Product: xorg Reporter: Matt Turner <mattst88>
Component: Server/GeneralAssignee: Xorg Project Team <xorg-team>
Status: RESOLVED FIXED QA Contact: Xorg Project Team <xorg-team>
Severity: normal    
Priority: medium    
Version: git   
Hardware: Other   
OS: All   
Whiteboard:
i915 platform: i915 features:
Attachments:
Description Flags
Add checks for __x86_64__ everytime we check for __amd64__
none
Found one more.
none
Remove all amd64 define checks in favor of __x86_64__
none
Fix duplicate checks introduced by original patch none

Description Matt Turner 2008-03-20 10:53:23 UTC
Created attachment 15341 [details] [review]
Add checks for __x86_64__ everytime we check for __amd64__

It seems Intel C Compiler neglects to define __amd64__, __amd64, or amd64, but *does* define __x86_64__. Politics anyone?

This patch adds checks for __x86_64__ anytime code checks for one of the three previous. Btw, gcc defines all but 'amd64'.
Comment 1 Matt Turner 2008-03-20 12:12:32 UTC
Created attachment 15342 [details] [review]
Found one more.

Same as previous patch + one more I forgot to add.
Comment 2 Matt Turner 2008-04-12 11:29:25 UTC
This is an extremely trivial bug. Can someone take 2 minutes and push this patch through?
Comment 3 Julien Cristau 2008-04-12 11:46:19 UTC
> --- Comment #2 from Matt Turner <mattst88@gmail.com>  2008-04-12 11:29:25 PST ---
> This is an extremely trivial bug. Can someone take 2 minutes and push this
> patch through?
> 
commit 1fa4de80fcfc697b5e5879cc351fb3e9dbf6acbe
Author: Matt Turner <mattst88@gmail.com>
Date:   Sat Apr 12 20:39:18 2008 +0200

    Check for __x86_64__ when we check for __amd64__
    
    It seems Intel C Compiler neglects to define __amd64__, __amd64, or
    amd64, but *does* define __x86_64__.
Comment 4 Matt Turner 2008-04-14 11:29:13 UTC
Created attachment 15913 [details] [review]
Remove all amd64 define checks in favor of __x86_64__

In at least two files, the previous patch duplicated checks for __x86_64__. This patch fixes this, and also replaces all checks for amd64, __amd64, and __amd64 with checks for __x86_64__.

Discussed on #xorg-devel yesterday.
Comment 5 Matt Turner 2008-05-13 18:39:30 UTC
Created attachment 16514 [details] [review]
Fix duplicate checks introduced by original patch

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.