Skip to content

Commit 8cc7c64

Browse files
projectgusdpgeorge
authored andcommitted
rp2: Workaround pico_aon_timer timezone binary size increase.
Provide stub implementations of localtime_r() and mktime() to avoid code size increase. Reported upstream at raspberrypi/pico-sdk#1810 This work was funded through GitHub Sponsors. Signed-off-by: Angus Gratton <[email protected]>
1 parent fa15ae4 commit 8cc7c64

File tree

2 files changed

+43
-0
lines changed

2 files changed

+43
-0
lines changed

ports/rp2/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ set(MICROPY_SOURCE_DRIVERS
147147

148148
set(MICROPY_SOURCE_PORT
149149
clocks_extra.c
150+
datetime_patch.c
150151
fatfs_port.c
151152
help.c
152153
machine_bitstream.c

ports/rp2/datetime_patch.c

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
/*
2+
* This file is part of the MicroPython project, http://micropython.org/
3+
*
4+
* The MIT License (MIT)
5+
*
6+
* Copyright (c) 2024 Angus Gratton
7+
*
8+
* Permission is hereby granted, free of charge, to any person obtaining a copy
9+
* of this software and associated documentation files (the "Software"), to deal
10+
* in the Software without restriction, including without limitation the rights
11+
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12+
* copies of the Software, and to permit persons to whom the Software is
13+
* furnished to do so, subject to the following conditions:
14+
*
15+
* The above copyright notice and this permission notice shall be included in
16+
* all copies or substantial portions of the Software.
17+
*
18+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
24+
* THE SOFTWARE.
25+
*/
26+
27+
#include <time.h>
28+
#include "py/mpconfig.h"
29+
#include "shared/timeutils/timeutils.h"
30+
31+
// This is a workaround for the issue that pico-sdk datetime.c will otherwise
32+
// pull in a lot of libc code for time zone support.
33+
//
34+
// Upstream issue is https://github.com/raspberrypi/pico-sdk/issues/1810
35+
36+
struct tm *localtime_r(const time_t *__restrict time, struct tm *__restrict local_time) {
37+
return gmtime_r(time, local_time);
38+
}
39+
40+
time_t mktime(struct tm *__restrict tm) {
41+
return timeutils_mktime(tm->tm_year, tm->tm_mon, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec);
42+
}

0 commit comments

Comments
 (0)