Rene Rebe:

package/base/glibc23/elf-machine-rela.patch.mips

@@ -1,50 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/base/glibc23/elf-machine-rela.patch.mips
-# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
---- libc/elf/dl-conflict.c.mips	Mon Feb  4 13:44:57 2002
-+++ libc/elf/dl-conflict.c	Mon Feb  4 15:10:31 2002
-@@ -33,6 +33,7 @@ void
- _dl_resolve_conflicts (struct link_map *l, ElfW(Rela) *conflict,
- 		       ElfW(Rela) *conflictend)
- {
-+#ifndef _DL_HAVE_NO_ELF_MACHINE_RELA
-   if (__builtin_expect (GL(dl_debug_mask) & DL_DEBUG_RELOC, 0))
-     _dl_printf ("\nconflict processing: %s\n",
- 		l->l_name[0] ? l->l_name : _dl_argv[0]);
-@@ -63,4 +64,5 @@ _dl_resolve_conflicts (struct link_map *
-     for (; conflict < conflictend; ++conflict)
-       elf_machine_rela (l, conflict, NULL, NULL, (void *) conflict->r_offset);
-   }
-+#endif
- }
---- libc/sysdeps/mips/dl-machine.h.mips	Mon Feb  4 13:45:18 2002
-+++ libc/sysdeps/mips/dl-machine.h	Mon Feb  4 15:08:39 2002
-@@ -56,6 +56,9 @@
- #define ELF_MACHINE_JMP_SLOT			R_MIPS_REL32
- #define elf_machine_type_class(type)		ELF_RTYPE_CLASS_PLT
- 
-+/* MIPS doesn't support RELA.  */
-+#define _DL_HAVE_NO_ELF_MACHINE_RELA
-+
- /* Translate a processor specific dynamic tag to the index
-    in l_info array.  */
- #define DT_MIPS(x) (DT_MIPS_##x - DT_LOPROC + DT_NUM)

package/base/glibc23/gcc2_is_ok.patch.cross

@@ -1,37 +1,14 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/base/glibc23/gcc2_is_ok.patch.cross
-# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
 
---- ./configure.orig      2002-10-15 02:38:43.000000000 +0200
-+++ ./configure   2002-10-15 02:40:02.000000000 +0200
-@@ -1492,5 +1492,5 @@
-     3.[2-9]*)
-        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
--    *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
-+    *) ac_prog_version="$ac_prog_version, bad (ignore)"; ac_verc_fail=no;;
+Glibc enforces the useage of gcc-3.x - unfortunately for header generation
+dufing a cross toolchain build gcc-2 is also pretty fine.  So flatten gcc-3
+only assumptions for cross builds.
 
-   esac
---- ./Makeconfig.orig	2003-03-08 14:22:36.000000000 +0100
-+++ ./Makeconfig	2003-03-08 14:36:02.000000000 +0100
-@@ -557,7 +557,7 @@
+  - Rene Rebe <rene@rocklinux.org>
+
+diff -u glibc-2.3.4-2004-05-01/Makeconfig glibc-2.3.4-2004-05-01-fixed/Makeconfig
+--- glibc-2.3.4-2004-05-01/Makeconfig	2004-04-18 00:38:24.000000000 +0200
++++ glibc-2.3.4-2004-05-01-fixed/Makeconfig	2004-05-02 19:52:24.000000000 +0200
+@@ -580,7 +580,7 @@
  # The -MP flag tells GCC >= 3.2 (which we now require) to produce dummy
  # targets for headers so that removed headers don't break the build.
  ifndef +mkdep
@@ -40,26 +17,15 @@
  endif
  
  # The program that makes Emacs-style TAGS files.
