rk: iommu: RK3288 disable iommu by default

[firefly-linux-kernel-4.4.55.git] / scripts / link-vmlinux.sh

diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index 32b10f53d0b4cbad76b13ef86d547ad864ae19c2..a4bc37f8fb3d784b4045a552dd3f930775527d4c 100644 (file)
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -55,12 +55,16 @@ vmlinux_link()
        if [ "${SRCARCH}" != "um" ]; then
                ${LD} ${LDFLAGS} ${LDFLAGS_vmlinux} -o ${2}                  \
                        -T ${lds} ${KBUILD_VMLINUX_INIT}                     \
-                       --start-group ${KBUILD_VMLINUX_MAIN} --end-group ${1}
+                       --start-group                                        \
+                               ${KBUILD_VMLINUX_MAIN}                       \
+                               ${KBUILD_VMLINUX_PIE}                        \
+                       --end-group ${1}
        else
                ${CC} ${CFLAGS_vmlinux} -o ${2}                              \
                        -Wl,-T,${lds} ${KBUILD_VMLINUX_INIT}                 \
                        -Wl,--start-group                                    \
                                 ${KBUILD_VMLINUX_MAIN}                      \
+                                ${KBUILD_VMLINUX_PIE}                       \
                        -Wl,--end-group                                      \
                        -lutil ${1}
                rm -f linux
@@ -145,10 +149,13 @@ esac
 #link vmlinux.o
 info LD vmlinux.o
 modpost_link vmlinux.o
-
 # modpost vmlinux.o to check for section mismatches
 ${MAKE} -f "${srctree}/scripts/Makefile.modpost" vmlinux.o
 
+if [ -n "${CONFIG_PIE}" ]; then
+       ${MAKE} -f "${srctree}/scripts/Makefile.build" obj=pie
+fi
+
 # Update version
 info GEN .version
 if [ ! -r .version ]; then