Attachment #33929 for bug #54852

View | Details | Raw Unified | Return to bug 54852
Collapse All | Expand All

Lines 819-824 Link Here

(-)xc/config/cf/Imake.cf.ppc64-support-updates (+7 lines)
819	# define Mc68020Architecture	819	# define Mc68020Architecture
820	# undef mc68000	820	# undef mc68000
821	# endif /* mc68000 */	821	# endif /* mc68000 */
		822	# ifdef __powerpc64__
		823	# ifndef Ppc64Architecture
		824	# define Ppc64Architecture
		825	# endif
		826	# undef __powerpc64__
		827	# undef __powerpc__
		828	# endif
822	# ifdef powerpc	829	# ifdef powerpc
823	# define PpcArchitecture	830	# define PpcArchitecture
824	# undef powerpc	831	# undef powerpc

Lines 329-334 Link Here

(-)xc/config/cf/linux.cf.ppc64-support-updates (-1 / +13 lines)
329	# define BuildXF86DRI NO	329	# define BuildXF86DRI NO
330	# elif defined(PpcArchitecture)	330	# elif defined(PpcArchitecture)
331	# define BuildXF86DRI YES	331	# define BuildXF86DRI YES
		332	# elif defined(Ppc64Architecture)
		333	# define BuildXF86DRI NO
332	# elif defined(s390Architecture) \|\| defined(s390xArchitecture)	334	# elif defined(s390Architecture) \|\| defined(s390xArchitecture)
333	# define BuildXF86DRI NO	335	# define BuildXF86DRI NO
334	# elif defined(SparcArchitecture)	336	# elif defined(SparcArchitecture)
Lines 527-533 Link Here
527	#define MkdirHierCmd mkdir -p	529	#define MkdirHierCmd mkdir -p
528		530
529	#ifndef HaveLib64	531	#ifndef HaveLib64
530	# if defined (AMD64Architecture) \|\| defined (s390xArchitecture)	532	# if defined (AMD64Architecture) \|\| defined (s390xArchitecture) \|\| defined (Ppc64Architecture)
531	# define HaveLib64 YES	533	# define HaveLib64 YES
532	# else	534	# else
533	# define HaveLib64 NO	535	# define HaveLib64 NO
Lines 834-839 Link Here
834	# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines	836	# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
835	#endif	837	#endif
836		838
		839	#ifdef Ppc64Architecture
		840	# define DefaultCCOptions -fsigned-char -mminimal-toc
		841	# ifndef OptimizedCDebugFlags
		842	# define OptimizedCDebugFlags DefaultGcc2Ppc64Opt
		843	# endif
		844	# define LinuxMachineDefines -D__powerpc64__ -D__powerpc__
		845	# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DPART_NET
		846	# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
		847	#endif /* Ppc64Architecture */
		848
837	#ifdef PpcArchitecture	849	#ifdef PpcArchitecture
838	# define DefaultCCOptions -fsigned-char	850	# define DefaultCCOptions -fsigned-char
839	# ifndef OptimizedCDebugFlags	851	# ifndef OptimizedCDebugFlags




# endif
#endif

/*
 * For PowerPC 64bit systems
 * only libraries are strictly needed
 */
#if defined(Ppc64Architecture)
# ifndef XF86Server
#  define XF86Server		YES
# endif
/* Amiga framebuffer module */
# ifndef XF86AFB
#  define XF86AFB		NO
# endif
/* 1bpp module */
# ifndef XF1Bpp
#  define XF1Bpp		NO
# endif
/* 4bpp module */
# ifndef XF4Bpp
#  define XF4Bpp		NO
# endif
/* 8/32bpp overlay module */
# ifndef XF8_32Bpp
#  define XF8_32Bpp		YES
# endif
/* 8/16bpp dual fb module */
# ifndef XF8_16Bpp
#  define XF8_16Bpp		YES
# endif
/* 24/32bpp conversion module */
# ifndef XF24_32Bpp
#  define XF24_32Bpp		YES
# endif
/* shadow fb module */
# ifndef XFShadowFB
#  define XFShadowFB		YES
# endif
/* vgahw module */
# ifndef XF86VgaHw
#  define XF86VgaHw		NO
# endif
/* fbdevhw module */
# ifndef XF86FBDevHw
#  define XF86FBDevHw		YES
# endif
/* XAA module */
# ifndef XF86XAA
#  define XF86XAA		YES
# endif
/* ramdac module */
# ifndef XF86Ramdac
#  define XF86Ramdac		YES
# endif
/* I2C module */
# ifndef XF86I2C
#  define XF86I2C		YES
# endif
/* DDC module */
# ifndef XF86DDC
#  define XF86DDC		YES
# endif
/* RAC (Resource Access Control) module */
# ifndef XF86RAC
#  define XF86RAC		YES
# endif

