Skip to content

Commit a039ac1

Browse files
iceman1001iceman1001
committed
Release v4.19552 - Orca
1 parent 1eb6e5c commit a039ac1

19 files changed

Lines changed: 36 additions & 51 deletions

‎Makefile.defs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ ifeq ($(DEBUG),1)
112112
DEFCFLAGS = -g -O0 -fstrict-aliasing -pipe
113113
DEFLDFLAGS =
114114
else
115-
DEFCXXFLAGS = -Wall -Werror -O3 -pipe
116-
DEFCFLAGS = -Wall -Werror -O3 -fstrict-aliasing -pipe
115+
DEFCXXFLAGS = -Wall -O3 -pipe
116+
DEFCFLAGS = -Wall -O3 -fstrict-aliasing -pipe
117117
DEFLDFLAGS =
118118
endif
119119

‎armsrc/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ showinfo:
185185
# version_pm3.c should be checked on every time fullimage.stage1.elf should be remade
186186
version_pm3.c: default_version_pm3.c $(OBJDIR)/fpga_version_info.o $(OBJDIR)/fpga_all.o $(THUMBOBJ) $(ARMOBJ) .FORCE
187187
$(info [-] CHECK $@)
188-
$(Q)$(SH) ../tools/mkversion.sh $@ || $(CP) $< $@
188+
$(Q)$(CP) $< $@
189189

190190
fpga_version_info.c: $(FPGA_BITSTREAMS) $(FPGA_COMPRESSOR)
191191
$(info [-] GEN $@)

‎bootrom/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ OBJS = $(OBJDIR)/bootrom.s19
5656
# version_pm3.c should be checked on every compilation
5757
version_pm3.c: default_version_pm3.c .FORCE
5858
$(info [=] CHECK $@)
59-
$(Q)$(SH) ../tools/mkversion.sh $@ || $(CP) $< $@
59+
$(Q)$(CP) $< $@
6060

6161
all: showinfo $(OBJS)
6262

