You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by je...@apache.org on 2021/06/07 19:15:33 UTC
[mynewt-core] branch master updated (cb68fa8 -> e7e7e06)
This is an automated email from the ASF dual-hosted git repository.
jerzy pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git.
from cb68fa8 pic32: Fix crt0.S build error
new 6d32885 crypto: mbedtls: Fix pic32mz builds
new e7e7e06 crypto: mbedtls: Fix xc32 build problem
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
crypto/mbedtls/include/mbedtls/config_mynewt.h | 2 +-
crypto/mbedtls/pkg.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
[mynewt-core] 01/02: crypto: mbedtls: Fix pic32mz builds
Posted by je...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jerzy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
commit 6d32885300b7f6e6b730c90e8e0eb8cdb581f667
Author: Jerzy Kasenberg <je...@apache.org>
AuthorDate: Sat Jun 5 01:10:52 2021 +0200
crypto: mbedtls: Fix pic32mz builds
Some time ago include of <syscfg/syscfg.h> was changed
in many files to <os/mynewt.h>.
This change prevents build of mbedtls for pic32mz chips
due to name conflict:
repos/apache-mynewt-core/crypto/mbedtls/src/aes.c:418:17: error: conflicting type qualifiers for 'RCON'
static uint32_t RCON[10];
microchip\xc32\v3.01\pic32mx\include\proc\pic32mz-ef\p32mz2048efh064.h:646:28: note: previous declaration of 'RCON' was here
extern volatile uint32_t RCON __attribute__((section("sfrs"), address(0xBF801240)));
This inclusion of mynewt.h is not really needed to build mbedtls library so this
reverts it back to what it used to be.
---
crypto/mbedtls/include/mbedtls/config_mynewt.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crypto/mbedtls/include/mbedtls/config_mynewt.h b/crypto/mbedtls/include/mbedtls/config_mynewt.h
index 82858d2..1c7d634 100644
--- a/crypto/mbedtls/include/mbedtls/config_mynewt.h
+++ b/crypto/mbedtls/include/mbedtls/config_mynewt.h
@@ -32,7 +32,7 @@
extern "C" {
#endif
-#include "os/mynewt.h"
+#include <syscfg/syscfg.h>
#undef MBEDTLS_HAVE_TIME /* we have no time.h */
#undef MBEDTLS_HAVE_TIME_DATE
[mynewt-core] 02/02: crypto: mbedtls: Fix xc32 build problem
Posted by je...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jerzy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
commit e7e7e06839078b7cb0084fd3f337ec20d6a563b8
Author: Jerzy Kasenberg <je...@apache.org>
AuthorDate: Sat Jun 5 01:19:48 2021 +0200
crypto: mbedtls: Fix xc32 build problem
Line:
pkg.cflags: '-DMBEDTLS_USER_CONFIG_FILE="mbedtls/config_mynewt.h"'
works for arm gcc
it does not work for xc32-gcc
Due to compiler issue this line results in build error:
Error: In file included from repos/apache-mynewt-core/crypto/mbedtls/src/aes.c:54:
repos/apache-mynewt-core/crypto/mbedtls/include/mbedtls/config.h:3439:10: error: #include expects "FILENAME" or <FILENAME>
#include MBEDTLS_USER_CONFIG_FILE
xc32-gcc is wrapper that executes another binary, during execution of
this second compiler, xc32-gcc removes quotes leaving definition of
MBEDTLS_USER_CONFIG_FILE unusable.
This changes "" to <> that is harmless for other compilers and fixes build for xc32.
---
crypto/mbedtls/pkg.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crypto/mbedtls/pkg.yml b/crypto/mbedtls/pkg.yml
index 529a8c8..f4defa7 100644
--- a/crypto/mbedtls/pkg.yml
+++ b/crypto/mbedtls/pkg.yml
@@ -25,5 +25,5 @@ pkg.keywords:
- ssl
- tls
-pkg.cflags: '-DMBEDTLS_USER_CONFIG_FILE="mbedtls/config_mynewt.h"'
+pkg.cflags: '-DMBEDTLS_USER_CONFIG_FILE=<mbedtls/config_mynewt.h>'
pkg.cflags.TEST: -DTEST