Commit 9a312f12 authored by Cianciosa, Mark's avatar Cianciosa, Mark
Browse files

Inital integration with clang.

parent 0ca208e3

CMakeLists.txt

+45 −2
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ register_project (llvm 
                  llvm

                  LLVM_BUILD_LLVM_DYLIB ON BOOL

                  LLVM_TARGETS_TO_BUILD Native STRING

                  LLVM_ENABLE_PROJECTS clang STRING

)



#-------------------------------------------------------------------------------
@@ -205,16 +206,58 @@ add_dependencies (llvm_vcsrevision_h pull_llvm) 
add_dependencies (benchmark pull_llvm)

add_dependencies (benchmark_main pull_llvm)

add_dependencies (obj.LLVMTableGenBasic pull_llvm)

add_dependencies (core-resource-headers pull_llvm)

add_dependencies (mips-resource-headers pull_llvm)

add_dependencies (utility-resource-headers pull_llvm)

add_dependencies (ppc-htm-resource-headers pull_llvm)

add_dependencies (loongarch-resource-headers pull_llvm)

add_dependencies (systemz-resource-headers pull_llvm)

add_dependencies (hexagon-resource-headers pull_llvm)

add_dependencies (webassembly-resource-headers pull_llvm)

add_dependencies (riscv-resource-headers pull_llvm)

add_dependencies (hlsl-resource-headers pull_llvm)

add_dependencies (ve-resource-headers pull_llvm)

add_dependencies (opencl-resource-headers pull_llvm)

add_dependencies (llvm-libc-resource-headers pull_llvm)

add_dependencies (openmp-resource-headers pull_llvm)

add_dependencies (windows-resource-headers pull_llvm)

add_dependencies (SampleAnalyzerPlugin_exports pull_llvm)

add_dependencies (CheckerDependencyHandlingAnalyzerPlugin_exports pull_llvm)

add_dependencies (CheckerOptionHandlingAnalyzerPlugin_exports pull_llvm)

add_dependencies (clangAnalysisFlowSensitiveResources pull_llvm)

add_dependencies (ppc-resource-headers pull_llvm)

add_dependencies (hmaptool pull_llvm)

add_dependencies (libclang_exports pull_llvm)

add_dependencies (hip-resource-headers pull_llvm)

add_dependencies (scan-view pull_llvm)

add_dependencies (scan-build pull_llvm)

add_dependencies (cuda-resource-headers pull_llvm)

add_dependencies (scan-build-py pull_llvm)

add_dependencies (x86-resource-headers pull_llvm)

add_dependencies (obj.clangSupport pull_llvm)



add_library (llvm_dep INTERFACE)

target_include_directories (llvm_dep

                            INTERFACE

                            $<BUILD_INTERFACE:${llvm_source_dir}/llvm/include>

                            $<BUILD_INTERFACE:${llvm_source_dir}/clang/include>

                            $<BUILD_INTERFACE:${llvm_binary_dir}/include>

                            $<BUILD_INTERFACE:${llvm_binary_dir}/tools/clang/include>

)



#  Need to manually figure out the native arch.

string(REGEX MATCH "^[^-]*" LLVM_NATIVE_ARCH ${LLVM_HOST_TRIPLE})

if (LLVM_NATIVE_ARCH MATCHES "arm64")

    set (LLVM_NATIVE_ARCH AArch64)

else ()

   message (FATAL_ERROR "Unknown native arch ${LLVM_NATIVE_ARCH}")

endif ()



target_link_libraries (llvm_dep

                       INTERFACE

                       LLVM

                       clangCodeGen

                       LLVM${LLVM_NATIVE_ARCH}CodeGen

                       LLVMOrcJIT

)



#-------------------------------------------------------------------------------

graph_framework.xcodeproj/project.pbxproj

