From 758ff64c69e34965f8af5b2d6ffd65e8d7ab2150 Mon Sep 17 00:00:00 2001
From: Ondřej Surý <ondrej@sury.org>
Date: Mon, 14 Feb 2011 13:23:51 +0100
Subject: Imported Upstream version 2011-02-01.1

---
 src/cmd/8l/asm.c | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

(limited to 'src/cmd/8l/asm.c')

diff --git a/src/cmd/8l/asm.c b/src/cmd/8l/asm.c
index cdb5a33e6..6e83d8dea 100644
--- a/src/cmd/8l/asm.c
+++ b/src/cmd/8l/asm.c
@@ -520,7 +520,7 @@ adddynsym(Sym *s)
 		adduint8(d, 0);	// section
 		adduint16(d, 0);	// desc
 		adduint32(d, 0);	// value
-	} else {
+	} else if(HEADTYPE != 10) {
 		diag("adddynsym: unsupported binary format");
 	}
 }
@@ -540,7 +540,7 @@ adddynlib(char *lib)
 		elfwritedynent(lookup(".dynamic", 0), DT_NEEDED, addstring(s, lib));
 	} else if(HEADTYPE == 6) {	// Mach-O
 		machoadddynlib(lib);
-	} else {
+	} else if(HEADTYPE != 10) {
 		diag("adddynlib: unsupported binary format");
 	}
 }
@@ -936,14 +936,17 @@ asmb(void)
 			sh->type = SHT_PROGBITS;
 			sh->flags = SHF_ALLOC;
 			sh->addralign = 1;
-			switch(HEADTYPE) {
-			case 7:
-				elfinterp(sh, startva, linuxdynld);
-				break;
-			case 9:
-				elfinterp(sh, startva, freebsddynld);
-				break;
+			if(interpreter == nil) {
+				switch(HEADTYPE) {
+				case 7:
+					interpreter = linuxdynld;
+					break;
+				case 9:
+					interpreter = freebsddynld;
+					break;
+				}
 			}
+			elfinterp(sh, startva, interpreter);
 
 			ph = newElfPhdr();
 			ph->type = PT_INTERP;
-- 
cgit v1.2.3