[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#840574: Please backport libgo fixes for sparc64



Hi Matthias,
As promised yesterday on #debian-toolchain, here is a debdiff to fix the
libgo debug/elf testsuite failure by providing a uuencoded copy of
go-relocation-test-gcc620-sparc64.obj.

Regards,
James
diff -u gcc-6-6.2.0/debian/changelog gcc-6-6.2.0/debian/changelog
--- gcc-6-6.2.0/debian/changelog
+++ gcc-6-6.2.0/debian/changelog
@@ -1,3 +1,10 @@
+gcc-6 (6.2.0-9+sparc64) UNRELEASED; urgency=medium
+
+  * Include go-relocation-test-gcc620-sparc64.obj.uue to fix libgo's
+    debug/elf TestDWARFRelocations test case.
+
+ -- James Clarke <jrtc27@jrtc27.com>  Thu, 20 Oct 2016 20:32:51 +0100
+
 gcc-6 (6.2.0-9) unstable; urgency=medium
 
   * Regenerate the control file.
diff -u gcc-6-6.2.0/debian/patches/libgo-elf-relocations-sparc64.diff gcc-6-6.2.0/debian/patches/libgo-elf-relocations-sparc64.diff
--- gcc-6-6.2.0/debian/patches/libgo-elf-relocations-sparc64.diff
+++ gcc-6-6.2.0/debian/patches/libgo-elf-relocations-sparc64.diff
@@ -1,4 +1,7 @@
 # DP: Backport r241051 from trunk
+# DP: src/libgo/go/debug/elf/testdata/go-relocation-test-gcc620-sparc64.obj is
+# DP: encoded in debian/go-relocation-test-gcc620-sparc64.obj.uue and is
+# DP: decoded at patch time.
 
 debug/elf: add sparc64 relocations
 
@@ -104,4 +106,0 @@
-Index: b/src/libgo/go/debug/elf/testdata/go-relocation-test-gcc620-sparc64.obj
-===================================================================
-Cannot display: file marked as a binary type.
-svn:mime-type = application/octet-stream
diff -u gcc-6-6.2.0/debian/rules.patch gcc-6-6.2.0/debian/rules.patch
--- gcc-6-6.2.0/debian/rules.patch
+++ gcc-6-6.2.0/debian/rules.patch
@@ -392,6 +392,10 @@
 	  $(patchdir)/svn-updates.diff > src/LAST_UPDATED
 endif
 
+ifneq (,$(filter libgo-elf-relocations-sparc64, $(debian_patches)))
+	uudecode debian/go-relocation-test-gcc620-sparc64.obj.uue
+endif
+
 	: # only needed when we have changes, and currently fails with autogen 5.18
 	: #cd $(srcdir)/fixincludes && ./genfixes
 
@@ -409,6 +413,11 @@
 	mv pxxx $@
 
 unpatch:
+ifneq (,$(filter libgo-elf-relocations-sparc64, $(debian_patches)))
+	# uudecoded in $(patch_stamp) rule
+	rm -f $(srcdir)/libgo/go/debug/elf/testdata/go-relocation-test-gcc620-sparc64.obj
+endif
+
 	QUILT_PATCHES=$(patchdir) \
 	  quilt --quiltrc /dev/null pop -a -R || test $$? = 2
 	rm -rf .pc
only in patch2:
unchanged:
--- gcc-6-6.2.0.orig/debian/go-relocation-test-gcc620-sparc64.obj.uue
+++ gcc-6-6.2.0/debian/go-relocation-test-gcc620-sparc64.obj.uue
@@ -0,0 +1,136 @@
+begin 644 src/libgo/go/debug/elf/testdata/go-relocation-test-gcc620-sparc64.obj
+M?T5,1@("`0`````````````!`"L````!````````````````````````````
+M`!(``````@!```````!``!4`$IWCOU""$``8\G>HA\(GJ'\#````D!!@`$``
+M```!`````0```('/X`@!`````````&AE;&QO+"!W;W)L9`````-"``0`````
+M"`$`````#```````````````````````````````+``````"``````+8````
+M.`,(!P`````#`0@``````P('``````,$!P`````#`08``````P(%``````0$
+M!6EN=``#"`4``````@`````#@P```&D"``````.$````:0,(!P`````%"`8(
+M````E0,!!@`````'````E0@`````V`3Q```"'@D`````!/(```!B``D`````
+M!/<```"/"`D`````!/@```"/$`D`````!/D```"/&`D`````!/H```"/(`D`
+M````!/L```"/*`D`````!/P```"/,`D`````!/T```"/.`D`````!/X```"/
+M0`H`````!`$`````CT@*``````0!`0```(]0"@`````$`0(```"/6`H`````
+M!`$$```"5F`*``````0!!@```EQH"@`````$`0@```!B<`H`````!`$,````
+M8G0*``````0!#@```'!X"@`````$`1(```!&@`H`````!`$3````5((*````
+M``0!%````F*#"@`````$`1@```)RB`H`````!`$A````>Y`*``````0!*0``
+M`(V8"@`````$`2H```"-H`H`````!`$K````C:@*``````0!+````(VP"@``
+M```$`2X````MN`H`````!`$O````8L`*``````0!,0```GC$``L`````!)8(
+M`````!@$G````E8)``````2=```"5@`)``````2>```"7`@)``````2B````
+M8A``!@@```(E!@@```"A#````)4```)R#0```(8```8(```"'@P```"5```"
+MB`T```"&$P`.``````\`````!`$[```"B`\`````!`$\```"B`\`````!`$]
+M```"B`8(````G`<```*Q$``````%J@```EP0``````6K```"7!``````!:P`
+M``)<$``````&&@```&(,```"MP```O,1``<```+H$``````&&P```O,2````
+M``$$````````````````````+`&<```#/Q,``````00```!B`Y&``1,`````
+M`00```,_`Y&(`0`&"````(\``1$!)0X3"P,.&PX1`1('$!<```(6``,..@L[
+M"TD3```#)``+"SX+`PX```0D``L+/@L#"```!0\`"PL```8/``L+21,```<F
+M`$D3```($P$##@L+.@L["P$3```)#0`##CH+.PM)$S@+```*#0`##CH+.P5)
+M$S@+```+%@`##CH+.PL```P!`4D3`1,```TA`$D3+PL```X3``,./!D```\T
+M``,..@L[!4D3/QD\&0``$#0``PXZ"SL+21,_&3P9```1(0```!(N`3\9`PXZ
+M"SL+)QD1`1('0!B60AD!$P``$P4``PXZ"SL+21,"&````````"P``@`````(
+M```````````````````````````L`````````````````````````,\``@``
+M`+8$`?L.#0`!`0$!`````0```2]U<W(O;&EB+V=C8R]S<&%R8S8T+6QI;G5X
+M+6=N=2\V+VEN8VQU9&4`+W5S<B]I;F-L=61E+W-P87)C-C0M;&EN=7@M9VYU
+M+V)I=',`+W5S<B]I;F-L=61E``!H96QL;RYC`````'-T9&1E9BYH``$``'1Y
+M<&5S+F@``@``;&EB:6\N:``#``!S=&1I;RYH``,``'-Y<U]E<G)L:7-T+F@`
+M`@`````)`@``````````%DM+`@,``0%?24]?8G5F7V5N9`!?;VQD7V]F9G-E
+M=`!S>7-?;F5R<@!?24]?<V%V95]E;F0`<VAO<G0@:6YT`'-I>F5?=`!S:7IE
+M='EP90!?;V9F<V5T`%])3U]W<FET95]P='(`7V9L86=S`%])3U]B=69?8F%S
+M90!?;6%R:V5R<P!?24]?<F5A9%]E;F0`<W1D97)R`%]L;V-K`&QO;F<@:6YT
+M`$=.52!#,3$@-BXR+C`@,C`Q-C`Y,30@+6UC<'4]=CD@+6<@+69S=&%C:RUP
+M<F]T96-T;W(M<W1R;VYG`%]C=7)?8V]L=6UN`%])3U\R7S%?<W1D97)R7P!?
+M24]?1DE,15]P;'5S`%]P;W,`87)G=@!?<V)U9@!?24]?1DE,10!U;G-I9VYE
+M9"!C:&%R`&%R9V,`<VEG;F5D(&-H87(`7TE/7S)?,5]S=&1I;E\`=6YS:6=N
+M960@:6YT`%])3U]M87)K97(`7W-H;W)T8G5F`%])3U]W<FET95]B87-E`%]U
+M;G5S960R`%])3U]R96%D7W!T<@!S:&]R="!U;G-I9VYE9"!I;G0`8VAA<@!M
+M86EN`%]N97AT`%]?<&%D,0!?7W!A9#(`7U]P860S`%]?<&%D-`!?7W!A9#4`
+M;&]N9R!U;G-I9VYE9"!I;G0`7TE/7W=R:71E7V5N9`!?7V]F9C8T7W0`7TE/
+M7S)?,5]S=&1O=71?`%]?;V9F7W0`7V-H86EN`%])3U]B86-K=7!?8F%S90!S
+M=&1I;@!?9FQA9W,R`%]M;V1E`%])3U]R96%D7V)A<V4`7W9T86)L95]O9F9S
+M970`7TE/7W-A=F5?8F%S90!S>7-?97)R;&ES=`!?9FEL96YO`&AE;&QO+F,`
+M<W1D;W5T`"]T;7``7TE/7VQO8VM?=```1T-#.B`H1&5B:6%N(#8N,BXP+30K
+M<W!A<F,V-"D@-BXR+C`@,C`Q-C`Y,30`````%/____\!``1X#PP._P\`````
+M````````'``````````````````````````L02T)#Q\-'@``````````````
+M```````````````````````!!`#_\0```````````````````````````P``
+M`0```````````````````````````P```P``````````````````````````
+M`P``!````````````````````````````P``!0``````````````````````
+M`````P``!@```````````````````````````P``"```````````````````
+M`````````P``"0```````````````````````````P``"P``````````````
+M`````````````P``#0```````````````````````````P``#P``````````
+M`````````````````P``$````````````````````````````P``#@``````
+M```````````````````)$@```0```````````````````"P````.$```````
+M````````````````````:&5L;&\N8P!M86EN`'!U=',`````````````````
+M$`````4````)````````````````````%`````4````,````````````````
+M````&`````\````'````````````````````!@````<````7````````````
+M````````#`````H````7`````````)X`````````$0````H````7````````
+M`H0`````````%0````H````7`````````I,`````````&0````(````V````
+M````````````````*0````D````7````````````````````+@````H````7
+M`````````#@`````````.P````H````7`````````=@`````````0@````H`
+M```7`````````1T`````````20````H````7`````````9(`````````4```
+M``H````7`````````4L`````````5P````H````7`````````3``````````
+M7@````H````7`````````"X`````````;`````H````7`````````)4`````
+M````<0````H````7`````````A(`````````?`````H````7`````````?@`
+M````````B0````H````7`````````#\`````````F`````H````7````````
+M`:4`````````H@````H````7`````````10`````````K@````H````7````
+M`````%X`````````N@````H````7`````````84`````````Q@````H````7
+M`````````'L`````````T@````H````7`````````D4`````````W@````H`
+M```7`````````6T`````````Z@````H````7`````````%``````````]@``
+M``H````7`````````>H````````!`@````H````7`````````&4````````!
+M#@````H````7```````````````````!&@````H````7`````````F(`````
+M```!)P````H````7`````````B$````````!-`````H````7`````````"$`
+M```````!00````H````7`````````'(````````!3@````H````7````````
+M`AH````````!6P````H````7`````````GP````````!:`````H````7````
+M`````C<````````!=0````H````7``````````P````````!@@````H````7
+M`````````-H````````!CP````H````7`````````E,````````!G`````H`
+M```7`````````6,````````!J0````H````7`````````(\````````!M@``
+M``H````7`````````$@````````!PP````H````7`````````;4````````!
+MT`````H````7`````````;P````````!W0````H````7`````````<,`````
+M```!Z@````H````7`````````<H````````!]P````H````7`````````=$`
+M```````"!`````H````7`````````C\````````"$0````H````7````````
+M`7P````````"'P````H````7`````````I@````````")@````H````7````
+M`````5@````````",@````H````7`````````:\````````"/@````H````7
+M`````````0X````````"2@````H````7`````````00````````"B0````H`
+M```7`````````/8````````"C@````H````7`````````3P````````"F@``
+M``H````7`````````@(````````"I@````H````7`````````.8````````"
+MO0````H````7`````````C$````````"R`````H````7`````````HP`````
+M```"TP````H````7`````````(@````````"W@````H````7`````````!@`
+M```````"^0````H````7`````````G`````````#!`````H````7````````
+M`:H````````#"@````(````V```````````````````#(0````H````7````
+M`````2L````````#,`````H````7`````````0D`````````!@````8````7
+M````````````````````$`````(````V````````````````````PP````(`
+M```V````````````````````'`````P````7````````````````````(```
+M``(````V````````````+G-Y;71A8@`N<W1R=&%B`"YS:'-T<G1A8@`N<F5L
+M82YT97AT`"YD871A`"YB<W,`+G)O9&%T80`N<F5L82YD96)U9U]I;F9O`"YD
+M96)U9U]A8F)R978`+G)E;&$N9&5B=6=?87)A;F=E<P`N<F5L82YD96)U9U]L
+M:6YE`"YD96)U9U]S='(`+F-O;6UE;G0`+FYO=&4N1TY5+7-T86-K`"YR96QA
+M+F1E8G5G7V9R86UE````````````````````````````````````````````
+M`````````````````````````````````````````````````````"`````!
+M``````````8```````````````````!``````````"P`````````````````
+M```$```````````````;````!`````````!````````````````````*6```
+M``````!(````$P````$`````````"``````````8````)@````$`````````
+M`P```````````````````&P```````````````````````````````$`````
+M`````````"P````(``````````,```````````````````!L````````````
+M```````````````````!```````````````Q`````0`````````"````````
+M````````````<``````````-````````````````````"```````````````
+M/@````$``````````````````````````````'T````````#1@``````````
+M``````````$``````````````#D````$`````````$``````````````````
+M``J@````````!C`````3````!@`````````(`````````!@```!*`````0``
+M```````````````````````````#PP````````#Q````````````````````
+M`0``````````````70````$`````````````````````````````!+0`````
+M````,`````````````````````$``````````````%@````$`````````$``
+M`````````````````!#0`````````#`````3````"0`````````(````````
+M`!@```!Q`````0`````````````````````````````$Y`````````#3````
+M`````````````````0``````````````;`````0`````````0```````````
+M````````$0``````````&````!,````+``````````@`````````&````'T`
+M```!`````````#````````````````````6W`````````J,`````````````
+M```````!``````````$```"(`````0`````````P```````````````````(
+M6@`````````N`````````````````````0`````````!````D0````$`````
+M````````````````````````"(@```````````````````````````````$`
+M`````````````*8````!``````````````````````````````B(````````
+M`#@````````````````````(``````````````"A````!`````````!`````
+M```````````````1&``````````P````$P```!``````````"``````````8
+M````$0````,`````````````````````````````$4@`````````LP``````
+M``````````````$```````````````$````"````````````````````````
+M``````C``````````8`````4````#@`````````(`````````!@````)````
+M`P`````````````````````````````*0``````````3````````````````
+,`````0``````````
+`
+end

Attachment: signature.asc
Description: PGP signature


Reply to: