Remove a superfluous part of a patch (patching a .orig file resulting from

a previous patch).

No PORTREVISION bump as the resulting binaries are identical.

2 files changed, 0 insertions, 168 deletions

diff --git a/devel/avr-gcc-3/files/patch-newdevices b/devel/avr-gcc-3/files/patch-newdevices
index 9a62f2e..e68ec92 100644
--- a/devel/avr-gcc-3/files/patch-newdevices
+++ b/devel/avr-gcc-3/files/patch-newdevices
@@ -136,90 +136,6 @@ diff -ur /tmp/gcc-orig/gcc/config/avr/avr.h ./gcc/config/avr/avr.h
  %{mmcu=at94k:crtat94k.o%s}"
  
  #define EXTRA_SPECS {"crt_binutils", CRT_BINUTILS_SPECS},
-diff -ur /tmp/gcc-orig/gcc/config/avr/avr.h.orig ./gcc/config/avr/avr.h.orig
---- /tmp/gcc-orig/gcc/config/avr/avr.h.orig	Tue Mar  9 03:59:55 2004
-+++ ./gcc/config/avr/avr.h.orig	Sat Jul 30 22:27:40 2005
-@@ -2351,12 +2351,12 @@
-    Do not define this macro if it does not need to do anything.  */
- 
- #define LINK_SPEC " %{!mmcu*:-m avr2}\
--%{mmcu=at90s1200|mmcu=attiny1*|mmcu=attiny28:-m avr1} \
--%{mmcu=attiny22|mmcu=attiny26|mmcu=at90s2*|mmcu=at90s4*|mmcu=at90s8*|mmcu=at90c8*|mmcu=at86rf401:-m avr2}\
-+%{mmcu=at90s1200|mmcu=attiny11|mmcu=attiny12|mmcu=attiny15|mmcu=attiny28:-m avr1} \
-+%{mmcu=attiny22|mmcu=attiny26|mmcu=at90s2*|mmcu=at90s4*|mmcu=at90s8*|mmcu=at90c8*|mmcu=at86rf401|mmcu=attiny13|mmcu=attiny2313|mmcu=attiny25|mmcu=attiny45|mmcu=attiny85:-m avr2}\
- %{mmcu=atmega103|mmcu=atmega603|mmcu=at43*|mmcu=at76*:-m avr3}\
--%{mmcu=atmega8*:-m avr4}\
--%{mmcu=atmega16*|mmcu=atmega32*|mmcu=atmega64|mmcu=atmega128|mmcu=at94k:-m avr5}\
--%{mmcu=atmega64|mmcu=atmega128|mmcu=atmega162|mmcu=atmega169: -Tdata 0x800100} "
-+%{mmcu=atmega8*|mmcu=atmega48|mmcu=at90pwm*:-m avr4}\
-+%{mmcu=atmega16*|mmcu=atmega32*|mmcu=atmega64*|mmcu=atmega128|mmcu=at90can128|mmcu=at94k:-m avr5}\
-+%{mmcu=atmega325|mmcu=atmega3250|mmcu=atmega48|mmcu=atmega88|mmcu=atmega64|mmcu=atmega645|mmcu=atmega6450|mmcu=atmega128|mmcu=at90can128|mmcu=at90can128|mmcu=atmega162|mmcu=atmega168|mmcu=atmega169: -Tdata 0x800100} "
- 
- /* A C string constant that tells the GCC driver program options to
-    pass to the linker.  It can also specify how to translate options
-@@ -2365,7 +2365,7 @@
-    Do not define this macro if it does not need to do anything.  */
- 
- #define LIB_SPEC \
--  "%{!mmcu=at90s1*:%{!mmcu=attiny1*:%{!mmcu=attiny28: -lc }}}"
-+  "%{!mmcu=at90s1*:%{!mmcu=attiny11:%{!mmcu=attiny12:%{!mmcu=attiny15:%{!mmcu=attiny28: -lc }}}}}"
- /* Another C string constant used much like `LINK_SPEC'.  The
-    difference between the two is that `LIB_SPEC' is used at the end
-    of the command given to the linker.
-@@ -2377,7 +2377,7 @@
- /* No libstdc++ for now.  Empty string doesn't work.  */
- 
- #define LIBGCC_SPEC \
--  "%{!mmcu=at90s1*:%{!mmcu=attiny1*:%{!mmcu=attiny28: -lgcc }}}"
-+  "%{!mmcu=at90s1*:%{!mmcu=attiny11:%{!mmcu=attiny12:%{!mmcu=attiny15:%{!mmcu=attiny28: -lgcc }}}}}"
- /* Another C string constant that tells the GCC driver program how
-    and when to place a reference to `libgcc.a' into the linker
-    command line.  This constant is placed both before and after the
-@@ -2421,23 +2421,38 @@
- %{mmcu=at90c8534:crtc8534.o%s} \
- %{mmcu=at90s8535:crts8535.o%s} \
- %{mmcu=at86rf401:crt86401.o%s} \
-+%{mmcu=attiny13:crttn13.o%s} \
-+%{mmcu=attiny2313:crttn2313.o%s} \
-+%{mmcu=attiny25:crttn25.o%s} \
-+%{mmcu=attiny45:crttn45.o%s} \
-+%{mmcu=attiny85:crttn85.o%s} \
- %{mmcu=atmega103|mmcu=avr3:crtm103.o%s} \
- %{mmcu=atmega603:crtm603.o%s} \
- %{mmcu=at43usb320:crt43320.o%s} \
- %{mmcu=at43usb355:crt43355.o%s} \
- %{mmcu=at76c711:crt76711.o%s} \
- %{mmcu=atmega8|mmcu=avr4:crtm8.o%s} \
-+%{mmcu=atmega48:crtm48.o%s} \
-+%{mmcu=atmega88:crtm88.o%s} \
- %{mmcu=atmega8515:crtm8515.o%s} \
- %{mmcu=atmega8535:crtm8535.o%s} \
-+%{mmcu=at90pwm2:crt90pwm2.o%s} \
-+%{mmcu=at90pwm3:crt90pwm3.o%s} \
- %{mmcu=atmega16:crtm16.o%s} \
- %{mmcu=atmega161|mmcu=avr5:crtm161.o%s} \
- %{mmcu=atmega162:crtm162.o%s} \
- %{mmcu=atmega163:crtm163.o%s} \
-+%{mmcu=atmega168:crtm168.o%s} \
- %{mmcu=atmega169:crtm169.o%s} \
- %{mmcu=atmega32:crtm32.o%s} \
- %{mmcu=atmega323:crtm323.o%s} \
-+%{mmcu=atmega325:crtm325.o%s} \
-+%{mmcu=atmega3250:crtm3250.o%s} \
- %{mmcu=atmega64:crtm64.o%s} \
-+%{mmcu=atmega645:crtm645.o%s} \
-+%{mmcu=atmega6450:crtm6450.o%s} \
- %{mmcu=atmega128:crtm128.o%s} \
-+%{mmcu=at90can128:crtcan128.o%s} \
- %{mmcu=at94k:crtat94k.o%s}"
- 
- #define EXTRA_SPECS {"crt_binutils", CRT_BINUTILS_SPECS},
-@@ -2479,4 +2494,5 @@
- /* zero register r1 */
- #define ZERO_REGNO 1
- 
-+#define DWARF2_DEBUGGING_INFO 1
- #define PREFERRED_DEBUGGING_TYPE DBX_DEBUG
 diff -ur /tmp/gcc-orig/gcc/config/avr/t-avr ./gcc/config/avr/t-avr
 --- /tmp/gcc-orig/gcc/config/avr/t-avr	Mon Apr 25 06:17:34 2005
 +++ ./gcc/config/avr/t-avr	Sat Jul 30 23:06:40 2005
