Mirrors/libhermit
1
0
Fork 0
mirror of https://github.com/hermitcore/libhermit.git synced 2025-03-09 00:00:03 +01:00
Code Issues Releases Wiki Activity

file(COPY now copying to x86_64-hermit/include.

Browse source
This commit is contained in:
Annika Wierichs 2017-10-08 16:01:22 +02:00
parent 6b8e960813
commit e72f9a32b9
9 changed files with 34 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -151,8 +151,6 @@ build_external(ircce ${HERMIT_ROOT}/usr/ircce "")
add_dependencies(hermit ircce)
## Infiniband
#build_external(infiniband ${HERMIT_ROOT}/usr/rdma-core/libibverbs "")
#add_dependencies(hermit infiniband)
build_external(rdma ${HERMIT_ROOT}/usr/rdma-core "")
add_dependencies(hermit rdma)

1
cmake/HermitCore.cmake
View file

@ -83,6 +83,7 @@ set(HERMIT_KERNEL_INCLUDES
# be found.
if(NOT BOOTSTRAP)
enable_language(C CXX Fortran Go)
#enable_language(C CXX Fortran)
include(${CMAKE_CURRENT_LIST_DIR}/HermitCore-Paths.cmake)
endif()

2
include/hermit/CMakeLists.txt
View file

@ -13,3 +13,5 @@ install(FILES
${GENERATED_CONFIG_DIR}/hermit/config.asm
DESTINATION ${TARGET_ARCH}/include/hermit/
COMPONENT bootstrap)
file(COPY ibv.h DESTINATION "${LOCAL_PREFIX_ARCH_INCLUDE_DIR}/hermit")

2
include/hermit/ibv.h
View file

@ -34,7 +34,7 @@
#ifndef __IBV_H__
#define __IBV_H__
//#include <infiniband/verbs.h> // GEHT NICHT
//#include <verbs.h> // GEHT NICHT aus x86_64-hermit/include heraus.
#ifdef __cplusplus
extern "C" {

3
kernel/ibv.c
View file

@ -31,8 +31,7 @@
#include <hermit/stddef.h>
#include <hermit/stdio.h>
#include <hermit/ibv.h> // kernel/syscall.c: #include <hermit/syscall.h> GEHT
/*#include <infiniband/verbs.h>*/ // GEHT NICHT
#include <hermit/ibv.h> // GEHT
typedef struct {

6
usr/rdma-core/CMakeLists.txt
View file

@ -30,6 +30,12 @@
# not support symbol versions, such as uclibc.
cmake_minimum_required(VERSION 2.8.11 FATAL_ERROR)
set(TARGET_ARCH x86_64-hermit) # defined in HermitCore-Toolchain-x86.cmake. workaround.
#include(../../cmake/HermitCore.cmake) # results in go lang error and fopen() error
#include(../../cmake/HermitCore-Toolchain-x86.cmake) # results in fopen() missing.
include(../../cmake/HermitCore-Paths.cmake)
project(rdma-core C)
# CMake likes to use -rdynamic too much, they fixed it in 3.4.

1
usr/rdma-core/buildlib/publish_headers.cmake
View file

@ -9,6 +9,7 @@ function(publish_internal_headers DEST)
endif()
set(DDIR "${BUILD_INCLUDE}/${DEST}")
#message(STATUS "BUILD_INCLUDE: ${BUILD_INCLUDE}")
file(MAKE_DIRECTORY "${DDIR}")
foreach(SFIL ${ARGN})

18
usr/rdma-core/libibverbs/CMakeLists.txt
View file

@ -1,3 +1,6 @@
#message(STATUS "TARGET_ARCH: ${TARGET_ARCH}") # include HermitCore.cmake in CMakeLists?
#message(STATUS "LOCAL_PREFIX_ARCH_INCLUDE_DIR: ${LOCAL_PREFIX_ARCH_INCLUDE_DIR}")
publish_headers(infiniband
arch.h
kern-abi.h
@ -40,3 +43,18 @@ target_link_libraries(ibverbs LINK_PRIVATE
${CMAKE_THREAD_LIBS_INIT}
${CMAKE_DL_LIBS}
)
message(STATUS "LOCAL_PREFIX_ARCH_LIB_DIR : ${LOCAL_PREFIX_ARCH_LIB_DIR}")
message(STATUS "LOCAL_PREFIX_ARCH_INCLUDE_DIR : ${LOCAL_PREFIX_ARCH_INCLUDE_DIR}")
file(COPY verbs.h DESTINATION "${LOCAL_PREFIX_ARCH_INCLUDE_DIR}")
# This actually shouldn't work. Why does it work for ircce???
#install(TARGETS ibverbs
#DESTINATION "${LOCAL_PREFIX_ARCH_LIB_DIR}/")
#install(FILES verbs.h
#DESTINATION "${LOCAL_PREFIX_ARCH_INCLUDE_DIR}/")
#rdma_create_symlink("${CMAKE_CURRENT_SOURCE_DIR}/verbs.h"
#"${LOCAL_PREFIX_ARCH_INCLUDE_DIR}/verbs.h") # working

6
usr/tests/ib_test.c
View file

@ -32,7 +32,9 @@
#include <errno.h>
#include <signal.h>
#include <ibv.h> // geht nicht
/*#include <verbs.h> // GEHT, brauche ich aber nicht?*/
#include <hermit/ibv.h> // Geht per cmake copy workaround
#define N 255
@ -48,7 +50,7 @@ int main(int argc, char** argv)
// ---------------------------------------------------------------------------
/*struct ibv_device **dev_list;*/
/*struct ibv_device **dev_list;*/
/*int num_devices;*/
printf("before get dev list.\n");