Master/upx
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

CI updates

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer
2024-07-13 12:49:02 +02:00
parent 08a38af553
commit 3a11a5a82e
4 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ci.yml
+3 -3
View File
@@ -467,8 +467,8 @@ jobs:
# { zig_target: aarch64-macos.12.0-none } # { zig_target: aarch64-macos.12.0-none }
# { zig_target: aarch64-macos.13.0-none } # { zig_target: aarch64-macos.13.0-none }
- { zig_target: aarch64-windows-gnu } - { zig_target: aarch64-windows-gnu }
- { zig_target: arm-linux-musleabihf, qemu: qemu-arm } - { zig_target: arm-linux-musleabihf, zig_flags: -mcpu=cortex_a5, qemu: qemu-arm }
# { zig_target: arm-linux-musleabihf, qemu: qemu-arm, zig_pic: -fPIE } # { zig_target: arm-linux-musleabihf, zig_flags: -mcpu=cortex_a5, qemu: qemu-arm, zig_pic: -fPIE }
- { zig_target: i386-linux-gnu.2.3.4, zig_flags: -march=i586 } - { zig_target: i386-linux-gnu.2.3.4, zig_flags: -march=i586 }
- { zig_target: i386-linux-musl, zig_flags: -march=i586, qemu: qemu-i386 } - { zig_target: i386-linux-musl, zig_flags: -march=i586, qemu: qemu-i386 }
# { zig_target: i386-linux-musl, zig_flags: -march=i586, qemu: qemu-i386, zig_pic: -fPIE } # { zig_target: i386-linux-musl, zig_flags: -march=i586, qemu: qemu-i386, zig_pic: -fPIE }
@@ -490,7 +490,7 @@ jobs:
- { zig_target: x86_64-windows-gnu } - { zig_target: x86_64-windows-gnu }
env: env:
# zig is currently missing winpthreads; see https://github.com/ziglang/zig/issues/10989 # zig is currently missing winpthreads; see https://github.com/ziglang/zig/issues/10989
UPX_CONFIG_EXPECT_THREADS: ${{ contains(matrix.zig_target, '-windows-') && 'OFF' || 'ON' }} UPX_CONFIG_EXPECT_THREADS: ${{ contains(matrix.zig_target, '-windows') && 'OFF' || 'ON' }}
# for zig-cc wrapper scripts (see below): # for zig-cc wrapper scripts (see below):
ZIG_CPPFLAGS: -DUPX_DOCTEST_CONFIG_MULTITHREADING ZIG_CPPFLAGS: -DUPX_DOCTEST_CONFIG_MULTITHREADING
ZIG_FLAGS: ${{ matrix.zig_flags }} ZIG_FLAGS: ${{ matrix.zig_flags }}
src/conf.h
+9
View File
@@ -41,9 +41,18 @@
#if !defined(__has_builtin) #if !defined(__has_builtin)
#define __has_builtin(x) 0 #define __has_builtin(x) 0
#endif #endif
#if !defined(__has_declspec_attribute)
#define __has_declspec_attribute(x) 0
#endif
#if !defined(__has_feature) #if !defined(__has_feature)
#define __has_feature(x) 0 #define __has_feature(x) 0
#endif #endif
#if !defined(__has_include)
#define __has_include(x) 0
#endif
#if !defined(__has_warning)
#define __has_warning(x) 0
#endif
// reserve name "upx" for namespace // reserve name "upx" for namespace
namespace upx {} namespace upx {}
src/help.cpp
+1
View File
@@ -163,6 +163,7 @@ static noinline void list_all_packers(FILE *f, int verbose) {
PackerNames pn; PackerNames pn;
pn.o = &o; pn.o = &o;
(void) PackMaster::visitAllPackers(PackerNames::visit, nullptr, &o, &pn); (void) PackMaster::visitAllPackers(PackerNames::visit, nullptr, &o, &pn);
// NOLINTNEXTLINE(bugprone-multi-level-implicit-pointer-conversion)
upx_gnomesort(pn.names, pn.names_count, sizeof(pn.names[0]), PackerNames::compare_fname); upx_gnomesort(pn.names, pn.names_count, sizeof(pn.names[0]), PackerNames::compare_fname);
size_t pos = 0; size_t pos = 0;
for (size_t i = 0; i < pn.names_count; i++) { for (size_t i = 0; i < pn.names_count; i++) {
src/util/util.cpp
+4
View File
@@ -446,6 +446,7 @@ TEST_CASE("upx_memswap") {
typedef byte element_type; typedef byte element_type;
element_type a = 11, b = 22; element_type a = 11, b = 22;
element_type *array[4]; element_type *array[4];
// NOLINTNEXTLINE(bugprone-multi-level-implicit-pointer-conversion)
memset(array, 0xfb, sizeof(array)); memset(array, 0xfb, sizeof(array));
array[1] = &a; array[1] = &a;
array[3] = &b; array[3] = &b;
@@ -454,14 +455,17 @@ TEST_CASE("upx_memswap") {
#if defined(__CHERI__) && defined(__CHERI_PURE_CAPABILITY__) #if defined(__CHERI__) && defined(__CHERI_PURE_CAPABILITY__)
// TODO later: CHERI clang-14 bug/miscompilation with upx_memswap(); or // TODO later: CHERI clang-14 bug/miscompilation with upx_memswap(); or
// maybe caused by tagged-memory issues ??? // maybe caused by tagged-memory issues ???
// NOLINTNEXTLINE(bugprone-multi-level-implicit-pointer-conversion)
memswap_no_overlap((byte *) array, (byte *) (array + 2), 2 * sizeof(array[0])); memswap_no_overlap((byte *) array, (byte *) (array + 2), 2 * sizeof(array[0]));
#else #else
// NOLINTNEXTLINE(bugprone-multi-level-implicit-pointer-conversion)
upx_memswap(array, array + 2, 2 * sizeof(array[0])); upx_memswap(array, array + 2, 2 * sizeof(array[0]));
#endif #endif
CHECK(array[1] == &b); CHECK(array[1] == &b);
CHECK(array[3] == &a); CHECK(array[3] == &a);
CHECK(*array[1] == 22); CHECK(*array[1] == 22);
CHECK(*array[3] == 11); CHECK(*array[3] == 11);
// NOLINTNEXTLINE(bugprone-multi-level-implicit-pointer-conversion)
memswap_no_overlap((byte *) array, (byte *) (array + 2), 2 * sizeof(array[0])); memswap_no_overlap((byte *) array, (byte *) (array + 2), 2 * sizeof(array[0]));
CHECK(array[1] == &a); CHECK(array[1] == &a);
CHECK(array[3] == &b); CHECK(array[3] == &b);