-@@ -637,7 +637,7 @@
- 	   $(foreach lib,$(libof-$(basename $(@F))) \
- 		         $(libof-$(<F)) $(libof-$(@F)),$(CPPFLAGS-$(lib))) \
- 	   $(CPPFLAGS-$(<F)) $(CPPFLAGS-$(@F)) $(CPPFLAGS-$(basename $(@F)))
--override CFLAGS	= -std=gnu99 \
-+override CFLAGS	= -std=gnu9x \
- 		  $(filter-out %frame-pointer,$(+cflags)) $(sysdep-CFLAGS) \
- 		  $(CFLAGS-$(suffix $@)) $(CFLAGS-$(<F)) $(CFLAGS-$(@F))
+diff -u glibc-2.3.4-2004-05-01/configure glibc-2.3.4-2004-05-01-fixed/configure
+--- glibc-2.3.4-2004-05-01/configure	2004-04-18 00:39:58.000000000 +0200
++++ glibc-2.3.4-2004-05-01-fixed/configure	2004-05-02 19:50:10.000000000 +0200
+@@ -4044,7 +4044,7 @@
+     '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+     3.[2-9]*)
+        ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+-    *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
++    *) ac_prog_version="$ac_prog_version, bad (ignore)"; ac_verc_fail=no;;
  
---- ./Makerules.orig	2003-03-08 14:24:11.000000000 +0100
-+++ ./Makerules	2003-03-08 14:40:22.000000000 +0100
-@@ -131,9 +131,8 @@
- # it's used in sysd-rules, below.
- $(common-objpfx)%.h $(common-objpfx)%.h.d: $(..)scripts/gen-as-const.awk \
- 					   %.sym $(before-compile)
--	$(AWK) -f $< $(filter %.sym,$^) \
--	| $(CC) -S -o - $(CFLAGS) $(CPPFLAGS) -x c - \
--		-MD -MF $(@:.h=.h.d)T -MT '$(@:.h=.h.d) $(@:.h.d=.h)' \
-+	$(AWK) -f $< $(filter %.sym,$^) | $(CC) -M $(CFLAGS) $(CPPFLAGS) -x c - > $(@:.h=.h.d)T
-+	$(AWK) -f $< $(filter %.sym,$^) | $(CC) -S $(CFLAGS) $(CPPFLAGS) -x c - \
- 	| sed -n 's/^.*@@@name@@@\([^@]*\)@@@value@@@[^0-9Xxa-fA-F-]*\([0-9Xxa-fA-F-][0-9Xxa-fA-F-]*\).*@@@end@@@.*$$/#define \1 \2/p' > $(@:.h.d=.h)T
- 	sed $(sed-remove-objpfx) $(sed-remove-dotdot) \
- 	    $(@:.h=.h.d)T > $(@:.h=.h.d)T2
+   esac
+   echo "$as_me:$LINENO: result: $ac_prog_version" >&5

package/base/glibc23/glibc-2.3-arm-eisa.patch

@@ -1,10 +0,0 @@
---- glibc-2.3.1/sysdeps/unix/sysv/linux/arm/ioperm.c.orig	2002-11-18 17:07:57.000000000 +0100
-+++ glibc-2.3.1/sysdeps/unix/sysv/linux/arm/ioperm.c	2002-11-18 17:02:17.000000000 +0100
-@@ -43,6 +43,7 @@
- 
- #include <sys/types.h>
- #include <sys/mman.h>
-+#include <linux/input.h>
- 
- #include <asm/page.h>
- #include <sys/sysctl.h>

package/base/glibc23/glibc23.conf

