Module Name: src
Committed By: joerg
Date: Thu Feb 20 22:52:11 UTC 2020
Modified Files:
src/sys/rump: Makefile.rump
src/sys/rump/librump/rumpkern: kobj_rename.c
Log Message:
The global offset table is spelled .TOC. on PPC64, so preserve that symbol.
To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.125 src/sys/rump/Makefile.rump
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/librump/rumpkern/kobj_rename.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/Makefile.rump
diff -u src/sys/rump/Makefile.rump:1.124 src/sys/rump/Makefile.rump:1.125
--- src/sys/rump/Makefile.rump:1.124 Sat Mar 3 22:46:30 2018
+++ src/sys/rump/Makefile.rump Thu Feb 20 22:52:10 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rump,v 1.124 2018/03/03 22:46:30 christos Exp $
+# $NetBSD: Makefile.rump,v 1.125 2020/02/20 22:52:10 joerg Exp $
#
.if !defined(_RUMP_MK)
@@ -235,7 +235,7 @@ __archivebuild: .USE
.endif
for renameobj in ${RUMP_SYMREN:U${.ALLSRC:C/(${RUMPOBJ_NORENAME:ts|})//g}}; do \
${NM} -go $${renameobj} | ${TOOL_AWK} ' \
- $$NF!~/^'${_PQ}'(rump|RUMP|__|_GLOBAL_OFFSET_TABLE'${_SYMQUIRK}'${RUMP_SYM_NORENAME:D|${RUMP_SYM_NORENAME}})/ \
+ $$NF!~/^'${_PQ}'(rump|RUMP|__|_GLOBAL_OFFSET_TABLE|\.TOC\.'${_SYMQUIRK}'${RUMP_SYM_NORENAME:D|${RUMP_SYM_NORENAME}})/ \
{s=$$NF;sub(/^'${_PQ}'/, "&rumpns_", s); print $$NF, s}'\
| sort | uniq > renametab.$${renameobj}; \
${OBJCOPY} --preserve-dates --redefine-syms \
Index: src/sys/rump/librump/rumpkern/kobj_rename.c
diff -u src/sys/rump/librump/rumpkern/kobj_rename.c:1.2 src/sys/rump/librump/rumpkern/kobj_rename.c:1.3
--- src/sys/rump/librump/rumpkern/kobj_rename.c:1.2 Fri Apr 25 18:31:35 2014
+++ src/sys/rump/librump/rumpkern/kobj_rename.c Thu Feb 20 22:52:10 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: kobj_rename.c,v 1.2 2014/04/25 18:31:35 pooka Exp $ */
+/* $NetBSD: kobj_rename.c,v 1.3 2020/02/20 22:52:10 joerg Exp $ */
/*-
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kobj_rename.c,v 1.2 2014/04/25 18:31:35 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kobj_rename.c,v 1.3 2020/02/20 22:52:10 joerg Exp $");
#define ELFSIZE ARCH_ELFSIZE
@@ -49,6 +49,7 @@ const char *norentab[] = {
"rump",
"__",
"_GLOBAL_OFFSET_TABLE",
+ ".TOC.",
};
static int
norename(const char *name)
