Merge branch 'dups'

Author: benma

CMakeLists.txt

@@ -320,6 +320,10 @@ string(APPEND CMAKE_C_FLAGS " -Wno-cast-function-type")
 # Hardening
 string(APPEND CMAKE_C_FLAGS " -fstack-protector-all")
 
+# Disallow duplicate definitions, which is the default since GCC
+# 10. It was not default in gcc-arm-none-eabi-8-2018-q4.
+string(APPEND CMAKE_C_FLAGS " -fno-common")
+
 # For `struct timespec` and `strdup`
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_XOPEN_SOURCE=600")
 

src/i2c_ecc.c

@@ -19,16 +19,14 @@
 #include "util.h"
 #include <string.h>
 
-struct i2c_m_sync_desc I2C_0;
-
 uint8_t i2c_ecc_read(uint8_t* rxdata, uint32_t rxlen)
 {
     struct _i2c_m_msg packet;
     uint8_t retries = I2C_ECC_RETRIES;
     int32_t r;
 
     packet.addr = I2C_ECC_ADDR >> 1;
-    packet.len = rxlen;
+    packet.len = (int32_t)rxlen;
     packet.buffer = rxdata;
     packet.flags = I2C_M_SEVEN | I2C_M_RD | I2C_M_STOP;
 
@@ -47,7 +45,7 @@ uint8_t i2c_ecc_write(uint8_t* txdata, uint32_t txlen)
     int32_t r;
 
     packet.addr = I2C_ECC_ADDR >> 1;
-    packet.len = txlen;
+    packet.len = (int32_t)txlen;
     packet.buffer = txdata;
     packet.flags = I2C_M_SEVEN | I2C_M_STOP;
 

src/random.c

@@ -25,10 +25,6 @@
 #include "util.h"
 #include <wally_crypto.h>
 
-#ifndef TESTING
-struct rand_sync_desc RAND_0;
-#endif
-
 void random_32_bytes_mcu(uint8_t* buf)
 {
     if (buf == NULL) {