Put the munmap and munmap_text trampolines in a separate .S file, so that they can be overridden independenly of mmap.

2010-04-29 20:12:56 +00:00 · 2010-04-29 20:12:56 +00:00 · cfd28b671a
commit cfd28b671a
parent a2a0562a9c
3 changed files with 13 additions and 10 deletions
--- a/lib/libc/syscall/Makefile.inc
+++ b/lib/libc/syscall/Makefile.inc
@ -69,6 +69,7 @@ SRCS+=  \
 	mkfifo.S \
 	mknod.S \
 	mmap.S \
+	munmap.S \
 	vm_getphys.S \
 	vm_getrefcount.S \
 	vm_remap.S \
--- a/lib/libc/syscall/mmap.S
+++ b/lib/libc/syscall/mmap.S
@ -1,17 +1,7 @@
 .text
 .extern	__mmap
 .globl	_mmap
-.extern	__munmap
-.globl	_munmap
-.extern	__munmap_text
-.globl	_munmap_text
 .balign	2

 _mmap:
 	jmp	__mmap
-
-_munmap:
-	jmp	__munmap
-
-_munmap_text:
-	jmp	__munmap_text
--- a/lib/libc/syscall/munmap.S
+++ b/lib/libc/syscall/munmap.S
@ -0,0 +1,12 @@
+.text
+.extern	__munmap
+.globl	_munmap
+.extern	__munmap_text
+.globl	_munmap_text
+.balign	2
+
+_munmap:
+	jmp	__munmap
+
+_munmap_text:
+	jmp	__munmap_text