Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for LLD linker and Mac OS platforms #3

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ endforeach()
foreach(target ${GVSOC_TARGETS})
set(GAPY_TARGETS_OPT ${GAPY_TARGETS_OPT} --target=${target})
if(NOT DEFINED GAPY_TARGETS_NAME)
set(GAPY_TARGETS_NAME ${target})
set(GAPY_TARGETS_NAME ${target})
else()
set(GAPY_TARGETS_NAME ${GAPY_TARGETS_NAME}_${target})
set(GAPY_TARGETS_NAME ${GAPY_TARGETS_NAME}_${target})
endif()
endforeach()

Expand Down Expand Up @@ -116,7 +116,8 @@ option(BUILD_OPTIMIZED_M32 "build GVSOC with optimizations in 32bits mode" O
option(BUILD_DEBUG_M32 "build GVSOC with debug information in 32bits mode" OFF)
option(SKIP_DPI "Do not build DPI" OFF)

set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g -O3")
SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g -O3 -std=c++17")
set(CMAKE_CC_FLAGS_RELWITHDEBINFO "-g -O3")


Expand All @@ -142,9 +143,9 @@ add_subdirectory(models)

foreach(subdir ${GVSOC_MODULES})
if(IS_DIRECTORY ${subdir})
if (NOT ${subdir} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
get_filename_component(name ${subdir} NAME)
add_subdirectory(${subdir} ${CMAKE_CURRENT_BINARY_DIR}/${name})
endif()
if (NOT ${subdir} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
get_filename_component(name ${subdir} NAME)
add_subdirectory(${subdir} ${CMAKE_CURRENT_BINARY_DIR}/${name})
endif()
endif()
endforeach()
3 changes: 1 addition & 2 deletions engine/src/proxy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
#include <gv/gvsoc.h>
#include <sys/types.h>
#include <unistd.h>
#include <sys/prctl.h>
#include <vp/time/time_scheduler.hpp>
#include <vp/proxy.hpp>

Expand Down Expand Up @@ -317,7 +316,7 @@ int Gv_proxy::open(int port, int *out_port)
return -1;
}

if (bind(this->telnet_socket, (struct sockaddr *)&addr, sizeof(addr)) == -1) {
if (::bind(this->telnet_socket, (struct sockaddr *)&addr, sizeof(addr)) == -1) {
fprintf(stderr, "Unable to bind the socket: %s\n", strerror(errno));
return -1;
}
Expand Down
Loading