diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-01-24 00:02:42 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-24 00:02:42 +0000 |
| commit | cd6a5f6c469fc98dc2c4067e37be33870549c753 (patch) | |
| tree | a23d65e627240559fc2b1bd04aa457bcc7975d57 /pkgs/development/compilers/gcc | |
| parent | 46d29bdaecc289e749bc6c0b80002dfa8fc82169 (diff) | |
| parent | 727e365f0276012d719f0e6c95ba0f0a53c9099a (diff) | |
| download | nixpkgs-cd6a5f6c469fc98dc2c4067e37be33870549c753.tar nixpkgs-cd6a5f6c469fc98dc2c4067e37be33870549c753.tar.gz nixpkgs-cd6a5f6c469fc98dc2c4067e37be33870549c753.tar.bz2 nixpkgs-cd6a5f6c469fc98dc2c4067e37be33870549c753.tar.lz nixpkgs-cd6a5f6c469fc98dc2c4067e37be33870549c753.tar.xz nixpkgs-cd6a5f6c469fc98dc2c4067e37be33870549c753.tar.zst nixpkgs-cd6a5f6c469fc98dc2c4067e37be33870549c753.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/compilers/gcc')
| -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 | ||||
| -rw-r--r-- | pkgs/development/compilers/gcc/common/configure-flags.nix | 4 |
3 files changed, 22 insertions, 4 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 81c1b94b90b..20da9a97aa5 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -78,6 +78,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; diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index 9c88e2182ff..c9e9b00f60e 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -94,10 +94,6 @@ let # libsanitizer requires netrom/netrom.h which is not # available in uclibc. "--disable-libsanitizer" - ] ++ lib.optionals (targetPlatform.libc == "uclibc") [ - # In uclibc cases, libgomp needs an additional '-ldl' - # and as I don't know how to pass it, I disable libgomp. - "--disable-libgomp" ] ++ lib.optional (targetPlatform.libc == "newlib" || targetPlatform.libc == "newlib-nano") "--with-newlib" ++ lib.optional (targetPlatform.libc == "avrlibc") "--with-avrlibc" ); |