From 04a47f306bbf910f4b4ae10600c6b5caf3c44f8b Mon Sep 17 00:00:00 2001
From: Sulekha Kulkarni <Sulekha.Kulkarni@microsoft.com>
Date: Thu, 11 Mar 2021 13:37:54 -0500
Subject: [PATCH] Added the compilation flag -DNO_IMPLICIT_INCLUDE_CHECKED_HDRS
 to the compilations that were failing because of implicit inclusion of
 checked headers. Filed bug #109 to track this issue.

---
 MultiSource/Benchmarks/BitBench/drop3/Makefile           | 1 +
 MultiSource/Benchmarks/FreeBench/pifft/Makefile          | 3 ++-
 MultiSource/Benchmarks/MallocBench/espresso/Makefile     | 2 +-
 MultiSource/Benchmarks/McCat/05-eks/Makefile             | 1 +
 MultiSource/Benchmarks/McCat/18-imp/Makefile             | 1 +
 MultiSource/Benchmarks/MiBench/consumer-lame/Makefile    | 1 +
 MultiSource/Benchmarks/MiBench/consumer-typeset/Makefile | 1 +
 MultiSource/Benchmarks/MiBench/network-patricia/Makefile | 1 +
 MultiSource/Benchmarks/MiBench/office-ispell/Makefile    | 1 +
 MultiSource/Benchmarks/Prolangs-C/TimberWolfMC/Makefile  | 1 +
 MultiSource/Benchmarks/Prolangs-C/agrep/Makefile         | 1 +
 MultiSource/Benchmarks/Prolangs-C/archie-client/Makefile | 2 ++
 MultiSource/Benchmarks/Prolangs-C/assembler/Makefile     | 1 +
 MultiSource/Benchmarks/Prolangs-C/cdecl/Makefile         | 1 +
 MultiSource/Benchmarks/Prolangs-C/loader/Makefile        | 1 +
 MultiSource/Benchmarks/Prolangs-C/unix-smail/Makefile    | 1 +
 MultiSource/Benchmarks/Ptrdist/bc/Makefile               | 1 +
 MultiSource/Benchmarks/Trimaran/netbench-url/Makefile    | 1 +
 MultiSource/Benchmarks/VersaBench/dbms/Makefile          | 1 +
 19 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/MultiSource/Benchmarks/BitBench/drop3/Makefile b/MultiSource/Benchmarks/BitBench/drop3/Makefile
index c341d2421..52b405a5f 100644
--- a/MultiSource/Benchmarks/BitBench/drop3/Makefile
+++ b/MultiSource/Benchmarks/BitBench/drop3/Makefile
@@ -1,6 +1,7 @@
 LEVEL = ../../../..
 
 PROG     = drop3
+CFLAGS  += -DNO_IMPLICIT_INCLUDE_CHECKED_HDRS
 LDFLAGS  = 
 RUN_OPTIONS = $(PROJ_SRC_DIR)/input-file
 include $(LEVEL)/MultiSource/Makefile.multisrc
diff --git a/MultiSource/Benchmarks/FreeBench/pifft/Makefile b/MultiSource/Benchmarks/FreeBench/pifft/Makefile
index a263379cc..17986349d 100644
--- a/MultiSource/Benchmarks/FreeBench/pifft/Makefile
+++ b/MultiSource/Benchmarks/FreeBench/pifft/Makefile
@@ -1,7 +1,8 @@
 LEVEL = ../../../..
 
 PROG     = pifft
-CPPFLAGS = -DVERSION='"1.00"' -DCOMPDATE="\"today\"" -DCFLAGS='""' -DHOSTNAME="\"thishost\"" 
+CPPFLAGS = -DVERSION='"1.00"' -DCOMPDATE="\"today\"" -DCFLAGS='""' -DHOSTNAME="\"thishost\""
+CFLAGS  += -DNO_IMPLICIT_INCLUDE_CHECKED_HDRS
 LDFLAGS  = -lm
 ifdef LARGE_PROBLEM_SIZE
 RUN_OPTIONS = $(PROJ_SRC_DIR)/ref.in
diff --git a/MultiSource/Benchmarks/MallocBench/espresso/Makefile b/MultiSource/Benchmarks/MallocBench/espresso/Makefile
index f9d70b16d..9d4973dda 100644
--- a/MultiSource/Benchmarks/MallocBench/espresso/Makefile
+++ b/MultiSource/Benchmarks/MallocBench/espresso/Makefile
@@ -1,6 +1,6 @@
 LEVEL = ../../../..
 PROG = espresso
 CPPFLAGS += -DNOMEMOPT
