diff options
| author | Andreas Enge <andreas@enge.fr> | 2023-03-20 18:21:47 +0100 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2023-03-20 18:49:06 +0100 |
| commit | ccb62d8feb50e2859d7c41429a9e3d9e0fe30bfe (patch) | |
| tree | 4ab573cee33f277828ad553a22579175b1dda22d /gnu/packages/patches/openjdk-10-hotspot-pointer-comparison.patch | |
| parent | 098bd280f82350073e8280e37d56a14162eed09c (diff) | |
| parent | f80215c7c4ae5ea0c316f4766e6c05ae4218ede3 (diff) | |
| download | guix-ccb62d8feb50e2859d7c41429a9e3d9e0fe30bfe.tar.gz | |
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/packages/patches/openjdk-10-hotspot-pointer-comparison.patch')
| -rw-r--r-- | gnu/packages/patches/openjdk-10-hotspot-pointer-comparison.patch | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/gnu/packages/patches/openjdk-10-hotspot-pointer-comparison.patch b/gnu/packages/patches/openjdk-10-hotspot-pointer-comparison.patch deleted file mode 100644 index 2c64d06fbe..0000000000 --- a/gnu/packages/patches/openjdk-10-hotspot-pointer-comparison.patch +++ /dev/null @@ -1,15 +0,0 @@ -Avoid ordered comparison of pointer with integer to prevent compile error -with GCC 11. - -diff --git a/src/hotspot/os/linux/os_linux.cpp b/src/hotspot/os/linux/os_linux.cpp ---- a/src/hotspot/os/linux/os_linux.cpp -+++ b/src/hotspot/os/linux/os_linux.cpp -@@ -2155,7 +2155,7 @@ void os::Linux::print_container_info(outputStream* st) { - } - - p = OSContainer::cpu_cpuset_memory_nodes(); -- if (p < 0) -+ if (p == NULL) - st->print("cpu_memory_nodes() failed\n"); - else { - st->print("cpu_memory_nodes: %s\n", p); |