Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
Actor Framework
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
cpp-libs
Actor Framework
Commits
4f4d2cde
Commit
4f4d2cde
authored
Nov 26, 2014
by
Joseph Noir
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add cross compiler adjustments
parent
2b759948
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
3 deletions
+21
-3
CMakeLists.txt
CMakeLists.txt
+1
-0
cmake/Toolchain-arm-stm32f4.cmake
cmake/Toolchain-arm-stm32f4.cmake
+5
-2
libcaf_core/caf/config.hpp
libcaf_core/caf/config.hpp
+1
-0
libcaf_core/src/get_root_uuid.cpp
libcaf_core/src/get_root_uuid.cpp
+14
-1
No files found.
CMakeLists.txt
View file @
4f4d2cde
...
...
@@ -365,6 +365,7 @@ if(CAF_FOR_RIOT)
include_directories
(
"
${
RIOT_BASE_DIR
}
/sys/include/."
)
include_directories
(
"
${
RIOT_BASE_DIR
}
/sys/net/include/."
)
include_directories
(
"
${
RIOT_BASE_DIR
}
/core/include/."
)
include_directories
(
"
${
RIOT_BASE_DIR
}
/core/include/arch/."
)
include_directories
(
"
${
RIOT_BASE_DIR
}
/cpu/native/include/."
)
endif
()
...
...
cmake/Toolchain-arm-stm32f4.cmake
View file @
4f4d2cde
...
...
@@ -21,6 +21,7 @@ set(CMAKE_CXX_COMPILER_ID_RUN TRUE)
set
(
CMAKE_CXX_COMPILER_ID GNU
)
set
(
CMAKE_CXX_COMPILER_FORCED TRUE
)
add_definitions
(
-DCOREIF_NG=1
)
include_directories
(
"
${
RIOT_BASE_DIR
}
/boards/stm32f4discovery/include/."
)
#SET(CMAKE_FIND_ROOT_PATH /home/noir/Downloads/gcc-arm-none-eabi-4_8-2014q3/arm-none-eabi/ /home/noir/Downloads/gcc-arm-none-eabi-4_8-2014q3/)
...
...
@@ -35,7 +36,9 @@ include_directories("${RIOT_BASE_DIR}/boards/stm32f4discovery/include/.")
# RIOT headers
# SET(CMAKE_FIND_ROOT_PATH )
SET
(
CROSS_CXX_FLAGS
"-static-libgcc -static-libstdc++ -static -Os -s -march=armv7-m -mtune=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -mthumb -mno-thumb-interwork -mfpu=vfp -mfix-cortex-m3-ldrd -mlittle-endian -nostartfiles -ffunction-sections -fdata-sections -fno-builtin"
)
# -march=armv7-m -mcpu=cortex-m4
SET
(
CROSS_C_FLAGS
"-static-libgcc -static-libstdc++ -static -Os -s -march=armv7-m -mtune=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -mthumb -mno-thumb-interwork -mfpu=vfp -mfix-cortex-m3-ldrd -mlittle-endian -nostartfiles -ffunction-sections -fdata-sections -fno-builtin"
)
# -march=armv7-m -mcpu=cortex-m4
SET
(
CROSS_CXX_FLAGS
"-static-libgcc -static-libstdc++ -static -Os -s -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -mthumb -mno-thumb-interwork -mfpu=vfp -mfix-cortex-m3-ldrd -mlittle-endian -nostartfiles -ffunction-sections -fdata-sections -fno-builtin"
)
# -march=armv7-m -mtune=cortex-m4
SET
(
CROSS_C_FLAGS
"-static-libgcc -static-libstdc++ -static -Os -s -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -mthumb -mno-thumb-interwork -mfpu=vfp -mfix-cortex-m3-ldrd -mlittle-endian -nostartfiles -ffunction-sections -fdata-sections -fno-builtin"
)
# -march=armv7-m -mtune=cortex-m4
#SET(CROSS_CXX_FLAGS "-static-libgcc -static-libstdc++ -static -Os -s -march=armv7-m -mtune=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -mthumb -mno-thumb-interwork -mfpu=vfp -mfix-cortex-m3-ldrd -mlittle-endian -nostartfiles -ffunction-sections -fdata-sections -fno-builtin")
#SET(CROSS_C_FLAGS "-static-libgcc -static-libstdc++ -static -Os -s -march=armv7-m -mtune=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -mthumb -mno-thumb-interwork -mfpu=vfp -mfix-cortex-m3-ldrd -mlittle-endian -nostartfiles -ffunction-sections -fdata-sections -fno-builtin")
SET
(
CMAKE_SHARED_LIBRARY_LINK_C_FLAGS
"-static-libgcc -static-libstdc++ -static -Os -s"
)
SET
(
CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS
"-static-libgcc -static-libstdc++ -static -Os -s"
)
libcaf_core/caf/config.hpp
View file @
4f4d2cde
...
...
@@ -153,6 +153,7 @@
#elif defined(WIN32) || defined(_WIN32)
# define CAF_WINDOWS
#elif defined(__RIOTBUILD_FLAG)
# define CAF_RIOT
# undef CAF_ENABLE_RUNTIME_CHECKS
#else
# error Platform and/or compiler not supportet
...
...
libcaf_core/src/get_root_uuid.cpp
View file @
4f4d2cde
...
...
@@ -237,4 +237,17 @@ std::string get_root_uuid() {
}
// namespace detail
}
// namespace caf
#endif // CAF_WINDOWS
#elif defined(CAF_RIOT)
namespace
caf
{
namespace
detail
{
std
::
string
get_root_uuid
()
{
std
::
string
uuid
(
"23"
);
return
uuid
;
}
}
// namespace detail
}
// namespace caf
#endif // CAF_RIOT
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment