diff options
| author | Philip Guenther <guenther@cvs.openbsd.org> | 2017-03-26 19:03:39 +0000 |
|---|---|---|
| committer | Philip Guenther <guenther@cvs.openbsd.org> | 2017-03-26 19:03:39 +0000 |
| commit | 2956eb4f8fe782dd73af767fecff99754a937e3f (patch) | |
| tree | 8c0df9e17a13caf194c849b5bcec5d3f82ad1073 /lib | |
| parent | c35ac55f5d5ad9cd8d6c536e8c320ffc057a7e63 (diff) | |
Use .file to convince 'as' to generate proper FILE symbols in the syscall
stubs that aren't actually in files, so that syspatch can figure out what
order the syscall stub objects are in the .so. Use -P to suppress to #line
directives that would override that. Tested with both gcc/gas and clang.
ok deraadt@
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc/sys/Makefile.inc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc index 01653303a27..e749798d86a 100644 --- a/lib/libc/sys/Makefile.inc +++ b/lib/libc/sys/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.146 2016/07/04 18:01:44 guenther Exp $ +# $OpenBSD: Makefile.inc,v 1.147 2017/03/26 19:03:38 guenther Exp $ # $NetBSD: Makefile.inc,v 1.35 1995/10/16 23:49:07 jtc Exp $ # @(#)Makefile.inc 8.1 (Berkeley) 6/17/93 @@ -122,25 +122,26 @@ TRIM=${LD} -x -r ${.TARGET}.o -o ${.TARGET} && rm -f ${.TARGET}.o TRIM.debug=${LD} -X -r ${.TARGET}.o -o ${.TARGET} && rm -f ${.TARGET}.o +GEN_PREFIX=.file "${@:R}.S"\n\#include "SYS.h" # Pick one of these to set what ASM is generated... GENERATE.rsyscall=\ echo creating ${.TARGET} && \ - printf '\#include "SYS.h"\nRSYSCALL(${.PREFIX})\n' + printf '${GEN_PREFIX}\nRSYSCALL(${.PREFIX})\n' GENERATE.rsyscall_noerr=\ echo creating ${.TARGET} && \ - printf '\#include "SYS.h"\nPSEUDO_NOERROR(${.PREFIX},${.PREFIX})\n' + printf '${GEN_PREFIX}\nPSEUDO_NOERROR(${.PREFIX},${.PREFIX})\n' GENERATE.pseudo=\ echo creating ${.TARGET} && \ - printf '\#include "SYS.h"\nPSEUDO(${.PREFIX},${.PREFIX:S/^_//})\n' + printf '${GEN_PREFIX}\nPSEUDO(${.PREFIX},${.PREFIX:S/^_//})\n' GENERATE.pseudo_noerr=\ echo creating ${.TARGET} && \ - printf '\#include "SYS.h"\nPSEUDO_NOERROR(${.PREFIX},${.PREFIX:S/^_//})\n' + printf '${GEN_PREFIX}\nPSEUDO_NOERROR(${.PREFIX},${.PREFIX:S/^_//})\n' GENERATE.rsyscall_hidden=\ echo creating ${.TARGET} && \ - printf '\#include "SYS.h"\nRSYSCALL_HIDDEN(${.PREFIX:S/^_//})\n' + printf '${GEN_PREFIX}\nRSYSCALL_HIDDEN(${.PREFIX:S/^_//})\n' # ...and one of these to control how it's compiled -FINISH= ${COMPILE.S} ${CFLAGS:M-[ID]*} ${AINC} -x assembler-with-cpp - +FINISH= ${COMPILE.S} ${CFLAGS:M-[ID]*} ${CFLAGS:M-pipe} ${AINC} -P -x assembler-with-cpp - FINISH.po=${FINISH} -o ${.TARGET}.o -DPROF && ${TRIM.debug} FINISH.so=${FINISH} -o ${.TARGET} ${PICFLAG} FINISH.do=${FINISH} -o ${.TARGET}.o ${DIST_CFLAGS} && ${TRIM} |