blob: 51b4e0247d0bc35592a8a98bf1b7767b3a5db29c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
Description: crt1.o: R_AMD64_GOT32 not supported by sunld
Probably, caused by crt1.o-amd64-PIE.patch
Index: libc/usr/src/cmd/sgs/ld/Makefile.com
===================================================================
--- libc.orig/usr/src/cmd/sgs/ld/Makefile.com
+++ libc/usr/src/cmd/sgs/ld/Makefile.com
@@ -34,7 +34,6 @@ BLTOBJ = msg.o
OBJS = $(BLTOBJ) $(COMOBJS)
.PARALLEL: $(OBJS)
-MAPFILES = ../common/mapfile-intf $(MAPFILE.NGB)
MAPOPTS = $(MAPFILES:%=-M%)
LDFLAGS += $(VERSREF) $(CC_USE_PROTO) $(MAPOPTS) $(VAR_LD_LLDFLAGS)
Index: libc/usr/src/cmd/Makefile.cmd
===================================================================
--- libc.orig/usr/src/cmd/Makefile.cmd
+++ libc/usr/src/cmd/Makefile.cmd
@@ -508,3 +508,10 @@ CLOBBERFILES += $(XPG4) $(XPG6) $(DCFILE
# This flag is for programs which should not build a 32-bit binary
sparc_64ONLY= $(POUND_SIGN)
64ONLY= $($(MACH)_64ONLY)
+
+unexport LD_ALTEXEC
+BDIRECT=
+MAPFILE.NES=
+MAPFILE.PGA=
+MAPFILE.NED=
+
Index: libc/usr/src/cmd/sgs/lddstub/i386/Makefile
===================================================================
--- libc.orig/usr/src/cmd/sgs/lddstub/i386/Makefile
+++ libc/usr/src/cmd/sgs/lddstub/i386/Makefile
@@ -29,6 +29,8 @@ include ../Makefile.com
.KEEP_STATE:
+LDFLAGS += -m elf_i386_sol2
+
install: all .WAIT $(ROOT)/$(DEB_USRLIBDIR_32)/$(PROG)
$(ROOT)/$(DEB_USRLIBDIR_32)/$(PROG): $(PROG)
$(INS.file)
Index: libc/usr/src/cmd/sgs/lddstub/Makefile.com
===================================================================
--- libc.orig/usr/src/cmd/sgs/lddstub/Makefile.com
+++ libc/usr/src/cmd/sgs/lddstub/Makefile.com
@@ -36,5 +36,5 @@ include ../../Makefile.com
# As of Solaris 9 the kernel accepts $ORIGIN within the interpreter field.
ASFLAGS= -P -D_ASM
-LDFLAGS= $(VERSREF) $(INTERP) $(CONVLIBDIR) -lconv -e stub \
+LDFLAGS= $(VERSREF) $(INTERP) $(CONVLIBDIR) -shared -lconv -e stub \
$(LDFLAGS.cmd)
|