-CFLAGS += -std=gnu89
+CFLAGS += -std=gnu89 -DNO_IMPLICIT_INCLUDE_CHECKED_HDRS
 RUN_OPTIONS = -t $(PROJ_SRC_DIR)/INPUT/largest.espresso
 include ../../../Makefile.multisrc
diff --git a/MultiSource/Benchmarks/McCat/05-eks/Makefile b/MultiSource/Benchmarks/McCat/05-eks/Makefile
index 2c56a443c..dc9feb9e2 100644
--- a/MultiSource/Benchmarks/McCat/05-eks/Makefile
+++ b/MultiSource/Benchmarks/McCat/05-eks/Makefile
@@ -1,5 +1,6 @@
 LEVEL = ../../../..
 PROG = eks
+CFLAGS += -DNO_IMPLICIT_INCLUDE_CHECKED_HDRS
 LDFLAGS = -lm
 #RUN_OPTIONS += 
 #STDIN_FILENAME = bnchmrk.in1
diff --git a/MultiSource/Benchmarks/McCat/18-imp/Makefile b/MultiSource/Benchmarks/McCat/18-imp/Makefile
index 76a5076bd..2c320e525 100644
--- a/MultiSource/Benchmarks/McCat/18-imp/Makefile
+++ b/MultiSource/Benchmarks/McCat/18-imp/Makefile
@@ -1,6 +1,7 @@
 LEVEL = ../../../..
 PROG = imp
 RUN_OPTIONS += $(PROJ_SRC_DIR)/sg01.imp
+CFLAGS  += -DNO_IMPLICIT_INCLUDE_CHECKED_HDRS
 LDFLAGS := -lm
 
 include $(LEVEL)/MultiSource/Makefile.multisrc
diff --git a/MultiSource/Benchmarks/MiBench/consumer-lame/Makefile b/MultiSource/Benchmarks/MiBench/consumer-lame/Makefile
index 484e8e426..21546e8c1 100644
--- a/MultiSource/Benchmarks/MiBench/consumer-lame/Makefile
+++ b/MultiSource/Benchmarks/MiBench/consumer-lame/Makefile
@@ -2,6 +2,7 @@ LEVEL = ../../../..
 
 PROG     = consumer-lame
 CPPFLAGS = -DHAVEMPGLIB -DLAMEPARSE -DNDEBUG -D__NO_MATH_INLINES -O -DLAMESNDFILE
+CFLAGS  += -DNO_IMPLICIT_INCLUDE_CHECKED_HDRS
 LDFLAGS  = -lm
 RUN_OPTIONS = -S $(PROJ_SRC_DIR)/large.wav /dev/null
 
diff --git a/MultiSource/Benchmarks/MiBench/consumer-typeset/Makefile b/MultiSource/Benchmarks/MiBench/consumer-typeset/Makefile
index 98a3be02e..76e3b264f 100644
--- a/MultiSource/Benchmarks/MiBench/consumer-typeset/Makefile
+++ b/MultiSource/Benchmarks/MiBench/consumer-typeset/Makefile
@@ -4,6 +4,7 @@ PROG     = consumer-typeset
 # FORTIFY_SOURCE is turned off for this benchmark because the type lies at some
 # point in this program and FORIFY implementations rely on the correct type.
 CPPFLAGS = -DOS_UNIX=1 -DOS_DOS=0 -DOS_MAC=0 -DDB_FIX=0 -DUSE_STAT=1 -DSAFE_DFT=0 -DCOLLATE=1 -DLIB_DIR=\"lout.lib\" -DFONT_DIR=\"font\" -DMAPS_DIR=\"maps\" -DINCL_DIR=\"include\" -DDATA_DIR=\"data\" -DHYPH_DIR=\"hyph\" -DLOCALE_DIR=\"locale\" -DCHAR_IN=1 -DCHAR_OUT=0 -DLOCALE_ON=1 -DASSERT_ON=1 -DDEBUG_ON=0  -DPDF_COMPRESSION=0 -D_FORTIFY_SOURCE=0
+CFLAGS  += -DNO_IMPLICIT_INCLUDE_CHECKED_HDRS
 
 ifeq ($(ARCH),Mips)
 CPPFLAGS += -DCOLLATE=0 -DLOCALE_ON=0
