Skip to content

Commit f0c57eb

Browse files
probonopdprobonopd
authored
Merge pull request #977 from soyersoyer/fixgcc133
Fix compilation with GCC 13.3
2 parents 8f2c638 + 7c12b8b commit f0c57eb

File tree

9 files changed

+20
-96
lines changed

9 files changed

+20
-96
lines changed

‎.github/workflows/build.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,34 +36,34 @@ jobs:
3636
- name: Install 64-bit toolchain
3737
run: |
3838
set -ex
39-
wget -q https://developer.arm.com/-/media/Files/downloads/gnu-a/10.3-2021.07/binrel/gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
40-
tar xf gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf.tar.xz
39+
wget -q https://developer.arm.com/-/media/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-x86_64-aarch64-none-elf.tar.xz
40+
tar xf arm-gnu-toolchain-13.3.rel1-x86_64-aarch64-none-elf.tar.xz
4141
4242
- name: Build for Raspberry Pi 5 (64-bit)
4343
run: |
4444
set -ex
45-
export PATH=$(readlink -f ./gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf/bin):$PATH
45+
export PATH=$(readlink -f ./arm-*/bin/):$PATH
4646
RPI=5 bash -ex build.sh
4747
cp ./src/kernel*.img ./sdcard/
4848
4949
- name: Build for Raspberry Pi 4 (64-bit)
5050
run: |
5151
set -ex
52-
export PATH=$(readlink -f ./gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf/bin):$PATH
52+
export PATH=$(readlink -f ./arm-*/bin/):$PATH
5353
RPI=4 bash -ex build.sh
5454
cp ./src/kernel*.img ./sdcard/
5555
5656
- name: Build for Raspberry Pi 3 (64-bit)
5757
run: |
5858
set -ex
59-
export PATH=$(readlink -f ./gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf/bin):$PATH
59+
export PATH=$(readlink -f ./arm-*/bin/):$PATH
6060
RPI=3 bash -ex build.sh
6161
cp ./src/kernel*.img ./sdcard/
6262
6363
- name: Prepare SD card content for 64-bit
6464
run: |
6565
set -ex
66-
export PATH=$(readlink -f ./gcc-arm-10.3-2021.07-x86_64-aarch64-none-elf/bin):$PATH
66+
export PATH=$(readlink -f ./arm-*/bin/):$PATH
6767
cd ./circle-stdlib/libs/circle/boot
6868
make
6969
make armstub64
@@ -121,20 +121,20 @@ jobs:
121121
- name: Install 32-bit toolchain
122122
run: |
123123
set -ex
124-
wget -q https://developer.arm.com/-/media/Files/downloads/gnu-a/10.3-2021.07/binrel/gcc-arm-10.3-2021.07-x86_64-arm-none-eabi.tar.xz
125-
tar xf gcc-arm-10.3-2021.07-x86_64-arm-none-eabi.tar.xz
124+
wget -q https://developer.arm.com/-/media/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi.tar.xz
125+
tar xf arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi.tar.xz
126126
127127
- name: Build for Raspberry Pi 2 (32-bit)
128128
run: |
129129
set -ex
130-
export PATH=$(readlink -f ./gcc-arm-10.3-2021.07-x86_64-arm-none-eabi/bin):$PATH
130+
export PATH=$(readlink -f ./arm-*/bin/):$PATH
131131
RPI=2 bash -ex build.sh
132132
cp ./src/kernel*.img ./sdcard/
133133
134134
- name: Build for Raspberry Pi 1 (32-bit)
135135
run: |
136136
set -ex
137-
export PATH=$(readlink -f ./gcc-arm-10.3-2021.07-x86_64-arm-none-eabi/bin):$PATH
137+
export PATH=$(readlink -f ./arm-*/bin/):$PATH
138138
RPI=1 bash -ex build.sh
139139
cp ./src/kernel*.img ./sdcard/
140140

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434

3535
# Toolchain
3636
gcc-*
37+
arm-gnu-*
3738

3839
# Build artifacts
3940
kernel*

‎Synth_Dexed‎

Submodule Synth_Dexed updated from 8c677ce to a02b5c0

‎src/Makefile‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,9 @@ OBJS = main.o kernel.o minidexed.o config.o userinterface.o uimenu.o \
1313
arm_float_to_q23.o arm_scale_zip_f32.o \
1414
net/ftpdaemon.o net/ftpworker.o net/applemidi.o net/udpmidi.o net/mdnspublisher.o udpmididevice.o
1515

16+
EXTRACLEAN = $(OBJS) $(OBJS:.o=.d)
17+
1618
OPTIMIZE = -O3
1719

1820
include ./Synth_Dexed.mk
1921
include ./Rules.mk
20-
21-
# Clean target
22-
.PHONY: clean
23-
24-
clean:
25-
@echo "Cleaning up..."
26-
rm -f $(OBJS) *.o *.d *~ core

‎src/Synth_Dexed.mk‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,8 @@ INCLUDE += -I $(CMSIS_DSP_INCLUDE_DIR)
3838
INCLUDE += -I $(CMSIS_DSP_PRIVATE_INCLUDE_DIR)
3939
INCLUDE += -I $(CMSIS_DSP_COMPUTELIB_INCLUDE_DIR)
4040

