[oe-commits] Khem Raj : binutils-2.20.bb: Fix compilation error with missing braces

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 954cab651b1bcd3a8b28655099a6da117cde75f3
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=954cab651b1bcd3a8b28655099a6da117cde75f3

Author: Khem Raj <raj.khem at gmail.com>
Date:   Thu Oct 22 00:34:25 2009 -0700

binutils-2.20.bb: Fix compilation error with missing braces

Signed-off-by: Khem Raj <raj.khem at gmail.com>

---

 .../binutils-arm-non-empty-know.patch              |   18 ++++++++++++++++++
 recipes/binutils/binutils_2.20.bb                  |    4 ++++
 2 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/recipes/binutils/binutils-2.20/binutils-arm-non-empty-know.patch b/recipes/binutils/binutils-2.20/binutils-arm-non-empty-know.patch
new file mode 100644
index 0000000..f0f54b2
--- /dev/null
+++ b/recipes/binutils/binutils-2.20/binutils-arm-non-empty-know.patch
@@ -0,0 +1,18 @@
+This is backported partially from 2.20 branch
+
+http://sourceware.org/ml/binutils-cvs/2009-10/msg00173.html
+
+-Khem
+Index: binutils-2.20/gas/as.h
+===================================================================
+--- binutils-2.20.orig/gas/as.h	2009-10-22 00:27:08.700469349 -0700
++++ binutils-2.20/gas/as.h	2009-10-22 00:28:04.068416318 -0700
+@@ -238,7 +238,7 @@ typedef addressT valueT;
+ #define know(p) gas_assert(p)	/* Verify our assumptions!  */
+ #endif /* not yet defined */
+ #else
+-#define know(p)			/* know() checks are no-op.ed  */
++#define know(p) do {} while (0)	/* know() checks are no-op.ed  */
+ #endif
+ 
+ /* input_scrub.c */
diff --git a/recipes/binutils/binutils_2.20.bb b/recipes/binutils/binutils_2.20.bb
index fd539fe..62f40f2 100644
--- a/recipes/binutils/binutils_2.20.bb
+++ b/recipes/binutils/binutils_2.20.bb
@@ -1,6 +1,9 @@
 require binutils.inc
 LICENSE = "GPLv3"
 
+INC_PR = "r1"
+PR = "${INC_PR}.1"
+
 SRC_URI = "\
      ${GNU_MIRROR}/binutils/binutils-${PV}.tar.bz2 \
      file://binutils-uclibc-100-uclibc-conf.patch;patch=1 \
@@ -11,6 +14,7 @@ SRC_URI = "\
      file://binutils-uclibc-gas-needs-libm.patch;patch=1 \
      file://binutils-arm-pr7093.patch;patch=1 \
      file://ld-stub-crash.patch;patch=1;pnum=0 \
+     file://binutils-arm-non-empty-know.patch;patch=1 \
      "
 
 # powerpc patches