Merge branch 'develop' into testing

2021-05-21 14:58:35 +02:00 · 2021-05-21 14:58:35 +02:00 · 7167f7a421
commit 7167f7a421
--- a/.travis.yml
+++ b/.travis.yml
@ -30,7 +30,7 @@ jobs:

    - os: osx
      env: BADGE=osx
-      osx_image: xcode10.3
+      osx_image: xcode10.3 # xcode11.3 to xcode11.3.1 fail to compile
      name: macOS 10.14.4 gcc
      compiler: gcc
      addons:
@ -42,7 +42,7 @@ jobs:

    - os: osx
      env: BADGE=osx
-      osx_image: xcode10.3
+      osx_image: xcode10.3 # xcode11.3 to xcode11.3.1 fail to compile
      name: macOS 10.14.4 gcc 32-bit
      compiler: gcc
      addons:
@ -56,7 +56,7 @@ jobs:

    - os: osx
      env: BADGE=osx
-      osx_image: xcode10.3
+      osx_image: xcode10.3 # xcode11.3 to xcode11.3.1 fail to compile
      name: macOS 10.14.4 clang
      compiler: clang
      addons:
@ -68,9 +68,9 @@ jobs:

    - os: osx
      env: BADGE=osx
-      osx_image: xcode10.3
+      osx_image: xcode10.3 # xcode11.3 to xcode11.3.1 fail to compile
      name: macOS 10.14.4 clang 32-bit
-      compiler: gcc
+      compiler: clang
      addons:
        homebrew:
          packages:
@ -80,6 +80,30 @@ jobs:
      before_install:
        - CFLAGS="$CFLAGS -m32"; CXXFLAGS="$CXXFLAGS -m32"; LDFLAGS="$LDFLAGS -m32";

