Incorporated fixes from Paul to make -Z option work. Emits old-style

ZMAGIC magic numbers in a long.
This commit is contained in:
Paul Richards 1993-11-15 20:58:20 +00:00
parent 1e064bd4be
commit 760e925fe9
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=767
3 changed files with 13 additions and 6 deletions

View File

@ -27,7 +27,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: md.c,v 1.2 1993/10/27 00:54:58 pk Exp $ * $Id: md.c,v 1.2 1993/11/09 04:19:16 paul Exp $
*/ */
#include <sys/param.h> #include <sys/param.h>
@ -96,7 +96,10 @@ md_init_header(hp, magic, flags)
struct exec *hp; struct exec *hp;
int magic, flags; int magic, flags;
{ {
N_SETMAGIC((*hp), magic, MID_I386, flags); if (oldmagic)
hp->a_midmag = oldmagic;
else
N_SETMAGIC((*hp), magic, MID_I386, flags);
/* TEXT_START depends on the value of outheader.a_entry. */ /* TEXT_START depends on the value of outheader.a_entry. */
if (!(link_mode & SHAREABLE)) /*WAS: if (entry_symbol) */ if (!(link_mode & SHAREABLE)) /*WAS: if (entry_symbol) */

View File

@ -32,7 +32,7 @@ static char sccsid[] = "@(#)ld.c 6.10 (Berkeley) 5/22/91";
Set, indirect, and warning symbol features added by Randy Smith. */ Set, indirect, and warning symbol features added by Randy Smith. */
/* /*
* $Id: ld.c,v 1.11 1993/11/05 12:47:11 pk Exp $ * $Id: ld.c,v 1.5 1993/11/09 04:18:56 paul Exp $
*/ */
/* Define how to initialize system-dependent header fields. */ /* Define how to initialize system-dependent header fields. */
@ -1938,7 +1938,8 @@ write_header ()
{ {
int flags = (rrs_section_type == RRS_FULL) ? EX_DYNAMIC : 0; int flags = (rrs_section_type == RRS_FULL) ? EX_DYNAMIC : 0;
N_SET_FLAG (outheader, flags); if (!oldmagic)
N_SET_FLAG (outheader, flags);
outheader.a_text = text_size; outheader.a_text = text_size;
outheader.a_data = data_size; outheader.a_data = data_size;
outheader.a_bss = bss_size; outheader.a_bss = bss_size;

View File

@ -27,7 +27,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: md.c,v 1.2 1993/10/27 00:54:58 pk Exp $ * $Id: md.c,v 1.2 1993/11/09 04:19:16 paul Exp $
*/ */
#include <sys/param.h> #include <sys/param.h>
@ -96,7 +96,10 @@ md_init_header(hp, magic, flags)
struct exec *hp; struct exec *hp;
int magic, flags; int magic, flags;
{ {
N_SETMAGIC((*hp), magic, MID_I386, flags); if (oldmagic)
hp->a_midmag = oldmagic;
else
N_SETMAGIC((*hp), magic, MID_I386, flags);
/* TEXT_START depends on the value of outheader.a_entry. */ /* TEXT_START depends on the value of outheader.a_entry. */
if (!(link_mode & SHAREABLE)) /*WAS: if (entry_symbol) */ if (!(link_mode & SHAREABLE)) /*WAS: if (entry_symbol) */