Skip to content
This repository has been archived by the owner on Nov 24, 2021. It is now read-only.

Commit

Permalink
remove OpenMP Runtime, move runtime to an own package
Browse files Browse the repository at this point in the history
  • Loading branch information
stlankes authored and jbreitbart committed Jul 22, 2018
1 parent 748744c commit f8f43cc
Show file tree
Hide file tree
Showing 44 changed files with 1 addition and 11,186 deletions.
4 changes: 0 additions & 4 deletions .gitmodules
Expand Up @@ -2,10 +2,6 @@
path = lwip
url = https://github.com/hermitcore/LwIP.git
branch = hermit
[submodule "usr/libomp"]
path = usr/libomp
url = https://github.com/hermitcore/libomp_oss.git
branch = hermit
[submodule "caves"]
path = caves
url = https://github.com/hermitcore/hermit-caves.git
12 changes: 0 additions & 12 deletions CMakeLists.txt
Expand Up @@ -159,16 +159,6 @@ if("${TARGET_ARCH}" STREQUAL "x86_64-hermit")

build_external(arch_x86_loader ${HERMIT_ROOT}/arch/x86_64/loader "")

## Intel's OpenMP runtime for x86 (libomp)
build_external(libiomp ${HERMIT_ROOT}/usr/libomp ""
-DHERMIT=1
-DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}
-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}/${TARGET_ARCH})

# libomp is part of HermitCore's runtime and should be available before any
# application will link
add_dependencies(hermit libiomp)

## iRCCE
build_external(ircce ${HERMIT_ROOT}/usr/ircce "")
add_dependencies(hermit ircce)
Expand All @@ -181,11 +171,9 @@ add_dependencies(hermit xray)
endif()

## Tests and benchmarks
if("${TARGET_ARCH}" STREQUAL "x86_64-hermit")
build_external(tests ${HERMIT_ROOT}/usr/tests hermit)
build_external(benchmarks ${HERMIT_ROOT}/usr/benchmarks hermit)
build_external(openmpbench ${HERMIT_ROOT}/usr/openmpbench hermit)
endif()

## relocate the local prefix to our install destination
install(DIRECTORY ${LOCAL_PREFIX_DIR}/
Expand Down
3 changes: 1 addition & 2 deletions tests.sh
Expand Up @@ -36,7 +36,7 @@ apt-get install -y qemu-system-x86 cmake wget curl gnupg checkinstall gawk dialo

echo "deb [trusted=yes] https://dl.bintray.com/hermitcore/ubuntu bionic main" | tee -a /etc/apt/sources.list
apt-get -qq update
apt-get install -y --allow-unauthenticated binutils-hermit newlib-hermit pte-hermit gcc-hermit #gcc-hermit-bootstrap
apt-get install -y --allow-unauthenticated -o Dpkg::Options::="--force-overwrite" binutils-hermit newlib-hermit pte-hermit gcc-hermit libomp-hermit #gcc-hermit-bootstrap
export PATH=/opt/hermit/bin:$PATH

mkdir -p build
Expand All @@ -46,7 +46,6 @@ make hermit-bootstrap
make hermit-bootstrap-install
rm -rf *
cmake -DTOOLCHAIN_BIN_DIR=/opt/hermit/bin -DCMAKE_INSTALL_PREFIX=/opt/hermit ..
install -m 644 ../usr/libomp/libgomp.spec /opt/hermit/x86_64-hermit/lib
make -j1 package

cd ..
Expand Down
44 changes: 0 additions & 44 deletions usr/libgomp/Makefile

This file was deleted.

116 changes: 0 additions & 116 deletions usr/libgomp/affinity.c

This file was deleted.

59 changes: 0 additions & 59 deletions usr/libgomp/alloc.c

This file was deleted.

0 comments on commit f8f43cc

Please sign in to comment.