From 9e63437b176f68a163f7230234b9d0ad2963ad41 Mon Sep 17 00:00:00 2001
From: Tom Overlund <tomov@dilacero.org>
Date: Sat, 19 Feb 2022 12:40:06 -0500
Subject: [PATCH] Get kroc working again in modern environments. Fixes a
 compile error and segfaults due to PIE. Issues 23 and 19, respectively.

---
 m4/kroc.m4                 | 2 +-
 tools/occ21/misc/harness.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/m4/kroc.m4 b/m4/kroc.m4
index 29f27af3..1186e356 100644
--- a/m4/kroc.m4
+++ b/m4/kroc.m4
@@ -84,7 +84,7 @@ if test "x$KROC_BUILD_ROOT" != "x"; then
                 KROC_CCSP_ENABLE_CPUTIMERS=$enableval,
                 KROC_CCSP_ENABLE_CPUTIMERS=no)
 
-  KROC_CCSP_CFLAGS="$KROC_CCSP_CFLAGS -fomit-frame-pointer -fno-defer-pop"
+  KROC_CCSP_CFLAGS="$KROC_CCSP_CFLAGS -fomit-frame-pointer -fno-defer-pop -no-pie -fno-pie"
 
   case "$target_cpu" in
     x86_64)
diff --git a/tools/occ21/misc/harness.c b/tools/occ21/misc/harness.c
index f3c78b6b..9429e45c 100644
--- a/tools/occ21/misc/harness.c
+++ b/tools/occ21/misc/harness.c
@@ -564,7 +564,7 @@ PUBLIC char asmfilename[MAX_FILENAME_LENGTH];
 #endif
 
 arg2_help_page_type help_level = 0;
-arg2_help_page_info oc_help_info;
+extern arg2_help_page_info oc_help_info;
 /*}}}*/
 
 /*{{{  extra definitions for COMPILING_TO_JCODE*/