[oe-commits] org.oe.dev binutils* 2.17: fix avr32

[koen commit]

binutils* 2.17: fix avr32

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 038835a3488b91319ff1b921e9d93f67b809c7ae
ViewMTN: http://monotone.openembedded.org/revision/info/038835a3488b91319ff1b921e9d93f67b809c7ae
Files:
1
packages/binutils/binutils-2.17/500-avr32-atmel.1.3.0.patch
packages/binutils/binutils-2.17/501-avr32-fix-pool-alignment.patch
packages/binutils/binutils_2.17.bb
mtn:manual_merge
true
Diffs:

#
# mt diff -r05ed4540fccdc5c128859987a31d2d0c58498d3c -r038835a3488b91319ff1b921e9d93f67b809c7ae
#
# 
# 
# add_file "packages/binutils/binutils-2.17/500-avr32-atmel.1.3.0.patch"
#  content [5f7f471aaf1689d853655f32ce35a826dc860c07]
# 
# add_file "packages/binutils/binutils-2.17/501-avr32-fix-pool-alignment.patch"
#  content [d74bbdb835334aa6edcbd34f0971c63bf1fd151e]
# 
# patch "packages/binutils/binutils_2.17.bb"
#  from [b221c1f76176e30933b227951e0ebee85e3033b1]
#    to [214d0d98246a44ff78cdafec723b4114aee39837]
# 
#   set "packages/binutils/binutils-2.17/500-avr32-atmel.1.3.0.patch"
#  attr "mtn:manual_merge"
# value "true"
# 
============================================================
# packages/binutils/binutils-2.17/500-avr32-atmel.1.3.0.patch is binary
============================================================
--- packages/binutils/binutils-2.17/501-avr32-fix-pool-alignment.patch	d74bbdb835334aa6edcbd34f0971c63bf1fd151e
+++ packages/binutils/binutils-2.17/501-avr32-fix-pool-alignment.patch	d74bbdb835334aa6edcbd34f0971c63bf1fd151e
@@ -0,0 +1,26 @@
+Index: a/gas/config/tc-avr32.c
+===================================================================
+--- a/gas/config/tc-avr32.c	(revision 31496)
++++ b/gas/config/tc-avr32.c	(revision 32014)
+@@ -3092,6 +3092,8 @@
+ 
+   /* Make sure the constant pool is properly aligned */
+   frag_align_code(2, 0);
++  if (bfd_get_section_alignment(stdoutput, pool->section) < 2)
++    bfd_set_section_alignment(stdoutput, pool->section, 2);
+ 
+   /* Assume none of the entries are discarded, and that we need the
+      maximum amount of alignment.  But we're not going to allocate
+Index: a/bfd/configure.in
+===================================================================
+--- a/bfd/configure.in	(revision 31496)
++++ b/bfd/configure.in	(revision 32014)
+@@ -8,7 +8,7 @@
+ AC_CANONICAL_TARGET
+ AC_ISC_POSIX
+ 
+-AM_INIT_AUTOMAKE(bfd, 2.17.atmel.1.2.0)
++AM_INIT_AUTOMAKE(bfd, 2.17.atmel.1.2.1)
+ 
+ dnl These must be called before AM_PROG_LIBTOOL, because it may want
+ dnl to call AC_CHECK_PROG.
============================================================
--- packages/binutils/binutils_2.17.bb	b221c1f76176e30933b227951e0ebee85e3033b1
+++ packages/binutils/binutils_2.17.bb	214d0d98246a44ff78cdafec723b4114aee39837
@@ -1,6 +1,6 @@ require binutils.inc
 require binutils.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = \
     "http://ftp.gnu.org/gnu/binutils/binutils-${PV}.tar.bz2 \
@@ -18,10 +18,8 @@ SRC_URI += "\
 	file://300-012_check_ldrunpath_length.patch;patch=1 \
 	file://300-001_ld_makefile_patch.patch;patch=1 \
 	file://400-mips-ELF_MAXPAGESIZE-4K.patch;patch=1 \
-        http://avr32linux.org/twiki/pub/Main/DevelopmentTools/500-avr32.patch.gz;patch=1 \
-        http://avr32linux.org/twiki/pub/Main/DevelopmentTools/501-avr32-sreldyn-fix.patch.gz;patch=1 \
-	http://avr32linux.org/twiki/pub/Main/DevelopmentTools/502-avr32-bfd-dont-allow-direct-refs-to-bss.patch.gz;patch=1 \
-        file://503-avr32-fix-got-offset-init.patch;patch=1 \
+        file://500-avr32-atmel.1.3.0.patch;patch=1 \
+        file://501-avr32-fix-pool-alignment.patch;patch=1 \
 "
 
 # Zecke's OSX fixes