* netbsd386.c (N_SET_FLAGS): Don't nuke the machine id field.

	From sukes@glue.umd.edu (Tasuki Hirata).

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index db44c5780ef521c1a812c1d640ee14071bd8fb52..618f7e6d9791d9db42f579a1e1785dc609a277b0 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,14 @@
+Wed Mar 16 16:43:33 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+       * netbsd386.c (N_SET_FLAGS): Don't nuke the machine id field.
+       From sukes@glue.umd.edu (Tasuki Hirata).
+
+Wed Mar 16 07:55:54 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+       * aoutf1.h (4 places): Use a simple #if on ARCH_SIZE, rather than
+       all that convoluted stuff with NAME, CAT3, etc.  The convoluted
+       stuff broke for SunOS4 /bin/cc (due to DEFUN elimination, I guess).
+
 Wed Mar 16 00:02:05 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
 
        * som.c (som_prep_for_fixups): Detect section symbols based

diff --git a/bfd/netbsd386.c b/bfd/netbsd386.c
index 5682df32e65510e3fd30fb15420ee3ae7296eba1..7430b5e1f51aa26eeea3520bcd2fbb285f9acc6e 100644 (file)
--- a/bfd/netbsd386.c
+++ b/bfd/netbsd386.c
@@ -53,6 +53,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
    (((exec).a_info & ~(0x3ff<<16)) | (((machtype)&0xff) << 16)))
 #define N_SET_FLAGS(exec, flags) \
   ((exec).a_info = ((exec).a_info & 0xffff) | (flags & 0xffff))
+#define N_SET_FLAGS(exec, flags) \
+  ((exec).a_info = \
+      (((exec).a_info & ~(0x3f<<26)) | (((flags)&0x3f) << 26)))
 
 #include "bfd.h"
 #include "sysdep.h"