for posterity, here's what i attempted -mike From 9532af952bae3ddd59526ec8e99a7c7f708c8b6a Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 11 Aug 2012 14:24:54 -0400 Subject: [PATCH] Linux prlimit64: move 32bit version to common location Most 32bit targets declare the prlimit64 wrapper in the arch-specific syscalls.list file. The few that don't are broken (like hppa), but rather than copy & paste that line into the missing arches, move it to the central Linux location. For 64bit targets, there is a line in the wordsize-64 directory that overrides this. Signed-off-by: Mike Frysinger ./ChangeLog 2012-08-11 Mike Frysinger * sysdeps/unix/sysv/linux/syscalls.list: Add prlimit64. * sysdeps/unix/sysv/linux/i386/syscalls.list: Delete prlimit64. * sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list: Likewise. * sysdeps/unix/sysv/linux/sh/syscalls.list: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list: Likewise. ./ports/ChangeLog.arm 2012-08-11 Mike Frysinger * sysdeps/unix/sysv/linux/arm/syscalls.list: Delete prlimit64. ./ports/ChangeLog.linux-generic 2012-08-11 Mike Frysinger * sysdeps/unix/sysv/linux/generic/wordsize-32/syscalls.list: Delete prlimit64. ./ports/ChangeLog.m68k 2012-08-11 Mike Frysinger * sysdeps/unix/sysv/linux/m68k/syscalls.list: Delete prlimit64. ./ports/ChangeLog.mips 2012-08-11 Mike Frysinger * sysdeps/unix/sysv/linux/mips/mips32/syscalls.list: Delete prlimit64. * sysdeps/unix/sysv/linux/mips/mips64/n32/syscalls.list: Delete prlimit64. --- ports/sysdeps/unix/sysv/linux/arm/syscalls.list | 2 -- .../sysv/linux/generic/wordsize-32/syscalls.list | 1 - ports/sysdeps/unix/sysv/linux/m68k/syscalls.list | 1 - .../unix/sysv/linux/mips/mips32/syscalls.list | 2 -- .../unix/sysv/linux/mips/mips64/n32/syscalls.list | 2 -- sysdeps/unix/sysv/linux/i386/syscalls.list | 2 -- .../sysv/linux/powerpc/powerpc32/syscalls.list | 1 - sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list | 1 - sysdeps/unix/sysv/linux/sh/syscalls.list | 2 -- .../unix/sysv/linux/sparc/sparc32/syscalls.list | 1 - sysdeps/unix/sysv/linux/syscalls.list | 1 + 11 files changed, 1 insertion(+), 15 deletions(-) diff --git a/ports/sysdeps/unix/sysv/linux/arm/syscalls.list b/ports/sysdeps/unix/sysv/linux/arm/syscalls.list index ba8cdd7..40ddc95 100644 --- a/ports/sysdeps/unix/sysv/linux/arm/syscalls.list +++ b/ports/sysdeps/unix/sysv/linux/arm/syscalls.list @@ -2,8 +2,6 @@ chown - chown32 i:sii __chown chown -prlimit64 EXTRA prlimit64 i:iipp prlimit64 - fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark # Semaphore and shm system calls. msgctl, shmctl, and semctl have C diff --git a/ports/sysdeps/unix/sysv/linux/generic/wordsize-32/syscalls.list b/ports/sysdeps/unix/sysv/linux/generic/wordsize-32/syscalls.list index 58b4057..fd555a2 100644 --- a/ports/sysdeps/unix/sysv/linux/generic/wordsize-32/syscalls.list +++ b/ports/sysdeps/unix/sysv/linux/generic/wordsize-32/syscalls.list @@ -3,5 +3,4 @@ # rlimit APIs getrlimit - getrlimit i:ip __getrlimit getrlimit setrlimit - setrlimit i:ip __setrlimit setrlimit -prlimit64 EXTRA prlimit64 i:iipp prlimit64 fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark diff --git a/ports/sysdeps/unix/sysv/linux/m68k/syscalls.list b/ports/sysdeps/unix/sysv/linux/m68k/syscalls.list index 1e27d8d..b324fd1 100644 --- a/ports/sysdeps/unix/sysv/linux/m68k/syscalls.list +++ b/ports/sysdeps/unix/sysv/linux/m68k/syscalls.list @@ -3,5 +3,4 @@ chown - chown32 i:sii __chown chown cacheflush EXTRA cacheflush i:iiii __cacheflush cacheflush -prlimit64 EXTRA prlimit64 i:iipp prlimit64 fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark diff --git a/ports/sysdeps/unix/sysv/linux/mips/mips32/syscalls.list b/ports/sysdeps/unix/sysv/linux/mips/mips32/syscalls.list index f357b5c..5cafa95 100644 --- a/ports/sysdeps/unix/sysv/linux/mips/mips32/syscalls.list +++ b/ports/sysdeps/unix/sysv/linux/mips/mips32/syscalls.list @@ -1,5 +1,3 @@ # File name Caller Syscall name # args Strong name Weak names -prlimit64 EXTRA prlimit64 i:iipp prlimit64 - fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark diff --git a/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/syscalls.list b/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/syscalls.list index 7ad5523..dd5ea93 100644 --- a/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/syscalls.list +++ b/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/syscalls.list @@ -3,6 +3,4 @@ readahead - readahead i:iii __readahead readahead sync_file_range - sync_file_range Ci:iiii sync_file_range -prlimit64 EXTRA prlimit64 i:iipp prlimit64 - fanotify_mark EXTRA fanotify_mark i:iiiis fanotify_mark diff --git a/sysdeps/unix/sysv/linux/i386/syscalls.list b/sysdeps/unix/sysv/linux/i386/syscalls.list index 149d432..da587b2 100644 --- a/sysdeps/unix/sysv/linux/i386/syscalls.list +++ b/sysdeps/unix/sysv/linux/i386/syscalls.list @@ -7,6 +7,4 @@ oldgetrlimit EXTRA getrlimit i:ip __old_getrlimit getrlimit@GLIBC_2.0 oldsetrlimit EXTRA setrlimit i:ip __old_setrlimit setrlimit@GLIBC_2.0 waitpid - waitpid Ci:ipi __waitpid waitpid __libc_waitpid -prlimit64 EXTRA prlimit64 i:iipp prlimit64 - fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list b/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list index aaa3557..420bfad 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list @@ -7,5 +7,4 @@ oldsetrlimit EXTRA setrlimit i:ip __old_setrlimit setrlimit@GLIBC_2.0 # Due to 64bit alignment there is a dummy second parameter readahead - readahead i:iiiii __readahead readahead -prlimit64 EXTRA prlimit64 i:iipp prlimit64 fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list b/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list index e946d33..061dc55 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list +++ b/sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list @@ -4,5 +4,4 @@ oldgetrlimit EXTRA getrlimit i:ip __old_getrlimit getrlimit@GLIBC_2.0 oldsetrlimit EXTRA setrlimit i:ip __old_setrlimit setrlimit@GLIBC_2.0 vfork - vfork 0 __vfork vfork -prlimit64 EXTRA prlimit64 i:iipp prlimit64 fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark diff --git a/sysdeps/unix/sysv/linux/sh/syscalls.list b/sysdeps/unix/sysv/linux/sh/syscalls.list index faffe37..62a4002 100644 --- a/sysdeps/unix/sysv/linux/sh/syscalls.list +++ b/sysdeps/unix/sysv/linux/sh/syscalls.list @@ -2,6 +2,4 @@ waitpid - waitpid Ci:ipi __waitpid waitpid __libc_waitpid -prlimit64 EXTRA prlimit64 i:iipp prlimit64 - fanotify_mark EXTRA fanotify_mark i:iiiiis __fanotify_mark fanotify_mark@@GLIBC_2.16 diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list b/sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list index 3d70185..b6d0aed 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list @@ -5,5 +5,4 @@ getrlimit - getrlimit 2 __getrlimit getrlimit getresuid - getresuid32 3 getresuid getresgid - getresgid32 3 getresgid -prlimit64 EXTRA prlimit64 i:iipp prlimit64 fanotify_mark EXTRA fanotify_mark i:iiiiis fanotify_mark diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list index 6343272..a7da7c5 100644 --- a/sysdeps/unix/sysv/linux/syscalls.list +++ b/sysdeps/unix/sysv/linux/syscalls.list @@ -54,6 +54,7 @@ pipe2 - pipe2 i:fi __pipe2 pipe2 pivot_root EXTRA pivot_root i:ss pivot_root poll - poll Ci:pii __libc_poll __poll poll prctl EXTRA prctl i:iiiii __prctl prctl +prlimit64 EXTRA prlimit64 i:iipp prlimit64 putpmsg - putpmsg i:ippii putpmsg query_module EXTRA query_module i:sipip query_module quotactl EXTRA quotactl i:isip quotactl -- 1.7.9.7