serge-sans-paille · serge-sans-paille · Nov 13, 2019 · Feb 13, 2020
diff --git a/.github/workflows/llvm.yml b/.github/workflows/llvm.yml
@@ -0,0 +1,34 @@
+name: CI
+
+on: [push]
+
+jobs:
+  build_llvm:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-latest
+          - windows-latest
+          - macOS-latest
+        cmake_args:
+          - ""
+    steps:
+    - name: Setup Windows
+      if: startsWith(matrix.os, 'windows')
+      uses: tstellar/actions/setup-windows@master
+      with:
+        arch: amd64
+    - uses: actions/checkout@v1
+      with:
+        fetch-depth: 1
+    - name: Install Ninja
+      uses: tstellar/actions/install-ninja@master
+      with:
+        os: ${{ runner.os }}
+    - name: Test LLVM
+      uses: tstellar/actions/build-test-llvm-project@master
+      with:
+        cmake_args: -G Ninja -DCMAKE_BUILD_TYPE=Release ${{ matrix.cmake_args }}
+        os: ${{ runner.os }}
diff --git a/llvm/bindings/go/build.sh b/llvm/bindings/go/build.sh
diff --git a/llvm/bindings/go/llvm/IRBindings.cpp → llvm/bindings/go/src/llvm/IRBindings.cpp b/llvm/bindings/go/llvm/IRBindings.cpp → llvm/bindings/go/src/llvm/IRBindings.cpp
diff --git a/llvm/bindings/go/llvm/IRBindings.h → llvm/bindings/go/src/llvm/IRBindings.h b/llvm/bindings/go/llvm/IRBindings.h → llvm/bindings/go/src/llvm/IRBindings.h
diff --git a/...dings/go/llvm/InstrumentationBindings.cpp → ...s/go/src/llvm/InstrumentationBindings.cpp b/...dings/go/llvm/InstrumentationBindings.cpp → ...s/go/src/llvm/InstrumentationBindings.cpp
diff --git a/...indings/go/llvm/InstrumentationBindings.h → ...ngs/go/src/llvm/InstrumentationBindings.h b/...indings/go/llvm/InstrumentationBindings.h → ...ngs/go/src/llvm/InstrumentationBindings.h
diff --git a/llvm/bindings/go/llvm/SupportBindings.cpp → .../bindings/go/src/llvm/SupportBindings.cpp b/llvm/bindings/go/llvm/SupportBindings.cpp → .../bindings/go/src/llvm/SupportBindings.cpp
diff --git a/llvm/bindings/go/llvm/SupportBindings.h → llvm/bindings/go/src/llvm/SupportBindings.h b/llvm/bindings/go/llvm/SupportBindings.h → llvm/bindings/go/src/llvm/SupportBindings.h
diff --git a/llvm/bindings/go/llvm/analysis.go → llvm/bindings/go/src/llvm/analysis.go b/llvm/bindings/go/llvm/analysis.go → llvm/bindings/go/src/llvm/analysis.go
diff --git a/llvm/bindings/go/llvm/bitreader.go → llvm/bindings/go/src/llvm/bitreader.go b/llvm/bindings/go/llvm/bitreader.go → llvm/bindings/go/src/llvm/bitreader.go
diff --git a/llvm/bindings/go/llvm/bitwriter.go → llvm/bindings/go/src/llvm/bitwriter.go b/llvm/bindings/go/llvm/bitwriter.go → llvm/bindings/go/src/llvm/bitwriter.go
diff --git a/llvm/bindings/go/llvm/dibuilder.go → llvm/bindings/go/src/llvm/dibuilder.go b/llvm/bindings/go/llvm/dibuilder.go → llvm/bindings/go/src/llvm/dibuilder.go
diff --git a/llvm/bindings/go/llvm/executionengine.go → llvm/bindings/go/src/llvm/executionengine.go b/llvm/bindings/go/llvm/executionengine.go → llvm/bindings/go/src/llvm/executionengine.go
diff --git a/.../bindings/go/llvm/executionengine_test.go → ...dings/go/src/llvm/executionengine_test.go b/.../bindings/go/llvm/executionengine_test.go → ...dings/go/src/llvm/executionengine_test.go
diff --git a/llvm/bindings/go/llvm/ir.go → llvm/bindings/go/src/llvm/ir.go b/llvm/bindings/go/llvm/ir.go → llvm/bindings/go/src/llvm/ir.go
diff --git a/llvm/bindings/go/llvm/ir_test.go → llvm/bindings/go/src/llvm/ir_test.go b/llvm/bindings/go/llvm/ir_test.go → llvm/bindings/go/src/llvm/ir_test.go
diff --git a/llvm/bindings/go/llvm/linker.go → llvm/bindings/go/src/llvm/linker.go b/llvm/bindings/go/llvm/linker.go → llvm/bindings/go/src/llvm/linker.go
diff --git a/llvm/bindings/go/llvm/llvm_config.go.in → llvm/bindings/go/src/llvm/llvm_config.go.in b/llvm/bindings/go/llvm/llvm_config.go.in → llvm/bindings/go/src/llvm/llvm_config.go.in
diff --git a/llvm/bindings/go/llvm/llvm_dep.go → llvm/bindings/go/src/llvm/llvm_dep.go b/llvm/bindings/go/llvm/llvm_dep.go → llvm/bindings/go/src/llvm/llvm_dep.go
@@ -14,5 +14,3 @@
 // +build !byollvm
 
 package llvm
