* i386mach3.c (N_TXTADDR): Don't define after all.

	(TEXT_START_ADDR): Don't include exec header size in value.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index c539c9287af4ad788f94890d53bca9607f3c347f..ef3539b613b5bee064bfe52b4824188819f360f1 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+Fri Dec 31 11:46:13 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
+
+       * i386mach3.c (N_TXTADDR): Don't define after all.
+       (TEXT_START_ADDR): Don't include exec header size in value.
+
 Thu Dec 30 15:47:54 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
 
        * i386mach3.c (N_TXTADDR): Define.

diff --git a/bfd/i386mach3.c b/bfd/i386mach3.c
index 4a4ba280ab7827ef49d43ee98212338c9c11bf6b..af08827f6708f18f5713ce202e2adf89506116d7 100644 (file)
--- a/bfd/i386mach3.c
+++ b/bfd/i386mach3.c
@@ -23,14 +23,14 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
    from i386aout or i386bsd.  So this target is only useful if it is the
    default target.  */
 
-#define        PAGE_SIZE       1 /* 4096 */
-#define        SEGMENT_SIZE    0 /* PAGE_SIZE*/
-#define TEXT_START_ADDR        0x10020
+#define        PAGE_SIZE       1
+#define        SEGMENT_SIZE    0
+#define TEXT_START_ADDR        0x10000
 #define ARCH 32
 #define BYTES_IN_WORD 4
-#define N_HEADER_IN_TEXT(x)    1               /* (N_MAGIC(x) == ZMAGIC) */
+/* This macro is only relevant when N_MAGIC(x) == ZMAGIC.  */
+#define N_HEADER_IN_TEXT(x)    1
 
-#define N_TXTADDR(x) 0x10000
 #define N_TXTSIZE(x)   ((x).a_text)
 
 #include "bfd.h"