Skip to content

Commit

Permalink
collapse WEAKASM symbols (_foo -> _sys_foo)
Browse files Browse the repository at this point in the history
To be revisited later when we can have weak aliases for syscalls.
  • Loading branch information
anttikantee committed Jun 23, 2014
1 parent 90172bf commit 3bcf1fd
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ netbsd_init.o: netbsd_init.c ${NBCC}
halt.o: halt.c ${NBCC}
${NBCC} ${NBCFLAGS} -c $< -o $@

MAPS=rump.map namespace.map host.map netbsd.map readwrite.map emul.map
MAPS=rump.map namespace.map host.map netbsd.map readwrite.map emul.map weakasm.map

bin/halt: halt.o emul.o rumpclient.o readwrite.o remoteinit.o ${MAPS}
./mkremote.sh halt halt.o
Expand All @@ -116,6 +116,9 @@ namespace.map: rumpsrc/lib/libc/include/namespace.h rump.map emul.map
cat rump.map emul.map > all.map
awk 'NR==FNR{a[$$1]=$$1;next}a[$$1]' all.map fns.map | awk '{printf("%s\t%s\n",$$2,$$1)}' > $@

weakasm.map: rumpsrc/lib/libc/sys/Makefile.inc
${RUMPMAKE} -f $< -V '$${WEAKASM}' | xargs -n 1 echo | awk '{sub("\..*", ""); printf("_sys_%s _%s\n", $$1, $$1);}' > $@

define NBUTIL_templ
rumpsrc/${1}/${2}.ro:
( cd rumpsrc/${1} && \
Expand Down
1 change: 1 addition & 0 deletions mkremote.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ ${CC} ${LDFLAGS} -Wl,-r ${OBJDIR}/tmp0_${NAME}.o netbsd_init.o -nostdlib rump/li
objcopy --redefine-syms=namespace.map ${OBJDIR}/tmp1_${NAME}.o
objcopy --redefine-syms=extra.map ${OBJDIR}/tmp1_${NAME}.o
objcopy --redefine-syms=rump.map ${OBJDIR}/tmp1_${NAME}.o
objcopy --redefine-syms=weakasm.map ${OBJDIR}/tmp1_${NAME}.o
objcopy --redefine-syms=readwrite.map ${OBJDIR}/tmp1_${NAME}.o
objcopy --redefine-syms=emul.map ${OBJDIR}/tmp1_${NAME}.o
objcopy --redefine-syms=netbsd.map ${OBJDIR}/tmp1_${NAME}.o
Expand Down

0 comments on commit 3bcf1fd

Please sign in to comment.