diff --git a/MultiSource/Benchmarks/MiBench/network-patricia/Makefile b/MultiSource/Benchmarks/MiBench/network-patricia/Makefile
index e07b48014..e445e02bb 100644
--- a/MultiSource/Benchmarks/MiBench/network-patricia/Makefile
+++ b/MultiSource/Benchmarks/MiBench/network-patricia/Makefile
@@ -1,6 +1,7 @@
 LEVEL = ../../../..
 
 PROG     = network-patricia
+CFLAGS  += -DNO_IMPLICIT_INCLUDE_CHECKED_HDRS
 LDFLAGS  = -lm
 RUN_OPTIONS = $(PROJ_SRC_DIR)/large.udp
 HASH_PROGRAM_OUTPUT = 1
diff --git a/MultiSource/Benchmarks/MiBench/office-ispell/Makefile b/MultiSource/Benchmarks/MiBench/office-ispell/Makefile
index 5f3b84011..a509eec7a 100644
--- a/MultiSource/Benchmarks/MiBench/office-ispell/Makefile
+++ b/MultiSource/Benchmarks/MiBench/office-ispell/Makefile
@@ -2,6 +2,7 @@ LEVEL = ../../../..
 
 PROG     = office-ispell
 CPPFLAGS = -Dconst=
+CFLAGS  += -DNO_IMPLICIT_INCLUDE_CHECKED_HDRS
 LDFLAGS  = -lm
 RUN_OPTIONS = -a -d $(PROJ_SRC_DIR)/americanmed+
 STDIN_FILENAME = $(PROJ_SRC_DIR)/large.txt
diff --git a/MultiSource/Benchmarks/Prolangs-C/TimberWolfMC/Makefile b/MultiSource/Benchmarks/Prolangs-C/TimberWolfMC/Makefile
index f90db4338..da5256f64 100644
--- a/MultiSource/Benchmarks/Prolangs-C/TimberWolfMC/Makefile
+++ b/MultiSource/Benchmarks/Prolangs-C/TimberWolfMC/Makefile
@@ -1,6 +1,7 @@
 LEVEL = ../../../..
 
 CPPFLAGS += -fcommon
+CFLAGS   += -DNO_IMPLICIT_INCLUDE_CHECKED_HDRS
 PROG = timberwolfmc
 LDFLAGS=-lm
 include $(LEVEL)/MultiSource/Makefile.multisrc
diff --git a/MultiSource/Benchmarks/Prolangs-C/agrep/Makefile b/MultiSource/Benchmarks/Prolangs-C/agrep/Makefile
index b24eaa787..ae76c1784 100644
--- a/MultiSource/Benchmarks/Prolangs-C/agrep/Makefile
+++ b/MultiSource/Benchmarks/Prolangs-C/agrep/Makefile
@@ -1,6 +1,7 @@
 LEVEL = ../../../..
 
 PROG = agrep
+CFLAGS  += -DNO_IMPLICIT_INCLUDE_CHECKED_HDRS
 RUN_OPTIONS = -2 int $(PROJ_SRC_DIR)/InstructionCombining.cpp.txt
 HASH_PROGRAM_OUTPUT = 1
 include $(LEVEL)/MultiSource/Makefile.multisrc
diff --git a/MultiSource/Benchmarks/Prolangs-C/archie-client/Makefile b/MultiSource/Benchmarks/Prolangs-C/archie-client/Makefile
index 700b6b153..2804f7cfd 100644
--- a/MultiSource/Benchmarks/Prolangs-C/archie-client/Makefile
+++ b/MultiSource/Benchmarks/Prolangs-C/archie-client/Makefile
@@ -7,6 +7,8 @@ ifdef HAVE_RE_COMP
 PROG = archie
 endif
 
+CFLAGS  += -DNO_IMPLICIT_INCLUDE_CHECKED_HDRS
+
 include $(LEVEL)/MultiSource/Makefile.multisrc
 
 ifeq ($(TARGET_OS),SunOS)
diff --git a/MultiSource/Benchmarks/Prolangs-C/assembler/Makefile b/MultiSource/Benchmarks/Prolangs-C/assembler/Makefile
index 699c8ea97..f89d09d37 100644
--- a/MultiSource/Benchmarks/Prolangs-C/assembler/Makefile
+++ b/MultiSource/Benchmarks/Prolangs-C/assembler/Makefile
@@ -1,6 +1,7 @@
 LEVEL = ../../../..
 
 PROG = assembler
+CFLAGS += -DNO_IMPLICIT_INCLUDE_CHECKED_HDRS
 LDFLAGS = -lm
 include $(LEVEL)/MultiSource/Makefile.multisrc
 
