[PATCH roland/getrlimit] Re: Bug 14138 - Move some functions to syscalls.list

[PATCH roland/getrlimit] Re: Bug 14138 - Move some functions to syscalls.list

[Roland McGrath]

> Adding this line to linux/syscalls.list:
> 
> getrlimit	-	ugetrlimit	i:ip	__new_getrlimit __getrlimit getrlimit@@GLIBC_2.2
> 
> The unix/syscalls.list takes precendence of the linux one. So, this did 
> not work out for x86 ;( Or did I made an error?

What exactly does that mean?  What getrlimit-related lines appear in the
sysd-syscalls generated after the change?  

> Btw. I  removed the linux/i386/getrlimit.c file for this as well,

Yes, that's necessary.

Anyway, you must have made some error, because it worked for me.
The change below is on the roland/getrlimit branch.

It needs testing and sign-off from powerpc, sh, am33, arm, and m68k
maintainers.


Thanks,
Roland


2012-07-26  Roland McGrath  <roland@hack.frob.com>

	[BZ #14138]
	* sysdeps/unix/sysv/linux/syscalls.list: Add getrlimit/ugetrlimit line.
	* sysdeps/unix/sysv/linux/i386/getrlimit.c: File removed.
	* sysdeps/unix/sysv/linux/powerpc/getrlimit.c: File removed.
	* sysdeps/unix/sysv/linux/sh/getrlimit.c: File removed.

ports/ChangeLog.am33
2012-07-26  Roland McGrath  <roland@hack.frob.com>

	[BZ #14138]
	* sysdeps/unix/sysv/linux/am33/getrlimit.c: File removed.

ports/ChangeLog.arm
2012-07-26  Roland McGrath  <roland@hack.frob.com>

	[BZ #14138]
	* sysdeps/unix/sysv/linux/arm/getrlimit.c: File removed.

ports/ChangeLog.m68k
2012-07-26  Roland McGrath  <roland@hack.frob.com>

	[BZ #14138]
	* sysdeps/unix/sysv/linux/m68k/getrlimit.c: File removed.


diff --git a/ports/sysdeps/unix/sysv/linux/am33/getrlimit.c b/ports/sysdeps/unix/sysv/linux/am33/getrlimit.c
deleted file mode 100644
index fc06dbd..0000000
diff --git a/ports/sysdeps/unix/sysv/linux/arm/getrlimit.c b/ports/sysdeps/unix/sysv/linux/arm/getrlimit.c
deleted file mode 100644
index fc06dbd..0000000
diff --git a/ports/sysdeps/unix/sysv/linux/m68k/getrlimit.c b/ports/sysdeps/unix/sysv/linux/m68k/getrlimit.c
deleted file mode 100644
index fc06dbd..0000000
diff --git a/sysdeps/unix/sysv/linux/i386/getrlimit.c b/sysdeps/unix/sysv/linux/i386/getrlimit.c
deleted file mode 100644
index e18f9de..0000000
diff --git a/sysdeps/unix/sysv/linux/powerpc/getrlimit.c b/sysdeps/unix/sysv/linux/powerpc/getrlimit.c
deleted file mode 100644
index fc06dbd..0000000
diff --git a/sysdeps/unix/sysv/linux/sh/getrlimit.c b/sysdeps/unix/sysv/linux/sh/getrlimit.c
deleted file mode 100644
index fc06dbd..0000000
diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list
index 9ec0028..6343272 100644
--- a/sysdeps/unix/sysv/linux/syscalls.list
+++ b/sysdeps/unix/sysv/linux/syscalls.list
@@ -25,6 +25,7 @@ getpmsg		-	getpmsg		i:ipppp	getpmsg
 getppid		-	getppid		Ei:	__getppid	getppid
 getresuid	-	getresuid	i:ppp	getresuid
 getresgid	-	getresgid	i:ppp	getresgid
+getrlimit	-	ugetrlimit	i:ip	__new_getrlimit __getrlimit getrlimit@@GLIBC_2.2
 getsid		-	getsid		i:i	getsid
 init_module	EXTRA	init_module	5	init_module
 inotify_add_watch	EXTRA	inotify_add_watch	i:isi	inotify_add_watch

Re: [PATCH roland/getrlimit] Re: Bug 14138 - Move some functions to syscalls.list

[Andreas Jaeger]

On 07/26/2012 08:59 PM, Roland McGrath wrote:
>> Adding this line to linux/syscalls.list:
>>
>> getrlimit	-	ugetrlimit	i:ip	__new_getrlimit __getrlimit getrlimit@@GLIBC_2.2
>>
>> The unix/syscalls.list takes precendence of the linux one. So, this did
>> not work out for x86 ;( Or did I made an error?
>
> What exactly does that mean?  What getrlimit-related lines appear in the
> sysd-syscalls generated after the change?
>
>> Btw. I  removed the linux/i386/getrlimit.c file for this as well,
>
> Yes, that's necessary.
>
> Anyway, you must have made some error, because it worked for me.
> The change below is on the roland/getrlimit branch.

thanks, I tested this now on both i686 and x86-64 and it works fine.

> It needs testing and sign-off from powerpc, sh, am33, arm, and m68k
> maintainers.

Andreas
-- 
  Andreas Jaeger aj@{suse.com,opensuse.org} Twitter/Identica: jaegerandi
   SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
    GF: Jeff Hawn,Jennifer Guild,Felix Imendörffer,HRB16746 (AG Nürnberg)
     GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126

Re: [PATCH roland/getrlimit] Re: Bug 14138 - Move some functions to syscalls.list

[Andreas Schwab]

Roland McGrath <roland@hack.frob.com> writes:

> ports/ChangeLog.m68k
> 2012-07-26  Roland McGrath  <roland@hack.frob.com>
>
> 	[BZ #14138]
> 	* sysdeps/unix/sysv/linux/m68k/getrlimit.c: File removed.

Ok.

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: [PATCH roland/getrlimit] Re: Bug 14138 - Move some functions to syscalls.list

[Joseph S. Myers]

On Thu, 26 Jul 2012, Roland McGrath wrote:

> It needs testing and sign-off from powerpc, sh, am33, arm, and m68k
> maintainers.

The build fails for ARM with a linker error "libc.so: version node not 
found for symbol getrlimit@@GLIBC_2.2".  (Previously the 2.2 version would 
get automatically converted to 2.4, the minimum symbol version for ARM 
specified in shlib-versions.)

-- 
Joseph S. Myers
joseph@codesourcery.com

Re: [PATCH roland/getrlimit] Re: Bug 14138 - Move some functions to syscalls.list

[Roland McGrath]

> On Thu, 26 Jul 2012, Roland McGrath wrote:
> 
> > It needs testing and sign-off from powerpc, sh, am33, arm, and m68k
> > maintainers.
> 
> The build fails for ARM with a linker error "libc.so: version node not 
> found for symbol getrlimit@@GLIBC_2.2".  (Previously the 2.2 version would 
> get automatically converted to 2.4, the minimum symbol version for ARM 
> specified in shlib-versions.)

Interesting.  I'll look into some black magic for this.


Thanks,
Roland

Re: [PATCH roland/getrlimit] Re: Bug 14138 - Move some functions to syscalls.list

[Roland McGrath]

> The build fails for ARM with a linker error "libc.so: version node not 
> found for symbol getrlimit@@GLIBC_2.2".  (Previously the 2.2 version would 
> get automatically converted to 2.4, the minimum symbol version for ARM 
> specified in shlib-versions.)

Please try the new version of the branch, patch also below.


Thanks,
Roland


2012-07-26  Roland McGrath  <roland@hack.frob.com>

	[BZ #14138]
	* sysdeps/unix/sysv/linux/syscalls.list: Add getrlimit/ugetrlimit line.
	* sysdeps/unix/sysv/linux/i386/getrlimit.c: File removed.
	* sysdeps/unix/sysv/linux/powerpc/getrlimit.c: File removed.
	* sysdeps/unix/sysv/linux/sh/getrlimit.c: File removed.

	* sysdeps/unix/make-syscalls.sh: Emit uses of the versioned_symbol and
	compat_symbol macros from <shlib-compat.h> rather than the underlying
	default_symbol_version and symbol_version macros, so that DEFAULT
	lines in shlib-versions are respected.

ports/ChangeLog.am33
2012-07-26  Roland McGrath  <roland@hack.frob.com>

	[BZ #14138]
	* sysdeps/unix/sysv/linux/am33/getrlimit.c: File removed.

ports/ChangeLog.arm
2012-07-26  Roland McGrath  <roland@hack.frob.com>

	[BZ #14138]
	* sysdeps/unix/sysv/linux/arm/getrlimit.c: File removed.

ports/ChangeLog.m68k
2012-07-26  Roland McGrath  <roland@hack.frob.com>

	[BZ #14138]
	* sysdeps/unix/sysv/linux/m68k/getrlimit.c: File removed.


diff --git a/ports/sysdeps/unix/sysv/linux/am33/getrlimit.c b/ports/sysdeps/unix/sysv/linux/am33/getrlimit.c
deleted file mode 100644
index fc06dbd..0000000
--- a/ports/sysdeps/unix/sysv/linux/am33/getrlimit.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/i386/getrlimit.c>
diff --git a/ports/sysdeps/unix/sysv/linux/arm/getrlimit.c b/ports/sysdeps/unix/sysv/linux/arm/getrlimit.c
deleted file mode 100644
index fc06dbd..0000000
--- a/ports/sysdeps/unix/sysv/linux/arm/getrlimit.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/i386/getrlimit.c>
diff --git a/ports/sysdeps/unix/sysv/linux/m68k/getrlimit.c b/ports/sysdeps/unix/sysv/linux/m68k/getrlimit.c
deleted file mode 100644
index fc06dbd..0000000
--- a/ports/sysdeps/unix/sysv/linux/m68k/getrlimit.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/i386/getrlimit.c>
diff --git a/sysdeps/unix/make-syscalls.sh b/sysdeps/unix/make-syscalls.sh
index 2bc7cc0..7e7de65 100644
--- a/sysdeps/unix/make-syscalls.sh
+++ b/sysdeps/unix/make-syscalls.sh
@@ -64,18 +64,30 @@ done`
 # Any calls left?
 test -n "$calls" || exit 0
 
-# This uses variables $weak and $strong.
+# This uses variables $weak, $strong, and $any_versioned.
 emit_weak_aliases()
 {
   # A shortcoming in the current gas is that it will only allow one
   # version-alias per symbol.  So we create new strong aliases as needed.
   vcount=""
 
+  # We use the <shlib-compat.h> macros to generate the versioned aliases
+  # so that the version sets can be mapped to the configuration's
+  # minimum version set as per shlib-versions DEFAULT lines.  But note
+  # we don't generate any "#if SHLIB_COMPAT (...)" conditionals.  To do
+  # that we'd need to change the syscalls.list format so that it can
+  # list the "obsoleted" version set too.  If it ever arises that we
+  # have a syscall entry point that is obsoleted by a newer version set,
+  # we'll have to revamp all this.
+  if [ $any_versioned = t ]; then
+    echo "	 echo '#include <shlib-compat.h>'; \\"
+  fi
+
   for name in $weak; do
     case $name in
       *@@*)
 	base=`echo $name | sed 's/@@.*//'`
-	ver=`echo $name | sed 's/.*@@//'`
+	ver=`echo $name | sed 's/.*@@//;s/\./_/g'`
 	echo "	 echo '#ifndef NOT_IN_libc'; \\"
 	if test -z "$vcount" ; then
 	  source=$strong
@@ -85,14 +97,14 @@ emit_weak_aliases()
 	  vcount=`expr $vcount + 1`
 	  echo "	 echo 'strong_alias ($strong, $source)'; \\"
 	fi
-	echo "	 echo 'default_symbol_version($source, $base, $ver)'; \\"
+	echo "	 echo 'versioned_symbol (libc, $source, $base, $ver)'; \\"
 	echo "	 echo '#else'; \\"
 	echo "	 echo 'strong_alias ($strong, $base)'; \\"
 	echo "	 echo '#endif'; \\"
 	;;
       *@*)
 	base=`echo $name | sed 's/@.*//'`
-	ver=`echo $name | sed 's/.*@//'`
+	ver=`echo $name | sed 's/.*@//;s/\./_/g'`
 	echo "	 echo '#ifndef NOT_IN_libc'; \\"
 	if test -z "$vcount" ; then
 	  source=$strong
@@ -102,7 +114,7 @@ emit_weak_aliases()
 	  vcount=`expr $vcount + 1`
 	  echo "	 echo 'strong_alias ($strong, $source)'; \\"
 	fi
-	echo "	 echo 'symbol_version ($source, $base, $ver)'; \\"
+	echo "	 echo 'compat_symbol (libc, $source, $base, $ver)'; \\"
 	echo "	 echo '#endif'; \\"
 	;;
       !*)
@@ -175,10 +187,11 @@ while read file srcfile caller syscall args strong weak; do
 
   # If there are versioned aliases the entry is only generated for the
   # shared library, unless it is a default version.
+  any_versioned=f
   shared_only=f
   case $weak in
-    *@@*) ;;
-    *@*) shared_only=t;;
+    *@@*) any_versioned=t ;;
+    *@*) any_versioned=t shared_only=t ;;
   esac
 
  case x$srcfile"$callnum" in
diff --git a/sysdeps/unix/sysv/linux/i386/getrlimit.c b/sysdeps/unix/sysv/linux/i386/getrlimit.c
deleted file mode 100644
index e18f9de..0000000
--- a/sysdeps/unix/sysv/linux/i386/getrlimit.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright (C) 1999-2012 Free Software Foundation, Inc.
-   This file is part of the GNU C Library.
-
-   The GNU C Library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include <errno.h>
-#include <sys/resource.h>
-
-#include <sysdep.h>
-#include <sys/syscall.h>
-#include <shlib-compat.h>
-#include <bp-checks.h>
-
-extern int __new_getrlimit (enum __rlimit_resource resource,
-			    struct rlimit *__unbounded rlimits);
-
-/* Consider moving to syscalls.list.  */
-
-int
-__new_getrlimit (enum __rlimit_resource resource, struct rlimit *rlimits)
-{
-  return INLINE_SYSCALL (ugetrlimit, 2, resource, CHECK_1 (rlimits));
-}
-
-weak_alias (__new_getrlimit, __getrlimit);
-versioned_symbol (libc, __new_getrlimit, getrlimit, GLIBC_2_2);
diff --git a/sysdeps/unix/sysv/linux/powerpc/getrlimit.c b/sysdeps/unix/sysv/linux/powerpc/getrlimit.c
deleted file mode 100644
index fc06dbd..0000000
--- a/sysdeps/unix/sysv/linux/powerpc/getrlimit.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/i386/getrlimit.c>
diff --git a/sysdeps/unix/sysv/linux/sh/getrlimit.c b/sysdeps/unix/sysv/linux/sh/getrlimit.c
deleted file mode 100644
index fc06dbd..0000000
--- a/sysdeps/unix/sysv/linux/sh/getrlimit.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/i386/getrlimit.c>
diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list
index 9ec0028..6343272 100644
--- a/sysdeps/unix/sysv/linux/syscalls.list
+++ b/sysdeps/unix/sysv/linux/syscalls.list
@@ -25,6 +25,7 @@ getpmsg		-	getpmsg		i:ipppp	getpmsg
 getppid		-	getppid		Ei:	__getppid	getppid
 getresuid	-	getresuid	i:ppp	getresuid
 getresgid	-	getresgid	i:ppp	getresgid
+getrlimit	-	ugetrlimit	i:ip	__new_getrlimit __getrlimit getrlimit@@GLIBC_2.2
 getsid		-	getsid		i:i	getsid
 init_module	EXTRA	init_module	5	init_module
 inotify_add_watch	EXTRA	inotify_add_watch	i:isi	inotify_add_watch

Re: [PATCH roland/getrlimit] Re: Bug 14138 - Move some functions to syscalls.list

[Joseph S. Myers]

On Thu, 26 Jul 2012, Roland McGrath wrote:

> > The build fails for ARM with a linker error "libc.so: version node not 
> > found for symbol getrlimit@@GLIBC_2.2".  (Previously the 2.2 version would 
> > get automatically converted to 2.4, the minimum symbol version for ARM 
> > specified in shlib-versions.)
> 
> Please try the new version of the branch, patch also below.

The new version is OK for ARM.

-- 
Joseph S. Myers
joseph@codesourcery.com

Re: [PATCH roland/getrlimit] Re: Bug 14138 - Move some functions to syscalls.list

[Roland McGrath]

> The new version is OK for ARM.

Great.  Still waiting for powerpc, sh, and am33 to sign off.


Thanks,
Roland

Re: [PATCH roland/getrlimit] Re: Bug 14138 - Move some functions to syscalls.list

[Joseph S. Myers]

On Fri, 27 Jul 2012, Roland McGrath wrote:

> > The new version is OK for ARM.
> 
> Great.  Still waiting for powerpc, sh, and am33 to sign off.

I don't think waiting for am33 makes sense for any patch until there is an 
updated am33 port checked in.

-- 
Joseph S. Myers
joseph@codesourcery.com

Re: [PATCH roland/getrlimit] Re: Bug 14138 - Move some functions to syscalls.list

[Roland McGrath]

> On Fri, 27 Jul 2012, Roland McGrath wrote:
> 
> > > The new version is OK for ARM.
> > 
> > Great.  Still waiting for powerpc, sh, and am33 to sign off.
> 
> I don't think waiting for am33 makes sense for any patch until there is an 
> updated am33 port checked in.

Yeah, I probably wasn't really going to wait past getting a powerpc testing
report.

Re: [PATCH roland/getrlimit] Re: Bug 14138 - Move some functions to syscalls.list

[Kaz Kojima]

Roland McGrath <roland@hack.frob.com> wrote:
> It needs testing and sign-off from powerpc, sh, am33, arm, and m68k
> maintainers.

I've tried the updated version in

http://sourceware.org/ml/libc-alpha/2012-07/msg00545.html

and it works fine on SH.

Regards,
	kaz

Re: [PATCH roland/getrlimit] Re: Bug 14138 - Move some functions to syscalls.list

[Ryan S. Arnold]

On Fri, Jul 27, 2012 at 11:16 AM, Roland McGrath <roland@hack.frob.com> wrote:
>> The new version is OK for ARM.
>
> Great.  Still waiting for powerpc, sh, and am33 to sign off.

I tested this on powerpc32 and powerpc64 and I don't see any new
failures during build or test because of it.

Ryan S. Arnold

Re: [PATCH roland/getrlimit] Re: Bug 14138 - Move some functions to syscalls.list

[Roland McGrath]

I've merged the branch.

Thanks,
Roland

Re: [PATCH roland/getrlimit] Re: Bug 14138 - Move some functions to syscalls.list

[Mark Salter]

On Thu, 2012-07-26 at 11:59 -0700, Roland McGrath wrote:
> It needs testing and sign-off from powerpc, sh, am33, arm, and m68k
> maintainers.

Just tried this on am33 and it works okay.

Re: [PATCH roland/getrlimit] Re: Bug 14138 - Move some functions to syscalls.list

[Andreas Krebbel]

On 26/07/12 20:59, Roland McGrath wrote:
>> Adding this line to linux/syscalls.list:
>>
>> getrlimit	-	ugetrlimit	i:ip	__new_getrlimit __getrlimit getrlimit@@GLIBC_2.2
>>
>> The unix/syscalls.list takes precendence of the linux one. So, this did 
>> not work out for x86 ;( Or did I made an error?
> 
> What exactly does that mean?  What getrlimit-related lines appear in the
> sysd-syscalls generated after the change?  
> 
>> Btw. I  removed the linux/i386/getrlimit.c file for this as well,
> 
> Yes, that's necessary.
> 
> Anyway, you must have made some error, because it worked for me.
> The change below is on the roland/getrlimit branch.
> 
> It needs testing and sign-off from powerpc, sh, am33, arm, and m68k
> maintainers.
> 
> 
> Thanks,
> Roland
> 
> 
> 2012-07-26  Roland McGrath  <roland@hack.frob.com>
> 
> 	[BZ #14138]
> 	* sysdeps/unix/sysv/linux/syscalls.list: Add getrlimit/ugetrlimit line.
> 	* sysdeps/unix/sysv/linux/i386/getrlimit.c: File removed.
> 	* sysdeps/unix/sysv/linux/powerpc/getrlimit.c: File removed.
> 	* sysdeps/unix/sysv/linux/sh/getrlimit.c: File removed.
> 
> ports/ChangeLog.am33
> 2012-07-26  Roland McGrath  <roland@hack.frob.com>
> 
> 	[BZ #14138]
> 	* sysdeps/unix/sysv/linux/am33/getrlimit.c: File removed.
> 
> ports/ChangeLog.arm
> 2012-07-26  Roland McGrath  <roland@hack.frob.com>
> 
> 	[BZ #14138]
> 	* sysdeps/unix/sysv/linux/arm/getrlimit.c: File removed.
> 
> ports/ChangeLog.m68k
> 2012-07-26  Roland McGrath  <roland@hack.frob.com>
> 
> 	[BZ #14138]
> 	* sysdeps/unix/sysv/linux/m68k/getrlimit.c: File removed.

sysdeps/unix/sysv/linux/s390/s390-32/getrlimit.c should be removed as well. Done with the
patch I've just comitted:

2012-08-20  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>

	* sysdeps/unix/sysv/linux/s390/s390-32/getrlimit.c: Remove.

---
 sysdeps/unix/sysv/linux/s390/s390-32/getrlimit.c |    1 -
 1 file changed, 1 deletion(-)

Index: glibc/sysdeps/unix/sysv/linux/s390/s390-32/getrlimit.c
===================================================================
--- glibc.orig/sysdeps/unix/sysv/linux/s390/s390-32/getrlimit.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/linux/i386/getrlimit.c>