Index: glibc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.336
diff -u -p -u -p -r1.336 glibc.spec
--- glibc.spec	18 Oct 2007 00:17:17 -0000	1.336
+++ glibc.spec	28 Nov 2007 13:10:36 -0000
@@ -5,7 +5,7 @@
 %define glibcversion 2.7
 %define glibcrelease 2
 %define run_glibc_tests 1
-%define auxarches i586 i686 athlon sparcv9v sparc64v alphaev6
+%define auxarches i586 i686 geode athlon sparcv9v sparc64v alphaev6
 %define xenarches i686 athlon
 %ifarch %{xenarches}
 %define buildxen 1
@@ -40,6 +40,7 @@ Source2: %(echo %{glibcsrcdir} | sed s/g
 %define glibc_release_unpack -a1 -a2
 %endif
 Source3: %{glibcname}-fedora-%{glibcdate}.tar.bz2
+Source4: %{glibcname}-geode.tar.bz2
 Patch0: %{glibcname}-fedora.patch
 Patch1: %{name}-ia64-lib64.patch
 Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root
@@ -79,8 +80,12 @@ Conflicts: kernel < 2.6.9
 %ifarch i386
 %define nptl_target_cpu i486
 %else
+%ifarch geode
+%define nptl_target_cpu i586
+%else
 %define nptl_target_cpu %{_target_cpu}
 %endif
+%endif
 # Need AS_NEEDED directive
 # Need --hash-style=* support
 BuildRequires: binutils >= 2.17.50.0.2-5
@@ -249,7 +254,7 @@ package or when debugging this package.
 %endif
 
 %prep
-%setup -q -n %{glibcsrcdir} %{glibc_release_unpack} -a3
+%setup -q -n %{glibcsrcdir} %{glibc_release_unpack} -a3 -a4
 %patch0 -E -p1
 %ifarch ia64
 %if "%{_lib}" == "lib64"
@@ -281,6 +286,9 @@ BuildFlags="-march=%{nptl_target_cpu} -m
 %ifarch i686
 BuildFlags="-march=i686 -mtune=generic"
 %endif
+%ifarch geode
+BuildFlags="-march=geode"
+%endif
 %ifarch i386
 BuildFlags="$BuildFlags -mno-tls-direct-seg-refs"
 %endif
@@ -340,6 +348,7 @@ CC="$GCC" CXX="$GXX" CFLAGS="$build_CFLA
 	--enable-add-ons=nptl$AddOns --without-cvs $EnableKernel \
 	--with-headers=%{_prefix}/include --enable-bind-now \
 	--with-tls --with-__thread --build %{nptl_target_cpu}-redhat-linux \
+	--with-cpu=%{_target_cpu} \
 	--host %{nptl_target_cpu}-redhat-linux \
 	--disable-profile
 make %{?_smp_mflags} -r CFLAGS="$build_CFLAGS" PARALLELMFLAGS=-s
@@ -593,12 +602,12 @@ LIB_LANG=''
 sed -e "s|$RPM_BUILD_ROOT||" -e "$LIB_LANG" -e "$SHARE_LANG" < rpm.filelist.in |
 	grep -v '/etc/\(localtime\|nsswitch.conf\|ld.so.conf\|ld.so.cache\|default\)'  | \
 	grep -v '/%{_lib}/lib\(pcprofile\|memusage\).so' | \
-	grep -v 'bin/\(memusage\|mtrace\|xtrace\|pcprofiledump\)' | \
+	grep -v 'bin/\(mtrace\|xtrace\|pcprofiledump\)' | \
 	sort > rpm.filelist
 
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/%{_lib}
 mv -f $RPM_BUILD_ROOT/%{_lib}/lib{pcprofile,memusage}.so $RPM_BUILD_ROOT%{_prefix}/%{_lib}
-for i in $RPM_BUILD_ROOT%{_prefix}/bin/{xtrace,memusage}; do
+for i in $RPM_BUILD_ROOT%{_prefix}/bin/xtrace; do
   cp -a $i $i.tmp
   sed -e 's~=/%{_lib}/libpcprofile.so~=%{_prefix}/%{_lib}/libpcprofile.so~' \
       -e 's~=/%{_lib}/libmemusage.so~=%{_prefix}/%{_lib}/libmemusage.so~' \
@@ -658,8 +667,6 @@ echo '%{_prefix}/sbin/nscd' > nscd.filel
 cat > utils.filelist <<EOF
 %{_prefix}/%{_lib}/libmemusage.so
 %{_prefix}/%{_lib}/libpcprofile.so
-%{_prefix}/bin/memusage
-%{_prefix}/bin/memusagestat
 %{_prefix}/bin/mtrace
 %{_prefix}/bin/pcprofiledump
 %{_prefix}/bin/xtrace