Merge changes between r19447 and r19464 from /fsf/trunk.

git-svn-id: svn://svn.eglibc.org/trunk@19465 7b3dc134-2b1b-0410-93df-9e9f96275f8d

9 files changed, 48 insertions, 53 deletions

diff --git a/libc/ports/.gitignore b/libc/ports/.gitignore
deleted file mode 100644
index 1c3f26029..000000000
--- a/libc/ports/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-autom4te*.cache
diff --git a/libc/ports/Banner b/libc/ports/Banner
deleted file mode 100644
index 6b9c1f0b4..000000000
--- a/libc/ports/Banner
+++ /dev/null
@@ -1 +0,0 @@
-Support for some architectures added on, not maintained in glibc core.
diff --git a/libc/ports/ChangeLog b/libc/ports/ChangeLog
index 4eb1e7f61..5adf0ec58 100644
--- a/libc/ports/ChangeLog
+++ b/libc/ports/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-03  Joseph Myers  <joseph@codesourcery.com>
+
+	* .gitignore: Remove file.
+	* Banner: Likewise.
+	* Makefile: Likewise.
+
 2012-06-21  Carlos O'Donell  <carlos_odonell@mentor.com>
 
 	* .gitignore: New file.
diff --git a/libc/ports/ChangeLog.arm b/libc/ports/ChangeLog.arm
index c411e1c1f..71e8b1b3d 100644
--- a/libc/ports/ChangeLog.arm
+++ b/libc/ports/ChangeLog.arm
@@ -1,3 +1,10 @@
+2012-07-03  Joseph Myers  <joseph@codesourcery.com>
+
+	* sysdeps/arm/Makefile (gnulib-arch): New variable.
+	(static-gnulib-arch): Likewise.
+	[subdir = elf] ($(objpfx)libgcc-stubs.a): New rule.
+	[subdir = elf] (lib-noranlib): Depend on $(objpfx)libgcc-stubs.a.
+
 2012-06-12  Joseph Myers  <joseph@codesourcery.com>
 
 	* sysdeps/unix/sysv/linux/arm/setcontext.S (__startcontext): Use
diff --git a/libc/ports/ChangeLog.powerpc b/libc/ports/ChangeLog.powerpc
index 0c7d3af0e..7141bb279 100644
--- a/libc/ports/ChangeLog.powerpc
+++ b/libc/ports/ChangeLog.powerpc
@@ -1,3 +1,16 @@
+2012-07-03  Joseph Myers  <joseph@codesourcery.com>
+
+	* sysdeps/powerpc/dl-procinfo.c (_dl_powerpc_platforms): Add
+	"ppca2".
+	* sysdeps/powerpc/dl-procinfo.h (_DL_PLATFORMS_COUNT): Increase to
+	13.
+	(PPC_PLATFORM_PPCA2): Define.
+	(PPC_PLATFORM_PPC405): Increase value.
+	(PPC_PLATFORM_PPC440): Likewise.
+	(PPC_PLATFORM_PPC464): Likewise.
+	(PPC_PLATFORM_PPC476): Likewise.
+	(_dl_string_platform): Handle ppca2.
+
 2012-06-13  Joseph Myers  <joseph@codesourcery.com>
 
 	* data/localplt-powerpcsoft-linux-gnu.data: Allow abort and
