Skip to content

Merge changes from upstream master #45

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.

Sign up for GitHub

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

Open
mjcarroll wants to merge 12 commits into
base: ros2
Choose a base branch
from
Open

Merge changes from upstream master #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c5d229e
Fix regression in fc69876d2074af28d953dede6d633ba6a02c058f.
hidmic Jul 7, 2020
87e9898
Include vitals in trampoline implementation.
hidmic Jul 7, 2020
03514a9
Mac M1 build fix proposal.
devnexen Jan 24, 2021
f778baa
Fix PLT_SEL_FILE for macOS and Linux
cottsay Dec 3, 2020
6a37161
Further Mac build fix proposal.
devnexen Mar 2, 2021
9c0b9df
Deal with archs that have DT_REL rather than DT_RELA
peadar May 13, 2021
93b10bf
Implement gnu_hash symbol lookup
peadar May 13, 2021
4185c32
CFI: enable indirect branch tracking on amd64 arch iand Sysv systems …
devnexen May 5, 2022
321fcc7
Stop forcing users to build with -Werror
cottsay Mar 21, 2024
ec9d0db
elf: Fix incorrect ELF type usage in build system
lbmeng Apr 10, 2025
ce849f9
Merge remote-tracking branch 'origin/master' into mjcarroll/merge_fro…
Jan 9, 2026
4960dcb
Remove vestigial functions after merge from upstream
Jan 9, 2026
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
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ script:
-Wno-dev
-DCMAKE_BUILD_TYPE=${CONFIGURATION}
-DCMAKE_INSTALL_PREFIX=mimick-${TRAVIS_TAG}
-DCMAKE_C_FLAGS="-Werror"
${CMAKE_OPTS}
..
- TERM=dumb cmake --build . -- -j4
Expand Down
8 changes: 8 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,11 @@ else ()
set (MMK_ABI "win")
else ()
set (MMK_ABI "systemv")
if (CMAKE_C_COMPILER_ID MATCHES "GNU")
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fcf-protection")
set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-zibt -Wl,-zshstk")
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-zibt -Wl,-zshstk")
endif ()
endif ()
set (MMK_ARCH "x86_64")
set (MMK_BITS 64)
Expand All @@ -92,6 +97,9 @@ else ()
else ()
message (FATAL_ERROR "Architecture '${_ARCH}' is not supported.")
endif ()
if (APPLE)
set (MMK_MANGLING "leading-underscore")
endif()
set (ASM_EXTENSION ".S")
endif ()

Expand Down
1 change: 1 addition & 0 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ install:
-DCMAKE_INSTALL_PREFIX="mimick-%RELEASE_NAME%"
-DCMAKE_BUILD_TYPE="%CONFIGURATION%"
-DCMAKE_SYSTEM_PROCESSOR="%PLATFORM%"
-DCMAKE_C_FLAGS="-Werror"
%CMAKE_OPTS%
-G "%GENERATOR%"
..
Expand Down
2 changes: 1 addition & 1 deletion sample/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
if (NOT MSVC)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic -Werror")
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pedantic")
endif ()

add_subdirectory (strdup)
4 changes: 2 additions & 2 deletions src/asm/trampoline-aarch64.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
*/
#include "mangling.h"

.align 4
.align 8
.globl MANGLE(mmk_trampoline)
MANGLE(mmk_trampoline):
adr x16, .
Expand Down Expand Up @@ -72,7 +72,7 @@ ret_ctx:
ldp x16, x30, [sp], #16
ret

.align 4
.align 8
.globl MANGLE(mmk_trampoline_end)
MANGLE(mmk_trampoline_end):
nop
Expand Down
8 changes: 8 additions & 0 deletions src/asm/trampoline-x86_64-systemv.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,19 @@
movdqu (%rsp), Reg; \
add $0x10, %rsp

# if defined(__CET__)
# define mmk_cet endbr64
# else
# define mmk_cet
# endif

.globl MANGLE(mmk_trampoline)
MANGLE(mmk_trampoline):
start:
mmk_cet
call next // Retrieve IP
next:
mmk_cet
pop %r11

push %r11 // Setup mock context
Expand Down
Loading