arm64: dts: rk3399-box: dp: select vopl for dp as vop0 for hdmi

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

diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
old mode 100644 (file)
new mode 100755 (executable)
index a4bc37f..ba6c34e
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -55,18 +55,14 @@ vmlinux_link()
        if [ "${SRCARCH}" != "um" ]; then
                ${LD} ${LDFLAGS} ${LDFLAGS_vmlinux} -o ${2}                  \
                        -T ${lds} ${KBUILD_VMLINUX_INIT}                     \
-                       --start-group                                        \
-                               ${KBUILD_VMLINUX_MAIN}                       \
-                               ${KBUILD_VMLINUX_PIE}                        \
-                       --end-group ${1}
+                       --start-group ${KBUILD_VMLINUX_MAIN} --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}
+                       -lutil -lrt -lpthread ${1}
                rm -f linux
        fi
 }
@@ -86,7 +82,13 @@ kallsyms()
                kallsymopt="${kallsymopt} --all-symbols"
        fi
 
-       kallsymopt="${kallsymopt} --page-offset=$CONFIG_PAGE_OFFSET"
+       if [ -n "${CONFIG_ARM}" ] && [ -z "${CONFIG_XIP_KERNEL}" ] && [ -n "${CONFIG_PAGE_OFFSET}" ]; then
+               kallsymopt="${kallsymopt} --page-offset=$CONFIG_PAGE_OFFSET"
+       fi
+
+       if [ -n "${CONFIG_X86_64}" ]; then
+               kallsymopt="${kallsymopt} --absolute-percpu"
+       fi
 
        local aflags="${KBUILD_AFLAGS} ${KBUILD_AFLAGS_KERNEL}               \
                      ${NOSTDINC_FLAGS} ${LINUXINCLUDE} ${KBUILD_CPPFLAGS}"
@@ -109,7 +111,6 @@ sortextable()
 }
 
 # Delete output files in case of error
-trap cleanup SIGHUP SIGINT SIGQUIT SIGTERM ERR
 cleanup()
 {
        rm -f .old_version
@@ -122,6 +123,20 @@ cleanup()
        rm -f vmlinux.o
 }
 
+on_exit()
+{
+       if [ $? -ne 0 ]; then
+               cleanup
+       fi
+}
+trap on_exit EXIT
+
+on_signals()
+{
+       exit 1
+}
+trap on_signals HUP INT QUIT TERM
+
 #
 #
 # Use "make V=1" to debug this script
@@ -149,13 +164,10 @@ 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
@@ -232,7 +244,6 @@ if [ -n "${CONFIG_KALLSYMS}" ]; then
        if ! cmp -s System.map .tmp_System.map; then
                echo >&2 Inconsistent kallsyms data
                echo >&2 Try "make KALLSYMS_EXTRA_PASS=1" as a workaround
-               cleanup
                exit 1
        fi
 fi