diff --git a/libc/ports/Makefile b/libc/ports/Makefile
deleted file mode 100644
index 657fdeef7..000000000
--- a/libc/ports/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# This makefile is not used by the glibc build process.
-# It's purely for making ports tarballs.
-
-.PHONY: dist dist-ports
-dist: dist-ports
-
-# Do `make dist dist-version=X.Y.Z' to make tar files of an older version.
-dist-version = $(version)
-# Also try 'dist-tag=some="-r TAG"' (or -D DATE) to get some tag rather
-# than the release tag for X.Y.Z.
-dist-tag = -r glibc-$(subst .,_,$(dist-version))
-
-distname = glibc-ports-$(dist-version)
-
-do-export = cvs $(CVSOPTS) -Q export -d $(basename $@) $(dist-tag)
-
-dist-ports: $(foreach Z,.bz2 .gz,$(distname).tar$Z)
-	md5sum $^
-$(distname).tar:
-	@rm -fr $(basename $@)
-	$(MAKE) -q `find sysdeps -name configure`
-	$(do-export) ports
-	find $(basename $@) -name configure -print | xargs touch
-	tar cf $@ $(basename $@)
-	rm -fr $(basename $@)
-
-sysdeps-of-stem = sysdeps/$* sysdeps/unix/sysv/linux/$*
-
-.PRECIOUS: %.gz %.bz2 # Don't delete output as intermediate files.
-dist-port-%: $(foreach Z,.bz2 .gz,glibc-port-%-$(dist-version).tar$Z)
-	md5sum $^
-glibc-port-%-$(dist-version).tar: ChangeLog.%
-	@rm -fr $(basename $@)
-	$(MAKE) -q `find $(sysdeps-of-stem) -name configure`
-	$(do-export) ports/ChangeLog.$* $(addprefix ports/,$(sysdeps-of-stem))
-	mv $(basename $@)/ports/* $(basename $@)/
-	rmdir $(basename $@)/ports
-	find $(basename $@) -name configure -print | xargs touch
-	tar cf $@ $(basename $@)
-	rm -fr $(basename $@)
-
-%.bz2: %; bzip2 -9vk $<
-%.gz: %; gzip -9vnc $< > $@.new && mv -f $@.new $@
diff --git a/libc/ports/sysdeps/arm/Makefile b/libc/ports/sysdeps/arm/Makefile
index 69a5a6a11..355f5b309 100644
--- a/libc/ports/sysdeps/arm/Makefile
+++ b/libc/ports/sysdeps/arm/Makefile
@@ -1,8 +1,16 @@
+gnulib-arch = $(elfobjdir)/libgcc-stubs.a
+static-gnulib-arch = $(elfobjdir)/libgcc-stubs.a
+
 ifeq ($(subdir),elf)
 sysdep-dl-routines += tlsdesc dl-tlsdesc
 sysdep_routines += aeabi_unwind_cpp_pr1 find_exidx tlsdesc dl-tlsdesc
 sysdep-rtld-routines += aeabi_unwind_cpp_pr1 tlsdesc dl-tlsdesc
 shared-only-routines += aeabi_unwind_cpp_pr1
+
+$(objpfx)libgcc-stubs.a: $(objpfx)aeabi_unwind_cpp_pr1.os
+	$(build-extra-lib)
+
+lib-noranlib: $(objpfx)libgcc-stubs.a
 endif
 
 ifeq ($(subdir),csu)
diff --git a/libc/ports/sysdeps/powerpc/dl-procinfo.c b/libc/ports/sysdeps/powerpc/dl-procinfo.c
index b1979ab1f..00cd497a2 100644
--- a/libc/ports/sysdeps/powerpc/dl-procinfo.c
+++ b/libc/ports/sysdeps/powerpc/dl-procinfo.c
@@ -1,5 +1,5 @@
 /* Data for processor capability information.  PowerPC version.
-   Copyright (C) 2005, 2006, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2005-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -67,7 +67,7 @@ PROCINFO_CLASS const char _dl_powerpc_cap_flags[25][10]
 #if !defined PROCINFO_DECL && defined SHARED
   ._dl_powerpc_platforms
 #else
-PROCINFO_CLASS const char _dl_powerpc_platforms[12][12]
+PROCINFO_CLASS const char _dl_powerpc_platforms[13][12]
 #endif
 #ifndef PROCINFO_DECL
 = {
@@ -79,6 +79,7 @@ PROCINFO_CLASS const char _dl_powerpc_platforms[12][12]
     [PPC_PLATFORM_CELL_BE] = "ppc-cell-be",
     [PPC_PLATFORM_POWER6X] = "power6x",
     [PPC_PLATFORM_POWER7] = "power7",
+    [PPC_PLATFORM_PPCA2] = "ppca2",
     [PPC_PLATFORM_PPC405] = "ppc405",
     [PPC_PLATFORM_PPC440] = "ppc440",
     [PPC_PLATFORM_PPC464] = "ppc464",
diff --git a/libc/ports/sysdeps/powerpc/dl-procinfo.h b/libc/ports/sysdeps/powerpc/dl-procinfo.h
index 785bd1ba0..98c37757a 100644
--- a/libc/ports/sysdeps/powerpc/dl-procinfo.h
+++ b/libc/ports/sysdeps/powerpc/dl-procinfo.h
@@ -1,5 +1,5 @@
 /* Processor capability information handling macros.  PowerPC version.
-   Copyright (C) 2005, 2006, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2005-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -30,7 +30,7 @@
 #define HWCAP_IMPORTANT                (PPC_FEATURE_HAS_ALTIVEC \
                                + PPC_FEATURE_HAS_DFP)
 
-#define _DL_PLATFORMS_COUNT    12
+#define _DL_PLATFORMS_COUNT    13
 
 #define _DL_FIRST_PLATFORM     32
 /* Mask to filter out platforms.  */
@@ -46,10 +46,11 @@
 #define PPC_PLATFORM_CELL_BE         5
 #define PPC_PLATFORM_POWER6X         6
 #define PPC_PLATFORM_POWER7          7
-#define PPC_PLATFORM_PPC405          8
-#define PPC_PLATFORM_PPC440          9
-#define PPC_PLATFORM_PPC464          10
-#define PPC_PLATFORM_PPC476          11
+#define PPC_PLATFORM_PPCA2           8
+#define PPC_PLATFORM_PPC405          9
+#define PPC_PLATFORM_PPC440          10
+#define PPC_PLATFORM_PPC464          11
+#define PPC_PLATFORM_PPC476          12
 
 static inline const char *
 __attribute__ ((unused))
@@ -127,6 +128,10 @@ _dl_string_platform (const char *str)
               == 0)
        return _DL_FIRST_PLATFORM + PPC_PLATFORM_CELL_BE;
       else if (strcmp (str + 3,
+                      GLRO(dl_powerpc_platforms)[PPC_PLATFORM_PPCA2] + 3)
+              == 0)
+       return _DL_FIRST_PLATFORM + PPC_PLATFORM_PPCA2;
+      else if (strcmp (str + 3,
                       GLRO(dl_powerpc_platforms)[PPC_PLATFORM_PPC405] + 3)
               == 0)
        return _DL_FIRST_PLATFORM + PPC_PLATFORM_PPC405;