-
-var _ run_build_sh
diff --git a/llvm/bindings/go/llvm/string.go → llvm/bindings/go/src/llvm/string.go b/llvm/bindings/go/llvm/string.go → llvm/bindings/go/src/llvm/string.go
diff --git a/llvm/bindings/go/llvm/string_test.go → llvm/bindings/go/src/llvm/string_test.go b/llvm/bindings/go/llvm/string_test.go → llvm/bindings/go/src/llvm/string_test.go
diff --git a/llvm/bindings/go/llvm/support.go → llvm/bindings/go/src/llvm/support.go b/llvm/bindings/go/llvm/support.go → llvm/bindings/go/src/llvm/support.go
diff --git a/llvm/bindings/go/llvm/target.go → llvm/bindings/go/src/llvm/target.go b/llvm/bindings/go/llvm/target.go → llvm/bindings/go/src/llvm/target.go
diff --git a/...bindings/go/llvm/transforms_coroutines.go → ...ings/go/src/llvm/transforms_coroutines.go b/...bindings/go/llvm/transforms_coroutines.go → ...ings/go/src/llvm/transforms_coroutines.go
diff --git a/...ngs/go/llvm/transforms_instrumentation.go → ...go/src/llvm/transforms_instrumentation.go b/...ngs/go/llvm/transforms_instrumentation.go → ...go/src/llvm/transforms_instrumentation.go
diff --git a/llvm/bindings/go/llvm/transforms_ipo.go → llvm/bindings/go/src/llvm/transforms_ipo.go b/llvm/bindings/go/llvm/transforms_ipo.go → llvm/bindings/go/src/llvm/transforms_ipo.go
diff --git a/.../bindings/go/llvm/transforms_pmbuilder.go → ...dings/go/src/llvm/transforms_pmbuilder.go b/.../bindings/go/llvm/transforms_pmbuilder.go → ...dings/go/src/llvm/transforms_pmbuilder.go
diff --git a/llvm/bindings/go/llvm/transforms_scalar.go → ...bindings/go/src/llvm/transforms_scalar.go b/llvm/bindings/go/llvm/transforms_scalar.go → ...bindings/go/src/llvm/transforms_scalar.go
diff --git a/llvm/bindings/go/llvm/version.go → llvm/bindings/go/src/llvm/version.go b/llvm/bindings/go/llvm/version.go → llvm/bindings/go/src/llvm/version.go
diff --git a/llvm/test/Bindings/Go/go.test b/llvm/test/Bindings/Go/go.test
@@ -1,4 +1,4 @@
-; RUN: llvm-go test llvm.org/llvm/bindings/go/llvm
+; RUN: CGO_CPPFLAGS="`llvm-config --cppflags`" CGO_CXXFLAGS=-std=c++14 CGO_LDFLAGS="`llvm-config --ldflags --libs --system-libs all`" go test llvm
 
 ; REQUIRES: shell
 ; UNSUPPORTED: asan, ubsan, msan
diff --git a/llvm/test/Bindings/Go/lit.local.cfg b/llvm/test/Bindings/Go/lit.local.cfg
@@ -57,4 +57,5 @@ def fixup_compiler_path(compiler):
 
 config.environment['CC'] = fixup_compiler_path(config.host_cc)
 config.environment['CXX'] = fixup_compiler_path(config.host_cxx)
-config.environment['CGO_LDFLAGS'] = config.host_ldflags
+config.environment['LD_LIBRARY_PATH'] = config.llvm_shlib_dir
+config.environment['GOPATH'] = os.path.join(config.llvm_src_root, 'bindings', 'go')
diff --git a/llvm/test/lit.cfg.py b/llvm/test/lit.cfg.py
@@ -160,7 +160,7 @@ def get_asan_rtlib():
 
 # The following tools are optional
 tools.extend([
-    ToolSubst('llvm-go', unresolved='ignore'),
+    ToolSubst('go', unresolved='ignore'),
     ToolSubst('llvm-mt', unresolved='ignore'),
     ToolSubst('Kaleidoscope-Ch3', unresolved='ignore'),
     ToolSubst('Kaleidoscope-Ch4', unresolved='ignore'),

diff --git a/llvm/utils/lit/lit/llvm/subst.py b/llvm/utils/lit/lit/llvm/subst.py
@@ -23,7 +23,7 @@ def resolve(self, config, dirs):
 
         if self.name == 'llc' and os.environ.get('LLVM_ENABLE_MACHINE_VERIFIER') == '1':
             command += ' -verify-machineinstrs'
-        elif self.name == 'llvm-go':
+        elif self.name == 'go':
             exe = getattr(config.config, 'go_executable', None)
             if exe:
                 command += ' go=' + exe
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,5 +14,3 @@
		// +build !byollvm

		package llvm

		var _ run_build_sh