diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-10-01 17:10:49 -0400 |
| commit | 2e65e4834a226c570866f2e8976ed7f252b45cd1 (patch) | |
| tree | 21d625bce8d03627680214df4a6622bf8eb79dc9 /gnu/packages/patches/ath9k-htc-firmware-gcc-compat.patch | |
| parent | 9c68ecb24dd1660ce736cdcdea0422a73ec318a2 (diff) | |
| parent | f1a3c11407b52004e523ec5de20d326c5661681f (diff) | |
Merge remote-tracking branch 'origin/master' into staging
With resolved conflicts in:
gnu/packages/bittorrent.scm
gnu/packages/databases.scm
gnu/packages/geo.scm
gnu/packages/gnupg.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/python-xyz.scm
gnu/packages/xorg.scm
guix/build/qt-utils.scm
Diffstat (limited to 'gnu/packages/patches/ath9k-htc-firmware-gcc-compat.patch')
| -rw-r--r-- | gnu/packages/patches/ath9k-htc-firmware-gcc-compat.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/gnu/packages/patches/ath9k-htc-firmware-gcc-compat.patch b/gnu/packages/patches/ath9k-htc-firmware-gcc-compat.patch new file mode 100644 index 0000000000..ceada2fa24 --- /dev/null +++ b/gnu/packages/patches/ath9k-htc-firmware-gcc-compat.patch @@ -0,0 +1,29 @@ +Fixes for compiling with -fno-common, default in GCC 10. + +Taken from upstream: +https://github.com/qca/open-ath9k-htc-firmware/commit/559e3eba3b4cf103da6b8d022f3e1387278b9db8 + +diff --git a/target_firmware/magpie_fw_dev/target/init/app_start.c b/target_firmware/magpie_fw_dev/target/init/app_start.c +--- a/target_firmware/magpie_fw_dev/target/init/app_start.c ++++ b/target_firmware/magpie_fw_dev/target/init/app_start.c +@@ -52,6 +52,8 @@ + #define ALLOCRAM_START ( ((unsigned int)&_fw_image_end) + 4) + #define ALLOCRAM_SIZE ( SYS_RAM_SZIE - ( ALLOCRAM_START - SYS_D_RAM_REGION_0_BASE) - SYS_D_RAM_STACK_SIZE) + ++void (* _assfail_ori)(struct register_dump_s *); ++ + // support for more than 64 bytes on command pipe + extern void usb_reg_out_patch(void); + extern int _HIFusb_get_max_msg_len_patch(hif_handle_t handle, int pipe); +diff --git a/target_firmware/magpie_fw_dev/target/init/init.h b/target_firmware/magpie_fw_dev/target/init/init.h +--- a/target_firmware/magpie_fw_dev/target/init/init.h ++++ b/target_firmware/magpie_fw_dev/target/init/init.h +@@ -46,7 +46,7 @@ + void AR6002_fatal_exception_handler_patch(CPU_exception_frame_t *exc_frame); + void exception_reset(struct register_dump_s *dump); + +-void (* _assfail_ori)(struct register_dump_s *); ++extern void (* _assfail_ori)(struct register_dump_s *); + void HTCMsgRecvHandler_patch(adf_nbuf_t hdr_buf, adf_nbuf_t buffer, void *context); + void HTCControlSvcProcessMsg_patch(HTC_ENDPOINT_ID EndpointID, adf_nbuf_t hdr_buf, + adf_nbuf_t pBuffers, void *arg); |