yann@1365: Original patch from: gentoo/src/patchsets/glibc/2.9/1040_all_2.3.3-localedef-fix-trampoline.patch
yann@1365: 
yann@1365: -= BEGIN original header =-
yann@1365: #! /bin/sh -e
yann@1365: 
yann@1365: # DP: Description: Fix localedef segfault when run under exec-shield,
yann@1365: #        PaX or similar. (#231438, #198099)
yann@1365: # DP: Dpatch Author: James Troup <james@nocrew.org>
yann@1365: # DP: Patch Author: (probably) Jakub Jelinek <jakub@redhat.com>
yann@1365: # DP: Upstream status: Unknown
yann@1365: # DP: Status Details: Unknown
yann@1365: # DP: Date: 2004-03-16
yann@1365: 
yann@1365: if [ $# -ne 2 ]; then
yann@1365:     echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
yann@1365:     exit 1
yann@1365: fi
yann@1365: case "$1" in
yann@1365:     -patch) patch -d "$2" -f --no-backup-if-mismatch -p1 < $0;;
yann@1365:     -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p1 < $0;;
yann@1365:     *)
yann@1365: 	echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
yann@1365: 	exit 1
yann@1365: esac
yann@1365: exit 0
yann@1365: 
yann@1365: -= END original header =-
yann@1365: 
yann@1365: diff -durN glibc-2_9.orig/locale/programs/3level.h glibc-2_9/locale/programs/3level.h
yann@1365: --- glibc-2_9.orig/locale/programs/3level.h	2007-07-16 02:54:59.000000000 +0200
yann@1365: +++ glibc-2_9/locale/programs/3level.h	2009-02-02 22:00:54.000000000 +0100
yann@1365: @@ -203,6 +203,42 @@
yann@1365:  	}
yann@1365:      }
yann@1365:  }
yann@1365: +
yann@1365: +/* GCC ATM seems to do a poor job with pointers to nested functions passed
yann@1365: +   to inlined functions.  Help it a little bit with this hack.  */
yann@1365: +#define wchead_table_iterate(tp, fn) \
yann@1365: +do									      \
yann@1365: +  {									      \
yann@1365: +    struct wchead_table *t = (tp);					      \
yann@1365: +    uint32_t index1;							      \
yann@1365: +    for (index1 = 0; index1 < t->level1_size; index1++)			      \
yann@1365: +      {									      \
yann@1365: +	uint32_t lookup1 = t->level1[index1];				      \
yann@1365: +	if (lookup1 != ((uint32_t) ~0))					      \
yann@1365: +	  {								      \
yann@1365: +	    uint32_t lookup1_shifted = lookup1 << t->q;			      \
yann@1365: +	    uint32_t index2;						      \
yann@1365: +	    for (index2 = 0; index2 < (1 << t->q); index2++)		      \
yann@1365: +	      {								      \
yann@1365: +		uint32_t lookup2 = t->level2[index2 + lookup1_shifted];	      \
yann@1365: +		if (lookup2 != ((uint32_t) ~0))				      \
yann@1365: +		  {							      \
yann@1365: +		    uint32_t lookup2_shifted = lookup2 << t->p;		      \
yann@1365: +		    uint32_t index3;					      \
yann@1365: +		    for (index3 = 0; index3 < (1 << t->p); index3++)	      \
yann@1365: +		      {							      \
yann@1365: +			struct element_t *lookup3			      \
yann@1365: +			  = t->level3[index3 + lookup2_shifted];	      \
yann@1365: +			if (lookup3 != NULL)				      \
yann@1365: +			  fn ((((index1 << t->q) + index2) << t->p) + index3, \
yann@1365: +			      lookup3);					      \
yann@1365: +		      }							      \
yann@1365: +		  }							      \
yann@1365: +	      }								      \
yann@1365: +	  }								      \
yann@1365: +      }									      \
yann@1365: +  } while (0)
yann@1365: +
yann@1365:  #endif
yann@1365:  
yann@1365:  #ifndef NO_FINALIZE