/* int10 module */
# ifndef XF86Int10
#  define XF86Int10		YES
# endif

# ifndef DevelDrivers
#  if XFree86Devel
#   define DevelDrivers		
#  else
#   define DevelDrivers		/* */
#  endif
# endif

/* Pure PCI drivers should go first */
# ifndef XF86CardDrivers
#  define XF86CardDrivers	ati mga \
				DevelDrivers \
				XF86OSCardDrivers XF86ExtraCardDrivers
# endif
# if HasGlide3
#  define TdfxDriDriver		
# else
#  define TdfxDriDriver		/**/
# endif
# ifndef DriDrivers
#  define DriDrivers		gamma r128
# endif
#endif

/*
 * For Mips/Arc platforms, the default is to build all modules which

# endif
#endif

#if HasGcc2 && defined(Ppc64Architecture)
# ifndef DefaultGcc2Ppc64Opt
#  define DefaultGcc2Ppc64Opt -O2 GccAliasingArgs
# endif
#endif

#if HasGcc2 && defined(PpcArchitecture)
# ifndef DefaultGcc2PpcOpt
#  define DefaultGcc2PpcOpt -O2 GccAliasingArgs

Lines 506-512 Link Here

(-)xc/config/cf/Imake.tmpl.ppc64-support-updates (-1 / +1 lines)
506	#define ByteOrder X_LITTLE_ENDIAN	506	#define ByteOrder X_LITTLE_ENDIAN
507	#elif defined(RsArchitecture)	507	#elif defined(RsArchitecture)
508	#define ByteOrder X_BIG_ENDIAN	508	#define ByteOrder X_BIG_ENDIAN
509	#elif defined(PpcArchitecture)	509	#elif defined(PpcArchitecture) \|\| defined(Ppc64Architecture)
510	#define ByteOrder X_BIG_ENDIAN	510	#define ByteOrder X_BIG_ENDIAN
511	#elif defined(HPArchitecture)	511	#elif defined(HPArchitecture)
512	#define ByteOrder X_BIG_ENDIAN	512	#define ByteOrder X_BIG_ENDIAN

Lines 618-623 Link Here

(-)xc/config/imake/imakemdep.h.ppc64-support-updates (+15 lines)
618	# ifdef ppc	618	# ifdef ppc
619	"-Dppc",	619	"-Dppc",
620	# endif	620	# endif
		621	# ifdef ppc64
		622	"-Dppc64",
		623	# endif
621	# if defined(m68k) \|\| defined(M68k) \|\| defined(m68040)	624	# if defined(m68k) \|\| defined(M68k) \|\| defined(m68040)
622	"-Dm68k",	625	"-Dm68k",
623	"-DM68k",	626	"-DM68k",
Lines 679-684 Link Here
679	# ifdef __powerpc__	682	# ifdef __powerpc__
680	"-D__powerpc__",	683	"-D__powerpc__",
681	# endif	684	# endif
		685	# ifdef __powerpc64__
		686	"-D__powerpc64__",
		687	# endif
682	# ifdef PowerMAX_OS	688	# ifdef PowerMAX_OS
683	"-DPowerMAX_OS",	689	"-DPowerMAX_OS",
684	# endif	690	# endif
Lines 711-716 Link Here
711	# ifdef __ppc__	717	# ifdef __ppc__
712	"-D__ppc__",	718	"-D__ppc__",
713	# endif	719	# endif
		720	# ifdef __ppc64__
		721	"-D__ppc64__",
		722	# endif
714	# ifdef __i386__	723	# ifdef __i386__
715	"-D__i386__",	724	"-D__i386__",
716	# endif	725	# endif
Lines 1255-1260 Link Here
1255	# ifdef __powerpc__	1264	# ifdef __powerpc__
1256	{"__powerpc__", "1"},	1265	{"__powerpc__", "1"},
1257	# endif	1266	# endif
		1267	# ifdef __powerpc64__
		1268	{"__powerpc64__", "1"},
		1269	# endif
1258	# ifdef PowerMAX_OS	1270	# ifdef PowerMAX_OS
1259	{"PowerMAX_OS", "1"},	1271	{"PowerMAX_OS", "1"},
1260	# endif	1272	# endif
Lines 1332-1337 Link Here
1332	#if defined(__ppc__)	1344	#if defined(__ppc__)
1333	{"__ppc__", "1"},	1345	{"__ppc__", "1"},
1334	#endif	1346	#endif
		1347	#if defined(__ppc64__)
		1348	{"__ppc64__", "1"},
		1349	#endif
1335	#if defined(__BIG_ENDIAN__)	1350	#if defined(__BIG_ENDIAN__)
1336	{"__BIG_ENDIAN__", "1"},	1351	{"__BIG_ENDIAN__", "1"},
1337	#endif	1352	#endif

Lines 65-70 Link Here

(-)xc/include/Xmd.h.ppc64-support-updates (+1 lines)
65	defined(__s390x__) \|\| \	65	defined(__s390x__) \|\| \
66	(defined(__hppa__) && defined(__LP64__)) \|\| \	66	(defined(__hppa__) && defined(__LP64__)) \|\| \
67	defined(__amd64__) \|\| defined(amd64) \|\| \	67	defined(__amd64__) \|\| defined(amd64) \|\| \
		68	defined(__powerpc64__) \|\| \
68	(defined(sgi) && (_MIPS_SZLONG == 64))	69	(defined(sgi) && (_MIPS_SZLONG == 64))
69	#define LONG64 /* 32/64-bit architecture */	70	#define LONG64 /* 32/64-bit architecture */
70	#endif	71	#endif