@@ -20,6 +20,18 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
+if [ $pkg = glibc22 ] ; then
+	# auto-detect for the old glibc
+	ADDONS=""
+else
+	# prevent the utilisation of nptl (...) - and enable it later
+	# if a 2.5/6 kernel is used
+	ADDONS="=linuxthreads"
+fi
+
+# use at least "-O" when build without optimisation for debugging ...
+var_insert GCC_WRAPPER_INSERT " " "-O"
+
 glibc_custmain() {
         # check whether profiling is enabled               
         if [ $ROCKCFG_PKG_GLIBC_ENABLE_PROFILE = 1 ] ; then
@@ -34,8 +46,8 @@ glibc_custmain() {
         # Disable glibc internal debuging but build debuging and profile
         # code so we can use this glibc to debug other programs.
         CFLAGS="$CFLAGS -g -DNDEBUG=1" ../configure --prefix=$root/usr \
-                --with-gnu-binutils --enable-add-ons $G_PROFILE \
-                --with-headers=$root/usr/include --with-gd=/usr \
+                --with-gnu-binutils --enable-add-ons"$ADDONS" $G_PROFILE \
+                --with-headers=$root/usr/src/linux/include --with-gd=/usr \
                 --with-gd-lib=/usr/lib --with-gd-include=/usr/include \
                 --build=${arch_build} --host=${arch_target}
 
@@ -77,7 +89,8 @@ glibc_custmain() {
 	#
 	if [ $stagelevel -le 1 ] ; then
 		libcso=$root/usr/lib/libc.so
-		sed -i 's,/[^ ]*/,,g' $libcso
+		sed 's,/[^ ]*/,,g' < $libcso > $libcso.new
+		mv $libcso.new $libcso
 	fi
 
 	# Install ld.so.conf
@@ -114,14 +127,9 @@ glibc_prepatch() {
 
 glibc_stage0() {
 	mkdir -p objdir; cd objdir
-	confopt="${confopt% --target=*}"
-
-	var_append confopt " " "--enable-add-ons --build=\$arch_build \
-	                        --host=\$arch_target"
-	# due to assembler check - and we do not yet have as ...
-	[ $arch = hppa ] && var_append confopt " " "--enable-hacker-mode"
-
-	eval "../configure $confopt"
+	eval "../configure --enable-add-ons"$ADDONS" ${confopt% --target=*}" \
+	                   "--build=\$arch_build --host=\$arch_target"
+               
 	make -k cross-compiling=yes install-headers || true
 
 	# make some final adaptions
@@ -132,7 +140,8 @@ glibc_stage0() {
 }
 
 threadsver="$ver"
-prepatch="glibc_prepatch"
+#reenable it as soon as the glibc morons release a new tarball ...
+#prepatch="glibc_prepatch"
 
 if [ $stagelevel -eq 0 ]; then
 	custmain="glibc_stage0"

package/base/glibc23/glibc23.desc

@@ -39,9 +39,10 @@
 
 [L] GPL
 [S] Stable
-[V] 2.3.2
+[V] 2.3.4-2004-05-01
 [P] X 01---5---9 111.000
 
-[D] 305952084 glibc-2.3.2.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/
-[D] 4056606041 glibc-linuxthreads-2.3.2.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/
+#[D] 305952084 glibc-2.3.2.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/
+#[D] 4056606041 glibc-linuxthreads-2.3.2.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/
+[D] X glibc-2.3.4-2004-05-01.tar.bz2 cvs://pserver:anoncvs@sources.redhat.com:/cvs/glibc::libc/!2004-05-01/
 

package/base/glibc23/more-utf8-locales.patch

@@ -1,204 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/base/glibc23/more-utf8-locales.patch
-# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
---- glibc-2.3.2/localedata/SUPPORTED	2002-02-23 20:30:27.000000000 +0100
-+++ glibc-2.3.2-stefanp/localedata/SUPPORTED	2003-06-19 14:18:59.000000000 +0200
-@@ -7,7 +7,7 @@
- ar_BH/ISO-8859-6 \
- ar_DZ/ISO-8859-6 \
- ar_EG/ISO-8859-6 \
--ar_IN/UTF-8 \
-+ar_IN.UTF-8/UTF-8 \
- ar_IQ/ISO-8859-6 \
- ar_JO/ISO-8859-6 \
- ar_KW/ISO-8859-6 \
-@@ -27,9 +27,12 @@
- bs_BA/ISO-8859-2 \
- ca_ES/ISO-8859-1 \
- ca_ES@euro/ISO-8859-15 \
-+ca_ES.UTF-8/UTF-8 \
- cs_CZ/ISO-8859-2 \
-+cs_CZ.UTF-8/UTF-8 \
- cy_GB/ISO-8859-14 \
- da_DK/ISO-8859-1 \
-+da_DK.UTF-8/UTF-8 \
- de_AT/ISO-8859-1 \
- de_AT@euro/ISO-8859-15 \
- de_BE/ISO-8859-1 \
-@@ -37,14 +40,17 @@
- de_CH/ISO-8859-1 \
- de_DE/ISO-8859-1 \
- de_DE@euro/ISO-8859-15 \
-+de_DE.UTF-8/UTF-8 \
- de_LU/ISO-8859-1 \
- de_LU@euro/ISO-8859-15 \
- el_GR/ISO-8859-7 \
-+el_GR.UTF-8/UTF-8 \
- en_AU/ISO-8859-1 \
- en_BW/ISO-8859-1 \
- en_CA/ISO-8859-1 \
- en_DK/ISO-8859-1 \
- en_GB/ISO-8859-1 \
-+en_GB.UTF-8/UTF-8 \
- en_HK/ISO-8859-1 \
- en_IE/ISO-8859-1 \
- en_IE@euro/ISO-8859-15 \
-@@ -53,6 +59,7 @@
- en_PH/ISO-8859-1 \
- en_SG/ISO-8859-1 \
- en_US/ISO-8859-1 \
-+en_US.UTF-8/UTF-8 \
- en_ZA/ISO-8859-1 \
- en_ZW/ISO-8859-1 \
- es_AR/ISO-8859-1 \
-@@ -64,6 +71,7 @@
- es_EC/ISO-8859-1 \
- es_ES/ISO-8859-1 \
- es_ES@euro/ISO-8859-15 \
-+es_ES.UTF-8/UTF-8 \
- es_GT/ISO-8859-1 \
- es_HN/ISO-8859-1 \
- es_MX/ISO-8859-1 \
-@@ -79,7 +87,7 @@
- et_EE/ISO-8859-1 \
- eu_ES/ISO-8859-1 \
- eu_ES@euro/ISO-8859-15 \
--fa_IR/UTF-8 \
-+fa_IR.UTF-8/UTF-8 \
- fi_FI/ISO-8859-1 \
- fi_FI@euro/ISO-8859-15 \
- fo_FO/ISO-8859-1 \
-@@ -97,7 +105,7 @@
- gl_ES@euro/ISO-8859-15 \
- gv_GB/ISO-8859-1 \
- he_IL/ISO-8859-8 \
--hi_IN/UTF-8 \
-+hi_IN.UTF-8/UTF-8 \
- hr_HR/ISO-8859-2 \
- hu_HU/ISO-8859-2 \
- id_ID/ISO-8859-1 \
-@@ -116,7 +124,7 @@
- lv_LV/ISO-8859-13 \
- mi_NZ/ISO-8859-13 \
- mk_MK/ISO-8859-5 \
--mr_IN/UTF-8 \
-+mr_IN.UTF-8/UTF-8 \
- ms_MY/ISO-8859-1 \
- mt_MT/ISO-8859-3 \
- nl_BE/ISO-8859-1 \
-@@ -163,3 +171,96 @@
- zh_HK/BIG5-HKSCS \
- zh_TW/BIG5 \
- zh_TW.EUC-TW/EUC-TW \
-+da_DK.ISO-8859-15/ISO-8859-15 \
-+en_GB.ISO-8859-15/ISO-8859-15 \
-+en_US.ISO-8859-15/ISO-8859-15 \
-+sv_SE.ISO-8859-15/ISO-8859-15 \
-+ar_AE.UTF-8/UTF-8 \
-+ar_BH.UTF-8/UTF-8 \
-+ar_DZ.UTF-8/UTF-8 \
-+ar_EG.UTF-8/UTF-8 \
-+ar_IQ.UTF-8/UTF-8 \
-+ar_JO.UTF-8/UTF-8 \
-+ar_KW.UTF-8/UTF-8 \
-+ar_LB.UTF-8/UTF-8 \
-+ar_LY.UTF-8/UTF-8 \
-+ar_MA.UTF-8/UTF-8 \
-+ar_OM.UTF-8/UTF-8 \
-+ar_QA.UTF-8/UTF-8 \
-+ar_SA.UTF-8/UTF-8 \
-+ar_SD.UTF-8/UTF-8 \
-+ar_SY.UTF-8/UTF-8 \
-+ar_TN.UTF-8/UTF-8 \
-+ar_YE.UTF-8/UTF-8 \
-+be_BY.UTF-8/UTF-8 \
-+bg_BG.UTF-8/UTF-8 \
-+de_AT.UTF-8/UTF-8 \
-+de_CH.UTF-8/UTF-8 \
-+de_LU.UTF-8/UTF-8 \
-+en_AU.UTF-8/UTF-8 \
-+en_CA.UTF-8/UTF-8 \
-+en_IE.UTF-8/UTF-8 \
-+en_NZ.UTF-8/UTF-8 \
-+en_ZA.UTF-8/UTF-8 \
-+es_AR.UTF-8/UTF-8 \
-+es_BO.UTF-8/UTF-8 \
-+es_CL.UTF-8/UTF-8 \
-+es_CO.UTF-8/UTF-8 \
-+es_CR.UTF-8/UTF-8 \
-+es_DO.UTF-8/UTF-8 \
-+es_EC.UTF-8/UTF-8 \
-+es_GT.UTF-8/UTF-8 \
-+es_HN.UTF-8/UTF-8 \
-+es_MX.UTF-8/UTF-8 \
-+es_NI.UTF-8/UTF-8 \
-+es_PA.UTF-8/UTF-8 \
-+es_PE.UTF-8/UTF-8 \
-+es_PR.UTF-8/UTF-8 \
-+es_PY.UTF-8/UTF-8 \
-+es_SV.UTF-8/UTF-8 \
-+es_UY.UTF-8/UTF-8 \
-+es_VE.UTF-8/UTF-8 \
-+et_EE.UTF-8/UTF-8 \
-+fi_FI.UTF-8/UTF-8 \
-+fo_FO.UTF-8/UTF-8 \
-+fr_BE.UTF-8/UTF-8 \
-+fr_CA.UTF-8/UTF-8 \
-+fr_CH.UTF-8/UTF-8 \
-+fr_FR.UTF-8/UTF-8 \
-+fr_LU.UTF-8/UTF-8 \
-+ga_IE.UTF-8/UTF-8 \
-+gl_ES.UTF-8/UTF-8 \
-+he_IL.UTF-8/UTF-8 \
-+hr_HR.UTF-8/UTF-8 \
-+hu_HU.UTF-8/UTF-8 \
-+id_ID.UTF-8/UTF-8 \
-+is_IS.UTF-8/UTF-8 \
-+it_CH.UTF-8/UTF-8 \
-+it_IT.UTF-8/UTF-8 \
-+ja_JP.UTF-8/UTF-8 \
-+ja_JP.SJIS/SHIFT_JIS \
-+kl_GL.UTF-8/UTF-8 \
-+lt_LT.UTF-8/UTF-8 \
-+lv_LV.UTF-8/UTF-8 \
-+mk_MK.UTF-8/UTF-8 \
-+nl_BE.UTF-8/UTF-8 \
-+nl_NL.UTF-8/UTF-8 \
-+no_NO.UTF-8/UTF-8 \
-+pl_PL.UTF-8/UTF-8 \
-+pt_BR.UTF-8/UTF-8 \
-+pt_PT.UTF-8/UTF-8 \
-+ro_RO.UTF-8/UTF-8 \
-+ru_RU.UTF-8/UTF-8 \
-+sk_SK.UTF-8/UTF-8 \
-+sl_SI.UTF-8/UTF-8 \
-+sq_AL.UTF-8/UTF-8 \
-+sr_YU.UTF-8/UTF-8 \
-+sv_FI.UTF-8/UTF-8 \
-+sv_SE.UTF-8/UTF-8 \
-+th_TH.UTF-8/UTF-8 \
-+uk_UA.UTF-8/UTF-8 \
-+zh_HK.UTF-8/UTF-8 \
-+tr_TR.UTF-8/UTF-8 \
-+vi_VN.UTF-8/UTF-8 \
-+zh_CN.UTF-8/UTF-8 \
-+zh_TW.UTF-8/UTF-8 \

package/base/glibc23/output-format-nobug.patch.arm

@@ -1,11 +0,0 @@
---- ./scripts/output-format.sed.orig	30 Jan 2004 20:06:13 -0000
-+++ ./scripts/output-format.sed	30 Jan 2004 20:08:10 -0000
-@@ -18,7 +18,7 @@
- s/\n//
- s/^\([^,]*\),\([^,]*\),B/OUTPUT_FORMAT(\1)/p
- s/^\([^,]*\),\([^,]*\),L/OUTPUT_FORMAT(\2)/p
--/,/s|^|*** BUG in libc/scripts/output-format.sed *** |p
-+/,/Q
- q
- : q
- s/"//g

package/base/glibc23/tls-prelink-defines-ppc.patch

@@ -1,66 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/base/glibc23/tls-prelink-defines-ppc.patch
-# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version. A copy of the GNU General Public
-# License can be found at Documentation/COPYING.
-# 
-# Many people helped and are helping developing ROCK Linux. Please
-# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
-# file for details.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
---- glibc-2.3.2/elf/elf.h.orig	2003-07-09 02:27:23.000000000 +0200
-+++ glibc-2.3.2/elf/elf.h	2003-07-09 02:28:36.000000000 +0200
-@@ -1881,8 +1881,40 @@
- #define R_PPC_SECTOFF_LO	34
- #define R_PPC_SECTOFF_HI	35
- #define R_PPC_SECTOFF_HA	36
-+
-+
-+/* Relocations for TLS support */
-+#define R_PPC_TLS              67
-+#define R_PPC_DTPMOD32         68
-+#define R_PPC_TPREL16          69
-+#define R_PPC_TPREL16_LO       70
-+#define R_PPC_TPREL16_HI       71
-+#define R_PPC_TPREL16_HA       72
-+#define R_PPC_TPREL32          73
-+#define R_PPC_DTPREL16         74
-+#define R_PPC_DTPREL16_LO      75
-+#define R_PPC_DTPREL16_HI      76
-+#define R_PPC_DTPREL16_HA      77
-+#define R_PPC_DTPREL32         78
-+#define R_PPC_GOT_TLSGD16      79
-+#define R_PPC_GOT_TLSGD16_LO   80
-+#define R_PPC_GOT_TLSGD16_HI   81
-+#define R_PPC_GOT_TLSGD16_HA   82
-+#define R_PPC_GOT_TLSLD16      83
-+#define R_PPC_GOT_TLSLD16_LO   84
-+#define R_PPC_GOT_TLSLD16_HI   85
-+#define R_PPC_GOT_TLSLD16_HA   86
-+#define R_PPC_GOT_TPREL16      87
-+#define R_PPC_GOT_TPREL16_LO   88
-+#define R_PPC_GOT_TPREL16_HI   89
-+#define R_PPC_GOT_TPREL16_HA   90
-+#define R_PPC_GOT_DTPREL16     91
-+#define R_PPC_GOT_DTPREL16_LO  92
-+#define R_PPC_GOT_DTPREL16_HI  93
-+#define R_PPC_GOT_DTPREL16_HA  94
-+
- /* Keep this the last entry.  */
--#define R_PPC_NUM		37
-+#define R_PPC_NUM              95
- 
- /* PowerPC64 relocations defined by the ABIs */
- #define R_PPC64_NONE    R_PPC_NONE