+18 −21
Original line number Diff line number Diff line
@@ -884,7 +884,7 @@ 
			isa = PBXProject;

			attributes = {

				BuildIndependentTargetsInParallel = YES;

				LastUpgradeCheck = 1520;

				LastUpgradeCheck = 1530;

				ORGANIZATIONNAME = "Cianciosa, Mark R.";

				TargetAttributes = {

					C73690302A38C498001733B0 = {
@@ -1337,7 +1337,7 @@ 
					"VMEC_FILE=\\\"/Users/m4c/Projects/graph_framework/graph_tests/vmec.nc\\\"",

					USE_METAL,

					"CXX_FLAGS=\\\"-g\\\"",

					"CXX=\\\"c++\\ -I/Users/m4c/Projects/graph_framework/graph_framework\\ -std=gnu++2a\\\"",

					"\"CXX_ARGS=\\\"-I/Users/m4c/Projects/graph_framework/graph_framework -std=gnu++2a\\\"\"",

					STATIC,

					"DEBUG=1",

					"$(inherited)",
@@ -1348,7 +1348,10 @@ 
				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;

				GCC_WARN_UNUSED_FUNCTION = YES;

				GCC_WARN_UNUSED_VARIABLE = YES;

				HEADER_SEARCH_PATHS = /usr/local/include;

				HEADER_SEARCH_PATHS = (

					/usr/local/include,

					LLVM/clang/include,

				);

				LIBRARY_SEARCH_PATHS = (

					/usr/local/lib,

					"build/_deps/llvm-build/lib",
@@ -1367,7 +1370,9 @@ 
				);

				SDKROOT = macosx;

				USER_HEADER_SEARCH_PATHS = (

					LLVM/clang/include,

					LLVM/llvm/include,

					"build/_deps/llvm-build/tools/clang/include",

					"build/_deps/llvm-build/include",

				);

			};
@@ -1419,7 +1424,7 @@ 
					"EFIT_FILE=\\\"/Users/m4c/Projects/graph_framework/graph_tests/efit.nc\\\"",

					"VMEC_FILE=\\\"/Users/m4c/Projects/graph_framework/graph_tests/vmec.nc\\\"",

					USE_METAL,

					"CXX=\\\"c++\\ -I/Users/m4c/Projects/graph_framework/graph_framework\\ -std=gnu++2a\\\"",

					"\"CXX_ARGS=\\\"-I/Users/m4c/Projects/graph_framework/graph_framework -std=gnu++2a\\\"\"",

					"$(inherited)",

				);

				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -1428,7 +1433,10 @@ 
				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;

				GCC_WARN_UNUSED_FUNCTION = YES;

				GCC_WARN_UNUSED_VARIABLE = YES;

				HEADER_SEARCH_PATHS = /usr/local/include;

				HEADER_SEARCH_PATHS = (

					/usr/local/include,

					LLVM/clang/include,

				);

				LIBRARY_SEARCH_PATHS = (

					/usr/local/lib,

					"build/_deps/llvm-build/lib",
@@ -1447,7 +1455,9 @@ 
				);

				SDKROOT = macosx;

				USER_HEADER_SEARCH_PATHS = (

					LLVM/clang/include,

					LLVM/llvm/include,

					"build/_deps/llvm-build/tools/clang/include",

					"build/_deps/llvm-build/include",

				);

			};
@@ -1460,14 +1470,7 @@ 
				DEAD_CODE_STRIPPING = YES;

				DEVELOPMENT_TEAM = 2M4J3Y9U5K;

				EXECUTABLE_PREFIX = lib;

				GCC_PREPROCESSOR_DEFINITIONS = (

					USE_METAL,

					"CXX_FLAGS=\\\"-gl\\\"",

					"CXX=\\\"c++\\ -I/Users/m4c/Projects/graph_framework/graph_framework\\ -std=gnu++2a\\\"",

					STATIC,

					"DEBUG=1",

					"$(inherited)",

				);

				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";

				MACOSX_DEPLOYMENT_TARGET = 13.5;

				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";

				OTHER_LDFLAGS = "";
@@ -1484,10 +1487,7 @@ 
				DEAD_CODE_STRIPPING = YES;

				DEVELOPMENT_TEAM = 2M4J3Y9U5K;

				EXECUTABLE_PREFIX = lib;

				GCC_PREPROCESSOR_DEFINITIONS = (

					USE_METAL,

					"CXX=\\\"c++\\ -I/Users/m4c/Projects/graph_framework/graph_framework\\ -std=gnu++2a\\ -g\" $(inherited)",

				);

				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";

				MACOSX_DEPLOYMENT_TARGET = 13.5;

				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";

				OTHER_LDFLAGS = "";
@@ -1521,10 +1521,7 @@ 
				CODE_SIGN_STYLE = Automatic;

				DEAD_CODE_STRIPPING = YES;

				DEVELOPMENT_TEAM = "";

				GCC_PREPROCESSOR_DEFINITIONS = (

					"CXX_FLAGS=\\\"-g\\\"",

					"$(inherited)",

				);

				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";

				MACOSX_DEPLOYMENT_TARGET = 13.5;

				OTHER_CPLUSPLUSFLAGS = "";

				OTHER_LDFLAGS = (

graph_framework.xcodeproj/xcshareddata/xcschemes/arithmetic_test.xcscheme

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<Scheme

   LastUpgradeVersion = "1520"

   LastUpgradeVersion = "1530"

   version = "1.7">

   <BuildAction

      parallelizeBuildables = "YES"

graph_framework.xcodeproj/xcshareddata/xcschemes/graph_driver.xcscheme

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<Scheme

   LastUpgradeVersion = "1520"

   LastUpgradeVersion = "1530"

   version = "1.3">

   <BuildAction

      parallelizeBuildables = "YES"

graph_framework.xcodeproj/xcshareddata/xcschemes/jit_test.xcscheme

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<Scheme

   LastUpgradeVersion = "1520"

   LastUpgradeVersion = "1530"

   version = "1.3">

   <BuildAction

      parallelizeBuildables = "YES"