Lines 68-73 Link Here

(-)xc/lib/Xt/Xtos.h.ppc64-support-updates (+1 lines)
68	defined(__s390x__) \|\| \	68	defined(__s390x__) \|\| \
69	(defined(__hppa__) && defined(__LP64__)) \|\| \	69	(defined(__hppa__) && defined(__LP64__)) \|\| \
70	defined(__amd64__) \|\| defined(amd64) \|\| \	70	defined(__amd64__) \|\| defined(amd64) \|\| \
		71	defined(__powerpc64__) \|\| \
71	(defined(sgi) && (_MIPS_SZLONG == 64))	72	(defined(sgi) && (_MIPS_SZLONG == 64))
72	#define LONG64	73	#define LONG64
73	#endif	74	#endif

Lines 106-111 Link Here

(-)xc/programs/Xserver/fb/fb.h.ppc64-support-updates (+1 lines)
106	defined(__sparc64__) \|\| \	106	defined(__sparc64__) \|\| \
107	defined(__s390x__) \|\| \	107	defined(__s390x__) \|\| \
108	defined(amd64) \|\| defined (__amd64__) \|\| \	108	defined(amd64) \|\| defined (__amd64__) \|\| \
		109	defined (__powerpc64__) \|\| \
109	(defined(sgi) && (_MIPS_SZLONG == 64))	110	(defined(sgi) && (_MIPS_SZLONG == 64))
110	typedef unsigned long FbBits;	111	typedef unsigned long FbBits;
111	# else	112	# else

Lines 280-286 Link Here

(-)xc/programs/Xserver/hw/xfree86/os-support/bus/Pci.h.ppc64-support-updates (-1 / +1 lines)
280	# define INCLUDE_XF86_MAP_PCI_MEM	280	# define INCLUDE_XF86_MAP_PCI_MEM
281	# define INCLUDE_XF86_NO_DOMAIN	281	# define INCLUDE_XF86_NO_DOMAIN
282	# endif	282	# endif
283	#elif defined(__powerpc__)	283	#elif defined(__powerpc__) \|\| defined(__powerpc64__)
284	# if defined(linux)	284	# if defined(linux)
285	# define ARCH_PCI_INIT linuxPciInit	285	# define ARCH_PCI_INIT linuxPciInit
286	# define INCLUDE_XF86_MAP_PCI_MEM	286	# define INCLUDE_XF86_MAP_PCI_MEM

Lines 34-39 Link Here

(-)xc/programs/Xserver/hw/xfree86/os-support/bus/Imakefile.ppc64-support-updates (+1 lines)
34		34
35	#elif defined(LinuxArchitecture) && \	35	#elif defined(LinuxArchitecture) && \
36	(defined(PpcArchitecture) \|\| \	36	(defined(PpcArchitecture) \|\| \
		37	defined(Ppc64Architecture) \|\| \
37	defined(MipsArchitecture) \|\| \	38	defined(MipsArchitecture) \|\| \
38	defined(ia64Architecture) \|\| \	39	defined(ia64Architecture) \|\| \
39	defined(Mc68020Architecture) \|\| \	40	defined(Mc68020Architecture) \|\| \

Lines 185-190 Link Here

(-)xc/programs/Xserver/os/xalloc.c.ppc64-support-updates (+1 lines)
185	defined(__sparc64__) \|\| \	185	defined(__sparc64__) \|\| \
186	defined(__s390x__) \|\| \	186	defined(__s390x__) \|\| \
187	defined(__amd64__) \|\| defined(amd64) \|\| \	187	defined(__amd64__) \|\| defined(amd64) \|\| \
		188	defined(__powerpc64__) \|\| \
188	(defined(sgi) && _MIPS_SZLONG == 64))	189	(defined(sgi) && _MIPS_SZLONG == 64))
189	#define MAGIC 0x1404196414071968	190	#define MAGIC 0x1404196414071968
190	#define MAGIC_FREE 0x1506196615061966	191	#define MAGIC_FREE 0x1506196615061966

