From b2e93531fd7bdf1b59f05145a0157cd3afdff852 Mon Sep 17 00:00:00 2001 From: Michael Ferguson Date: Tue, 9 Jul 2024 14:59:27 -0400 Subject: [PATCH 1/3] Use 'find' to gather sources for ctags/etags instead of relying on Makefiles. --- Signed-off-by: Michael Ferguson --- compiler/Makefile | 33 ++++++++------------------------- 1 file changed, 8 insertions(+), 25 deletions(-) diff --git a/compiler/Makefile b/compiler/Makefile index 78186898e931..13fc1b913449 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -40,33 +40,16 @@ ALL_HEADERS= */*.h ../frontend/include/chpl/*/*.h # Generate tags command, dependent on if Make variable, TAGS == 1 ifeq ($(TAGS), 1) -TAGS_COMMAND=-@(which $(CHPL_TAGS_UTIL) > /dev/null 2>&1 && echo "Updating TAGS..." && $(CHPL_TAGS_UTIL) $(CHPL_TAGS_FLAGS) $(ALL_SRCS) $(ALL_HEADERS)) || echo "$(CHPL_TAGS_UTIL) not available" -EBROWSE_COMMAND=-@(which ebrowse > /dev/null 2>&1 && echo "Updating BROWSE..." && ebrowse $(ALL_SRCS) $(ALL_HEADERS)) || echo "ebrowse not available" +$(info Gathering source files for ctags/etags) +COMPILER_SOURCES=$(shell find . -name '*.h' -or -name '*.cpp' -or -name '*.c') +FRONTEND_SOURCES=$(shell find ../frontend/lib -name '*.h' -or -name '*.cpp' -or -name '*.c') +FRONTEND_HEADERS=$(shell find ../frontend/include -name '*.h') +ALL_SOURCES=$(COMPILER_SOURCES) $(FRONTEND_SOURCES) $(FRONTEND_HEADERS) +# create the TAGS_COMMAND and EBROWSE_COMMAND variables for use later +TAGS_COMMAND=-@(which $(CHPL_TAGS_UTIL) > /dev/null 2>&1 && echo "Updating TAGS..." && $(CHPL_TAGS_UTIL) $(CHPL_TAGS_FLAGS) $(ALL_SOURCES)) || echo "$(CHPL_TAGS_UTIL) not available" +EBROWSE_COMMAND=-@(which ebrowse > /dev/null 2>&1 && echo "Updating BROWSE..." && ebrowse $(ALL_SOURCES)) || echo "ebrowse not available" endif -# -# include source subdirectories here -# include these subdirs so ETAGS builds tags for .cpp files too -include ../frontend/lib/immediates/Makefile.include -include ../frontend/lib/parsing/Makefile.include -include ../frontend/lib/framework/Makefile.include -include ../frontend/lib/resolution/Makefile.include -include ../frontend/lib/types/Makefile.include -include ../frontend/lib/uast/Makefile.include -include ../frontend/lib/util/Makefile.include - -include adt/Makefile.include -include AST/Makefile.include -include backend/Makefile.include -include codegen/Makefile.include -include llvm/Makefile.include -include main/Makefile.include -include optimizations/Makefile.include -include passes/Makefile.include -include resolution/Makefile.include -include util/Makefile.include - - TARGETS = $(CHPL) LIBS = -lm From befb6bfab80c234e58cec1315d29db336324274e Mon Sep 17 00:00:00 2001 From: Michael Ferguson Date: Mon, 9 Sep 2024 11:50:45 -0400 Subject: [PATCH 2/3] Remov Makefiles in compiler/ --- Signed-off-by: Michael Ferguson --- compiler/AST/Makefile | 43 ------------- compiler/AST/Makefile.include | 23 ------- compiler/AST/Makefile.share | 81 ------------------------- compiler/adt/Makefile | 43 ------------- compiler/adt/Makefile.include | 23 ------- compiler/adt/Makefile.share | 26 -------- compiler/backend/Makefile | 44 -------------- compiler/backend/Makefile.include | 23 ------- compiler/backend/Makefile.share | 25 -------- compiler/codegen/Makefile | 49 --------------- compiler/codegen/Makefile.include | 23 ------- compiler/codegen/Makefile.share | 40 ------------ compiler/llvm/Makefile | 44 -------------- compiler/llvm/Makefile.include | 23 ------- compiler/llvm/Makefile.share | 32 ---------- compiler/main/Makefile | 44 -------------- compiler/main/Makefile.include | 23 ------- compiler/main/Makefile.share | 32 ---------- compiler/optimizations/Makefile | 43 ------------- compiler/optimizations/Makefile.include | 23 ------- compiler/optimizations/Makefile.share | 46 -------------- compiler/passes/Makefile | 43 ------------- compiler/passes/Makefile.include | 23 ------- compiler/passes/Makefile.share | 55 ----------------- compiler/resolution/Makefile | 43 ------------- compiler/resolution/Makefile.include | 23 ------- compiler/resolution/Makefile.share | 54 ----------------- compiler/util/Makefile | 44 -------------- compiler/util/Makefile.include | 23 ------- compiler/util/Makefile.share | 31 ---------- 30 files changed, 1092 deletions(-) delete mode 100644 compiler/AST/Makefile delete mode 100644 compiler/AST/Makefile.include delete mode 100644 compiler/AST/Makefile.share delete mode 100644 compiler/adt/Makefile delete mode 100644 compiler/adt/Makefile.include delete mode 100644 compiler/adt/Makefile.share delete mode 100644 compiler/backend/Makefile delete mode 100644 compiler/backend/Makefile.include delete mode 100644 compiler/backend/Makefile.share delete mode 100644 compiler/codegen/Makefile delete mode 100644 compiler/codegen/Makefile.include delete mode 100644 compiler/codegen/Makefile.share delete mode 100644 compiler/llvm/Makefile delete mode 100644 compiler/llvm/Makefile.include delete mode 100644 compiler/llvm/Makefile.share delete mode 100644 compiler/main/Makefile delete mode 100644 compiler/main/Makefile.include delete mode 100644 compiler/main/Makefile.share delete mode 100644 compiler/optimizations/Makefile delete mode 100644 compiler/optimizations/Makefile.include delete mode 100644 compiler/optimizations/Makefile.share delete mode 100644 compiler/passes/Makefile delete mode 100644 compiler/passes/Makefile.include delete mode 100644 compiler/passes/Makefile.share delete mode 100644 compiler/resolution/Makefile delete mode 100644 compiler/resolution/Makefile.include delete mode 100644 compiler/resolution/Makefile.share delete mode 100644 compiler/util/Makefile delete mode 100644 compiler/util/Makefile.include delete mode 100644 compiler/util/Makefile.share diff --git a/compiler/AST/Makefile b/compiler/AST/Makefile deleted file mode 100644 index c3a0b49256ac..000000000000 --- a/compiler/AST/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -ifndef CHPL_MAKE_HOME -export CHPL_MAKE_HOME=$(shell pwd)/../.. -endif - -COMPILER_ROOT = .. -COMPILER_SUBDIR = AST - -# -# standard header -# -include $(COMPILER_ROOT)/make/Makefile.compiler.head - -AST_OBJDIR = $(OBJ_SUBDIR) -include Makefile.share - -TARGETS = $(AST_OBJS) - -include $(COMPILER_ROOT)/make/Makefile.compiler.subdirrules - -FORCE: - -# -# standard footer -# -include $(COMPILER_ROOT)/make/Makefile.compiler.foot diff --git a/compiler/AST/Makefile.include b/compiler/AST/Makefile.include deleted file mode 100644 index e9dfd30116c2..000000000000 --- a/compiler/AST/Makefile.include +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -AST_OBJDIR = $(COMPILER_BUILD)/AST - -ALL_SRCS += AST/*.cpp - -include $(COMPILER_ROOT)/AST/Makefile.share diff --git a/compiler/AST/Makefile.share b/compiler/AST/Makefile.share deleted file mode 100644 index cfa42a6f25ee..000000000000 --- a/compiler/AST/Makefile.share +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -AST_SRCS = \ - AggregateType.cpp \ - alist.cpp \ - astutil.cpp \ - metadata.cpp \ - baseAST.cpp \ - bb.cpp \ - build.cpp \ - CatchStmt.cpp \ - CallExpr.cpp \ - checkAST.cpp \ - DecoratedClassType.cpp \ - DeferStmt.cpp \ - dominator.cpp \ - expr.cpp \ - foralls.cpp \ - flags.cpp \ - FnSymbol.cpp \ - ForallStmt.cpp \ - IfExpr.cpp \ - ImportStmt.cpp \ - interfaces.cpp \ - iterator.cpp \ - LoopExpr.cpp \ - ModuleSymbol.cpp \ - PartialCopyData.cpp \ - primitive.cpp \ - stmt.cpp \ - symbol.cpp \ - thunks.cpp \ - TryStmt.cpp \ - type.cpp \ - UseStmt.cpp \ - view.cpp \ - wellknown.cpp \ - \ - LoopStmt.cpp \ - \ - WhileStmt.cpp \ - WhileDoStmt.cpp \ - DoWhileStmt.cpp \ - CForLoop.cpp \ - ForLoop.cpp \ - ParamForLoop.cpp \ - \ - AstVisitor.cpp \ - AstVisitorTraverse.cpp \ - AstLogger.cpp \ - AstDump.cpp \ - AstDumpToHtml.cpp \ - \ - AstCount.cpp \ - \ - AstToText.cpp \ - \ - CollapseBlocks.cpp \ - TransformLogicalShortCircuit.cpp - - -SRCS = $(AST_SRCS) - -AST_OBJS = \ - $(AST_SRCS:%.cpp=$(AST_OBJDIR)/%.$(OBJ_SUFFIX)) diff --git a/compiler/adt/Makefile b/compiler/adt/Makefile deleted file mode 100644 index 64ce6886e787..000000000000 --- a/compiler/adt/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -ifndef CHPL_MAKE_HOME -export CHPL_MAKE_HOME=$(shell pwd)/../.. -endif - -COMPILER_ROOT = .. -COMPILER_SUBDIR = adt - -# -# standard header -# -include $(COMPILER_ROOT)/make/Makefile.compiler.head - -ADT_OBJDIR = $(OBJ_SUBDIR) -include Makefile.share - -TARGETS = $(ADT_OBJS) - -include $(COMPILER_ROOT)/make/Makefile.compiler.subdirrules - -FORCE: - -# -# standard footer -# -include $(COMPILER_ROOT)/make/Makefile.compiler.foot diff --git a/compiler/adt/Makefile.include b/compiler/adt/Makefile.include deleted file mode 100644 index 33abb4b94c1b..000000000000 --- a/compiler/adt/Makefile.include +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -ADT_OBJDIR = $(COMPILER_BUILD)/adt - -ALL_SRCS += adt/*.cpp - -include $(COMPILER_ROOT)/adt/Makefile.share diff --git a/compiler/adt/Makefile.share b/compiler/adt/Makefile.share deleted file mode 100644 index 3beb6feeb113..000000000000 --- a/compiler/adt/Makefile.share +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -ADT_SRCS = \ - bitVec.cpp \ - vec.cpp - -SRCS = $(ADT_SRCS) - -ADT_OBJS = \ - $(ADT_SRCS:%.cpp=$(ADT_OBJDIR)/%.$(OBJ_SUFFIX)) diff --git a/compiler/backend/Makefile b/compiler/backend/Makefile deleted file mode 100644 index 1083e3ebeaa2..000000000000 --- a/compiler/backend/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -ifndef CHPL_MAKE_HOME -export CHPL_MAKE_HOME=$(shell pwd)/../.. -endif - -COMPILER_ROOT = .. -COMPILER_SUBDIR = backend -COMP_CXXFLAGS += -I$(COMPILER_ROOT)/ifa - -# -# standard header -# -include $(COMPILER_ROOT)/make/Makefile.compiler.head - -BACKEND_OBJDIR = $(OBJ_SUBDIR) -include Makefile.share - -TARGETS = $(BACKEND_OBJS) - -include $(COMPILER_ROOT)/make/Makefile.compiler.subdirrules - -FORCE: - -# -# standard footer -# -include $(COMPILER_ROOT)/make/Makefile.compiler.foot diff --git a/compiler/backend/Makefile.include b/compiler/backend/Makefile.include deleted file mode 100644 index 8ec3dbba14b8..000000000000 --- a/compiler/backend/Makefile.include +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -BACKEND_OBJDIR = $(COMPILER_BUILD)/backend - -ALL_SRCS += backend/*.cpp - -include $(COMPILER_ROOT)/backend/Makefile.share diff --git a/compiler/backend/Makefile.share b/compiler/backend/Makefile.share deleted file mode 100644 index 5cf607a1465a..000000000000 --- a/compiler/backend/Makefile.share +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -BACKEND_SRCS = \ - beautify.cpp \ - -SRCS = $(BACKEND_SRCS) - -BACKEND_OBJS = \ - $(BACKEND_SRCS:%.cpp=$(BACKEND_OBJDIR)/%.$(OBJ_SUFFIX)) diff --git a/compiler/codegen/Makefile b/compiler/codegen/Makefile deleted file mode 100644 index 4f0e3f4caf6d..000000000000 --- a/compiler/codegen/Makefile +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -ifndef CHPL_MAKE_HOME -export CHPL_MAKE_HOME=$(shell pwd)/../.. -endif - -COMPILER_ROOT = .. -COMPILER_SUBDIR = codegen - -# -# standard header -# -include $(COMPILER_ROOT)/make/Makefile.compiler.head - -CODEGEN_OBJDIR = $(OBJ_SUBDIR) -include Makefile.share - -TARGETS = reservedSymbolNames.h $(CODEGEN_OBJS) - -include $(COMPILER_ROOT)/make/Makefile.compiler.subdirrules - -FORCE: - -# -# standard footer -# -include $(COMPILER_ROOT)/make/Makefile.compiler.foot - -reservedSymbolNames.h: reservedSymbolNames Makefile - sed -e 's/^\([ ]*\)\([A-Za-z_][A-Za-z0-9_]*\)/\1cnames.insert(astr("\2"));/' <$< >$@ - -$(OBJ_SUBDIR)/codegen.o: reservedSymbolNames.h - diff --git a/compiler/codegen/Makefile.include b/compiler/codegen/Makefile.include deleted file mode 100644 index 3bd196fabc7d..000000000000 --- a/compiler/codegen/Makefile.include +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -CODEGEN_OBJDIR = $(COMPILER_BUILD)/codegen - -ALL_SRCS += codegen/*.cpp - -include $(COMPILER_ROOT)/codegen/Makefile.share diff --git a/compiler/codegen/Makefile.share b/compiler/codegen/Makefile.share deleted file mode 100644 index 8a38363008d1..000000000000 --- a/compiler/codegen/Makefile.share +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -GEN_HEADERS = \ - reservedSymbolNames.h - -CODEGEN_SRCS = \ - codegen.cpp \ - cg-expr.cpp \ - cg-CForLoop.cpp \ - cg-DoWhileStmt.cpp \ - cg-LoopStmt.cpp \ - cg-WhileDoStmt.cpp \ - cg-alist.cpp \ - library.cpp \ - mli.cpp \ - cg-stmt.cpp \ - cg-symbol.cpp \ - cg-type.cpp - - -SRCS = $(CODEGEN_SRCS) - -CODEGEN_OBJS = \ - $(CODEGEN_SRCS:%.cpp=$(CODEGEN_OBJDIR)/%.$(OBJ_SUFFIX)) diff --git a/compiler/llvm/Makefile b/compiler/llvm/Makefile deleted file mode 100644 index 6b4a89f1c696..000000000000 --- a/compiler/llvm/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -ifndef CHPL_MAKE_HOME -export CHPL_MAKE_HOME=$(shell pwd)/../.. -endif - -COMPILER_ROOT = .. -COMPILER_SUBDIR = llvm -#COMP_CXXFLAGS += -I$(COMPILER_ROOT)/ifa - -# -# standard header -# -include $(COMPILER_ROOT)/make/Makefile.compiler.head - -LLVM_OBJDIR = $(OBJ_SUBDIR) -include Makefile.share - -TARGETS = $(LLVM_OBJS) - -include $(COMPILER_ROOT)/make/Makefile.compiler.subdirrules - -FORCE: - -# -# standard footer -# -include $(COMPILER_ROOT)/make/Makefile.compiler.foot diff --git a/compiler/llvm/Makefile.include b/compiler/llvm/Makefile.include deleted file mode 100644 index 8b9178f40fc1..000000000000 --- a/compiler/llvm/Makefile.include +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -LLVM_OBJDIR = $(COMPILER_BUILD)/llvm - -ALL_SRCS += llvm/*.cpp - -include $(COMPILER_ROOT)/llvm/Makefile.share diff --git a/compiler/llvm/Makefile.share b/compiler/llvm/Makefile.share deleted file mode 100644 index 849cbf3820a6..000000000000 --- a/compiler/llvm/Makefile.share +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -LLVM_SRCS = \ - clangUtil.cpp \ - llvmAggregateGlobalOps.cpp \ - llvmDumpIR.cpp \ - llvmExtractIR.cpp \ - llvmGlobalToWide.cpp \ - llvmUtil.cpp \ - llvmDebug.cpp \ - - -SRCS = $(LLVM_SRCS) - -LLVM_OBJS = \ - $(LLVM_SRCS:%.cpp=$(LLVM_OBJDIR)/%.$(OBJ_SUFFIX)) diff --git a/compiler/main/Makefile b/compiler/main/Makefile deleted file mode 100644 index 1b2cdf1d7763..000000000000 --- a/compiler/main/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -ifndef CHPL_MAKE_HOME -export CHPL_MAKE_HOME=$(shell pwd)/../.. -endif - -COMPILER_ROOT = .. -COMPILER_SUBDIR = main - -# -# standard header -# -include $(COMPILER_ROOT)/make/Makefile.compiler.head - -MAIN_OBJDIR = $(OBJ_SUBDIR) -include Makefile.share - -TARGETS = $(MAIN_OBJS) - - -include $(COMPILER_ROOT)/make/Makefile.compiler.subdirrules - -FORCE: - -# -# standard footer -# -include $(COMPILER_ROOT)/make/Makefile.compiler.foot diff --git a/compiler/main/Makefile.include b/compiler/main/Makefile.include deleted file mode 100644 index e824f63b5d8a..000000000000 --- a/compiler/main/Makefile.include +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -MAIN_OBJDIR = $(COMPILER_BUILD)/main - -ALL_SRCS += main/*.cpp - -include $(COMPILER_ROOT)/main/Makefile.share diff --git a/compiler/main/Makefile.share b/compiler/main/Makefile.share deleted file mode 100644 index 1ff385e04135..000000000000 --- a/compiler/main/Makefile.share +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -MAIN_SRCS = \ - arg.cpp \ - checks.cpp \ - config.cpp \ - driver.cpp \ - log.cpp \ - runpasses.cpp \ - version.cpp \ - PhaseTracker.cpp - -SRCS = $(MAIN_SRCS) - -MAIN_OBJS = \ - $(MAIN_SRCS:%.cpp=$(MAIN_OBJDIR)/%.$(OBJ_SUFFIX)) diff --git a/compiler/optimizations/Makefile b/compiler/optimizations/Makefile deleted file mode 100644 index 3f243c72ed59..000000000000 --- a/compiler/optimizations/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -ifndef CHPL_MAKE_HOME -export CHPL_MAKE_HOME=$(shell pwd)/../.. -endif - -COMPILER_ROOT = .. -COMPILER_SUBDIR = optimizations - -# -# standard header -# -include $(COMPILER_ROOT)/make/Makefile.compiler.head - -OPTIMIZATIONS_OBJDIR = $(OBJ_SUBDIR) -include Makefile.share - -TARGETS = $(OPTIMIZATIONS_OBJS) - -include $(COMPILER_ROOT)/make/Makefile.compiler.subdirrules - -FORCE: - -# -# standard footer -# -include $(COMPILER_ROOT)/make/Makefile.compiler.foot diff --git a/compiler/optimizations/Makefile.include b/compiler/optimizations/Makefile.include deleted file mode 100644 index 859a296c318f..000000000000 --- a/compiler/optimizations/Makefile.include +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -OPTIMIZATIONS_OBJDIR = $(COMPILER_BUILD)/optimizations - -ALL_SRCS += optimizations/*.cpp - -include $(COMPILER_ROOT)/optimizations/Makefile.share diff --git a/compiler/optimizations/Makefile.share b/compiler/optimizations/Makefile.share deleted file mode 100644 index 1c9b953534f0..000000000000 --- a/compiler/optimizations/Makefile.share +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -OPTIMIZATIONS_SRCS = \ - arrayViewElision.cpp \ - bulkCopyRecords.cpp \ - copyPropagation.cpp \ - deadCodeElimination.cpp \ - forallOptimizations.cpp \ - gpuTransforms.cpp \ - inlineFunctions.cpp \ - inferConstRefs.cpp \ - liveVariableAnalysis.cpp \ - localizeGlobals.cpp \ - loopInvariantCodeMotion.cpp \ - noAliasSets.cpp \ - optimizeForallUnorderedOps.cpp \ - optimizeOnClauses.cpp \ - propagateDomainConstness.cpp \ - refPropagation.cpp \ - remoteValueForwarding.cpp \ - removeEmptyRecords.cpp \ - removeUnnecessaryAutoCopyCalls.cpp \ - removeUnnecessaryGotos.cpp \ - replaceArrayAccessesWithRefTemps.cpp \ - scalarReplace.cpp - -SRCS = $(OPTIMIZATIONS_SRCS) - -OPTIMIZATIONS_OBJS = \ - $(OPTIMIZATIONS_SRCS:%.cpp=$(OPTIMIZATIONS_OBJDIR)/%.$(OBJ_SUFFIX)) diff --git a/compiler/passes/Makefile b/compiler/passes/Makefile deleted file mode 100644 index 3283c58648b1..000000000000 --- a/compiler/passes/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -ifndef CHPL_MAKE_HOME -export CHPL_MAKE_HOME=$(shell pwd)/../.. -endif - -COMPILER_ROOT = .. -COMPILER_SUBDIR = passes - -# -# standard header -# -include $(COMPILER_ROOT)/make/Makefile.compiler.head - -PASSES_OBJDIR = $(OBJ_SUBDIR) -include Makefile.share - -TARGETS = $(PASSES_OBJS) - -include $(COMPILER_ROOT)/make/Makefile.compiler.subdirrules - -FORCE: - -# -# standard footer -# -include $(COMPILER_ROOT)/make/Makefile.compiler.foot diff --git a/compiler/passes/Makefile.include b/compiler/passes/Makefile.include deleted file mode 100644 index 2b904291a04d..000000000000 --- a/compiler/passes/Makefile.include +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -PASSES_OBJDIR = $(COMPILER_BUILD)/passes - -ALL_SRCS += passes/*.cpp - -include $(COMPILER_ROOT)/passes/Makefile.share diff --git a/compiler/passes/Makefile.share b/compiler/passes/Makefile.share deleted file mode 100644 index 174fc12816ec..000000000000 --- a/compiler/passes/Makefile.share +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -GEN_HEADERS = \ - reservedSymbolNames.h - -PASSES_SRCS = \ - addInitGuards.cpp \ - buildDefaultFunctions.cpp \ - checkNormalized.cpp \ - checkResolved.cpp \ - checkGeneratedAst.cpp \ - cleanup.cpp \ - convert-uast.cpp \ - createTaskFunctions.cpp \ - denormalize.cpp \ - errorHandling.cpp \ - expandExternArrayCalls.cpp \ - externCResolve.cpp \ - flattenClasses.cpp \ - flattenFunctions.cpp \ - initializerRules.cpp \ - InitErrorHandling.cpp \ - InitNormalize.cpp \ - insertLineNumbers.cpp \ - insertWideReferences.cpp \ - normalize.cpp \ - normalizeErrors.cpp \ - parallel.cpp \ - parseAndConvert.cpp \ - resolveIntents.cpp \ - ResolveScope.cpp \ - returnStarTuplesByRefArgs.cpp \ - scopeResolve.cpp \ - splitInit.cpp - -SRCS = $(PASSES_SRCS) - -PASSES_OBJS = \ - $(PASSES_SRCS:%.cpp=$(PASSES_OBJDIR)/%.$(OBJ_SUFFIX)) diff --git a/compiler/resolution/Makefile b/compiler/resolution/Makefile deleted file mode 100644 index ec3e0aa04bcf..000000000000 --- a/compiler/resolution/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -ifndef CHPL_MAKE_HOME -export CHPL_MAKE_HOME=$(shell pwd)/../.. -endif - -COMPILER_ROOT = .. -COMPILER_SUBDIR = resolution - -# -# standard header -# -include $(COMPILER_ROOT)/make/Makefile.compiler.head - -RESOLUTION_OBJDIR = $(OBJ_SUBDIR) -include Makefile.share - -TARGETS = $(RESOLUTION_OBJS) - -include $(COMPILER_ROOT)/make/Makefile.compiler.subdirrules - -FORCE: - -# -# standard footer -# -include $(COMPILER_ROOT)/make/Makefile.compiler.foot diff --git a/compiler/resolution/Makefile.include b/compiler/resolution/Makefile.include deleted file mode 100644 index e5add765fd20..000000000000 --- a/compiler/resolution/Makefile.include +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -RESOLUTION_OBJDIR = $(COMPILER_BUILD)/resolution - -ALL_SRCS += resolution/*.cpp - -include $(COMPILER_ROOT)/resolution/Makefile.share diff --git a/compiler/resolution/Makefile.share b/compiler/resolution/Makefile.share deleted file mode 100644 index 249012d35d56..000000000000 --- a/compiler/resolution/Makefile.share +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -RESOLUTION_SRCS = \ - addAutoDestroyCalls.cpp \ - AutoDestroyScope.cpp \ - caches.cpp \ - callDestructors.cpp \ - callInfo.cpp \ - cleanups.cpp \ - closures.cpp \ - cullOverReferences.cpp \ - expandVarArgs.cpp \ - fixupExports.cpp \ - functionResolution.cpp \ - generics.cpp \ - implementForallIntents.cpp \ - initializerResolution.cpp \ - interfaceResolution.cpp \ - lateConstCheck.cpp \ - lifetime.cpp \ - loopDetails.cpp \ - lowerForalls.cpp \ - lowerIterators.cpp \ - nilChecking.cpp \ - postFold.cpp \ - preFold.cpp \ - ResolutionCandidate.cpp \ - resolveFunction.cpp \ - tuples.cpp \ - typeSpecifier.cpp \ - virtualDispatch.cpp \ - visibleFunctions.cpp \ - wrappers.cpp - -SRCS = $(RESOLUTION_SRCS) - -RESOLUTION_OBJS = \ - $(RESOLUTION_SRCS:%.cpp=$(RESOLUTION_OBJDIR)/%.$(OBJ_SUFFIX)) diff --git a/compiler/util/Makefile b/compiler/util/Makefile deleted file mode 100644 index 6f6f6b177679..000000000000 --- a/compiler/util/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -ifndef CHPL_MAKE_HOME -export CHPL_MAKE_HOME=$(shell pwd)/../.. -endif - -COMPILER_ROOT = .. -COMPILER_SUBDIR = util -COMP_CXXFLAGS += -I$(COMPILER_ROOT)/ifa - -# -# standard header -# -include $(COMPILER_ROOT)/make/Makefile.compiler.head - -UTIL_OBJDIR = $(OBJ_SUBDIR) -include Makefile.share - -TARGETS = $(UTIL_OBJS) - -include $(COMPILER_ROOT)/make/Makefile.compiler.subdirrules - -FORCE: - -# -# standard footer -# -include $(COMPILER_ROOT)/make/Makefile.compiler.foot diff --git a/compiler/util/Makefile.include b/compiler/util/Makefile.include deleted file mode 100644 index e9648cc6adf2..000000000000 --- a/compiler/util/Makefile.include +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -UTIL_OBJDIR = $(COMPILER_BUILD)/util - -ALL_SRCS += util/*.cpp - -include $(COMPILER_ROOT)/util/Makefile.share diff --git a/compiler/util/Makefile.share b/compiler/util/Makefile.share deleted file mode 100644 index 41a43463c5e6..000000000000 --- a/compiler/util/Makefile.share +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -UTIL_SRCS = \ - astlocs.cpp \ - exprAnalysis.cpp \ - files.cpp \ - misc.cpp \ - mysystem.cpp \ - stringutil.cpp \ - timer.cpp - -SRCS = $(UTIL_SRCS) - -UTIL_OBJS = \ - $(UTIL_SRCS:%.cpp=$(UTIL_OBJDIR)/%.$(OBJ_SUFFIX)) From 126a45b70269407a763cf798b85613b37393b640 Mon Sep 17 00:00:00 2001 From: Michael Ferguson Date: Mon, 9 Sep 2024 11:51:12 -0400 Subject: [PATCH 3/3] Remove Makefiles in frontend/ --- Signed-off-by: Michael Ferguson --- frontend/Makefile.include | 35 ------ frontend/lib/framework/Makefile | 42 ------- frontend/lib/framework/Makefile.include | 38 ------ frontend/lib/immediates/Makefile | 42 ------- frontend/lib/immediates/Makefile.include | 31 ----- frontend/lib/immediates/make_prims/Makefile | 73 ----------- frontend/lib/parsing/Makefile | 42 ------- frontend/lib/parsing/Makefile.include | 34 ----- frontend/lib/resolution/Makefile | 42 ------- frontend/lib/resolution/Makefile.include | 46 ------- frontend/lib/types/Makefile | 42 ------- frontend/lib/types/Makefile.include | 58 --------- frontend/lib/uast/Makefile | 42 ------- frontend/lib/uast/Makefile.include | 133 -------------------- frontend/lib/util/Makefile | 48 ------- frontend/lib/util/Makefile.include | 42 ------- 16 files changed, 790 deletions(-) delete mode 100644 frontend/Makefile.include delete mode 100644 frontend/lib/framework/Makefile delete mode 100644 frontend/lib/framework/Makefile.include delete mode 100644 frontend/lib/immediates/Makefile delete mode 100644 frontend/lib/immediates/Makefile.include delete mode 100644 frontend/lib/immediates/make_prims/Makefile delete mode 100644 frontend/lib/parsing/Makefile delete mode 100644 frontend/lib/parsing/Makefile.include delete mode 100644 frontend/lib/resolution/Makefile delete mode 100644 frontend/lib/resolution/Makefile.include delete mode 100644 frontend/lib/types/Makefile delete mode 100644 frontend/lib/types/Makefile.include delete mode 100644 frontend/lib/uast/Makefile delete mode 100644 frontend/lib/uast/Makefile.include delete mode 100644 frontend/lib/util/Makefile delete mode 100644 frontend/lib/util/Makefile.include diff --git a/frontend/Makefile.include b/frontend/Makefile.include deleted file mode 100644 index f8ba3c892315..000000000000 --- a/frontend/Makefile.include +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Set CHPL_DEVELOPER to 0 if it is not set yet -CHPL_DEVELOPER ?= 0 -# set DYNO_ENABLE_ASSERTIONS to 0 if it is not set yet -DYNO_ENABLE_ASSERTIONS ?= 0 - -ifeq ($(CHPL_DEVELOPER), 0) - ifeq ($(DYNO_ENABLE_ASSERTIONS), 0) - LIB_CMAKE_ARG := -DCMAKE_BUILD_TYPE=Release - LIBCOMPILER_BUILD_DIR := $(COMPILER_BUILD)/frontend/Release - else - LIB_CMAKE_ARG := -DCMAKE_BUILD_TYPE=Release -DDYNO_ENABLE_ASSERTIONS=ON - LIBCOMPILER_BUILD_DIR := $(COMPILER_BUILD)/frontend/ReleaseWithAsserts - endif -else - LIB_CMAKE_ARG := -DCMAKE_BUILD_TYPE=Debug - LIBCOMPILER_BUILD_DIR := $(COMPILER_BUILD)/frontend/Debug -endif diff --git a/frontend/lib/framework/Makefile b/frontend/lib/framework/Makefile deleted file mode 100644 index dac4c042bbdf..000000000000 --- a/frontend/lib/framework/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -ifndef CHPL_MAKE_HOME -export CHPL_MAKE_HOME=$(shell pwd)/../../.. -endif - -COMPILER_ROOT = ../../../compiler -COMPILER_SUBDIR = frontend/lib/framework - -# -# standard header -# -include $(COMPILER_ROOT)/make/Makefile.compiler.head - -include Makefile.include - -TARGETS = $(FRONTEND_FRAMEWORK_OBJS) - -include $(COMPILER_ROOT)/make/Makefile.compiler.subdirrules - -FORCE: - -# -# standard footer -# -include $(COMPILER_ROOT)/make/Makefile.compiler.foot diff --git a/frontend/lib/framework/Makefile.include b/frontend/lib/framework/Makefile.include deleted file mode 100644 index 3074e82de9f2..000000000000 --- a/frontend/lib/framework/Makefile.include +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FRONTEND_FRAMEWORK_OBJDIR = $(COMPILER_BUILD)/frontend/lib/framework - -ALL_SRCS += ../frontend/lib/framework/*.cpp - -FRONTEND_FRAMEWORK_SRCS = \ - compiler-configuration.cpp \ - Context.cpp \ - ErrorBase.cpp \ - error-classes-list.cpp \ - ErrorMessage.cpp \ - ErrorWriter.cpp \ - ID.cpp \ - Location.cpp \ - UniqueString.cpp \ - - -SRCS = $(FRONTEND_FRAMEWORK_SRCS) - -FRONTEND_FRAMEWORK_OBJS = \ - $(FRONTEND_FRAMEWORK_SRCS:%.cpp=$(FRONTEND_FRAMEWORK_OBJDIR)/%.$(OBJ_SUFFIX)) diff --git a/frontend/lib/immediates/Makefile b/frontend/lib/immediates/Makefile deleted file mode 100644 index a3fccf935e1f..000000000000 --- a/frontend/lib/immediates/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -ifndef CHPL_MAKE_HOME -export CHPL_MAKE_HOME=$(shell pwd)/../../.. -endif - -COMPILER_ROOT = ../../../compiler -COMPILER_SUBDIR = frontend/lib/immediates - -# -# standard header -# -include $(COMPILER_ROOT)/make/Makefile.compiler.head - -include Makefile.include - -TARGETS = $(FRONTEND_IMMEDIATES_OBJS) - -include $(COMPILER_ROOT)/make/Makefile.compiler.subdirrules - -FORCE: - -# -# standard footer -# -include $(COMPILER_ROOT)/make/Makefile.compiler.foot diff --git a/frontend/lib/immediates/Makefile.include b/frontend/lib/immediates/Makefile.include deleted file mode 100644 index 837669f4b39d..000000000000 --- a/frontend/lib/immediates/Makefile.include +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FRONTEND_IMMEDIATES_OBJDIR = $(COMPILER_BUILD)/frontend/lib/immediates - -ALL_SRCS += ../frontend/lib/immediates/*.h ../frontend/lib/immediates/*.cpp - -FRONTEND_IMMEDIATES_SRCS = \ - ifa_vars.cpp \ - hash_multipliers.cpp \ - num.cpp \ - -SRCS = $(FRONTEND_IMMEDIATES_SRCS) - -FRONTEND_IMMEDIATES_OBJS = \ - $(FRONTEND_IMMEDIATES_SRCS:%.cpp=$(FRONTEND_IMMEDIATES_OBJDIR)/%.$(OBJ_SUFFIX)) diff --git a/frontend/lib/immediates/make_prims/Makefile b/frontend/lib/immediates/make_prims/Makefile deleted file mode 100644 index e13c8b53018f..000000000000 --- a/frontend/lib/immediates/make_prims/Makefile +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# -# Makefile: builds stuff related to make_prims -# - -COMPILER_ROOT = ../.. -COMPILER_SUBDIR = ifa/make_prims - -# -# standard header -# -include $(COMPILER_ROOT)/make/Makefile.compiler.head - - -# -# make_prims-specific variables -# - -MAKE_PRIMS = make_prims$(EXE_SUFFIX) -MAKE_PRIMS_SRCS = \ - make_prims.cpp -MAKE_PRIMS_OBJS = $(MAKE_PRIMS_SRCS:%.cpp=$(OBJ_SUBDIR)/%.o) - - -# -# standard subdirectory variables -# - -SRCS = $(MAKE_PRIMS_SRCS) -EXECS = $(MAKE_PRIMS) - - -# -# rules -# - -TARGETS = $(MAKE_PRIMS) - -include $(COMPILER_ROOT)/make/Makefile.compiler.subdirrules - - -# -# target-specific rules -# - -$(MAKE_PRIMS): $(CHPL_MAKE_PLATFORM)/$(MAKE_PRIMS) - cp -f $< $@ - -$(CHPL_MAKE_PLATFORM)/$(MAKE_PRIMS): $(MAKE_PRIMS_OBJS) - $(CXX) $(LDFLAGS) -o $@ $^ $(LIBS) - - -# -# standard footer -# -include $(COMPILER_ROOT)/make/Makefile.compiler.foot diff --git a/frontend/lib/parsing/Makefile b/frontend/lib/parsing/Makefile deleted file mode 100644 index db396c00d9b6..000000000000 --- a/frontend/lib/parsing/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -ifndef CHPL_MAKE_HOME -export CHPL_MAKE_HOME=$(shell pwd)/../../.. -endif - -COMPILER_ROOT = ../../../compiler -COMPILER_SUBDIR = frontend/lib/parsing - -# -# standard header -# -include $(COMPILER_ROOT)/make/Makefile.compiler.head - -include Makefile.include - -TARGETS = $(FRONTEND_PARSING_OBJS) - -include $(COMPILER_ROOT)/make/Makefile.compiler.subdirrules - -FORCE: - -# -# standard footer -# -include $(COMPILER_ROOT)/make/Makefile.compiler.foot diff --git a/frontend/lib/parsing/Makefile.include b/frontend/lib/parsing/Makefile.include deleted file mode 100644 index 1b36b380cc95..000000000000 --- a/frontend/lib/parsing/Makefile.include +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FRONTEND_PARSING_OBJDIR = $(COMPILER_BUILD)/frontend/lib/parsing - -ALL_SRCS += ../frontend/lib/parsing/*.h ../frontend/lib/parsing/*.cpp - -FRONTEND_PARSING_SRCS = \ - bison-chpl-lib.cpp \ - flex-chpl-lib.cpp \ - parsing-queries.cpp \ - Parser.cpp \ - parser-stats.cpp \ - - -SRCS = $(FRONTEND_PARSING_SRCS) - -FRONTEND_PARSING_OBJS = \ - $(FRONTEND_PARSING_SRCS:%.cpp=$(FRONTEND_PARSING_OBJDIR)/%.$(OBJ_SUFFIX)) diff --git a/frontend/lib/resolution/Makefile b/frontend/lib/resolution/Makefile deleted file mode 100644 index 75ea601dfbe1..000000000000 --- a/frontend/lib/resolution/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -ifndef CHPL_MAKE_HOME -export CHPL_MAKE_HOME=$(shell pwd)/../../.. -endif - -COMPILER_ROOT = ../../../compiler -COMPILER_SUBDIR = frontend/lib/resolution - -# -# standard header -# -include $(COMPILER_ROOT)/make/Makefile.compiler.head - -include Makefile.include - -TARGETS = $(FRONTEND_RESOLUTION_OBJS) - -include $(COMPILER_ROOT)/make/Makefile.compiler.subdirrules - -FORCE: - -# -# standard footer -# -include $(COMPILER_ROOT)/make/Makefile.compiler.foot diff --git a/frontend/lib/resolution/Makefile.include b/frontend/lib/resolution/Makefile.include deleted file mode 100644 index 99e3a9c0afb7..000000000000 --- a/frontend/lib/resolution/Makefile.include +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FRONTEND_RESOLUTION_OBJDIR = $(COMPILER_BUILD)/frontend/lib/resolution - -ALL_SRCS += ../frontend/lib/resolution/*.h ../frontend/lib/resolution/*.cpp - -FRONTEND_RESOLUTION_SRCS = \ - Resolver.cpp \ - call-init-deinit.cpp \ - can-pass.cpp \ - signature-checks.cpp \ - copy-elision.cpp \ - default-functions.cpp \ - disambiguation.cpp \ - InitResolver.cpp \ - intents.cpp \ - prims.cpp \ - resolution-queries.cpp \ - resolution-types.cpp \ - return-type-inference.cpp \ - scope-queries.cpp \ - scope-types.cpp \ - split-init.cpp \ - VarScopeVisitor.cpp \ - - -SRCS = $(FRONTEND_RESOLUTION_SRCS) - -FRONTEND_RESOLUTION_OBJS = \ - $(FRONTEND_RESOLUTION_SRCS:%.cpp=$(FRONTEND_RESOLUTION_OBJDIR)/%.$(OBJ_SUFFIX)) diff --git a/frontend/lib/types/Makefile b/frontend/lib/types/Makefile deleted file mode 100644 index 97f7849b52e7..000000000000 --- a/frontend/lib/types/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -ifndef CHPL_MAKE_HOME -export CHPL_MAKE_HOME=$(shell pwd)/../../.. -endif - -COMPILER_ROOT = ../../../compiler -COMPILER_SUBDIR = frontend/lib/types - -# -# standard header -# -include $(COMPILER_ROOT)/make/Makefile.compiler.head - -include Makefile.include - -TARGETS = $(FRONTEND_TYPES_OBJS) - -include $(COMPILER_ROOT)/make/Makefile.compiler.subdirrules - -FORCE: - -# -# standard footer -# -include $(COMPILER_ROOT)/make/Makefile.compiler.foot diff --git a/frontend/lib/types/Makefile.include b/frontend/lib/types/Makefile.include deleted file mode 100644 index e0866acc0b77..000000000000 --- a/frontend/lib/types/Makefile.include +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FRONTEND_TYPES_OBJDIR = $(COMPILER_BUILD)/frontend/lib/types - -ALL_SRCS += ../frontend/lib/types/*.cpp - -FRONTEND_TYPES_SRCS = \ - AnyType.cpp \ - ArrayType.cpp \ - BasicClassType.cpp \ - BoolType.cpp \ - BuiltinType.cpp \ - CStringType.cpp \ - ClassType.cpp \ - ClassTypeDecorator.cpp \ - ComplexType.cpp \ - CompositeType.cpp \ - DomainType.cpp \ - EnumType.cpp \ - ErroneousType.cpp \ - ImagType.cpp \ - IntType.cpp \ - NilType.cpp \ - NothingType.cpp \ - Param.cpp \ - PrimitiveType.cpp \ - QualifiedType.cpp \ - RealType.cpp \ - RecordType.cpp \ - TupleType.cpp \ - Type.cpp \ - TypeTag.cpp \ - UintType.cpp \ - UnionType.cpp \ - UnknownType.cpp \ - VoidType.cpp \ - - -SRCS = $(FRONTEND_TYPES_SRCS) - -FRONTEND_TYPES_OBJS = \ - $(FRONTEND_TYPES_SRCS:%.cpp=$(FRONTEND_TYPES_OBJDIR)/%.$(OBJ_SUFFIX)) diff --git a/frontend/lib/uast/Makefile b/frontend/lib/uast/Makefile deleted file mode 100644 index ad3e60241b30..000000000000 --- a/frontend/lib/uast/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -ifndef CHPL_MAKE_HOME -export CHPL_MAKE_HOME=$(shell pwd)/../../.. -endif - -COMPILER_ROOT = ../../../compiler -COMPILER_SUBDIR = frontend/lib/uast - -# -# standard header -# -include $(COMPILER_ROOT)/make/Makefile.compiler.head - -include Makefile.include - -TARGETS = $(FRONTEND_UAST_OBJS) - -include $(COMPILER_ROOT)/make/Makefile.compiler.subdirrules - -FORCE: - -# -# standard footer -# -include $(COMPILER_ROOT)/make/Makefile.compiler.foot diff --git a/frontend/lib/uast/Makefile.include b/frontend/lib/uast/Makefile.include deleted file mode 100644 index f189c9d98d6a..000000000000 --- a/frontend/lib/uast/Makefile.include +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FRONTEND_UAST_OBJDIR = $(COMPILER_BUILD)/frontend/lib/uast - -ALL_SRCS += ../frontend/lib/uast/*.cpp - -FRONTEND_UAST_SRCS = \ - AggregateDecl.cpp \ - AnonFormal.cpp \ - Array.cpp \ - AstList.cpp \ - AstNode.cpp \ - AstTag.cpp \ - As.cpp \ - AttributeGroup.cpp \ - Begin.cpp \ - Block.cpp \ - BoolLiteral.cpp \ - BracketLoop.cpp \ - Break.cpp \ - Builder.cpp \ - BuilderResult.cpp \ - BytesLiteral.cpp \ - Call.cpp \ - Catch.cpp \ - chpl-syntax-printer.cpp \ - Class.cpp \ - Cobegin.cpp \ - Coforall.cpp \ - Comment.cpp \ - Conditional.cpp \ - Continue.cpp \ - CStringLiteral.cpp \ - Decl.cpp \ - Defer.cpp \ - Delete.cpp \ - Domain.cpp \ - Dot.cpp \ - DoWhile.cpp \ - EmptyStmt.cpp \ - Enum.cpp \ - EnumElement.cpp \ - ErroneousExpression.cpp \ - ExternBlock.cpp \ - FnCall.cpp \ - For.cpp \ - Forall.cpp \ - Foreach.cpp \ - Formal.cpp \ - ForwardingDecl.cpp \ - Function.cpp \ - FunctionSignature.cpp \ - Identifier.cpp \ - ImagLiteral.cpp \ - Implements.cpp \ - Import.cpp \ - Include.cpp \ - IndexableLoop.cpp \ - IntLiteral.cpp \ - Interface.cpp \ - Label.cpp \ - Let.cpp \ - Literal.cpp \ - Local.cpp \ - Loop.cpp \ - Manage.cpp \ - Module.cpp \ - MultiDecl.cpp \ - NamedDecl.cpp \ - New.cpp \ - NumericLiteral.cpp \ - On.cpp \ - OpCall.cpp \ - post-parse-checks.cpp \ - Pragma.cpp \ - PrimCall.cpp \ - PrimOp.cpp \ - Qualifier.cpp \ - Range.cpp \ - RealLiteral.cpp \ - Record.cpp \ - Reduce.cpp \ - ReduceIntent.cpp \ - Require.cpp \ - Return.cpp \ - Scan.cpp \ - Select.cpp \ - Serial.cpp \ - SimpleBlockLike.cpp \ - StringLikeLiteral.cpp \ - StringLiteral.cpp \ - Sync.cpp \ - TaskVar.cpp \ - Throw.cpp \ - Try.cpp \ - Tuple.cpp \ - TupleDecl.cpp \ - TypeDecl.cpp \ - TypeQuery.cpp \ - UintLiteral.cpp \ - Use.cpp \ - Union.cpp \ - VarArgFormal.cpp \ - Variable.cpp \ - VarLikeDecl.cpp \ - VisibilityClause.cpp \ - When.cpp \ - While.cpp \ - WithClause.cpp \ - Yield.cpp \ - Zip.cpp \ - - -SRCS = $(FRONTEND_UAST_SRCS) - -FRONTEND_UAST_OBJS = \ - $(FRONTEND_UAST_SRCS:%.cpp=$(FRONTEND_UAST_OBJDIR)/%.$(OBJ_SUFFIX)) diff --git a/frontend/lib/util/Makefile b/frontend/lib/util/Makefile deleted file mode 100644 index fe2af870da8e..000000000000 --- a/frontend/lib/util/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -ifndef CHPL_MAKE_HOME -export CHPL_MAKE_HOME=$(shell pwd)/../../.. -endif - -COMPILER_ROOT = ../../../compiler -COMPILER_SUBDIR = frontend/lib/util - -# -# standard header -# -include $(COMPILER_ROOT)/make/Makefile.compiler.head - -include Makefile.include - -TARGETS = $(FRONTEND_UTIL_OBJS) - -include $(COMPILER_ROOT)/make/Makefile.compiler.subdirrules - -$(FRONTEND_UTIL_OBJDIR)/my_aligned_alloc.o: my_aligned_alloc.c $(OBJ_SUBDIR_MADE) - $(CC) -c $(COMP_CFLAGS) -DCOMPILER_SUBDIR=$(COMPILER_SUBDIR) -o $@ $< - -$(FRONTEND_UTIL_OBJDIR)/my_strerror_r.o: my_strerror_r.c $(OBJ_SUBDIR_MADE) - $(CC) -c $(COMP_CFLAGS) -DCOMPILER_SUBDIR=$(COMPILER_SUBDIR) -o $@ $< - -FORCE: - -# -# standard footer -# -include $(COMPILER_ROOT)/make/Makefile.compiler.foot diff --git a/frontend/lib/util/Makefile.include b/frontend/lib/util/Makefile.include deleted file mode 100644 index a2f25369ab4a..000000000000 --- a/frontend/lib/util/Makefile.include +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 2020-2024 Hewlett Packard Enterprise Development LP -# Copyright 2004-2019 Cray Inc. -# Other additional copyright holders may be indicated within. -# -# The entirety of this work is licensed under the Apache License, -# Version 2.0 (the "License"); you may not use this file except -# in compliance with the License. -# -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -FRONTEND_UTIL_OBJDIR = $(COMPILER_BUILD)/frontend/lib/util - -ALL_SRCS += ../frontend/lib/util/*.h ../frontend/lib/util/*.cpp - - -FRONTEND_UTIL_SRCS = \ - assertions.cpp \ - bitmap.cpp \ - break.cpp \ - chplenv.cpp \ - filesystem.cpp \ - printf.cpp \ - string-escapes.cpp \ - string-utils.cpp \ - subprocess.cpp \ - terminal.cpp \ - - -SRCS = $(FRONTEND_UTIL_SRCS) my_aligned_alloc.c my_strerror_r.c - -FRONTEND_UTIL_OBJS = \ - $(FRONTEND_UTIL_SRCS:%.cpp=$(FRONTEND_UTIL_OBJDIR)/%.$(OBJ_SUFFIX)) \ - $(FRONTEND_UTIL_OBJDIR)/my_aligned_alloc.o \ - $(FRONTEND_UTIL_OBJDIR)/my_strerror_r.o \