7 files changed, 14 insertions, 12 deletions
diff --git a/sysdeps/powerpc/__longjmp.S b/sysdeps/powerpc/__longjmp.S
index 02292a0eb2..4a22fb8952 100644
--- a/sysdeps/powerpc/__longjmp.S
+++ b/sysdeps/powerpc/__longjmp.S
@@ -19,7 +19,7 @@
 
 #include <sysdep.h>
 #define _ASM
-#include <jmp_buf.h>
+#include <bits/setjmp.h>
 
 ENTRY (__longjmp)
 	lwz %r1,(JB_GPR1*4)(%r3)
diff --git a/sysdeps/powerpc/fenvbits.h b/sysdeps/powerpc/bits/fenv.h
index 8acd0ab8a4..9158a54586 100644
--- a/sysdeps/powerpc/fenvbits.h
+++ b/sysdeps/powerpc/bits/fenv.h
@@ -16,10 +16,10 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-/* This file should never be included directly.  */
+#ifndef _FENV_H
+# error "Never use <bits/fenv.h> directly; include <fenv.h> instead."
+#endif
 
-#ifndef _FENVBITS_H
-#define _FENVBITS_H	1
 
 /* Define bits representing the exception.  We use the bit positions of
    the appropriate bits in the FPSCR...  */
@@ -126,5 +126,3 @@ extern const fenv_t __fe_dfl_env;
 extern const fenv_t __fe_nomask_env;
 # define FE_NOMASK_ENV	(&__fe_nomask_env);
 #endif
-
-#endif /* fenvbits.h */
diff --git a/sysdeps/powerpc/mathbits.h b/sysdeps/powerpc/bits/mathdef.h
index 2cecb6fa88..c0e6caa843 100644
--- a/sysdeps/powerpc/mathbits.h
+++ b/sysdeps/powerpc/bits/mathdef.h
@@ -16,8 +16,10 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#ifndef _MATHBITS_H
-#define _MATHBITS_H	1
+#ifndef _MATH_H
+#error "Never use <bits/mathdef.h> directly; include <math.h> instead"
+#endif
+
 
 /* FIXME! This file describes properties of the compiler, not the machine;
    it should not be part of libc!
@@ -68,5 +70,3 @@ typedef double double_t;
 #define INFINITY	HUGE_VAL
 
 #endif
-
-#endif /* mathbits.h */
diff --git a/sysdeps/powerpc/__math.h b/sysdeps/powerpc/bits/mathinline.h
index db9688cfc5..db9688cfc5 100644
--- a/sysdeps/powerpc/__math.h
+++ b/sysdeps/powerpc/bits/mathinline.h
diff --git a/sysdeps/powerpc/jmp_buf.h b/sysdeps/powerpc/bits/setjmp.h
index df832b157c..a9cab03fc6 100644
--- a/sysdeps/powerpc/jmp_buf.h
+++ b/sysdeps/powerpc/bits/setjmp.h
@@ -1,6 +1,6 @@
 /* Define the machine-dependent type `jmp_buf'.  PowerPC version.  */
 
-/* The previous jmp_buf.h had __jmp_buf defined as a structure.
+/* The previous bits/setjmp.h had __jmp_buf defined as a structure.
    We use an array of 'long int' instead, to make writing the
    assembler easier. Naturally, user code should not depend on
    either representation. */
diff --git a/sysdeps/powerpc/dl-machine.h b/sysdeps/powerpc/dl-machine.h
index 17e8d9a12d..6ddbea584b 100644
--- a/sysdeps/powerpc/dl-machine.h
+++ b/sysdeps/powerpc/dl-machine.h
@@ -591,6 +591,10 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
     }
   else if (rinfo == R_PPC_COPY)
     {
+      if (sym == NULL)
+	/* This can happen in trace mode when an object could not be
+	   found.  */
+	return;
       if (sym->st_size > refsym->st_size
 	  || (_dl_verbose && sym->st_size < refsym->st_size))
 	{
diff --git a/sysdeps/powerpc/setjmp.S b/sysdeps/powerpc/setjmp.S
index af10581af0..ddfea7eed3 100644
--- a/sysdeps/powerpc/setjmp.S
+++ b/sysdeps/powerpc/setjmp.S
@@ -19,7 +19,7 @@
 
 #include <sysdep.h>
 #define _ASM
-#include <jmp_buf.h>
+#include <bits/setjmp.h>
 
 ENTRY (__sigsetjmp)
 	stw  %r1,(JB_GPR1*4)(3)