Return to bug 54852

Lines 1102-1107 Link Here

(-)xc/config/cf/xorg.cf.ppc64-support-updates (+99 lines)
1102	# endif	1102	# endif
1103	#endif	1103	#endif
1104		1104
		1105	/*
		1106	* For PowerPC 64bit systems
		1107	* only libraries are strictly needed
		1108	*/
		1109	#if defined(Ppc64Architecture)
		1110	# ifndef XF86Server
		1111	# define XF86Server YES
		1112	# endif
		1113	/* Amiga framebuffer module */
		1114	# ifndef XF86AFB
		1115	# define XF86AFB NO
		1116	# endif
		1117	/* 1bpp module */
		1118	# ifndef XF1Bpp
		1119	# define XF1Bpp NO
		1120	# endif
		1121	/* 4bpp module */
		1122	# ifndef XF4Bpp
		1123	# define XF4Bpp NO
		1124	# endif
		1125	/* 8/32bpp overlay module */
		1126	# ifndef XF8_32Bpp
		1127	# define XF8_32Bpp YES
		1128	# endif
		1129	/* 8/16bpp dual fb module */
		1130	# ifndef XF8_16Bpp
		1131	# define XF8_16Bpp YES
		1132	# endif
		1133	/* 24/32bpp conversion module */
		1134	# ifndef XF24_32Bpp
		1135	# define XF24_32Bpp YES
		1136	# endif
		1137	/* shadow fb module */
		1138	# ifndef XFShadowFB
		1139	# define XFShadowFB YES
		1140	# endif
		1141	/* vgahw module */
		1142	# ifndef XF86VgaHw
		1143	# define XF86VgaHw NO
		1144	# endif
		1145	/* fbdevhw module */
		1146	# ifndef XF86FBDevHw
		1147	# define XF86FBDevHw YES
		1148	# endif
		1149	/* XAA module */
		1150	# ifndef XF86XAA
		1151	# define XF86XAA YES
		1152	# endif
		1153	/* ramdac module */
		1154	# ifndef XF86Ramdac
		1155	# define XF86Ramdac YES
		1156	# endif
		1157	/* I2C module */
		1158	# ifndef XF86I2C
		1159	# define XF86I2C YES
		1160	# endif
		1161	/* DDC module */
		1162	# ifndef XF86DDC
		1163	# define XF86DDC YES
		1164	# endif
		1165	/* RAC (Resource Access Control) module */
		1166	# ifndef XF86RAC
		1167	# define XF86RAC YES
		1168	# endif
1169
1170	/* int10 module */
1171	# ifndef XF86Int10
1172	# define XF86Int10 YES
1173	# endif
1174
1175	# ifndef DevelDrivers
1176	# if XFree86Devel
1177	# define DevelDrivers
1178	# else
1179	# define DevelDrivers /* */
1180	# endif
1181	# endif
1182
1183	/* Pure PCI drivers should go first */
1184	# ifndef XF86CardDrivers
1185	# define XF86CardDrivers ati mga \
1186	DevelDrivers \
1187	XF86OSCardDrivers XF86ExtraCardDrivers
1188	# endif
1189	# if HasGlide3
1190	# define TdfxDriDriver
1191	# else
1192	# define TdfxDriDriver /**/
1193	# endif
1194	# ifndef DriDrivers
1195	# define DriDrivers gamma r128
1196	# endif
1197	#endif
1105		1198
1106	/*	1199	/*
1107	* For Mips/Arc platforms, the default is to build all modules which	1200	* For Mips/Arc platforms, the default is to build all modules which
Lines 1913-1918 Link Here
1913	# endif	2006	# endif
1914	#endif	2007	#endif
1915		2008
		2009	#if HasGcc2 && defined(Ppc64Architecture)
		2010	# ifndef DefaultGcc2Ppc64Opt
		2011	# define DefaultGcc2Ppc64Opt -O2 GccAliasingArgs
		2012	# endif
		2013	#endif
		2014
1916	#if HasGcc2 && defined(PpcArchitecture)	2015	#if HasGcc2 && defined(PpcArchitecture)
1917	# ifndef DefaultGcc2PpcOpt	2016	# ifndef DefaultGcc2PpcOpt
1918	# define DefaultGcc2PpcOpt -O2 GccAliasingArgs	2017	# define DefaultGcc2PpcOpt -O2 GccAliasingArgs