$NetBSD: patch-ac,v 1.6 2023/02/22 07:44:55 wiz Exp $

--- linux.cf.orig	2023-02-22 02:28:43.000000000 +0000
+++ linux.cf
@@ -94,6 +94,10 @@ XCOMM platform:  $XFree86: xc/config/cf/
 #define HasGnuAr	YES
 #endif
 
+#ifndef HasGnuAr
+#define HasGnuAr		YES
+#endif
+
 XCOMM operating system:  OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
 XCOMM libc:	(LinuxCLibMajorVersion./**/LinuxCLibMinorVersion./**/LinuxCLibTeenyVersion)
 XCOMM binutils:	(LinuxBinUtilsMajorVersion)
@@ -619,10 +623,10 @@ InstallNamedTargetNoClobber(install,file
 #  if defined (i386Architecture) && ((GccMajorVersion >3) \
    || ((GccMajorVersion == 3) &&  (GccMinorVersion >= 1)))
 #   ifndef CcCmd
-#    define CcCmd		gcc -m32
+#    define CcCmd		gcc
 #   endif
 #   ifndef CplusplusCmd
-#    define CplusplusCmd	c++ -m32
+#    define CplusplusCmd	c++
 #   endif
 #  endif
 #  if defined (Ppc64Architecture)
@@ -789,7 +793,6 @@ InstallNamedTargetNoClobber(install,file
 #define YaccCmd			bison -y
 #define LexCmd			flex -l
 #define HasFlex			YES
-#define LexLib			-lfl
 #define PreProcessCmd		CcCmd -E
 #define PostIncDir		DefaultGccIncludeDir
 #define LdCombineFlags		-r
@@ -863,7 +866,7 @@ InstallNamedTargetNoClobber(install,file
 
 #ifdef i386Architecture
 # ifndef OptimizedCDebugFlags
-#  define OptimizedCDebugFlags	DefaultGcc2i386Opt
+#  define OptimizedCDebugFlags	-O2 -fPIC -D_FORTIFY_SOURCE=2 -I/usr/pkg/include -I/usr/X11R7/include
 # endif
 # define LinuxMachineDefines	-D__i386__
 # define ServerOSDefines	XFree86ServerOSDefines -DDDXTIME
@@ -1106,20 +1109,12 @@ InstallNamedTargetNoClobber(install,file
 #endif
 
 
-#define HasGnuMake		YES
-
-#define MakeNamedTargetSubdir(dir,flags,subname)\
-	$(MAKE) -C dir $(MFLAGS) $(PARALLELMFLAGS) flags subname
-
 #define ArchitectureDefines	-DLINUX_ARCHITECTURE
 
 #define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB)
 #define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
 
 #if HaveLib64
-# ifndef LibDirName
-#  define LibDirName		lib64
-# endif
 # ifndef SystemUsrLibDir
 #  define SystemUsrLibDir	/usr/lib64
 # endif