Common prototypes for mmap and ftruncate

modified:   src/stub/src/include/linux.h
	modified:   src/stub/src/amd64-linux.elf-so_main.c
	modified:   src/stub/src/i386-linux.elf-so_main.c
	modified:   src/stub/src/i386-linux.elf.execve-main.c
	modified:   src/stub/src/i386-linux.elf.interp-main.c
	modified:   src/stub/src/i386-linux.elf.shell-main.c
This commit is contained in:
John Reiser
2023-09-28 12:07:04 -07:00
parent d6d5e7ae3d
commit 194bf2b852
6 changed files with 3 additions and 12 deletions
-1
View File
@@ -37,7 +37,6 @@ extern unsigned Pprotect(void *, size_t, unsigned);
extern void *Pmap(void *, size_t, unsigned, unsigned, int, size_t); extern void *Pmap(void *, size_t, unsigned, unsigned, int, size_t);
extern int Punmap(void *, size_t); extern int Punmap(void *, size_t);
extern size_t Pwrite(unsigned, void const *, size_t); extern size_t Pwrite(unsigned, void const *, size_t);
extern int ftruncate(int fd, off_t length);
extern void f_int3(int arg); extern void f_int3(int arg);
-1
View File
@@ -298,7 +298,6 @@ make_hatch_i386(
#elif defined(__arm__) /*}{*/ #elif defined(__arm__) /*}{*/
extern unsigned get_sys_munmap(void); extern unsigned get_sys_munmap(void);
extern int upxfd_create(void); // early 32-bit Android lacks memfd_create extern int upxfd_create(void); // early 32-bit Android lacks memfd_create
extern size_t lseek(int fd, size_t offset, int whence);
#define SEEK_SET 0 #define SEEK_SET 0
static void * static void *
@@ -127,9 +127,6 @@ static uint32_t ascii5(char *p, uint32_t v, unsigned n)
} }
extern char *mmap(void *addr, size_t len,
int prot, int flags, int fd, off_t offset);
#if defined(__i386__) #if defined(__i386__)
# define SET2(p, c0, c1) \ # define SET2(p, c0, c1) \
* (unsigned short *) (p) = ((c1)<<8 | (c0)) * (unsigned short *) (p) = ((c1)<<8 | (c0))
@@ -96,9 +96,6 @@ do_brk(void *addr)
return brk(addr); return brk(addr);
} }
extern char *mmap(void *addr, size_t len,
int prot, int flags, int fd, off_t offset);
/************************************************************************* /*************************************************************************
// UPX & NRV stuff // UPX & NRV stuff
**************************************************************************/ **************************************************************************/
-3
View File
@@ -93,9 +93,6 @@ do_brk(void *addr)
return brk(addr); return brk(addr);
} }
extern char *mmap(void *addr, size_t len,
int prot, int flags, int fd, off_t offset);
/************************************************************************* /*************************************************************************
// UPX & NRV stuff // UPX & NRV stuff
**************************************************************************/ **************************************************************************/
+3 -1
View File
@@ -546,8 +546,9 @@ static ssize_t write(int fd, void const *buf, size_t len)
void *brk(void *); void *brk(void *);
int close(int); int close(int);
void exit(int) __attribute__((__noreturn__,__nothrow__)); void exit(int) __attribute__((__noreturn__,__nothrow__));
int ftruncate(int fd, size_t len);
off_t lseek(int fd, off_t offset, int whence);
int memfd_create(char const *, unsigned); int memfd_create(char const *, unsigned);
void *mmap(void *, size_t, int, int, int, off_t);
int munmap(void *, size_t); int munmap(void *, size_t);
int mprotect(void const *, size_t, int); int mprotect(void const *, size_t, int);
int open(char const *, unsigned, unsigned); int open(char const *, unsigned, unsigned);
@@ -557,6 +558,7 @@ ssize_t write(int, void const *, size_t);
#endif /*}*/ #endif /*}*/
void __clear_cache(void *, void *); void __clear_cache(void *, void *);
void *mmap(void *, size_t, int, int, int, off_t);
/************************************************************************* /*************************************************************************