[Xorg] [Bug 303] New: PowerPC64 changes break makedepend/imake on non-PPC64 platforms

[bugzilla-daemon at pdx.freedesktop.org]

http://pdx.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=303

           Summary: PowerPC64 changes break makedepend/imake on non-PPC64
                    platforms
           Product: xorg
           Version: unspecified
          Platform: PC
        OS/Version: All
            Status: NEW
          Severity: normal
          Priority: P2
         Component: imake
        AssignedTo: xorg at freedesktop.org
        ReportedBy: alan.coopersmith at sun.com
                CC: mharris at www.linux.org.uk


Building the XORG-RELEASE-1 branch on an x86 box today, I noticed many strange
errors in my build logs, such as:

../../../config/makedepend/makedepend: warning:  cfbgc.c (reading
../../../programs/Xserver/include/compiler.h), line 1462: #    error - Non-gcc
PowerPC and !PowerMAXOS ???

Looking at xc/config/imake/imakemdep.h where it defines the preprocessor symbols
to be used in makedepend and imake on each platform, it appears the PPC64 changes
were added incorrectly.

Specifically these sections:
# ifdef __powerpc__
#  ifdef __powerpc64__
        "-D__powerpc64__",
#  endif
# else
        "-D__powerpc__",
# endif

and

# ifdef __powerpc__
#  ifdef __powerpc64__
        {"__powerpc64__", "1"},
#  endif
# else
        {"__powerpc__", "1"},
# endif

Both the #endif and #else lines were added after the PPC64 additions, but only
one of them should have been, as the current result is
On PowerPC64: define __powerpc64__
On PowerPC that is not-PowerPC64: define nothing
On everything but PowerPC: define __powerpc__

Either the #else or the #endif need to be removed from both sections (depending
on whether __powerpc__ should be defined on both PPC & PPC64 or just PPC).



------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.