diff --git a/MultiSource/Benchmarks/Prolangs-C/cdecl/Makefile b/MultiSource/Benchmarks/Prolangs-C/cdecl/Makefile
index 2ab08a414..a35c5c722 100644
--- a/MultiSource/Benchmarks/Prolangs-C/cdecl/Makefile
+++ b/MultiSource/Benchmarks/Prolangs-C/cdecl/Makefile
@@ -1,6 +1,7 @@
 LEVEL = ../../../..
 
 CFLAGS += -std=gnu89
+CFLAGS += -DNO_IMPLICIT_INCLUDE_CHECKED_HDRS
 
 PROG = cdecl
 STDIN_FILENAME = $(SourceDir)/testset
diff --git a/MultiSource/Benchmarks/Prolangs-C/loader/Makefile b/MultiSource/Benchmarks/Prolangs-C/loader/Makefile
index a4128258e..b9532ec9c 100644
--- a/MultiSource/Benchmarks/Prolangs-C/loader/Makefile
+++ b/MultiSource/Benchmarks/Prolangs-C/loader/Makefile
@@ -1,6 +1,7 @@
 LEVEL = ../../../..
 
 CPPFLAGS = -fcommon
+CFLAGS  += -DNO_IMPLICIT_INCLUDE_CHECKED_HDRS
 LDFLAGS = -lm
 PROG = loader
 include $(LEVEL)/MultiSource/Makefile.multisrc
diff --git a/MultiSource/Benchmarks/Prolangs-C/unix-smail/Makefile b/MultiSource/Benchmarks/Prolangs-C/unix-smail/Makefile
index 95690812e..acefba9eb 100644
--- a/MultiSource/Benchmarks/Prolangs-C/unix-smail/Makefile
+++ b/MultiSource/Benchmarks/Prolangs-C/unix-smail/Makefile
@@ -1,6 +1,7 @@
 LEVEL = ../../../..
 
 PROG = unix-smail
+CFLAGS  += -DNO_IMPLICIT_INCLUDE_CHECKED_HDRS
 RUN_OPTIONS = -v ALL
 STDIN_FILENAME = $(PROJ_SRC_DIR)/main.c
 
diff --git a/MultiSource/Benchmarks/Ptrdist/bc/Makefile b/MultiSource/Benchmarks/Ptrdist/bc/Makefile
index e04a77691..3178c9ae3 100644
--- a/MultiSource/Benchmarks/Ptrdist/bc/Makefile
+++ b/MultiSource/Benchmarks/Ptrdist/bc/Makefile
@@ -1,6 +1,7 @@
 LEVEL = ../../../..
 
 PROG = bc
+CFLAGS  += -DNO_IMPLICIT_INCLUDE_CHECKED_HDRS
 OBJS = scan.o util.o main.o number.o storage.o load.o execute.o bc.o global.o
 STDIN_FILENAME = $(PROJ_SRC_DIR)/primes.b
 HASH_PROGRAM_OUTPUT = 1
diff --git a/MultiSource/Benchmarks/Trimaran/netbench-url/Makefile b/MultiSource/Benchmarks/Trimaran/netbench-url/Makefile
index 0709ea4b1..2ec638159 100644
--- a/MultiSource/Benchmarks/Trimaran/netbench-url/Makefile
+++ b/MultiSource/Benchmarks/Trimaran/netbench-url/Makefile
@@ -1,6 +1,7 @@
 LEVEL = ../../../..
 
 PROG     = netbench-url
+CFLAGS  += -DNO_IMPLICIT_INCLUDE_CHECKED_HDRS
 ifdef LARGE_PROBLEM_SIZE
 RUN_OPTIONS = $(PROJ_SRC_DIR)/medium_inputs 1400
 else
diff --git a/MultiSource/Benchmarks/VersaBench/dbms/Makefile b/MultiSource/Benchmarks/VersaBench/dbms/Makefile
index 89928d255..76f672635 100644
--- a/MultiSource/Benchmarks/VersaBench/dbms/Makefile
+++ b/MultiSource/Benchmarks/VersaBench/dbms/Makefile
@@ -1,6 +1,7 @@
 LEVEL = ../../../..
 
 PROG     = dbms
+CFLAGS  += -DNO_IMPLICIT_INCLUDE_CHECKED_HDRS
 ifdef SMALL_PROBLEM_SIZE
 RUN_OPTIONS = -i $(PROJ_SRC_DIR)/dbms.train.in
 else