Resolve merge conflicts, adjust method of W^X handing (.sh files)

remove testsuites (not useable) remove mmalloc (not part of new binutils).

1 files changed, 7 insertions, 3 deletions

diff --git a/gnu/usr.bin/binutils/bfd/m68k4knetbsd.c b/gnu/usr.bin/binutils/bfd/m68k4knetbsd.c
index 106a1434fc2..1ca4a626999 100644
--- a/gnu/usr.bin/binutils/bfd/m68k4knetbsd.c
+++ b/gnu/usr.bin/binutils/bfd/m68k4knetbsd.c
@@ -1,5 +1,6 @@
 /* BFD back-end for NetBSD/m68k a.out-ish binaries.
-   Copyright 1990, 1991, 1992, 1995, 1998 Free Software Foundation, Inc.
+   Copyright 1990, 1991, 1992, 1995, 1998, 2001, 2003
+   Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -17,7 +18,6 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#define BYTES_IN_WORD	4
 #define TARGET_IS_BIG_ENDIAN_P
 
 #define TARGET_PAGE_SIZE	0x1000
@@ -25,7 +25,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define DEFAULT_ARCH	bfd_arch_m68k
 #define DEFAULT_MID 	M_68K4K_NETBSD
 
-#define MY(OP) CAT(m68k4knetbsd_,OP)
+/* Do not "beautify" the CONCAT* macro args.  Traditional C will not
+   remove whitespace added here, and thus will fail to concatenate
+   the tokens.  */
+#define MY(OP) CONCAT2 (m68k4knetbsd_,OP)
+
 /* This needs to start with a.out so GDB knows it is an a.out variant.  */
 #define TARGETNAME "a.out-m68k4k-netbsd"