Merge remote-tracking branch 'origin/noregparm' into remove-asm

Author: yzhang71

sysdeps/i386/dl-fixup-attribute.h

@@ -22,7 +22,7 @@
 /* We cannot use this scheme for profiling because the _mcount call destroys
    the passed register information.  */
 #ifndef PROF
-# define DL_ARCH_FIXUP_ATTRIBUTE __attribute__ ((regparm (3), stdcall, unused))
+# define DL_ARCH_FIXUP_ATTRIBUTE __attribute__ ((stdcall, unused))
 #else
 # define DL_ARCH_FIXUP_ATTRIBUTE
 #endif

sysdeps/i386/dl-tls.h

@@ -27,10 +27,8 @@ typedef struct dl_tls_index
 
 #ifdef SHARED
 /* This is the prototype for the GNU version.  */
-extern void *___tls_get_addr (tls_index *ti)
-     __attribute__ ((__regparm__ (1)));
-extern void *___tls_get_addr_internal (tls_index *ti)
-     __attribute__ ((__regparm__ (1))) attribute_hidden;
+extern void *___tls_get_addr (tls_index *ti);
+extern void *___tls_get_addr_internal (tls_index *ti);
 rtld_hidden_proto (___tls_get_addr)
 rtld_hidden_def (___tls_get_addr)
 
@@ -50,7 +48,7 @@ __tls_get_addr (tls_index *ti)
 
 /* Prepare using the definition of __tls_get_addr in the generic
    version of this file.  */
-# define __tls_get_addr __attribute__ ((__regparm__ (1))) ___tls_get_addr
+# define __tls_get_addr ___tls_get_addr
 strong_alias (___tls_get_addr, ___tls_get_addr_internal)
 #else
 

sysdeps/i386/dl-tlsdesc-dynamic.h

@@ -60,7 +60,6 @@
 	C code, hand-optimized a little bit.
 
 ptrdiff_t
-__attribute__ ((__regparm__ (1)))
 _dl_tlsdesc_dynamic (struct tlsdesc *tdp)
 {
   struct tlsdesc_dynamic_arg *td = tdp->arg;

sysdeps/i386/dl-tlsdesc.h

@@ -23,7 +23,7 @@
 /* Type used to represent a TLS descriptor in the GOT.  */
 struct tlsdesc
 {
-  ptrdiff_t __attribute__ ((regparm (1))) (*entry) (struct tlsdesc *);
+  ptrdiff_t (*entry) (struct tlsdesc *);
   void *arg;
 };
 
@@ -41,15 +41,15 @@ struct tlsdesc_dynamic_arg
   size_t gen_count;
 };
 
-extern ptrdiff_t attribute_hidden __attribute__ ((regparm (1)))
+extern ptrdiff_t
   _dl_tlsdesc_return (struct tlsdesc *),
   _dl_tlsdesc_undefweak (struct tlsdesc *);
 
 # ifdef SHARED
 extern void *_dl_make_tlsdesc_dynamic (struct link_map *map,
 				       size_t ti_offset) attribute_hidden;
 
-extern ptrdiff_t attribute_hidden __attribute__ ((regparm (1)))
+extern ptrdiff_t
   _dl_tlsdesc_dynamic (struct tlsdesc *);
 # endif
 

sysdeps/i386/machine-gmon.h

@@ -28,11 +28,9 @@
 /* We must not pollute the global namespace.  */
 #define mcount_internal __mcount_internal
 
-extern void mcount_internal (u_long frompc, u_long selfpc)
-  __attribute__ ((regparm (2))) attribute_hidden;
+extern void mcount_internal (u_long frompc, u_long selfpc);
 
 #define _MCOUNT_DECL(frompc, selfpc)                \
-  __attribute__ ((regparm (2)))			    \
 void mcount_internal (u_long frompc, u_long selfpc)
 
 

sysdeps/i386/tst-audit3.h

@@ -16,5 +16,5 @@
    License along with the GNU C Library; if not, see
    <https://www.gnu.org/licenses/>.  */
 
-extern long long audit1_test (int, int, int) __attribute__ ((regparm(3)));
-extern float audit2_test (int, int, int) __attribute__ ((regparm(3)));
+extern long long audit1_test (int, int, int);
+extern float audit2_test (int, int, int);

sysdeps/i386/tst-auditmod3a.c

@@ -20,7 +20,6 @@
 #include "tst-audit3.h"
 
 long long
-__attribute__ ((regparm(3)))
 audit1_test (int i, int j, int k)
 {
   if (i != 1 || j != 2 || k != 3)
@@ -29,7 +28,6 @@ audit1_test (int i, int j, int k)
 }
 
 float
-__attribute__ ((regparm(3)))
 audit2_test (int i, int j, int k)
 {
   if (i != 1 || j != 2 || k != 3)

sysdeps/unix/sysv/linux/i386/sysdep.c

@@ -22,7 +22,6 @@
    an error number into errno.  ERROR is the negative error number
    returned from the x86 kernel.  */
 int
-__attribute__ ((__regparm__ (1)))
 __syscall_error (int error)
 {
   __set_errno (-error);

sysdeps/unix/sysv/linux/i386/sysdep.h

@@ -235,8 +235,7 @@
 
 #else	/* !__ASSEMBLER__ */
 
-extern int __syscall_error (int)
-  attribute_hidden __attribute__ ((__regparm__ (1)));
+extern int __syscall_error (int);
 
 /* Six-argument syscalls use an out-of-line helper, because an inline
    asm using all registers apart from %esp cannot work reliably and

sysdeps/x86/nptl/bits/pthreadtypes-arch.h

@@ -49,7 +49,7 @@
 
 #ifndef __x86_64__
 /* Extra attributes for the cleanup functions.  */
-# define __cleanup_fct_attribute __attribute__ ((__regparm__ (1)))
+# define __cleanup_fct_attribute
 #endif
 
 #endif	/* bits/pthreadtypes.h */