]>
Commit | Line | Data |
---|---|---|
bceb6c91 MT |
1 | 2009-11-08 Magnus Granberg <zorry@ume.nu> |
2 | ||
3 | bug #292139 | |
4 | * Makeconfig +link-pie: set +link to +link-pie | |
5 | +link-static: change $(static-start-installed-name) to S$(static-start-installed-name) | |
6 | +prector: set +prector to +prectorS +postctor: set +postctor to +postctorS | |
7 | ||
8 | ||
9 | --- a/Makeconfig 2009-11-06 16:39:18.000000000 +0100 | |
10 | +++ b/Makeconfig 2009-11-08 03:14:45.000000000 +0100 | |
11 | @@ -447,11 +447,12 @@ | |
12 | $(common-objpfx)libc% $(+postinit),$^) \ | |
13 | $(link-extra-libs) $(link-libc) $(+postctorS) $(+postinit) | |
14 | endif | |
15 | ++link = $(+link-pie) | |
16 | # Command for statically linking programs with the C library. | |
17 | ifndef +link-static | |
18 | +link-static = $(CC) -nostdlib -nostartfiles -static -o $@ \ | |
19 | $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \ | |
20 | - $(addprefix $(csu-objpfx),$(static-start-installed-name)) \ | |
21 | + $(addprefix $(csu-objpfx),S$(static-start-installed-name)) \ | |
22 | $(+preinit) $(+prector) \ | |
23 | $(filter-out $(addprefix $(csu-objpfx),start.o \ | |
24 | $(start-installed-name))\ | |
25 | @@ -549,11 +550,10 @@ | |
26 | ifeq ($(elf),yes) | |
27 | +preinit = $(addprefix $(csu-objpfx),crti.o) | |
28 | +postinit = $(addprefix $(csu-objpfx),crtn.o) | |
3ae9e320 MT |
29 | -+prector = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbegin.o` |
30 | -+postctor = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtend.o` | |
bceb6c91 | 31 | -# Variants of the two previous definitions for linking PIE programs. |
3ae9e320 MT |
32 | +prectorS = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbeginS.o` |
33 | +postctorS = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtendS.o` | |
bceb6c91 MT |
34 | ++prector = $(+prectorS) |
35 | ++postctor = $(+postctorS) | |
36 | +interp = $(addprefix $(elf-objpfx),interp.os) | |
37 | endif | |
38 | csu-objpfx = $(common-objpfx)csu/ |