diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-07-15 03:44:28 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-07-15 03:44:27 -0700 |
| commit | d487ef9aa9d94ff46708447ac76e929a9f1c23a0 (patch) | |
| tree | f0a17ca3811d8e4adb8ffceb8801352863aa4aa7 /scripts | |
| parent | 429d29225ef44f5f8f7b9885b2b9556d7fbd787a (diff) | |
| parent | 750075feff660497f19ba4593ac1c6f64ace6c10 (diff) | |
Merge "Merge remote-tracking branch 'origin/tmp-917a9a9133a6' into lsk"
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/ld-version.sh | 2 | ||||
| -rwxr-xr-x | scripts/link-vmlinux.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/ld-version.sh b/scripts/ld-version.sh index 198580d245e0..1659b409ef10 100755 --- a/scripts/ld-version.sh +++ b/scripts/ld-version.sh @@ -1,7 +1,7 @@ #!/usr/bin/awk -f # extract linker version number from stdin and turn into single number { - gsub(".*)", ""); + gsub(".*\\)", ""); split($1,a, "."); print a[1]*10000000 + a[2]*100000 + a[3]*10000 + a[4]*100 + a[5]; exit diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh index dacf71a43ad4..ba6c34ea5429 100755 --- a/scripts/link-vmlinux.sh +++ b/scripts/link-vmlinux.sh @@ -62,7 +62,7 @@ vmlinux_link() -Wl,--start-group \ ${KBUILD_VMLINUX_MAIN} \ -Wl,--end-group \ - -lutil -lrt ${1} + -lutil -lrt -lpthread ${1} rm -f linux fi } |