diff --git a/devel/avr-gcc/files/patch-newdevices b/devel/avr-gcc/files/patch-newdevices
index 9a62f2e..e68ec92 100644
--- a/devel/avr-gcc/files/patch-newdevices
+++ b/devel/avr-gcc/files/patch-newdevices
@@ -136,90 +136,6 @@ diff -ur /tmp/gcc-orig/gcc/config/avr/avr.h ./gcc/config/avr/avr.h
  %{mmcu=at94k:crtat94k.o%s}"
  
  #define EXTRA_SPECS {"crt_binutils", CRT_BINUTILS_SPECS},
-diff -ur /tmp/gcc-orig/gcc/config/avr/avr.h.orig ./gcc/config/avr/avr.h.orig
---- /tmp/gcc-orig/gcc/config/avr/avr.h.orig	Tue Mar  9 03:59:55 2004
-+++ ./gcc/config/avr/avr.h.orig	Sat Jul 30 22:27:40 2005
-@@ -2351,12 +2351,12 @@
-    Do not define this macro if it does not need to do anything.  */
- 
- #define LINK_SPEC " %{!mmcu*:-m avr2}\
--%{mmcu=at90s1200|mmcu=attiny1*|mmcu=attiny28:-m avr1} \
--%{mmcu=attiny22|mmcu=attiny26|mmcu=at90s2*|mmcu=at90s4*|mmcu=at90s8*|mmcu=at90c8*|mmcu=at86rf401:-m avr2}\
-+%{mmcu=at90s1200|mmcu=attiny11|mmcu=attiny12|mmcu=attiny15|mmcu=attiny28:-m avr1} \
-+%{mmcu=attiny22|mmcu=attiny26|mmcu=at90s2*|mmcu=at90s4*|mmcu=at90s8*|mmcu=at90c8*|mmcu=at86rf401|mmcu=attiny13|mmcu=attiny2313|mmcu=attiny25|mmcu=attiny45|mmcu=attiny85:-m avr2}\
- %{mmcu=atmega103|mmcu=atmega603|mmcu=at43*|mmcu=at76*:-m avr3}\
--%{mmcu=atmega8*:-m avr4}\
--%{mmcu=atmega16*|mmcu=atmega32*|mmcu=atmega64|mmcu=atmega128|mmcu=at94k:-m avr5}\
--%{mmcu=atmega64|mmcu=atmega128|mmcu=atmega162|mmcu=atmega169: -Tdata 0x800100} "
-+%{mmcu=atmega8*|mmcu=atmega48|mmcu=at90pwm*:-m avr4}\
-+%{mmcu=atmega16*|mmcu=atmega32*|mmcu=atmega64*|mmcu=atmega128|mmcu=at90can128|mmcu=at94k:-m avr5}\
-+%{mmcu=atmega325|mmcu=atmega3250|mmcu=atmega48|mmcu=atmega88|mmcu=atmega64|mmcu=atmega645|mmcu=atmega6450|mmcu=atmega128|mmcu=at90can128|mmcu=at90can128|mmcu=atmega162|mmcu=atmega168|mmcu=atmega169: -Tdata 0x800100} "
- 
- /* A C string constant that tells the GCC driver program options to
-    pass to the linker.  It can also specify how to translate options
-@@ -2365,7 +2365,7 @@
-    Do not define this macro if it does not need to do anything.  */
- 
- #define LIB_SPEC \
--  "%{!mmcu=at90s1*:%{!mmcu=attiny1*:%{!mmcu=attiny28: -lc }}}"
-+  "%{!mmcu=at90s1*:%{!mmcu=attiny11:%{!mmcu=attiny12:%{!mmcu=attiny15:%{!mmcu=attiny28: -lc }}}}}"
- /* Another C string constant used much like `LINK_SPEC'.  The
-    difference between the two is that `LIB_SPEC' is used at the end
-    of the command given to the linker.
-@@ -2377,7 +2377,7 @@
- /* No libstdc++ for now.  Empty string doesn't work.  */
- 
- #define LIBGCC_SPEC \
--  "%{!mmcu=at90s1*:%{!mmcu=attiny1*:%{!mmcu=attiny28: -lgcc }}}"
-+  "%{!mmcu=at90s1*:%{!mmcu=attiny11:%{!mmcu=attiny12:%{!mmcu=attiny15:%{!mmcu=attiny28: -lgcc }}}}}"
- /* Another C string constant that tells the GCC driver program how
-    and when to place a reference to `libgcc.a' into the linker
-    command line.  This constant is placed both before and after the
-@@ -2421,23 +2421,38 @@
- %{mmcu=at90c8534:crtc8534.o%s} \
- %{mmcu=at90s8535:crts8535.o%s} \
- %{mmcu=at86rf401:crt86401.o%s} \
-+%{mmcu=attiny13:crttn13.o%s} \
-+%{mmcu=attiny2313:crttn2313.o%s} \
-+%{mmcu=attiny25:crttn25.o%s} \
-+%{mmcu=attiny45:crttn45.o%s} \
-+%{mmcu=attiny85:crttn85.o%s} \
- %{mmcu=atmega103|mmcu=avr3:crtm103.o%s} \
- %{mmcu=atmega603:crtm603.o%s} \
- %{mmcu=at43usb320:crt43320.o%s} \
- %{mmcu=at43usb355:crt43355.o%s} \
- %{mmcu=at76c711:crt76711.o%s} \
- %{mmcu=atmega8|mmcu=avr4:crtm8.o%s} \
-+%{mmcu=atmega48:crtm48.o%s} \
-+%{mmcu=atmega88:crtm88.o%s} \
- %{mmcu=atmega8515:crtm8515.o%s} \
- %{mmcu=atmega8535:crtm8535.o%s} \
-+%{mmcu=at90pwm2:crt90pwm2.o%s} \
-+%{mmcu=at90pwm3:crt90pwm3.o%s} \
- %{mmcu=atmega16:crtm16.o%s} \
- %{mmcu=atmega161|mmcu=avr5:crtm161.o%s} \
- %{mmcu=atmega162:crtm162.o%s} \
- %{mmcu=atmega163:crtm163.o%s} \
-+%{mmcu=atmega168:crtm168.o%s} \
- %{mmcu=atmega169:crtm169.o%s} \
- %{mmcu=atmega32:crtm32.o%s} \
- %{mmcu=atmega323:crtm323.o%s} \
-+%{mmcu=atmega325:crtm325.o%s} \
-+%{mmcu=atmega3250:crtm3250.o%s} \
- %{mmcu=atmega64:crtm64.o%s} \
-+%{mmcu=atmega645:crtm645.o%s} \
-+%{mmcu=atmega6450:crtm6450.o%s} \
- %{mmcu=atmega128:crtm128.o%s} \
-+%{mmcu=at90can128:crtcan128.o%s} \
- %{mmcu=at94k:crtat94k.o%s}"
- 
- #define EXTRA_SPECS {"crt_binutils", CRT_BINUTILS_SPECS},
-@@ -2479,4 +2494,5 @@
- /* zero register r1 */
- #define ZERO_REGNO 1
- 
-+#define DWARF2_DEBUGGING_INFO 1
- #define PREFERRED_DEBUGGING_TYPE DBX_DEBUG
 diff -ur /tmp/gcc-orig/gcc/config/avr/t-avr ./gcc/config/avr/t-avr
 --- /tmp/gcc-orig/gcc/config/avr/t-avr	Mon Apr 25 06:17:34 2005
 +++ ./gcc/config/avr/t-avr	Sat Jul 30 23:06:40 2005