diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2023-01-23 23:48:21 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-23 23:48:21 +0100 |
commit | 2696d7e4a6e4ce7d1b1d04a5c3af016609503dd7 (patch) | |
tree | 04e7dc489169660b490c14b040e7660b23c5fba1 /pkgs/development/compilers/gcc/11 | |
parent | 3b30efdeb1f1afa6b2c5498ae13eaa307f8d6616 (diff) | |
parent | 6e13168f479f7e840a2434dc2e2520c031fa285f (diff) | |
download | nixpkgs-2696d7e4a6e4ce7d1b1d04a5c3af016609503dd7.tar nixpkgs-2696d7e4a6e4ce7d1b1d04a5c3af016609503dd7.tar.gz nixpkgs-2696d7e4a6e4ce7d1b1d04a5c3af016609503dd7.tar.bz2 nixpkgs-2696d7e4a6e4ce7d1b1d04a5c3af016609503dd7.tar.lz nixpkgs-2696d7e4a6e4ce7d1b1d04a5c3af016609503dd7.tar.xz nixpkgs-2696d7e4a6e4ce7d1b1d04a5c3af016609503dd7.tar.zst nixpkgs-2696d7e4a6e4ce7d1b1d04a5c3af016609503dd7.zip |
Merge pull request #208657 from tpwrules/darwin-fix-avr
Diffstat (limited to 'pkgs/development/compilers/gcc/11')
-rw-r--r-- | pkgs/development/compilers/gcc/11/avr-gcc-11.3-darwin.patch | 20 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/11/default.nix | 2 |
2 files changed, 22 insertions, 0 deletions
diff --git a/pkgs/development/compilers/gcc/11/avr-gcc-11.3-darwin.patch b/pkgs/development/compilers/gcc/11/avr-gcc-11.3-darwin.patch new file mode 100644 index 00000000000..787862fbcff --- /dev/null +++ b/pkgs/development/compilers/gcc/11/avr-gcc-11.3-darwin.patch @@ -0,0 +1,20 @@ +--- a/gcc/config/avr/avr.c 2022-10-08 19:18:33.000000000 +0200 ++++ b/gcc/config/avr/avr.patched.c 2022-10-08 19:19:34.000000000 +0200 +@@ -10196,7 +10196,7 @@ + to track need of __do_copy_data. */ + + static void +-avr_output_data_section_asm_op (const void *data) ++avr_output_data_section_asm_op (const char *data) + { + avr_need_copy_data_p = true; + +@@ -10209,7 +10209,7 @@ + to track need of __do_clear_bss. */ + + static void +-avr_output_bss_section_asm_op (const void *data) ++avr_output_bss_section_asm_op (const char *data) + { + avr_need_clear_bss_p = true; + diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix index 265e696523d..dc472abec4f 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -72,6 +72,8 @@ let majorVersion = "11"; sha256 = "sha256-LFAXUEoYD7YeCG8V9mWanygyQOI7U5OhCRIKOVCCDAg="; }) ] + # https://github.com/osx-cross/homebrew-avr/issues/280#issuecomment-1272381808 + ++ optional (stdenv.isDarwin && targetPlatform.isAvr) ./avr-gcc-11.3-darwin.patch # Obtain latest patch with ../update-mcfgthread-patches.sh ++ optional (!crossStageStatic && targetPlatform.isMinGW && threadsCross.model == "mcf") ./Added-mcf-thread-model-support-from-mcfgthread.patch; |