Skip to content

Commit c8fc656

Browse files
Nightwalker-87Nightwalker-87
committedAug 29, 2021
Bugfixes
- Corrected paths for chip-id files (Closes #1180) - Fixed 32-bit build (Closes #985) (Closes #1175) - Patch for GitHub Actions Workflow (Ubuntu)
1 parent db8f789 commit c8fc656

File tree

4 files changed

+18
-107
lines changed

4 files changed

+18
-107
lines changed
 

‎.github/workflows/c-cpp.yml

+8-98
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
steps:
1616
- uses: actions/checkout@v2
1717
- name: install dependencies
18-
run: sudo apt-get install gcc-6 libusb-1.0.0-dev libgtk-3-dev rpm
18+
run: sudo apt update && sudo apt-get install gcc-6 libusb-1.0.0-dev libgtk-3-dev rpm
1919
- name: make debug
2020
run: sudo make clean && make debug
2121
- name: make test
@@ -35,7 +35,7 @@ jobs:
3535
steps:
3636
- uses: actions/checkout@v2
3737
- name: install dependencies
38-
run: sudo apt-get install gcc-6 libusb-1.0.0-dev libgtk-3-dev rpm
38+
run: sudo apt update && sudo apt-get install gcc-6 libusb-1.0.0-dev libgtk-3-dev rpm
3939
- name: Set compiler flags
4040
run: |
4141
CFLAGS="$CFLAGS -m32"
@@ -60,7 +60,7 @@ jobs:
6060
steps:
6161
- uses: actions/checkout@v2
6262
- name: install dependencies
63-
run: sudo apt-get install clang-10 libusb-1.0.0-dev libgtk-3-dev rpm
63+
run: sudo apt update && sudo apt-get install clang-10 libusb-1.0.0-dev libgtk-3-dev rpm
6464
- name: make debug
6565
run: sudo make clean && make debug
6666
- name: make test
@@ -80,7 +80,7 @@ jobs:
8080
steps:
8181
- uses: actions/checkout@v2
8282
- name: Install dependencies
83-
run: sudo apt-get install clang-10 libusb-1.0.0-dev libgtk-3-dev rpm
83+
run: sudo apt update && sudo apt-get install clang-10 libusb-1.0.0-dev libgtk-3-dev rpm
8484
- name: Set compiler flags
8585
run: |
8686
CFLAGS="$CFLAGS -m32"
@@ -105,7 +105,7 @@ jobs:
105105
steps:
106106
- uses: actions/checkout@v2
107107
- name: Install dependencies
108-
run: sudo apt-get install gcc-10 libusb-1.0.0-dev libgtk-3-dev rpm
108+
run: sudo apt update && sudo apt-get install gcc-10 libusb-1.0.0-dev libgtk-3-dev rpm
109109
- name: make debug
110110
run: sudo make clean && make debug
111111
- name: make test
@@ -125,7 +125,7 @@ jobs:
125125
steps:
126126
- uses: actions/checkout@v2
127127
- name: Install dependencies
128-
run: sudo apt-get install gcc-10 libusb-1.0.0-dev libgtk-3-dev rpm
128+
run: sudo apt update && sudo apt-get install gcc-10 libusb-1.0.0-dev libgtk-3-dev rpm
129129
- name: Set compiler flags
130130
run: |
131131
CFLAGS="$CFLAGS -m32"
@@ -150,7 +150,7 @@ jobs:
150150
steps:
151151
- uses: actions/checkout@v2
152152
- name: Install dependencies
153-
run: sudo apt-get install clang-10 libusb-1.0.0-dev libgtk-3-dev rpm
153+
run: sudo apt update && sudo apt-get install clang-10 libusb-1.0.0-dev libgtk-3-dev rpm
154154
- name: make debug
155155
run: sudo make clean && make debug
156156
- name: make test
@@ -170,7 +170,7 @@ jobs:
170170
steps:
171171
- uses: actions/checkout@v2
172172
- name: Install dependencies
173-
run: sudo apt-get install clang-10 libusb-1.0.0-dev libgtk-3-dev rpm
173+
run: sudo apt update && sudo apt-get install clang-10 libusb-1.0.0-dev libgtk-3-dev rpm
174174
- name: Set compiler flags
175175
run: |
176176
CFLAGS="$CFLAGS -m32"
@@ -191,96 +191,6 @@ jobs:
191191

192192
# macOS
193193

194-
# job_macos_10_14_64_gcc:
195-
# name: macos-10.14 gcc
196-
# runs-on: macos-10.14
197-
# steps:
198-
# - uses: actions/checkout@v2
199-
# - name: Install dependencies
200-
# run: brew install gcc libusb gtk+3
201-
# - name: make debug
202-
# run: sudo make clean && make debug
203-
# - name: make test
204-
# run: sudo make clean && make test
205-
# - name: make release
206-
# run: sudo make clean && make release
207-
# - name: sudo make install
208-
# run: sudo make clean && sudo make install
209-
# - name: sudo make package
210-
# run: sudo make package
211-
# - name: sudo make uninstall
212-
# run: sudo make uninstall && sudo make clean
213-
214-
# job_macos_10_14_32_gcc:
215-
# name: macos-10.14 gcc 32-bit
216-
# runs-on: macos-10.14
217-
# steps:
218-
# - uses: actions/checkout@v2
219-
# - name: Install dependencies
220-
# run: brew install gcc libusb gtk+3
221-
# - name: Set compiler flags
222-
# run: |
223-
# CFLAGS="$CFLAGS -m32"
224-
# CXXFLAGS="$CXXFLAGS -m32"
225-
# LDFLAGS="$LDFLAGS -m32"
226-
# - name: make debug
227-
# run: sudo make clean && make debug
228-
# - name: make test
229-
# run: sudo make clean && make test
230-
# - name: make release
231-
# run: sudo make clean && make release
232-
# - name: sudo make install
233-
# run: sudo make clean && sudo make install
234-
# - name: sudo make package
235-
# run: sudo make package
236-
# - name: sudo make uninstall
237-
# run: sudo make uninstall && sudo make clean
238-
239-
# job_macos_10_14_64_clang:
240-
# name: macos-10.14 clang
241-
# runs-on: macos-10.14
242-
# steps:
243-
# - uses: actions/checkout@v2
244-
# - name: Install dependencies
245-
# run: brew install llvm libusb gtk+3
246-
# - name: make debug
247-
# run: sudo make clean && make debug
248-
# - name: make test
249-
# run: sudo make clean && make test
250-
# - name: make release
251-
# run: sudo make clean && make release
252-
# - name: sudo make install
253-
# run: sudo make clean && sudo make install
254-
# - name: sudo make package
255-
# run: sudo make package
256-
# - name: sudo make uninstall
257-
# run: sudo make uninstall && sudo make clean
258-
259-
# job_macos_10_14_32_clang:
260-
# name: macos-10.14 clang 32-bit
261-
# runs-on: macos-10.14
262-
# steps:
263-
# - uses: actions/checkout@v2
264-
# - name: Install dependencies
265-
# run: brew install llvm libusb gtk+3
266-
# - name: Set compiler flags
267-
# run: |
268-
# CFLAGS="$CFLAGS -m32"
269-
# CXXFLAGS="$CXXFLAGS -m32"
270-
# LDFLAGS="$LDFLAGS -m32"
271-
# - name: make debug
272-
# run: sudo make clean && make debug
273-
# - name: make test
274-
# run: sudo make clean && make test
275-
# - name: make release
276-
# run: sudo make clean && make release
277-
# - name: sudo make install
278-
# run: sudo make clean && sudo make install
279-
# - name: sudo make package
280-
# run: sudo make package
281-
# - name: sudo make uninstall
282-
# run: sudo make uninstall && sudo make clean
283-
284194
job_macos_10_15_gcc:
285195
name: macos-10.15 gcc
286196
runs-on: macos-10.15

‎.github/workflows/codeql-analysis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
steps:
3737
- name: Install dependencies
38-
run: sudo apt-get install gcc-10 libusb-1.0.0-dev libgtk-3-dev rpm
38+
run: sudo apt update && sudo apt-get install gcc-10 libusb-1.0.0-dev libgtk-3-dev rpm
3939
- name: Checkout repository
4040
uses: actions/checkout@v2
4141

‎CMakeLists.txt

+7-6
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
99
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
1010
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
1111

12-
set(CMAKE_STLINK_ETC_DIR etc)
13-
set(CMAKE_ETC_CHIPS_DIR ${CMAKE_STLINK_ETC_DIR}/stlink/chips)
14-
set(CMAKE_ETC_CHIPS_DIR_ABS ${CMAKE_INSTALL_PREFIX}/${CMAKE_ETC_CHIPS_DIR})
15-
add_definitions( -DETC_STLINK_DIR="${CMAKE_ETC_CHIPS_DIR_ABS}" )
16-
1712

1813
###
1914
# General project settings
@@ -23,6 +18,11 @@ project(stlink C)
2318
set(PROJECT_DESCRIPTION "Open source version of the STMicroelectronics ST-LINK Tools")
2419
include(GNUInstallDirs) # Define GNU standard installation directories
2520

21+
## MCU configuration files
22+
set(CMAKE_CHIPS_SUBDIR stlink/chips)
23+
set(CMAKE_CHIPS_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_CHIPS_SUBDIR})
24+
add_definitions( -DETC_STLINK_DIR="${CMAKE_CHIPS_DIR}" )
25+
2626
## Determine project version
2727
include(${CMAKE_MODULE_PATH}/get_version.cmake)
2828

