Merge changes between r22176 and r22241 from /fsf/trunk.

git-svn-id: svn://svn.eglibc.org/trunk@22242 7b3dc134-2b1b-0410-93df-9e9f96275f8d

5 files changed, 27 insertions, 18 deletions

diff --git a/libc/ports/sysdeps/unix/sysv/linux/hppa/bits/ipc.h b/libc/ports/sysdeps/unix/sysv/linux/hppa/bits/ipc.h
index bc07c1fa3..04a75e2e8 100644
--- a/libc/ports/sysdeps/unix/sysv/linux/hppa/bits/ipc.h
+++ b/libc/ports/sysdeps/unix/sysv/linux/hppa/bits/ipc.h
@@ -57,6 +57,6 @@ struct ipc_perm
 #endif
     unsigned short int __seq;		/* Sequence number.  */
     unsigned int __pad3;
-    unsigned long long int __unused1;
-    unsigned long long int __unused2;
+    __extension__ unsigned long long int __unused1;
+    __extension__ unsigned long long int __unused2;
   };
diff --git a/libc/ports/sysdeps/unix/sysv/linux/mips/bits/sigcontext.h b/libc/ports/sysdeps/unix/sysv/linux/mips/bits/sigcontext.h
index 085a00d04..f3c5180b8 100644
--- a/libc/ports/sysdeps/unix/sysv/linux/mips/bits/sigcontext.h
+++ b/libc/ports/sysdeps/unix/sysv/linux/mips/bits/sigcontext.h
@@ -39,16 +39,16 @@
 struct sigcontext {
   unsigned int sc_regmask;
   unsigned int sc_status;
-  unsigned long long sc_pc;
-  unsigned long long sc_regs[32];
-  unsigned long long sc_fpregs[32];
+  __extension__ unsigned long long sc_pc;
+  __extension__ unsigned long long sc_regs[32];
+  __extension__ unsigned long long sc_fpregs[32];
   unsigned int sc_ownedfp;
   unsigned int sc_fpc_csr;
   unsigned int sc_fpc_eir;
   unsigned int sc_used_math;
   unsigned int sc_dsp;
-  unsigned long long sc_mdhi;
-  unsigned long long sc_mdlo;
+  __extension__ unsigned long long sc_mdhi;
+  __extension__ unsigned long long sc_mdlo;
   unsigned long sc_hi1;
   unsigned long sc_lo1;
   unsigned long sc_hi2;
@@ -61,17 +61,17 @@ struct sigcontext {
 
 /* This structure changed in 2.6.12-rc4 when DSP support was added.  */
 struct sigcontext {
-  unsigned long long sc_regs[32];
-  unsigned long long sc_fpregs[32];
-  unsigned long long sc_mdhi;
-  unsigned long long sc_hi1;
-  unsigned long long sc_hi2;
-  unsigned long long sc_hi3;
-  unsigned long long sc_mdlo;
-  unsigned long long sc_lo1;
-  unsigned long long sc_lo2;
-  unsigned long long sc_lo3;
-  unsigned long long sc_pc;
+  __extension__ unsigned long long sc_regs[32];
+  __extension__ unsigned long long sc_fpregs[32];
+  __extension__ unsigned long long sc_mdhi;
+  __extension__ unsigned long long sc_hi1;
+  __extension__ unsigned long long sc_hi2;
+  __extension__ unsigned long long sc_hi3;
+  __extension__ unsigned long long sc_mdlo;
+  __extension__ unsigned long long sc_lo1;
+  __extension__ unsigned long long sc_lo2;
+  __extension__ unsigned long long sc_lo3;
+  __extension__ unsigned long long sc_pc;
   unsigned int sc_fpc_csr;
   unsigned int sc_used_math;
   unsigned int sc_dsp;
diff --git a/libc/ports/sysdeps/unix/sysv/linux/tile/tilegx/configure b/libc/ports/sysdeps/unix/sysv/linux/tile/tilegx/configure
new file mode 100644
index 000000000..bfa30f6dc
--- /dev/null
+++ b/libc/ports/sysdeps/unix/sysv/linux/tile/tilegx/configure
@@ -0,0 +1,4 @@
+# This file is generated from configure.in by Autoconf.  DO NOT EDIT!
+ # Local configure fragment for sysdeps/unix/sysv/linux/tile/tilegx
+
+ldd_rewrite_script=$dir/ldd-rewrite.sed
diff --git a/libc/ports/sysdeps/unix/sysv/linux/tile/tilegx/configure.in b/libc/ports/sysdeps/unix/sysv/linux/tile/tilegx/configure.in
new file mode 100644
index 000000000..87d86bd4c
--- /dev/null
+++ b/libc/ports/sysdeps/unix/sysv/linux/tile/tilegx/configure.in
@@ -0,0 +1,4 @@
+GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
+# Local configure fragment for sysdeps/unix/sysv/linux/tile/tilegx
+
+ldd_rewrite_script=$dir/ldd-rewrite.sed
diff --git a/libc/ports/sysdeps/unix/sysv/linux/tile/tilegx/ldd-rewrite.sed b/libc/ports/sysdeps/unix/sysv/linux/tile/tilegx/ldd-rewrite.sed
new file mode 100644
index 000000000..8b0bb691c
--- /dev/null
+++ b/libc/ports/sysdeps/unix/sysv/linux/tile/tilegx/ldd-rewrite.sed
@@ -0,0 +1 @@
+s_^\(RTLDLIST=\)\(.*lib\)\(\|32\)\(/[^/]*\.so\.[0-9.]*\)[ 	]*$_\1"\2\4 \232\4"_