41-
DEFINE += -DUSE_FX
42-
4341
ifeq ($(RPI), $(filter $(RPI), 3 4 5))
4442
DEFINE += -DARM_MATH_NEON
4543
DEFINE += -DARM_MATH_NEON_EXPERIMENTAL
4644
DEFINE += -DHAVE_NEON
4745
endif
48-
49-
EXTRACLEAN = $(SYNTH_DEXED_DIR)/*.[od] $(CMSIS_DSP_SOURCE_DIR)/SupportFunctions/*.[od] $(CMSIS_DSP_SOURCE_DIR)/SupportFunctions/*.[od] $(CMSIS_DSP_SOURCE_DIR)/BasicMathFunctions/*.[od] $(CMSIS_DSP_SOURCE_DIR)/FastMathFunctions/*.[od] $(CMSIS_DSP_SOURCE_DIR)/FilteringFunctions/*.[od] $(CMSIS_DSP_SOURCE_DIR)/CommonTables/*.[od] $(CMSIS_DSP_COMPUTELIB_SRC_DIR)/*.[od]

‎src/circle_stdlib_app.h‎

Lines changed: 0 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -225,72 +225,4 @@ class CStdlibAppStdio: public CStdlibAppScreen
225225
CConsole mConsole;
226226
};
227227

228-
/**
229-
* Stdlib application that adds network functionality
230-
* to the CStdlibAppStdio features.
231-
*/
232-
class CStdlibAppNetwork: public CStdlibAppStdio
233-
{
234-
public:
235-
#define CSTDLIBAPP_WLAN_FIRMWARE_PATH CSTDLIBAPP_DEFAULT_PARTITION "/firmware/"
236-
#define CSTDLIBAPP_WLAN_CONFIG_FILE CSTDLIBAPP_DEFAULT_PARTITION "/wpa_supplicant.conf"
237-
238-
CStdlibAppNetwork (const char *kernel,
239-
const char *pPartitionName = CSTDLIBAPP_DEFAULT_PARTITION,
240-
const u8 *pIPAddress = 0, // use DHCP if pIPAddress == 0
241-
const u8 *pNetMask = 0,
242-
const u8 *pDefaultGateway = 0,
243-
const u8 *pDNSServer = 0,
244-
TNetDeviceType DeviceType = NetDeviceTypeEthernet)
245-
: CStdlibAppStdio(kernel, pPartitionName),
246-
mDeviceType (DeviceType),
247-
mWLAN (CSTDLIBAPP_WLAN_FIRMWARE_PATH),
248-
mNet(pIPAddress, pNetMask, pDefaultGateway, pDNSServer, DEFAULT_HOSTNAME, DeviceType),
249-
mWPASupplicant (CSTDLIBAPP_WLAN_CONFIG_FILE)
250-
{
251-
}
252-
253-
virtual bool Initialize (bool const bWaitForActivate = true)
254-
{
255-
if (!CStdlibAppStdio::Initialize ())
256-
{
257-
return false;
258-
}
259-
260-
if (mDeviceType == NetDeviceTypeWLAN)
261-
{
262-
if (!mWLAN.Initialize ())
263-
{
264-
return false;
265-
}
266-
}
267-
268-
if (!mNet.Initialize (false))
269-
{
270-
return false;
271-
}
272-
273-
if (mDeviceType == NetDeviceTypeWLAN)
274-
{
275-
if (!mWPASupplicant.Initialize ())
276-
{
277-
return false;
278-
}
279-
}
280-
281-
while (bWaitForActivate && !mNet.IsRunning ())
282-
{
283-
mScheduler.Yield ();
284-
}
285-
286-
return true;
287-
}
288-
289-
protected:
290-
CScheduler mScheduler;
291-
TNetDeviceType mDeviceType;
292-
CBcm4343Device mWLAN;
293-
CNetSubSystem mNet;
294-
CWPASupplicant mWPASupplicant;
295-
};
296228
#endif

‎src/performanceconfig.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -953,13 +953,13 @@ bool CPerformanceConfig::CreateNewPerformanceFile(void)
953953
FRESULT Result = f_open (&File, nFileName.c_str(), FA_WRITE | FA_CREATE_ALWAYS);
954954
if (Result != FR_OK)
955955
{
956-
m_PerformanceFileName[nNewPerformance]=nullptr;
956+
m_PerformanceFileName[nNewPerformance].clear();
957957
return false;
958958
}
959959

960960
if (f_close (&File) != FR_OK)
961961
{
962-
m_PerformanceFileName[nNewPerformance]=nullptr;
962+
m_PerformanceFileName[nNewPerformance].clear();
963963
return false;
964964
}
965965

‎src/uimenu.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include "userinterface.h"
2727
#include "sysexfileloader.h"
2828
#include "config.h"
29-
#include <cmath>
29+
#include <math.h>
3030
#include <circle/sysconfig.h>
3131
#include <assert.h>
3232
#include <cstddef>

‎submod.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ cd -
1818
#cd -
1919

2020
# Use fixed master branch of Synth_Dexed
21-
cd Synth_Dexed/
22-
git checkout -f 3c683fc801
23-
cd -
21+
#cd Synth_Dexed/
22+
#git checkout -f a02b5c0bf2da132f49a923f9c69796220a8ea93f
23+
#cd -

0 commit comments

Comments
 (0)