Only include Hdr:Machine.<Machine> from Hdr:CPU.Arch if not already

The logic behind this is to permit the calling source file to override which
`Machine` type is used, by `GET`ting a different one first. This can be
useful for a component that can only be built for one `Machine` type
(for example, many IOMD-only driver modules).

Version 2.99. Not tagged

VersionNum

@@ -5,17 +5,17 @@
  */
 #define Module_MajorVersion_CMHG        2.99
 #define Module_MinorVersion_CMHG
-#define Module_Date_CMHG                28 Apr 2022
+#define Module_Date_CMHG                18 May 2022
 
 #define Module_MajorVersion             "2.99"
 #define Module_Version                  299
 #define Module_MinorVersion             ""
-#define Module_Date                     "28 Apr 2022"
+#define Module_Date                     "18 May 2022"
 
-#define Module_ApplicationDate          "28-Apr-22"
+#define Module_ApplicationDate          "18-May-22"
 
 #define Module_ComponentName            "HdrSrc"
 
 #define Module_FullVersion              "2.99"
-#define Module_HelpVersion              "2.99 (28 Apr 2022)"
+#define Module_HelpVersion              "2.99 (18 May 2022)"
 #define Module_LibraryVersionInfo       "2:99"

hdr/CPU/Arch

@@ -146,7 +146,9 @@ OldOpt  SETA    {OPT}
         GBLL    Included_Hdr_CPU_Arch
 Included_Hdr_CPU_Arch SETL {TRUE}
 
+ [ :LNOT: :DEF: Included_Hdr_Machine_Machine
         GET     Hdr:Machine.<Machine>
+ ]
 
 ; MRS/MSR and USR32, IRQ32, FIQ32, SVC32, ABT and UND modes
 MchFlg_v3   * 2_00000000000000000000000000000001