SourceForge.net Logo

A.2. binutils-2.15.94.0.2.2-with-gcc-4.0.2.patch

# 
# GPL $Id: linux-2.6.11.geode.patch,v 1.1 2005/10/16 15:01:45 cvonk Exp $
# patch file introducing the Geode SC1100 CPU in Linux 2.6.11
#
--- toolchain_build_i586-org/binutils-2.15.94.0.2.2/gas/tc.h	2006-10-13 13:27:43.000000000 -0700
+++ toolchain_build_i586/binutils-2.15.94.0.2.2/gas/tc.h	2006-10-13 13:28:35.000000000 -0700
@@ -24,23 +24,6 @@
 
 extern const pseudo_typeS md_pseudo_table[];
 
-/* JF moved this here from as.h under the theory that nobody except MACHINE.c
-   and write.c care about it anyway.  */
-
-struct relax_type
-{
-  /* Forward reach. Signed number. > 0.  */
-  long rlx_forward;
-  /* Backward reach. Signed number. < 0.  */
-  long rlx_backward;
-
-  /* Bytes length of this address.  */
-  unsigned char rlx_length;
-
-  /* Next longer relax-state.  0 means there is no 'next' relax-state.  */
-  relax_substateT rlx_more;
-};
-
 typedef struct relax_type relax_typeS;
 
 extern const int md_reloc_size;	/* Size of a relocation record.  */
--- toolchain_build_i586-org/binutils-2.15.94.0.2.2/gas/as.h	2006-10-13 13:27:29.000000000 -0700
+++ toolchain_build_i586/binutils-2.15.94.0.2.2/gas/as.h	2006-10-13 13:30:02.000000000 -0700
@@ -606,6 +606,26 @@
 struct fix;
 typedef struct symbol symbolS;
 struct relax_type;
+
+/* JF moved this here from as.h under the theory that nobody except MACHINE.c
+   and write.c care about it anyway.  */
+/* CJV moved it back from tc.h to as.h, because otherwise it does not 
+   compile with GCC 4.0.2. */
+
+struct relax_type
+{
+  /* Forward reach. Signed number. > 0.  */
+  long rlx_forward;
+  /* Backward reach. Signed number. < 0.  */
+  long rlx_backward;
+
+  /* Bytes length of this address.  */
+  unsigned char rlx_length;
+
+  /* Next longer relax-state.  0 means there is no 'next' relax-state.  */
+  relax_substateT rlx_more;
+};
+
 typedef struct frag fragS;
 
 #ifdef BFD_ASSEMBLER
# 

Example A.2. binutils-2.15.94.0.2.2-with-gcc-4.0.2.patch