Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Upstream-Status: Pending |
| 2 | |
| 3 | Don't always define LONG64 for AMD64 |
| 4 | |
| 5 | X32 defines __amd64__/amd64 with 32bit long. We should simply check |
| 6 | __LP64__ before defining LONG64 without checking __amd64__/amd64. |
| 7 | |
| 8 | This fixes compilation with x32 toolchain. |
| 9 | |
| 10 | Received this patch from H.J. Lu <hjl.tools@gmail.com> |
| 11 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/1 |
| 12 | |
| 13 | --- xproto-7.0.22/Xmd.h.x32 2009-07-11 04:19:50.000000000 -0700 |
| 14 | +++ xproto-7.0.22/Xmd.h 2011-11-30 17:14:19.290395893 -0800 |
| 15 | @@ -62,7 +62,6 @@ SOFTWARE. |
| 16 | defined(__ia64__) || defined(ia64) || \ |
| 17 | defined(__sparc64__) || \ |
| 18 | defined(__s390x__) || \ |
| 19 | - defined(__amd64__) || defined(amd64) || \ |
| 20 | defined(__powerpc64__) |
| 21 | # define LONG64 /* 32/64-bit architecture */ |
| 22 | # endif |