--- a/components/gdb/Makefile	Mon Jun 20 15:19:38 2011 +0200
+++ b/components/gdb/Makefile	Mon Jun 20 16:03:57 2011 +0000
@@ -66,9 +66,9 @@
 CONFIGURE_OPTIONS += --with-libexpat-prefix=/usr/lib
 
 # common targets
-build:		$(BUILD_32_and_64)
+build:		$(BUILD_64)
 
-install:	$(INSTALL_32_and_64)
+install:	$(INSTALL_64)
 
 test:		$(NO_TESTS)
 

--- a/components/gdb/gdb.p5m	Mon Jun 20 15:19:38 2011 +0200
+++ b/components/gdb/gdb.p5m	Mon Jun 20 16:03:57 2011 +0000
@@ -33,8 +33,6 @@
 
 dir path=usr
 dir path=usr/bin
-dir path=usr/bin/$(MACH32) variant.arch=i386
-dir path=usr/bin/$(MACH64) variant.arch=i386
 dir path=usr/info
 dir path=usr/share
 dir path=usr/share/locale
@@ -72,14 +70,8 @@
 dir path=usr/share/locale/zh_CN/LC_MESSAGES
 dir path=usr/share/man
 dir path=usr/share/man/man1
-file usr/bin/$(MACH64)/gdb path=/usr/bin/gdb variant.arch=sparc
-file usr/bin/$(MACH64)/gdbtui path=/usr/bin/gdbtui variant.arch=sparc
-file path=usr/bin/$(MACH64)/gdb variant.arch=i386
-file path=usr/bin/$(MACH64)/gdbtui variant.arch=i386
-file usr/bin/gdb path=usr/bin/$(MACH32)/gdb variant.arch=i386
-file usr/bin/gdbtui path=usr/bin/$(MACH32)/gdbtui variant.arch=i386
-hardlink path=usr/bin/gdb target=../lib/isaexec variant.arch=i386
-hardlink path=usr/bin/gdbtui target=../lib/isaexec variant.arch=i386
+file usr/bin/$(MACH64)/gdb path=/usr/bin/gdb
+file usr/bin/$(MACH64)/gdbtui path=/usr/bin/gdbtui
 file path=usr/info/annotate.info
 file path=usr/info/bfd.info
 file path=usr/info/configure.info