summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordchagin <dchagin@FreeBSD.org>2016-01-09 16:25:30 +0000
committerdchagin <dchagin@FreeBSD.org>2016-01-09 16:25:30 +0000
commita1e3b366c78d8dbd5b80f830911528438032f941 (patch)
tree12ce21a5fdf180520130cfa253cc8b37b1e18b12
parent68ddeae1b4dafbdcc753ae60d8495aecc6dde4cc (diff)
downloadFreeBSD-src-a1e3b366c78d8dbd5b80f830911528438032f941.zip
FreeBSD-src-a1e3b366c78d8dbd5b80f830911528438032f941.tar.gz
MFC r283432:
Being exported through vdso the note.Linux section used by glibc to determine the kernel version (this saves one uname call). Temporarily disable the export of a note.Linux section until I figured out how to change the kernel version in the note.Linux on the fly.
-rw-r--r--sys/amd64/linux/linux_locore.s3
-rw-r--r--sys/amd64/linux32/linux32_locore.s4
-rw-r--r--sys/i386/linux/linux_locore.s4
3 files changed, 6 insertions, 5 deletions
diff --git a/sys/amd64/linux/linux_locore.s b/sys/amd64/linux/linux_locore.s
index ec81f98..5dcc09a 100644
--- a/sys/amd64/linux/linux_locore.s
+++ b/sys/amd64/linux/linux_locore.s
@@ -58,7 +58,7 @@ NON_GPROF_ENTRY(__vdso_getcpu)
.weak getcpu
.set getcpu, __vdso_getcpu
-
+#if 0
.section .note.Linux, "a",@note
.long 2f - 1f /* namesz */
.balign 4
@@ -73,3 +73,4 @@ NON_GPROF_ENTRY(__vdso_getcpu)
4:
.balign 4
.previous
+#endif
diff --git a/sys/amd64/linux32/linux32_locore.s b/sys/amd64/linux32/linux32_locore.s
index 7db3683..4edbdf3 100644
--- a/sys/amd64/linux32/linux32_locore.s
+++ b/sys/amd64/linux32/linux32_locore.s
@@ -55,7 +55,7 @@ NON_GPROF_ENTRY(linux32_vsyscall)
ret
.endvsyscall:
-
+#if 0
.section .note.Linux, "a",@note
.long 2f - 1f /* namesz */
.balign 4
@@ -70,7 +70,7 @@ NON_GPROF_ENTRY(linux32_vsyscall)
4:
.balign 4
.previous
-
+#endif
#define do_cfa_expr(offset) \
.byte 0x0f; /* DW_CFA_def_cfa_expression */ \
diff --git a/sys/i386/linux/linux_locore.s b/sys/i386/linux/linux_locore.s
index 54553b5..6c4d19c 100644
--- a/sys/i386/linux/linux_locore.s
+++ b/sys/i386/linux/linux_locore.s
@@ -48,7 +48,7 @@ NON_GPROF_ENTRY(linux_vsyscall)
ret
.endvsyscall:
-
+#if 0
.section .note.Linux, "a",@note
.long 2f - 1f /* namesz */
.balign 4
@@ -63,7 +63,7 @@ NON_GPROF_ENTRY(linux_vsyscall)
4:
.balign 4
.previous
-
+#endif
#define do_cfa_expr(offset) \
.byte 0x0f; /* DW_CFA_def_cfa_expression */ \
OpenPOWER on IntegriCloud