Updated Hercules compiler submodules

diff --git a/HerculesCompiler b/HerculesCompiler
index 000cce909bf35794ab52dd9461f2dd01315cf27d..9ff00557cc30cd6cb23149e0c699e6a90782512c 160000 (submodule)
--- a/HerculesCompiler
+++ b/HerculesCompiler
@@ -1 +1 @@
-Subproject commit 000cce909bf35794ab52dd9461f2dd01315cf27d
+Subproject commit 9ff00557cc30cd6cb23149e0c699e6a90782512c

diff --git a/Makefile b/Makefile
index 3991a2d85e7f1b77984a56197039b7cb496e3379..424e638fdc721a3ad75d04a39949dbee25737da3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -51,7 +51,7 @@ build_native/build.ninja: | build_native
        cd $(@D) && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$(PREFIX)" \
                -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_ENABLE_BACKTRACES=ON -DLLVM_ENABLE_WERROR=OFF \
                -DBUILD_SHARED_LIBS=OFF -DLLVM_ENABLE_RTTI=ON \
-               -DCMAKE_CXX_FLAGS='-DHERCULES_PASS_ROOT=\"$(PREFIX)/lib/hercules/\"' \
+               -DCMAKE_CXX_FLAGS='-DHERCULES_PASS_ROOT=\"$(PREFIX)/lib/hercules/src/passes/\"' \
                -G "Ninja" $(CURDIR)/llvm
 
 libpremnotify: export CC=$(DEB_HOST_GNU_TYPE)-gcc-5
@@ -62,8 +62,8 @@ build/build.ninja: | build llvm/tools/clang llvm/projects/openmp
        cd $(@D) && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$(PREFIX)" \
                -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_ENABLE_BACKTRACES=ON -DLLVM_ENABLE_WERROR=OFF \
                -DBUILD_SHARED_LIBS=OFF -DLLVM_ENABLE_RTTI=ON $(LLVM_CROSS_FLAGS) \
-               -DCMAKE_CXX_FLAGS='-DHERCULES_PASS_ROOT=\"$(PREFIX)/lib/hercules/\"' \
-               -G "Ninja" $(CURDIR)/llvm
+               -DCMAKE_CXX_FLAGS='-DHERCULES_PASS_ROOT=\"$(PREFIX)/lib/hercules/src/passes/\"' \
+               -G"Ninja" $(CURDIR)/llvm
 
 $(TMP_DESTDIR)/$(PREFIX)/lib/cmake/llvm: | llvm-clang
        DESTDIR=$(TMP_DESTDIR) ninja -C build install
@@ -77,20 +77,12 @@ build_passes/build.ninja: | build_passes $(TMP_DESTDIR)/$(PREFIX)/lib/cmake/llvm
 passes: build_passes/build.ninja
        ninja -C build_passes
 
-$(DESTDIR)$(PREFIX)/bin/herculesCompileCPU.sh: HerculesCompiler/cpu-driver/herculesCompileCPU.sh
-       sed -e '/^PASSROOT=/          s!=.*!="$(PREFIX)/lib/hercules"!'  \
-           -e '/^LLVM_BIN_DIR=/      s!=.*!="$(PREFIX)/bin/"!'  \
-           -e '/^PREM_RUNTIME_PATH=/ s!=.*!="$(PREFIX)/lib/hercules"!'  \
-               < $< > $@
-       chmod +x $@
-
 libpremnotify:
        $(MAKE) -C HerculesCompiler/libpremnotify
 
 install: all
        DESTDIR=$(DESTDIR) ninja -C build install
        DESTDIR=$(DESTDIR) ninja -C build_passes install
-       $(MAKE) $(DESTDIR)$(PREFIX)/bin/herculesCompileCPU.sh
        $(MAKE) -C HerculesCompiler/libpremnotify install DESTDIR=$(DESTDIR) PREFIX=$(PREFIX)
 
 clean:

diff --git a/clang b/clang
index fa98fd2c878db20e8228ae88bb55d175a2a2cbf3..ea1669da8189e0970c4155f4611ace70a58f1a43 160000 (submodule)
--- a/clang
+++ b/clang
@@ -1 +1 @@
-Subproject commit fa98fd2c878db20e8228ae88bb55d175a2a2cbf3
+Subproject commit ea1669da8189e0970c4155f4611ace70a58f1a43

diff --git a/debian/changelog b/debian/changelog
index e607a8cabd736f1d27a6d82ea1999c9579357e76..8dd921e00abde8f8a0928545432b6db5221eda77 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+hercules-compiler (2018.11-2) unstable; urgency=medium
+
+  * Update submodules HerculesCompiler and clang
+
+ -- kreilfla <kreilfla@ritchie.ciirc.cvut.cz>  Tue, 13 Nov 2018 09:57:54 +0100
+
 hercules-compiler (2018.11-1) unstable; urgency=medium
 
   * Updated submodules HerculesCompiler and openmp

diff --git a/openmp b/openmp
index 9180e09272d506a331bc010f72926a708a0d45ef..7716df0aa0e605ca6aefc3752bf1734267dc162b 160000 (submodule)
--- a/openmp
+++ b/openmp
@@ -1 +1 @@
-Subproject commit 9180e09272d506a331bc010f72926a708a0d45ef
+Subproject commit 7716df0aa0e605ca6aefc3752bf1734267dc162b