From b5cc42e0290aa44bb77e7761075458d241e5ddca Mon Sep 17 00:00:00 2001
From: Jon Trulson <jon@radscan.com>
Date: Sun, 30 May 2021 16:24:51 -0600
Subject: [PATCH] Apply a patch from Roger Brown for risc-v and other minor
 fixes

Summary:

cde/config/cf/DtInfo.tmpl - add RISCVArchitecture as little endian
cde/config/cf/Imake.cf    - add AArch64Architecture for NetBSD
cde/config/cf/Imake.cf    - add RISCVArchitecture for Linux
cde/config/cf/linux.cf    - add RISCVArchitecture bit order
cde/lib/DtHelp/Imakefile  - add -ljpeg for OpenBSD
---
 cde/config/cf/DtInfo.tmpl | 2 +-
 cde/config/cf/Imake.cf    | 8 ++++++++
 cde/config/cf/linux.cf    | 8 ++++++++
 cde/lib/DtHelp/Imakefile  | 2 +-
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/cde/config/cf/DtInfo.tmpl b/cde/config/cf/DtInfo.tmpl
index bef360eb4..e4a205c5b 100644
--- a/cde/config/cf/DtInfo.tmpl
+++ b/cde/config/cf/DtInfo.tmpl
@@ -412,7 +412,7 @@ TEMPLATE_OBJS=TemplateDB//**/*.o
 
 #define TemplateObjs $(TEMPLATE_OBJS)
 
-#if defined(i386Architecture) || defined(AMD64Architecture) || defined(AlphaArchitecture) || defined(ARMArchitecture) || defined(AArch64Architecture)
+#if defined(i386Architecture) || defined(AMD64Architecture) || defined(AlphaArchitecture) || defined(ARMArchitecture) || defined(AArch64Architecture) || defined(RISCVArchitecture)
 # define ByteOrderDefines LittleEndianDefines
 #elif defined(HAL32V7Architecture) || defined(SunArchitecture) || defined(SparcArchitecture) || defined(Sparc64Architecture) || defined(AIXArchitecture) || defined(HPArchitecture) || defined(PpcArchitecture)
 # define ByteOrderDefines BigEndianDefines
diff --git a/cde/config/cf/Imake.cf b/cde/config/cf/Imake.cf
index b28af3ce9..3b3452ec0 100644
--- a/cde/config/cf/Imake.cf
+++ b/cde/config/cf/Imake.cf
@@ -166,6 +166,10 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $
 #  define SparcArchitecture
 #  undef sparc
 # endif
+# ifdef __aarch64__
+#  define AArch64Architecture
+#  undef __aarch64__
+# endif
 #endif /* NetBSD */
 
 #ifdef __FreeBSD__
@@ -470,6 +474,10 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $
 #  endif
 #  undef __powerpc__
 # endif
+# ifdef __riscv
+#  define RISCVArchitecture
+#  undef __riscv
+# endif /* __riscv */
 # if defined(__amd64__) || defined (__x86_64__)
 #  undef __amd64__
 #  undef __x86_64__
diff --git a/cde/config/cf/linux.cf b/cde/config/cf/linux.cf
index ac41511da..3a37c69f4 100644
--- a/cde/config/cf/linux.cf
+++ b/cde/config/cf/linux.cf
@@ -258,6 +258,14 @@ TIRPCINC =
 # define LinuxMachineDefines	-D__alpha__
 #endif /* AlphaArchitecture */
 
+#ifdef RISCVArchitecture
+# ifndef OptimizedCDebugFlags
+#  define OptimizedCDebugFlags  DefaultGcc2i386Opt
+# endif
+# define LinuxMachineDefines    -D__riscv__
+# define LSBBitOrder             YES
+#endif /* RISCVArchitecture */
+
 #ifdef Mc68020Architecture
 # ifndef OptimizedCDebugFlags
 #  define OptimizedCDebugFlags	DefaultGcc2i386Opt
diff --git a/cde/lib/DtHelp/Imakefile b/cde/lib/DtHelp/Imakefile
index a091a3d3c..aa1590131 100644
--- a/cde/lib/DtHelp/Imakefile
+++ b/cde/lib/DtHelp/Imakefile
@@ -38,7 +38,7 @@ DEFINES = -DDTLIB $(LOCAL_DEFINES) \
 	  -DOSMINORVERSION=OSMinorVersion \
 	  $(ICONV_INBUF_DEFINE) $(BIT_ORDER_DEFINES)
 
-#if defined(FreeBSDArchitecture)
+#if defined(FreeBSDArchitecture) || defined(OpenBSDArchitecture)
 JPEGLIB = -ljpeg
 #endif