Skip to content

Commit

Permalink
Merge branch '8_maintenance'
Browse files Browse the repository at this point in the history
  • Loading branch information
johnhaddon committed May 15, 2024
2 parents ffa40ce + 846fe04 commit 057bfbb
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 3 deletions.
11 changes: 11 additions & 0 deletions Changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,17 @@
- LLVM : Updated to version 15.0.7.
- Cycles : Disabled CUDA binary generation for Kepler and Maxwell architecture GPUs.

8.x.x (relative to 8.0.1)
-----



8.0.1 (relative to 8.0.0)
-----

- Cortex : Updated to version 10.5.7.1.
- Jemalloc : Enabled `tls_model("initial-exec")` to prevent infinite recursion with dynamic TLS on Linux distributions with modern glibc versions.

8.0.0 (relative to 7.0.0)
-----

Expand Down
4 changes: 2 additions & 2 deletions Cortex/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

"downloads" : [

"https://github.com/ImageEngine/cortex/archive/refs/tags/10.5.7.0.tar.gz"
"https://github.com/ImageEngine/cortex/archive/refs/tags/10.5.7.1.tar.gz"

],

Expand All @@ -25,7 +25,7 @@

# Build first.
"scons {args}",
# The install separately. This avoids a problem with parallel builds - see
# Then install separately. This avoids a problem with parallel builds - see
# https://github.com/ImageEngine/cortex/issues/1308.
"scons install {args}",

Expand Down
11 changes: 11 additions & 0 deletions Jemalloc/patches/tlsModel.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/configure
+++ b/configure
@@ -5079,7 +5079,7 @@
main ()
{
static __thread int
- __attribute__((tls_model("initial-exec"))) foo;
+ __attribute__((tls_model("initial-exec"), unused)) foo;
foo = 0;
;
return 0;
2 changes: 1 addition & 1 deletion build.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import tarfile
import zipfile

__version = "8.0.0"
__version = "8.0.1"

"""
Config file format
Expand Down

0 comments on commit 057bfbb

Please sign in to comment.