+    - os: osx
+      env: BADGE=osx
+      osx_image: xcode12.5
+      name: macOS 11.3 gcc
+      compiler: gcc
+      addons:
+        homebrew:
+          packages:
+            - gcc
+            - libusb
+            - gtk+3
+
+    - os: osx
+      env: BADGE=osx
+      osx_image: xcode12.5
+      name: macOS 11.3 clang
+      compiler: clang
+      addons:
+        homebrew:
+          packages:
+            - clang
+            - libusb
+            - gtk+3
+
 script:
  - git fetch --tags
  - printenv
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -16,8 +16,10 @@ Features:
 Updates & changes:

 - Added instructions for bug-reports and feature-requests to contribution guidelines ([#906](https://github.com/stlink-org/stlink/pull/906))
+- Added travis CI configuration for macOS 10.14 to maintain capability for 32-bit compilation ([#f5ada94](https://github.com/stlink-org/stlink/commit/f5ada9474cdb87ff37de0d4eb9e75622b5870646))

 Fixes:
+- cmake: Install shared libraries in proper directories ([#1142](https://github.com/stlink-org/stlink/pull/1142))

 # v1.7.0

@ -59,10 +61,10 @@ Updates & changes:

 Fixes:

- Improvements and fixes of the flash loaders, unification of the reset function ([#244](https://github.com/stlink-org/stlink/pull/244), [#382](https://github.com/stlink-org/stlink/pull/382), [#705](https://github.com/stlink-org/stlink/pull/705), [#980](https://github.com/stlink-org/stlink/pull/980), [#995](https://github.com/stlink-org/stlink/pull/995), [#1008](https://github.com/stlink-org/stlink/pull/1008), [#1115](https://github.com/stlink-org/stlink/pull/1115), [#1117](https://github.com/stlink-org/stlink/pull/1117), [#1122](https://github.com/stlink-org/stlink/pull/1122), [#1124](https://github.com/stlink-org/stlink/pull/1124))
- Flash loader rework ([#356](https://github.com/stlink-org/stlink/pull/356), [#556](https://github.com/stlink-org/stlink/pull/556), [#593](https://github.com/stlink-org/stlink/pull/593), [#597](https://github.com/stlink-org/stlink/pull/597), [#607](https://github.com/stlink-org/stlink/pull/607), [#612](https://github.com/stlink-org/stlink/pull/612), [#638](https://github.com/stlink-org/stlink/pull/638), [#661](https://github.com/stlink-org/stlink/pull/661), [#690](https://github.com/stlink-org/stlink/pull/690), [#807](https://github.com/stlink-org/stlink/pull/807), [#817](https://github.com/stlink-org/stlink/pull/817), [#818](https://github.com/stlink-org/stlink/pull/818), [#854](https://github.com/stlink-org/stlink/pull/854), [#868](https://github.com/stlink-org/stlink/pull/868), [#967](https://github.com/stlink-org/stlink/pull/967), [#979](https://github.com/stlink-org/stlink/pull/979), [#1008](https://github.com/stlink-org/stlink/pull/1008), [#1043](https://github.com/stlink-org/stlink/pull/1043), [#1054](https://github.com/stlink-org/stlink/pull/1054), [#1092](https://github.com/stlink-org/stlink/pull/1092), [#1105](https://github.com/stlink-org/stlink/pull/1105), [#1113](https://github.com/stlink-org/stlink/pull/1113))
+- Improvements and fixes of the flash loaders, unification of the reset function ([#244](https://github.com/stlink-org/stlink/pull/244), [#382](https://github.com/stlink-org/stlink/pull/382), [#705](https://github.com/stlink-org/stlink/pull/705), [#724](https://github.com/stlink-org/stlink/pull/724), [#980](https://github.com/stlink-org/stlink/pull/980), [#995](https://github.com/stlink-org/stlink/pull/995), [#1008](https://github.com/stlink-org/stlink/pull/1008), [#1115](https://github.com/stlink-org/stlink/pull/1115), [#1117](https://github.com/stlink-org/stlink/pull/1117), [#1122](https://github.com/stlink-org/stlink/pull/1122), [#1124](https://github.com/stlink-org/stlink/pull/1124))
+- Flash loader rework ([#356](https://github.com/stlink-org/stlink/pull/356), [#556](https://github.com/stlink-org/stlink/pull/556), [#593](https://github.com/stlink-org/stlink/pull/593), [#597](https://github.com/stlink-org/stlink/pull/597), [#607](https://github.com/stlink-org/stlink/pull/607), [#612](https://github.com/stlink-org/stlink/pull/612), [#638](https://github.com/stlink-org/stlink/pull/638), [#661](https://github.com/stlink-org/stlink/pull/661), [#690](https://github.com/stlink-org/stlink/pull/690), [#724](https://github.com/stlink-org/stlink/pull/724), [#807](https://github.com/stlink-org/stlink/pull/807), [#817](https://github.com/stlink-org/stlink/pull/817), [#818](https://github.com/stlink-org/stlink/pull/818), [#854](https://github.com/stlink-org/stlink/pull/854), [#868](https://github.com/stlink-org/stlink/pull/868), [#967](https://github.com/stlink-org/stlink/pull/967), [#979](https://github.com/stlink-org/stlink/pull/979), [#1008](https://github.com/stlink-org/stlink/pull/1008), [#1043](https://github.com/stlink-org/stlink/pull/1043), [#1054](https://github.com/stlink-org/stlink/pull/1054), [#1092](https://github.com/stlink-org/stlink/pull/1092), [#1105](https://github.com/stlink-org/stlink/pull/1105), [#1113](https://github.com/stlink-org/stlink/pull/1113))
 - Fixed old DFU serial number for STLINK programmers ([#417](https://github.com/stlink-org/stlink/pull/417), [#494](https://github.com/stlink-org/stlink/pull/494), [#1106](https://github.com/stlink-org/stlink/pull/1106), [#1121](https://github.com/stlink-org/stlink/pull/1121))
- Use vl flashloader for all STM32F1 series ([#769](https://github.com/stlink-org/stlink/pull/769), [#1041](https://github.com/stlink-org/stlink/pull/1041), [#1044](https://github.com/stlink-org/stlink/pull/1044))
+- Use vl flashloader for all STM32F1 series ([#724](https://github.com/stlink-org/stlink/pull/724), [#769](https://github.com/stlink-org/stlink/pull/769), [#1041](https://github.com/stlink-org/stlink/pull/1041), [#1044](https://github.com/stlink-org/stlink/pull/1044))
 - [regression] Changed timeout on flash write ([#787](https://github.com/stlink-org/stlink/pull/787), [#981](https://github.com/stlink-org/stlink/pull/981), [#987](https://github.com/stlink-org/stlink/pull/987))
 - cmake compile failure with external `CMAKE_MODULE_PATH` set ([#962](https://github.com/stlink-org/stlink/pull/962))
 - doc/man: Fixed installation directory ([#970](https://github.com/stlink-org/stlink/pull/970))
@ -87,6 +89,7 @@ Fixes:
 - Fixed STM32WB55 reading DEBUG IDCODE from the wrong address ([#1100](https://github.com/stlink-org/stlink/pull/1100), [#1101](https://github.com/stlink-org/stlink/pull/1101))
 - Applied missing changes to tests ([#1119](https://github.com/stlink-org/stlink/pull/1119))
 - Improvements for Chip_ID read ([#1008](https://github.com/stlink-org/stlink/pull/1008), [#1120](https://github.com/stlink-org/stlink/pull/1120))
+- Fixed reading of chip ID on Cortex-M0+ core ([#1017](https://github.com/stlink-org/stlink/pull/1017), [#1125](https://github.com/stlink-org/stlink/pull/1125), [#1126](https://github.com/stlink-org/stlink/pull/1126), [#1133](https://github.com/stlink-org/stlink/pull/1133))

 # v1.6.1

@ -184,7 +187,6 @@ Fixes:
 - Set static link for `libssp` (stack-smashing protection) ([#960](https://github.com/stlink-org/stlink/pull/960), [#961](https://github.com/stlink-org/stlink/pull/961))
 - Fixed udev rules installing to wrong directory ([#966](https://github.com/stlink-org/stlink/pull/966))
 - Fixed formatting for options display in `st-flash` & `st-info` (commits [#c783d0e](https://github.com/stlink-org/stlink/commit/c783d0e777ccc83a7a8be26a4f4d3414e0478560) and [#562cd24](https://github.com/stlink-org/stlink/commit/562cd2496e696dbd22950925866aac662d81ee5f))
- Fixed reading of chip ID on Cortex-M0+ core ([#1125](https://github.com/stlink-org/stlink/pull/1125), [#1126](https://github.com/stlink-org/stlink/pull/1126), [#1133](https://github.com/stlink-org/stlink/pull/1133))

 # v1.6.0

@ -264,7 +266,7 @@ Updates and fixes:
 - Debian packaging, `cmake` and `README.md` fixes ([#682](https://github.com/stlink-org/stlink/pull/682), [#683](https://github.com/stlink-org/stlink/pull/683))
 - Disabled static library installation by default ([#702](https://github.com/stlink-org/stlink/pull/702))
 - Fix for `libusb` deprecation ([#703](https://github.com/stlink-org/stlink/pull/703), [#704](https://github.com/stlink-org/stlink/pull/704))
- Renamed `STLINK_CHIPID_STM32_L4R9` to `STLINK_CHIPID_STM32_L4RX` ([#706](https://github.com/stlink-org/stlink/pull/706))
+- Renamed `STLINK_CHIPID_STM32_L4R9` to `STLINK_CHIPID_STM32_L4Rx` ([#706](https://github.com/stlink-org/stlink/pull/706))
 - [regression] stlink installation under Linux (Debian 9) is broken since #695 ([#700](https://github.com/stlink-org/stlink/pull/700), [#701](https://github.com/stlink-org/stlink/pull/701), [#707](https://github.com/stlink-org/stlink/pull/707))
 - Fixed flash memory map for STM32F72xxx target ([#711](https://github.com/stlink-org/stlink/pull/711))
 - Proper flash page size calculation for STM32F412xx target ([#721](https://github.com/stlink-org/stlink/pull/721))
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -194,8 +194,11 @@ else ()
    target_link_libraries(${STLINK_LIB_SHARED} ${LIBUSB_LIBRARY} ${SSP_LIB})
 endif ()

-install(TARGETS ${STLINK_LIB_SHARED} DESTINATION ${STLINK_LIBRARY_PATH})
-
+install(TARGETS ${STLINK_LIB_SHARED}
+        ARCHIVE DESTINATION ${STLINK_LIBRARY_PATH}
+        LIBRARY DESTINATION ${STLINK_LIBRARY_PATH}
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+        )

 ###
 # Static library
--- a/doc/version_support.md
+++ b/doc/version_support.md
@ -14,8 +14,8 @@ Up on compiling c-make will **automatically** download and install the latest co

 | Package Repository | libusb<br />version | cmake<br />version | gtk-3<br />version | Supported macOS versions |
 | ------------------ | ------------------- | ------------------ | ------------------ | ------------------------ |
-| homebrew           | 1.0.23              | 3.17.0             | 3.24.18<br />gtk+3 | 10.9 - 10.15             |
-| MacPorts           | 1.0.23              | 3.17.0             | 3.24.18<br />gtk3  | 10.4 - 10.15             |
+| homebrew           | 1.0.23              | 3.17.0             | 3.24.18<br />gtk+3 | 10.9 - 11.x              |
+| MacPorts           | 1.0.23              | 3.17.0             | 3.24.18<br />gtk3  | 10.4 - 11.x              |

 NOTE: In order to use a STLINK/V1 programmer on macOS, versions 10.14 or 10.15 are required.

--- a/src/stlink-lib/chipid.c
+++ b/src/stlink-lib/chipid.c
@ -647,7 +647,7 @@ static const struct stlink_chipid_params devices[] = {
    {
        // STM32L011
        .chip_id = STLINK_CHIPID_STM32_L011,
-        .description = "L011",
+        .description = "L01x/L02x",
        .flash_type = STLINK_FLASH_TYPE_L0,
        .flash_size_reg = 0x1ff8007c,
        .flash_pagesize = 0x80,
--- a/src/win32/win32_socket.c
+++ b/src/win32/win32_socket.c
@ -70,7 +70,7 @@ int win32_poll(struct pollfd *fds, unsigned int nfds, int timo) {

    if (rc > 0) {
        for ( i = 0; i < nfds; ++i) {
-            int fd = fds[i].fd;
+            SOCKET fd = fds[i].fd;

            if (fds[i].events & (POLLIN | POLLPRI) && FD_ISSET(fd, &ifds)) {
                fds[i].revents |= POLLIN;