‎client/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ set (TARGET_SOURCES
431431

432432
add_custom_command(
433433
OUTPUT ${CMAKE_BINARY_DIR}/version_pm3.c
434-
COMMAND sh ${PM3_ROOT}/tools/mkversion.sh ${CMAKE_BINARY_DIR}/version_pm3.c || ${CMAKE_COMMAND} -E copy ${PM3_ROOT}/common/default_version_pm3.c ${CMAKE_BINARY_DIR}/version_pm3.c
434+
COMMAND ${CMAKE_COMMAND} -E copy ${PM3_ROOT}/common/default_version_pm3.c ${CMAKE_BINARY_DIR}/version_pm3.c
435435
DEPENDS ${PM3_ROOT}/common/default_version_pm3.c
436436
)
437437

@@ -689,7 +689,7 @@ add_executable(proxmark3
689689
${ADDITIONAL_SRC}
690690
)
691691

692-
target_compile_options(proxmark3 PUBLIC -Wall -Werror -O3)
692+
target_compile_options(proxmark3 PUBLIC -Wall -O3)
693693
if (EMBED_READLINE)
694694
if (NOT SKIPREADLINE EQUAL 1)
695695
add_dependencies(proxmark3 ncurses readline)

‎client/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ endif
446446

447447
PM3CFLAGS += -DHAVE_SNPRINTF
448448

449-
CXXFLAGS ?= -Wall -Werror
449+
CXXFLAGS ?= -Wall
450450
CXXFLAGS += $(MYDEFS) $(MYCXXFLAGS) $(MYINCLUDES)
451451

452452
PM3CXXFLAGS = $(CXXFLAGS)
@@ -979,7 +979,7 @@ src/pm3_pywrap.c: pm3.i
979979
# version_pm3.c should be checked on every compilation
980980
src/version_pm3.c: default_version_pm3.c .FORCE
981981
$(info [=] CHECK $@)
982-
$(Q)$(SH) ../tools/mkversion.sh $@ || $(CP) $< $@
982+
$(Q)$(CP) $< $@
983983

984984
# easy printing of MAKE VARIABLES
985985
print-%: ; @echo $* = $($*)

‎client/deps/amiibo.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ target_link_libraries(pm3rrg_rdv4_amiibo PRIVATE
1919
m
2020
pm3rrg_rdv4_mbedtls)
2121

22-
target_compile_options(pm3rrg_rdv4_amiibo PRIVATE -Wall -Werror -O3)
22+
target_compile_options(pm3rrg_rdv4_amiibo PRIVATE -Wall -O3)
2323
set_property(TARGET pm3rrg_rdv4_amiibo PROPERTY POSITION_INDEPENDENT_CODE ON)
2424

2525
target_include_directories(pm3rrg_rdv4_amiibo PRIVATE amiitool

‎client/deps/cliparser.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ target_include_directories(pm3rrg_rdv4_cliparser PRIVATE
99
../../include
1010
../src)
1111
target_include_directories(pm3rrg_rdv4_cliparser INTERFACE cliparser)
12-
target_compile_options(pm3rrg_rdv4_cliparser PRIVATE -Wall -Werror -O3)
12+
target_compile_options(pm3rrg_rdv4_cliparser PRIVATE -Wall -O3)
1313
set_property(TARGET pm3rrg_rdv4_cliparser PROPERTY POSITION_INDEPENDENT_CODE ON)

‎client/deps/hardnested.cmake‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ add_library(pm3rrg_rdv4_hardnested_nosimd OBJECT
22
hardnested/hardnested_bf_core.c
33
hardnested/hardnested_bitarray_core.c)
44

5-
target_compile_options(pm3rrg_rdv4_hardnested_nosimd PRIVATE -Wall -Werror -O3)
5+
target_compile_options(pm3rrg_rdv4_hardnested_nosimd PRIVATE -Wall -O3)
66
set_property(TARGET pm3rrg_rdv4_hardnested_nosimd PROPERTY POSITION_INDEPENDENT_CODE ON)
77

88
target_include_directories(pm3rrg_rdv4_hardnested_nosimd PRIVATE
@@ -32,7 +32,7 @@ if ("${CMAKE_SYSTEM_PROCESSOR}" IN_LIST X86_CPUS)
3232
hardnested/hardnested_bf_core.c
3333
hardnested/hardnested_bitarray_core.c)
3434

35-
target_compile_options(pm3rrg_rdv4_hardnested_mmx PRIVATE -Wall -Werror -O3)
35+
target_compile_options(pm3rrg_rdv4_hardnested_mmx PRIVATE -Wall -O3)
3636
target_compile_options(pm3rrg_rdv4_hardnested_mmx BEFORE PRIVATE
3737
-mmmx -mno-sse2 -mno-avx -mno-avx2 -mno-avx512f)
3838
set_property(TARGET pm3rrg_rdv4_hardnested_mmx PROPERTY POSITION_INDEPENDENT_CODE ON)
@@ -47,7 +47,7 @@ if ("${CMAKE_SYSTEM_PROCESSOR}" IN_LIST X86_CPUS)
4747
hardnested/hardnested_bf_core.c
4848
hardnested/hardnested_bitarray_core.c)
4949

50-
target_compile_options(pm3rrg_rdv4_hardnested_sse2 PRIVATE -Wall -Werror -O3)
50+
target_compile_options(pm3rrg_rdv4_hardnested_sse2 PRIVATE -Wall -O3)
5151
target_compile_options(pm3rrg_rdv4_hardnested_sse2 BEFORE PRIVATE
5252
-mmmx -msse2 -mno-avx -mno-avx2 -mno-avx512f)
5353
set_property(TARGET pm3rrg_rdv4_hardnested_sse2 PROPERTY POSITION_INDEPENDENT_CODE ON)
@@ -62,7 +62,7 @@ if ("${CMAKE_SYSTEM_PROCESSOR}" IN_LIST X86_CPUS)
6262
hardnested/hardnested_bf_core.c
6363
hardnested/hardnested_bitarray_core.c)
6464

65-
target_compile_options(pm3rrg_rdv4_hardnested_avx PRIVATE -Wall -Werror -O3)
65+
target_compile_options(pm3rrg_rdv4_hardnested_avx PRIVATE -Wall -O3)
6666
target_compile_options(pm3rrg_rdv4_hardnested_avx BEFORE PRIVATE
6767
-mmmx -msse2 -mavx -mno-avx2 -mno-avx512f)
6868
set_property(TARGET pm3rrg_rdv4_hardnested_avx PROPERTY POSITION_INDEPENDENT_CODE ON)
@@ -77,7 +77,7 @@ if ("${CMAKE_SYSTEM_PROCESSOR}" IN_LIST X86_CPUS)
7777
hardnested/hardnested_bf_core.c
7878
hardnested/hardnested_bitarray_core.c)
7979

80-
target_compile_options(pm3rrg_rdv4_hardnested_avx2 PRIVATE -Wall -Werror -O3)
80+
target_compile_options(pm3rrg_rdv4_hardnested_avx2 PRIVATE -Wall -O3)
8181
target_compile_options(pm3rrg_rdv4_hardnested_avx2 BEFORE PRIVATE
8282
-mmmx -msse2 -mavx -mavx2 -mno-avx512f)
8383
set_property(TARGET pm3rrg_rdv4_hardnested_avx2 PROPERTY POSITION_INDEPENDENT_CODE ON)
@@ -92,7 +92,7 @@ if ("${CMAKE_SYSTEM_PROCESSOR}" IN_LIST X86_CPUS)
9292
hardnested/hardnested_bf_core.c
9393
hardnested/hardnested_bitarray_core.c)
9494

