* sysdeps/i386/dl-machine.h (ELF_MACHINE_NO_RELA): Define

	unconditionally to (defined RTLD_BOOTSTRAP).
	* sysdeps/arm/dl-machine.h (ELF_MACHINE_NO_RELA): Likewise.
linuxthreads/
	* sysdeps/powerpc/tcb-offsets.sym (thread_offsetof): Rework for GCC 4.

diff --git a/ChangeLog b/ChangeLog
index b973d58b463fba5d01405dd88da514b31e94d035..fdbd4521c106cc945028a10ea16135f5940bfe3d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-05  Jakub Jelinek  <jakub@redhat.com>
+
+       * sysdeps/i386/dl-machine.h (ELF_MACHINE_NO_RELA): Define
+       unconditionally to (defined RTLD_BOOTSTRAP).
+       * sysdeps/arm/dl-machine.h (ELF_MACHINE_NO_RELA): Likewise.
+
 2005-03-01  H.J. Lu  <hongjiu.lu@intel.com>
 
        [BZ #776]

diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 4cbcfbb7a3677fb38a77205e6c224e13fdd6531b..d55879a479c33e97409f32ce23b49a00591f7691 100644 (file)
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-05  Jakub Jelinek  <jakub@redhat.com>
+
+       * sysdeps/powerpc/tcb-offsets.sym (thread_offsetof): Rework for GCC 4.
+
 2005-02-09  Daniel Jacobowitz  <dan@codesourcery.com>
 
        * descr.h (__pthread_find_self, thread_self): Mark as pure

diff --git a/linuxthreads/sysdeps/powerpc/tcb-offsets.sym b/linuxthreads/sysdeps/powerpc/tcb-offsets.sym
index b526b62336051b8a6359f1deffe9d0debe9520d4..7c5cca01ea45e91a8de02b3a10d9932d02f58a0b 100644 (file)
--- a/linuxthreads/sysdeps/powerpc/tcb-offsets.sym
+++ b/linuxthreads/sysdeps/powerpc/tcb-offsets.sym
@@ -8,7 +8,7 @@
 -- Abuse tls.h macros to derive offsets relative to the thread register.
 #  undef __thread_register
 #  define __thread_register    ((void *) 0)
-#  define thread_offsetof(mem) ((void *) &THREAD_SELF->p_##mem - (void *) 0)
+#  define thread_offsetof(mem) ((ptrdiff_t) THREAD_SELF + offsetof (struct _pthread_descr_struct, p_##mem))
 
 # else
 

diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h
index e8015ac5fe120bea1e808aa349e9d50feb1ad69f..7ddd81234b06f4eac6b19f1f19957cf147ac02cc 100644 (file)
--- a/sysdeps/arm/dl-machine.h
+++ b/sysdeps/arm/dl-machine.h
@@ -353,9 +353,7 @@ elf_machine_plt_value (struct link_map *map, const Elf32_Rel *reloc,
 
 /* ARM never uses Elf32_Rela relocations for the dynamic linker.
    Prelinked libraries may use Elf32_Rela though.  */
-#ifdef RTLD_BOOTSTRAP
-# define ELF_MACHINE_NO_RELA 1
-#endif
+#define ELF_MACHINE_NO_RELA (defined RTLD_BOOTSTRAP)
 
 #ifdef RESOLVE
 

diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h
index a965a4a5fc230f7edd22c5edede1bb161ac2e5d9..367a4fb1a8e0cfdad93edc1d05f9025429be4ce3 100644 (file)
--- a/sysdeps/i386/dl-machine.h
+++ b/sysdeps/i386/dl-machine.h
@@ -301,9 +301,7 @@ elf_machine_plt_value (struct link_map *map, const Elf32_Rel *reloc,
 
 /* The i386 never uses Elf32_Rela relocations for the dynamic linker.
    Prelinked libraries may use Elf32_Rela though.  */
-#ifdef RTLD_BOOTSTRAP
-# define ELF_MACHINE_NO_RELA 1
-#endif
+#define ELF_MACHINE_NO_RELA (defined RTLD_BOOTSTRAP)
 
 #ifdef RESOLVE_MAP
 

diff --git a/sysdeps/i386/i486/Makefile b/sysdeps/i386/i486/Makefile
new file mode 100644 (file)
index 0000000..930731a
--- /dev/null
+++ b/sysdeps/i386/i486/Makefile
@@ -0,0 +1,4 @@
+# Temporary workaround for GCC4 PR debug/19345
+ifeq ($(subdir),string)
+CFLAGS-string-inlines.c += -g0
+endif