--- a/components/frame_na7_db_ir	Fri Jun 22 06:38:03 2018 +0000
+++ b/components/frame_na7_db_ir	Fri Jun 22 07:00:42 2018 +0000
@@ -33,3 +33,12 @@
 cfile_plain $SRCDIR/prf_func.c
 cfile_plain $SRCDIR/frm_ext.c
 cfile_plain $SRCDIR/frame_version.c
+
+# OSL
+
+# drop -o3
+CFLAGS="-mw -x -pw2 -o -me -mt -g -mn"
+
+SRCDIR=$SRC/gpf2/osl
+
+cfile_plain $SRCDIR/os_com_ir.c

--- a/src/gpf2/osl/os_com_ir.c	Fri Jun 22 06:38:03 2018 +0000
+++ b/src/gpf2/osl/os_com_ir.c	Fri Jun 22 07:00:42 2018 +0000
@@ -6,9 +6,7 @@
 /* set of included headers from COFF symtab: */
 #include <stdio.h>
 #include <string.h>
-#include "gpfconf.h"	/* FreeCalypso addition */
-#include "../../nucleus/nucleus.h"
-#include "../../nucleus/tc_extr.h"	/* not seen in original, but needed */
+#include "nucleus.h"
 #include "typedefs.h"
 #include "os.h"
 #include "gdi.h"
@@ -45,7 +43,7 @@
 	TCT_System_Protect();
 	elem = pTable->pFreeElement;
 	pTable->pFreeElement = elem->pNext;
-	bcopy(Msg, &elem->Data, sizeof(OS_QDATA));
+	memcpy(&elem->Data, Msg, sizeof(OS_QDATA));
 	queue = &pTable->Queue[Priority - OS_MIN_PRIORITY];
 	*queue->pWrite++ = &elem->Data;
 	if (queue->pWrite - queue->pStart >= pTable->Entries + 1)
@@ -87,7 +85,7 @@
 		ReleaseSemaphoreCB(&pTable->FreeSemCB);
 		return(OS_ERROR);
 	}
-	bcopy(*pQueue->pRead, Msg, sizeof(OS_QDATA));
+	memcpy(Msg, *pQueue->pRead, sizeof(OS_QDATA));
 	pElem = (T_QDATA_ELEMENT *)*pQueue->pRead++;
 	pElem->Data.data16 = 0;
 	pElem->pNext = pTable->pFreeElement;