diff options
| author | Bruce Evans <bde@FreeBSD.org> | 1999-02-06 08:41:06 +0000 |
|---|---|---|
| committer | Bruce Evans <bde@FreeBSD.org> | 1999-02-06 08:41:06 +0000 |
| commit | 33982c726ff29e25ab7e17fa566c5f0657fccd59 (patch) | |
| tree | ff313dfe13ca12e455aff152e46fe3b8b9c15cf7 /sys/i386 | |
| parent | 61da17a62c9256aadf22ebda167414e5d156226a (diff) | |
| download | src-33982c726ff29e25ab7e17fa566c5f0657fccd59.tar.gz src-33982c726ff29e25ab7e17fa566c5f0657fccd59.zip | |
Added underscores to some names in svr4_locore.s so that it compiles
with -aout. Added translation back to elf names in asnames.h as
usual. The elf names were inconsistent in the aout case even
internally because a macro adds an underscore to just one of them.
Removed commented out code for a previous life of `svr4_esigcode'.
Didn't add an underscore to `svr4_esigcode' since it is correct for
aout although wrong for elf, like most internal names in assembler
files. These names should be in a different namespace so that gprof
can ignore them.
Fixed some disorder in asnames.h.
Notes
Notes:
svn path=/head/; revision=43706
Diffstat (limited to 'sys/i386')
| -rw-r--r-- | sys/i386/include/asnames.h | 9 | ||||
| -rw-r--r-- | sys/i386/svr4/svr4_locore.s | 10 |
2 files changed, 10 insertions, 9 deletions
diff --git a/sys/i386/include/asnames.h b/sys/i386/include/asnames.h index 90df00774443..d653571b5abe 100644 --- a/sys/i386/include/asnames.h +++ b/sys/i386/include/asnames.h @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: asnames.h,v 1.26 1998/10/03 17:23:25 jdp Exp $ + * $Id: asnames.h,v 1.27 1999/01/30 15:38:48 kato Exp $ */ #ifndef _MACHINE_ASNAMES_H_ @@ -297,7 +297,7 @@ #define _other_cpus other_cpus #define _ovbcopy_vector ovbcopy_vector #define _panic panic -#define _pc98_system_parameter pc98_system_parameter +#define _pc98_system_parameter pc98_system_parameter #define _poly_div16 poly_div16 #define _poly_div2 poly_div2 #define _poly_div4 poly_div4 @@ -310,10 +310,10 @@ #define _prv_CMAP1 prv_CMAP1 #define _prv_CMAP2 prv_CMAP2 #define _prv_CMAP3 prv_CMAP3 -#define _prv_PMAP1 prv_PMAP1 #define _prv_CPAGE1 prv_CPAGE1 #define _prv_CPAGE2 prv_CPAGE2 #define _prv_CPAGE3 prv_CPAGE3 +#define _prv_PMAP1 prv_PMAP1 #define _prv_PPAGE1 prv_PPAGE1 #define _qs qs #define _rcpoll rcpoll @@ -347,6 +347,9 @@ #define _ss_unlock ss_unlock #define _started_cpus started_cpus #define _stopped_cpus stopped_cpus +#define _svr4_sigcode svr4_sigcode +#define _svr4_sys_context svr4_sys_context +#define _svr4_szsigcode svr4_szsigcode #define _swi_dispatcher swi_dispatcher #define _swi_generic swi_generic #define _swi_null swi_null diff --git a/sys/i386/svr4/svr4_locore.s b/sys/i386/svr4/svr4_locore.s index f5a9e153f37c..7903e736fa9d 100644 --- a/sys/i386/svr4/svr4_locore.s +++ b/sys/i386/svr4/svr4_locore.s @@ -26,21 +26,19 @@ NON_GPROF_ENTRY(svr4_sigcode) /* must be FreeBSD, right? */ 1: pushl %eax # fake return address pushl $1 # pointer to ucontext - movl $svr4_sys_context,%eax + movl $_svr4_sys_context,%eax #endif int $0x80 # enter kernel with args on stack movl $exit,%eax int $0x80 # exit if sigreturn fails -/* .globl _svr4_esigcode*/ - .align 2 /* long word align */ svr4_esigcode: .data - .globl svr4_szsigcode -svr4_szsigcode: - .long svr4_esigcode - svr4_sigcode + .globl _svr4_szsigcode +_svr4_szsigcode: + .long svr4_esigcode - _svr4_sigcode .text |