@@ -287,8 +287,9 @@ install(TARGETS st-info DESTINATION ${CMAKE_INSTALL_BINDIR})
287287
install(TARGETS st-util DESTINATION ${CMAKE_INSTALL_BINDIR})
288288
install(TARGETS st-trace DESTINATION ${CMAKE_INSTALL_BINDIR})
289289

290+
# Install MCU configuration files
290291
file(GLOB CHIP_FILES ${CMAKE_SOURCE_DIR}/config/chips/*.chip)
291-
install(FILES ${CHIP_FILES} DESTINATION ${CMAKE_ETC_CHIPS_DIR})
292+
install(FILES ${CHIP_FILES} DESTINATION ${CMAKE_CHIPS_DIR})
292293

293294

294295
###

‎src/common.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -2199,7 +2199,7 @@ static int map_file(mapped_file_t *mf, const char *path) {
21992199

22002200
if (sizeof(st.st_size) != sizeof(size_t)) {
22012201
// on 32 bit systems, check if there is an overflow
2202-
if (st.st_size > (off_t)INT32_MAX) {
2202+
if (st.st_size > (off_t)SSIZE_MAX) {
22032203
fprintf(stderr, "mmap() size_t overflow for file %s\n", path);
22042204
goto on_error;
22052205
}
@@ -2213,7 +2213,7 @@ static int map_file(mapped_file_t *mf, const char *path) {
22132213
goto on_error;
22142214
}
22152215

2216-
mf->len = st.st_size;
2216+
mf->len = (size_t)st.st_size;
22172217
error = 0; // success
22182218

22192219
on_error:

0 commit comments

Comments
 (0)