Module Name: xsrc
Committed By: mrg
Date: Mon Mar 20 05:58:56 UTC 2023
Modified Files:
xsrc/external/mit/xorg-cf-files/dist: Imake.cf Imake.tmpl NetBSD.cf
X11.tmpl linux.cf site.def
Removed Files:
xsrc/external/mit/xbitmaps/dist: compile
xsrc/external/mit/xorg-cf-files/dist: compile
Log Message:
merge xbitmaps 1.1.3 and xorg-cf-files 1.0.8.
also, fix riscv64 on netbsd to define _XSERVER64.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xbitmaps/dist/compile
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xorg-cf-files/dist/Imake.cf
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xorg-cf-files/dist/Imake.tmpl
cvs rdiff -u -r1.9 -r1.10 xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf
cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xorg-cf-files/dist/X11.tmpl
cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/xorg-cf-files/dist/compile
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xorg-cf-files/dist/linux.cf \
xsrc/external/mit/xorg-cf-files/dist/site.def
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-cf-files/dist/Imake.cf
diff -u xsrc/external/mit/xorg-cf-files/dist/Imake.cf:1.7 xsrc/external/mit/xorg-cf-files/dist/Imake.cf:1.8
--- xsrc/external/mit/xorg-cf-files/dist/Imake.cf:1.7 Sun Mar 5 00:59:48 2017
+++ xsrc/external/mit/xorg-cf-files/dist/Imake.cf Mon Mar 20 05:58:56 2023
@@ -37,6 +37,10 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v
# define x86_64DarwinArchitecture
# undef __x86_64__
# endif
+# ifdef __aarch64__
+# define aarch64DarwinArchitecture
+# undef __aarch64__
+# endif
#endif
#if defined(clipper) || defined(__clipper__)
@@ -259,6 +263,14 @@ XCOMM $XFree86: xc/config/cf/Imake.cf,v
# define ia64Architecture
# undef __ia64__
# endif
+# if defined(__riscv)
+# undef __riscv
+# ifdef _LP64
+# define RV64Architecture
+# else
+# define RV32Architecture
+# endif
+# endif
#endif /* NetBSD */
/* Systems based on kernel of NetBSD */
@@ -1041,6 +1053,29 @@ XCOMM Keep cpp from replacing path eleme
# define AArch64Architecture
# undef __aarch64__
# endif
+# if defined(__loongarch__)
+# undef __loongarch__
+# if __loongarch_grlen == 64
+# undef __loongarch_grlen
+# undef __loongarch_lp64
+# define LoongArch64Architecture
+# endif
+# if __loongarch_grlen == 32
+# undef __loongarch_grlen
+# define LoongArch32Architecture
+# endif
+# endif
+# if defined(__riscv)
+# undef __riscv
+# if __riscv_xlen == 64
+# undef __riscv_xlen
+# define RV64Architecture
+# endif
+# if __riscv_xlen == 32
+# undef __riscv_xlen
+# define RV32Architecture
+# endif
+# endif
#endif /* linux || __GLIBC__ */
#if (defined(__Lynx__) || defined(Lynx)) && (defined(i386) || defined(__i386__) || defined(__x86__) || defined(__powerpc__) || defined(__sparc__) || defined(sparc))
Index: xsrc/external/mit/xorg-cf-files/dist/Imake.tmpl
diff -u xsrc/external/mit/xorg-cf-files/dist/Imake.tmpl:1.3 xsrc/external/mit/xorg-cf-files/dist/Imake.tmpl:1.4
--- xsrc/external/mit/xorg-cf-files/dist/Imake.tmpl:1.3 Fri Jan 20 22:47:37 2023
+++ xsrc/external/mit/xorg-cf-files/dist/Imake.tmpl Mon Mar 20 05:58:56 2023
@@ -1834,7 +1834,7 @@ CXXEXTRA_INCLUDES = CplusplusExtraInclud
#else
CPP = CppCmd $(STD_CPP_DEFINES) /* simple filters */
RAWCPP = RawCppCmd $(STD_CPP_OPTIONS)
- PREPROCESSCMD = PreProcessCmd $(STD_CPP_DEFINES) /* prefered; mdep */
+ PREPROCESSCMD = PreProcessCmd $(STD_CPP_DEFINES) /* preferred; mdep */
#endif
INSTALL = InstallCmd
INSTALLFLAGS = InstallFlags
Index: xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf
diff -u xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf:1.9 xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf:1.10
--- xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf:1.9 Fri Jan 20 22:47:37 2023
+++ xsrc/external/mit/xorg-cf-files/dist/NetBSD.cf Mon Mar 20 05:58:56 2023
@@ -284,7 +284,7 @@ XCOMM operating system: OSName (OSMajor
# ifndef XFree86ConsoleDefines
# define XFree86ConsoleDefines -DWSCONS_SUPPORT
# endif
-#elif defined(ia64Architecture) || defined(AMD64Architecture)
+#elif defined(ia64Architecture) || defined(AMD64Architecture) || defined(RV64Architecture)
#define ServerExtraDefines GccGasOption XFree86ServerDefines -D_XSERVER64
#else
# define ServerExtraDefines GccGasOption
@@ -595,7 +595,7 @@ InstallManPageAliasesBase(file,destdir,a
#include <bsdLib.rules>
#endif /* HasSharedLibraries */
-/* Always build the XInput library, regardless of server support on this plattform */
+/* Always build the XInput library, regardless of server support on this platform */
#if !defined(BuildXInputLib) && !defined(BuildServersOnly)
# define BuildXInputLib YES
#endif
@@ -698,6 +698,6 @@ sed 's/\.[0-9]*$$//'`
/*
* Always include xorg.cf for GccAliasingArgs,
- * regardless of server support on this plattform
+ * regardless of server support on this platform
*/
#include <xorg.cf>
Index: xsrc/external/mit/xorg-cf-files/dist/X11.tmpl
diff -u xsrc/external/mit/xorg-cf-files/dist/X11.tmpl:1.5 xsrc/external/mit/xorg-cf-files/dist/X11.tmpl:1.6
--- xsrc/external/mit/xorg-cf-files/dist/X11.tmpl:1.5 Wed Mar 19 23:45:21 2014
+++ xsrc/external/mit/xorg-cf-files/dist/X11.tmpl Mon Mar 20 05:58:56 2023
@@ -1185,7 +1185,7 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#endif
#endif
-#ifndef FontCacheExtentionDefines
+#ifndef FontCacheExtensionDefines
#if BuildFontCache
#define FontCacheExtensionDefines -DFONTCACHE
#else
@@ -3744,7 +3744,7 @@ XFTINCLUDES=$(FONTCONFIGINCLUDES) $(FREE
*
* Make sure that *Standard is set correctly, if not, the
* standard compile/link paths will be added *before* the
- * local X directorys and installed versions of the standard
+ * local X directories and installed versions of the standard
* X headers will end up getting used.
*/
Index: xsrc/external/mit/xorg-cf-files/dist/linux.cf
diff -u xsrc/external/mit/xorg-cf-files/dist/linux.cf:1.2 xsrc/external/mit/xorg-cf-files/dist/linux.cf:1.3
--- xsrc/external/mit/xorg-cf-files/dist/linux.cf:1.2 Fri Jan 20 22:47:37 2023
+++ xsrc/external/mit/xorg-cf-files/dist/linux.cf Mon Mar 20 05:58:56 2023
@@ -91,7 +91,7 @@ XCOMM platform: $XFree86: xc/config/cf/
#endif
#ifndef HasGnuAr
-#define HasGnuAr YES
+#define HasGnuAr YES
#endif
XCOMM operating system: OSName (OSMajorVersion./**/OSMinorVersion./**/OSTeenyVersion)
@@ -588,7 +588,7 @@ InstallNamedTargetNoClobber(install,file
#define MkdirHierCmd mkdir -p
#ifndef HaveLib64
-# if defined (AMD64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture) || defined (AArch64Architecture)
+# if defined (AMD64Architecture) || defined (s390xArchitecture) || defined (Ppc64Architecture) || defined (AArch64Architecture) || defined (RV64Architecture)
# define HaveLib64 YES
# else
# define HaveLib64 NO
@@ -615,7 +615,7 @@ InstallNamedTargetNoClobber(install,file
# ifndef MakeDllModules
# define MakeDllModules YES
# endif
-# endif /* MipsArchitecure */
+# endif /* MipsArchitecture */
# if defined (i386Architecture) && ((GccMajorVersion >3) \
|| ((GccMajorVersion == 3) && (GccMinorVersion >= 1)))
# ifndef CcCmd
@@ -738,7 +738,7 @@ InstallNamedTargetNoClobber(install,file
# ifdef i386Architecture
# define CcCmd gcc -b i486-linux
# define AsCmd CcCmd -c -x assembler
-# define LdCmd CcCmd -nosdlib -Wl,"-m elf_i386"
+# define LdCmd CcCmd -nostdlib -Wl,"-m elf_i386"
# define AsmDefines -D__ELF__
# define CplusplusCmd c++ -b i486-linux
# endif /* i386Architecture */
@@ -1004,6 +1004,42 @@ InstallNamedTargetNoClobber(install,file
# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
#endif /* AArch64Architecture */
+#ifdef LoongArch64Architecture
+# ifndef OptimizedCDebugFlags
+# define OptimizedCDebugFlags -O2 GccAliasingArgs
+# endif
+# define LinuxMachineDefines -D__loongarch__ -D__loongarch_grlen=64 -D__loongarch_lp64
+# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
+# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
+#endif /* LoongArch64Architecture */
+
+#ifdef LoongArch32Architecture
+# ifndef OptimizedCDebugFlags
+# define OptimizedCDebugFlags -O2 GccAliasingArgs
+# endif
+# define LinuxMachineDefines -D__loongarch__ -D__loongarch_grlen=32
+# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
+# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
+#endif /* LoongArch32Architecture */
+
+#ifdef RV64Architecture
+# ifndef OptimizedCDebugFlags
+# define OptimizedCDebugFlags -O2 GccAliasingArgs
+# endif
+# define LinuxMachineDefines -D__riscv -D__riscv_xlen=64
+# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
+# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64
+#endif /* RV64Architecture */
+
+#ifdef RV32Architecture
+# ifndef OptimizedCDebugFlags
+# define OptimizedCDebugFlags -O2 GccAliasingArgs
+# endif
+# define LinuxMachineDefines -D__riscv -D__riscv_xlen=32
+# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME
+# define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines
+#endif /* RV32Architecture */
+
#ifndef StandardDefines
# ifdef __linux__
# define StandardDefines -Dlinux LinuxMachineDefines LinuxSourceDefines
@@ -1038,7 +1074,7 @@ InstallNamedTargetNoClobber(install,file
# define ConnectionFlags -DUNIXCONN -DTCPCONN
#endif
-/* Some of these man page defaults are overriden in the above OS sections */
+/* Some of these man page defaults are overridden in the above OS sections */
#ifndef ManSuffix
# define ManSuffix 1x
#endif
Index: xsrc/external/mit/xorg-cf-files/dist/site.def
diff -u xsrc/external/mit/xorg-cf-files/dist/site.def:1.2 xsrc/external/mit/xorg-cf-files/dist/site.def:1.3
--- xsrc/external/mit/xorg-cf-files/dist/site.def:1.2 Mon Aug 23 22:23:03 2021
+++ xsrc/external/mit/xorg-cf-files/dist/site.def Mon Mar 20 05:58:56 2023
@@ -35,7 +35,7 @@ XCOMM site: $XFree86: xc/config/cf/site
#ifdef BeforeVendorCF
/*
- * Include this for easy XFree86 customisations
+ * Include this for easy XFree86 customizations
*/
#ifndef SiteIConfigFiles
#define SiteIConfigFiles $(IRULESRC)/xorgsite.def $(IRULESRC)/host.def
@@ -80,7 +80,7 @@ XCOMM site: $XFree86: xc/config/cf/site
#endif
#ifndef FontEncDir
-#define FontEncDir ${FONTROOTDIR}/encodings
+#define FontEncDir FontDir/encodings
#endif
/*
