Build the arch, os and platform libraries as PIE code if PIE is

enabled as they get linked into stage2 which is the PIE part.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3472

diff --git a/coregrind/amd64-linux/Makefile.am b/coregrind/amd64-linux/Makefile.am
index a25c4733d00d2a491e79b875b360b3fa1676b5ec..460c19301fc123cd26bd31c01e9794a9c3d8f470 100644 (file)
--- a/coregrind/amd64-linux/Makefile.am
+++ b/coregrind/amd64-linux/Makefile.am
@@ -14,3 +14,9 @@ libplatform_a_SOURCES = \
        ldt.c \
        syscall.S \
        syscalls.c
+
+if USE_PIE
+libplatform_a_CFLAGS = $(AM_CFLAGS) -fpie
+else
+libplatform_a_CFLAGS = $(AM_CFLAGS)
+endif

diff --git a/coregrind/amd64/Makefile.am b/coregrind/amd64/Makefile.am
index c464e8484d50f4aeb3eb3585ef7b4bdf69eceb46..6355589cd8022c3ea5f16c987ed19126bf4250cd 100644 (file)
--- a/coregrind/amd64/Makefile.am
+++ b/coregrind/amd64/Makefile.am
@@ -25,6 +25,12 @@ libarch_a_SOURCES = \
        jmp_with_stack.c \
        state.c
 
+if USE_PIE
+libarch_a_CFLAGS = $(AM_CFLAGS) -fpie
+else
+libarch_a_CFLAGS = $(AM_CFLAGS)
+endif
+
 # Extract ld's default linker script and hack it to our needs
 stage2.lds: Makefile
        $(CC) -Wl,--verbose -nostdlib 2>&1 | sed \

diff --git a/coregrind/linux/Makefile.am b/coregrind/linux/Makefile.am
index 6698c931a7e2ec4663d0a6a39a945beee57aba94..94663df36058ee9cde23923fccb144b6ca058479 100644 (file)
--- a/coregrind/linux/Makefile.am
+++ b/coregrind/linux/Makefile.am
@@ -12,3 +12,9 @@ libos_a_SOURCES = \
        core_os.c \
        sema.c \
        syscalls.c
+
+if USE_PIE
+libos_a_CFLAGS = $(AM_CFLAGS) -fpie
+else
+libos_a_CFLAGS = $(AM_CFLAGS)
+endif

diff --git a/coregrind/x86-linux/Makefile.am b/coregrind/x86-linux/Makefile.am
index 1dbf5dfc7d0ff2f58cca455da359ab432e5dfe57..9eb91c871d2545f618d955d17b9e565b68887aa0 100644 (file)
--- a/coregrind/x86-linux/Makefile.am
+++ b/coregrind/x86-linux/Makefile.am
@@ -14,3 +14,9 @@ libplatform_a_SOURCES = \
        ldt.c \
        syscall.S \
        syscalls.c
+
+if USE_PIE
+libplatform_a_CFLAGS = $(AM_CFLAGS) -fpie
+else
+libplatform_a_CFLAGS = $(AM_CFLAGS)
+endif

diff --git a/coregrind/x86/Makefile.am b/coregrind/x86/Makefile.am
index 55cf63ba0e17aa2c284f289a9bd1050c92d2faa4..bc02b70f783fbbe8dd2e4608da95360404490037 100644 (file)
--- a/coregrind/x86/Makefile.am
+++ b/coregrind/x86/Makefile.am
@@ -25,6 +25,12 @@ libarch_a_SOURCES = \
        jmp_with_stack.c \
        state.c
 
+if USE_PIE
+libarch_a_CFLAGS = $(AM_CFLAGS) -fpie
+else
+libarch_a_CFLAGS = $(AM_CFLAGS)
+endif
+
 # Extract ld's default linker script and hack it to our needs
 stage2.lds: Makefile
        $(CC) -Wl,--verbose -nostdlib 2>&1 | sed \