95-
target_compile_options(pm3rrg_rdv4_hardnested_avx512 PRIVATE -Wall -Werror -O3)
95+
target_compile_options(pm3rrg_rdv4_hardnested_avx512 PRIVATE -Wall -O3)
9696
target_compile_options(pm3rrg_rdv4_hardnested_avx512 BEFORE PRIVATE
9797
-mmmx -msse2 -mavx -mavx2 -mavx512f)
9898
set_property(TARGET pm3rrg_rdv4_hardnested_avx512 PROPERTY POSITION_INDEPENDENT_CODE ON)
@@ -116,7 +116,7 @@ elseif ("${CMAKE_SYSTEM_PROCESSOR}" IN_LIST ARM64_CPUS)
116116
hardnested/hardnested_bf_core.c
117117
hardnested/hardnested_bitarray_core.c)
118118

119-
target_compile_options(pm3rrg_rdv4_hardnested_neon PRIVATE -Wall -Werror -O3)
119+
target_compile_options(pm3rrg_rdv4_hardnested_neon PRIVATE -Wall -O3)
120120
set_property(TARGET pm3rrg_rdv4_hardnested_neon PROPERTY POSITION_INDEPENDENT_CODE ON)
121121

122122
target_include_directories(pm3rrg_rdv4_hardnested_neon PRIVATE
@@ -134,7 +134,7 @@ elseif ("${CMAKE_SYSTEM_PROCESSOR}" IN_LIST ARM32_CPUS)
134134
hardnested/hardnested_bf_core.c
135135
hardnested/hardnested_bitarray_core.c)
136136

137-
target_compile_options(pm3rrg_rdv4_hardnested_neon PRIVATE -Wall -Werror -O3)
137+
target_compile_options(pm3rrg_rdv4_hardnested_neon PRIVATE -Wall -O3)
138138
target_compile_options(pm3rrg_rdv4_hardnested_neon BEFORE PRIVATE
139139
-mfpu=neon)
140140
set_property(TARGET pm3rrg_rdv4_hardnested_neon PROPERTY POSITION_INDEPENDENT_CODE ON)
@@ -155,7 +155,7 @@ add_library(pm3rrg_rdv4_hardnested STATIC
155155
hardnested/hardnested_bruteforce.c
156156
$<TARGET_OBJECTS:pm3rrg_rdv4_hardnested_nosimd>
157157
${SIMD_TARGETS})
158-
target_compile_options(pm3rrg_rdv4_hardnested PRIVATE -Wall -Werror -O3)
158+
target_compile_options(pm3rrg_rdv4_hardnested PRIVATE -Wall -O3)
159159
set_property(TARGET pm3rrg_rdv4_hardnested PROPERTY POSITION_INDEPENDENT_CODE ON)
160160
target_include_directories(pm3rrg_rdv4_hardnested PRIVATE
161161
../../common

‎client/deps/id48lib.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ add_library(pm3rrg_rdv4_id48 STATIC
33
id48/id48_generator.c
44
id48/id48_recover.c
55
)
6-
target_compile_options( pm3rrg_rdv4_id48 PRIVATE -Wpedantic -Wall -Werror -O3 -Wno-unknown-pragmas -Wno-inline -Wno-unused-function -DID48_NO_STDIO)
6+
target_compile_options( pm3rrg_rdv4_id48 PRIVATE -Wpedantic -Wall -O3 -Wno-unknown-pragmas -Wno-inline -Wno-unused-function -DID48_NO_STDIO)
77
target_include_directories(pm3rrg_rdv4_id48 PRIVATE id48)
88
target_include_directories(pm3rrg_rdv4_id48 INTERFACE id48)
99
set_property(TARGET pm3rrg_rdv4_id48 PROPERTY POSITION_INDEPENDENT_CODE ON)

‎client/deps/jansson.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ add_library(pm3rrg_rdv4_jansson STATIC
1414

1515
target_compile_definitions(pm3rrg_rdv4_jansson PRIVATE HAVE_STDINT_H)
1616
target_include_directories(pm3rrg_rdv4_jansson INTERFACE jansson)
17-
target_compile_options(pm3rrg_rdv4_jansson PRIVATE -Wall -Werror -Wno-unused-function -O3)
17+
target_compile_options(pm3rrg_rdv4_jansson PRIVATE -Wall -Wno-unused-function -O3)
1818
set_property(TARGET pm3rrg_rdv4_jansson PROPERTY POSITION_INDEPENDENT_CODE ON)

0 commit comments

Comments
 (0)