about summary refs log tree commit diff
path: root/pkgs/development/compilers
diff options
context:
space:
mode:
authorRandy Eckenrode <randy@largeandhighquality.com>2023-12-02 18:19:48 -0500
committerRandy Eckenrode <randy@largeandhighquality.com>2023-12-02 18:30:46 -0500
commitdb20831951cebae92b8e630b61bf5ca3c1bdad11 (patch)
treeb606704b6e53f9202fda9aa6e7c38794d95181c0 /pkgs/development/compilers
parentcda101679dde20093ed8fbeb1d874354d01206a2 (diff)
downloadnixlib-db20831951cebae92b8e630b61bf5ca3c1bdad11.tar
nixlib-db20831951cebae92b8e630b61bf5ca3c1bdad11.tar.gz
nixlib-db20831951cebae92b8e630b61bf5ca3c1bdad11.tar.bz2
nixlib-db20831951cebae92b8e630b61bf5ca3c1bdad11.tar.lz
nixlib-db20831951cebae92b8e630b61bf5ca3c1bdad11.tar.xz
nixlib-db20831951cebae92b8e630b61bf5ca3c1bdad11.tar.zst
nixlib-db20831951cebae92b8e630b61bf5ca3c1bdad11.zip
gcc11: drop AVR patch on Darwin (no longer needed)
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r--pkgs/development/compilers/gcc/patches/11/avr-gcc-11.3-darwin.patch20
-rw-r--r--pkgs/development/compilers/gcc/patches/default.nix3
2 files changed, 0 insertions, 23 deletions
diff --git a/pkgs/development/compilers/gcc/patches/11/avr-gcc-11.3-darwin.patch b/pkgs/development/compilers/gcc/patches/11/avr-gcc-11.3-darwin.patch
deleted file mode 100644
index 787862fbcffa..000000000000
--- a/pkgs/development/compilers/gcc/patches/11/avr-gcc-11.3-darwin.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix
index 9eda241f6d3a..32938be376d9 100644
--- a/pkgs/development/compilers/gcc/patches/default.nix
+++ b/pkgs/development/compilers/gcc/patches/default.nix
@@ -175,9 +175,6 @@ in
 
 ## gcc 11.0 and older ##############################################################################
 
-# https://github.com/osx-cross/homebrew-avr/issues/280#issuecomment-1272381808
-++ optional (is11 && stdenv.isDarwin && targetPlatform.isAvr) ./avr-gcc-11.3-darwin.patch
-
 # libgcc’s `configure` script misdetects aarch64-darwin, resulting in an invalid deployment target.
 ++ optional (is11 && stdenv.isDarwin && stdenv.isAarch64) ./11/libgcc-aarch64-darwin-detection.patch