Skip to content

Update remote and version of sumodule rpmalloc #5696

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

Merged
JohannesLorenz merged 4 commits into from
Oct 5, 2020
Merged

Update remote and version of sumodule rpmalloc #5696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
23d6c94
Update remote of sumodule rpmalloc
JohannesLorenz Oct 3, 2020
1e9b89c
Update submodule rpmalloc to 1.4.1
JohannesLorenz Oct 3, 2020
04b840f
Add windows declarations to solve linker errors
JohannesLorenz Oct 4, 2020
511f2e4
Set Win32 API version for MinGW
DomClark Oct 5, 2020
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
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
url = https://github.com/Lukas-W/qt5-x11embed.git
[submodule "src/3rdparty/rpmalloc/rpmalloc"]
path = src/3rdparty/rpmalloc/rpmalloc
url = https://github.com/rampantpixels/rpmalloc.git
url = https://github.com/mjansson/rpmalloc.git
[submodule "plugins/zynaddsubfx/zynaddsubfx"]
path = plugins/zynaddsubfx/zynaddsubfx
url = https://github.com/lmms/zynaddsubfx.git
Expand Down
6 changes: 6 additions & 0 deletions src/3rdparty/rpmalloc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ if (NOT LMMS_BUILD_WIN32)
)
endif()

if(MINGW)
target_compile_definitions(rpmalloc
PRIVATE -D_WIN32_WINNT=0x600
)
endif()

if (CMAKE_BUILD_TYPE STREQUAL "Debug")
# rpmalloc uses GCC builtin "__builtin_umull_overflow" with ENABLE_VALIDATE_ARGS,
# which is only available starting with GCC 5
Expand Down
2 changes: 1 addition & 1 deletion src/3rdparty/rpmalloc/rpmalloc
Open in desktop
Submodule rpmalloc updated 30 files
+3 −0 .github/FUNDING.yml
+2 −0 .gitignore
+2 −2 BENCHMARKS.md
+99 −0 CHANGELOG
+22 −23 LICENSE
+108 −36 README.md
+213 −0 build/msvs/rpmalloc-test.vcxproj
+12 −2 build/msvs/rpmalloc.sln
+5 −5 build/msvs/rpmalloc.vcxproj
+7 −7 build/msvs/test.vcxproj
+1 −1 build/ninja/android.py
+75 −86 build/ninja/clang.py
+15 −12 build/ninja/gcc.py
+17 −2 build/ninja/generator.py
+52 −38 build/ninja/msvc.py
+6 −6 build/ninja/platform.py
+30 −23 build/ninja/toolchain.py
+1 −1 build/ninja/version.py
+155 −0 build/ninja/vslocate.py
+5 −5 build/ninja/xcode.py
+6 −12 configure.py
+309 −380 rpmalloc/malloc.c
+0 −123 rpmalloc/new.cc
+2,628 −1,495 rpmalloc/rpmalloc.c
+256 −59 rpmalloc/rpmalloc.h
+111 −0 rpmalloc/rpnew.h
+201 −0 test/main-override.cc
+584 −153 test/main.c
+10 −15 test/thread.c
+6 −2 test/thread.h