1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
|
$NetBSD: patch-ac,v 1.8 2006/02/27 22:58:57 joerg Exp $
--- config/cf/NetBSD.cf.in.orig 2005-12-06 10:56:30.000000000 +0100
+++ config/cf/NetBSD.cf.in 2005-12-06 11:01:02.000000000 +0100
@@ -126,7 +126,7 @@ XCOMM operating system: OSName (OSMajor
# if ((OSMajorVersion == 2 && OSMinorVersion == 99 && OSTeenyVersion < 11) || \
(OSMajorVersion == 2 && OSMinorVersion < 99) || \
(OSMajorVersion < 2))
-# define LibraryMTDefines -DUSE_NBSD_THREADLIB
+# define LibraryMTDefines @@NETBSD_THREADLIB@@
# endif
# define SystemMTDefines -D_REENTRANT
# define MTSafeAPIDefines -DXUSE_MTSAFE_API -DXNO_MTSAFE_PWDAPI
@@ -150,7 +150,7 @@ XCOMM operating system: OSName (OSMajor
#define MkdirHierCmd mkdir -p
#undef CcCmd
-#define CcCmd gcc
+#define CcCmd @@PKGSRC_CC@@
#ifndef DefaultCCOptions
#if defined(UseInstalled)
#define DefaultCCOptions /**/
@@ -166,7 +166,7 @@ XCOMM operating system: OSName (OSMajor
#endif
#endif
-#define CppCmd cpp
+#define CppCmd @@PKGSRC_CPP@@
#define StandardCppOptions -traditional
#define StandardCppDefines /**/
#define PreProcessCmd CcCmd -E
@@ -195,7 +195,7 @@ XCOMM operating system: OSName (OSMajor
* Disabled for NetBSD/vax until I figure out the scheme. --CS
*/
#if ((OSMajorVersion > 0) && defined(i386Architecture)) || \
- defined(PpcArchitecture)
+ defined(PpcArchitecture) || defined(AMD64Architecture)
# ifndef DoLoadableServer
# define DoLoadableServer YES
# endif
@@ -240,16 +240,19 @@ XCOMM operating system: OSName (OSMajor
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
# elif defined(PpcArchitecture)
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DDDXOSINIT
+# elif defined(AMD64Architecture)
+# define ServerOSDefines XFree86ServerOSDefines
+# define ServerExtraSysLibs -lx86_64
# else
# define ServerOSDefines /**/
# endif
# if defined(AlphaArchitecture)
# define ServerExtraSysLibs -lalpha
-# else
+# elif !defined(ServerExtraSysLibs)
# define ServerExtraSysLibs /**/
# endif
#endif
-#ifdef i386Architecture
+#if defined(i386Architecture) || defined(AMD64Architecture)
# define ServerExtraDefines GccGasOption XFree86ServerDefines
# ifndef XFree86ConsoleDefines
# if (OSMajorVersion == 1 && ((OSMinorVersion == 3 && OSTeenyVersion >= 6) \
@@ -404,6 +407,10 @@ XCOMM operating system: OSName (OSMajor
# endif /* MTRRBuiltin */
#endif /* i386Architecture */
+#if defined(AMD64Architecture)
+# define HasMTRRBuiltin YES
+#endif
+
/*
* agpgart support (NetBSD 1.5Y and up)
*/
@@ -420,7 +427,7 @@ XCOMM operating system: OSName (OSMajor
* MMX, SSE and 3DNow will be autodetected. NetBSD 1.6 and up have the
* necessary kernel and toolchain support.
*/
-#if defined(i386Architecture) && \
+#if (defined(i386Architecture) || defined(AMD64Architecture)) && \
((OSMajorVersion > 1) || (OSMajorVersion == 1 && OSMinorVersion > 5))
# define HasX86Support YES
# define HasMMXSupport YES
@@ -590,7 +597,7 @@ InstallManPageAliasesBase(file,destdir,a
# define BuildXInputLib YES
#endif
-#if defined(i386Architecture) || defined(Arm32Architecture) || defined(AlphaArchitecture) || defined(PpcArchitecture)
+#if defined(i386Architecture) || defined(Arm32Architecture) || defined(AlphaArchitecture) || defined(PpcArchitecture) || defined(AMD64Architecture)
# include <xorg.cf>
#endif
|
