diff options
| author | Kir Kolyshkin <kir@openvz.org> | 2017-03-25 01:07:46 +0300 |
|---|---|---|
| committer | Pavel Emelyanov <xemul@virtuozzo.com> | 2017-04-02 18:12:10 +0300 |
| commit | f62818d9adaa240554311afc5575547c40d1b04d (patch) | |
| tree | f7df53f86a1d0e048cf12daace24e52f00bcd5ab /compel/src | |
| parent | 8b99809a4ea991b66b2fd7c3d92e3278be15a926 (diff) | |
compel: no -r for ARM ldflags
Commit d9486bd720 ("arm/pie/build: do not produce relocatable parasite
object") removed -r from LDFLAGS used to compile criu pie. This
functionality somehow never made it to criu-dev, and was also lost
in master then compel was ported to it.
Make it work with compel.
Unfortunately it was not as simple as I initially thought, as -r flag
to ld was built into nmk. This patch removes it, and adds it to all
places that need intermediate linking.
Cc: Dmitry Safonov <dsafonov@virtuozzo.com>
Cc: Cyrill Gorcunov <gorcunov@openvz.org>
Acked-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
Diffstat (limited to 'compel/src')
| -rw-r--r-- | compel/src/main.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/compel/src/main.c b/compel/src/main.c index e0dcb09ae..4584ef915 100644 --- a/compel/src/main.c +++ b/compel/src/main.c @@ -26,7 +26,11 @@ #define COMPEL_CFLAGS_PIE CFLAGS_DEFAULT_SET "-fpie" #define COMPEL_CFLAGS_NOPIC CFLAGS_DEFAULT_SET "-fno-pic" +#ifdef NO_RELOCS +#define COMPEL_LDFLAGS_COMMON "-z noexecstack -T " +#else #define COMPEL_LDFLAGS_COMMON "-r -z noexecstack -T " +#endif typedef struct { const char *arch; // dir name under arch/ |