Merged revisions 180235-180237,180239-180240,180242-180252,180254-180258,180261-180262,180264,180266-180268,180270-180272,180276-180278,180282-180284,180287,180289,180292,180294-180296,180299-180302,180304-180305,180307-180314,180316,180320-180321,180323-180325,180327-180329,180333-180336,180340-180354,180358-180364,180367-180377,180380-180381,180383-180385,180388,180397,180400-180402,180405,180407-180408,180410-180411,180417-180421,180423-180427,180429-180430,180432,180434-180435,180437-180442,180444-180446,180448-180459,180464-180468,180517-180526,180528,180531-180532,180536-180546,180549-180552,180556,180558-180560,180562-180565,180567-180569,180572,180574-180580,180588-180590,180600-180613,180617-180618,180620,180622-180627,180632-180634,180639-180642,180646-180657,180659-180660,180669-180670,180673-180675,180677-180682,180684-180687,180694-180705,180707-180709,180712-180717,180721,180723-180729,180731-180739,180741-180743,180745-180748,180750,180752,180756-180758,180760-180765,180767-180771,180773-180776,180778-180780,180783-180788,180791,180793-180796,180799-180800,180802-180803,180805,180810,180814,180818-180822,180825-180833,180837,180839-180840,180842-180862,180864-180870,180872-180875,180877-180895,180897-180911,180913,180916-180922,180928-180936,180938-180957,180959-180967,180970,180972,180974,180976,180978,180982-180983,180986,180992,180996,180999-181003,181005-181007,181009-181017,181021-181024,181026-181027,181030-181031,181037-181042,181044-181049,181053-181056,181062-181065,181068-181072,181074-181082,181084-181087,181089-181107,181111-181112,181114,181116,181118-181120,181122,181124-181125,181127-181128,181131-181132,181134,181138-181139,181141-181143,181145,181147,181149-181166,181168-181175,181179-181183,181187-181200,181202-181241,181245-181246,181248,181250-181263,181265-181267,181269-181273,181278-181292,181296-181301,181306-181312,181315,181317-181327,181331-181335,181338-181341,181345-181350,181353,181355,181357-181361,181363-181372,181376-181381,181383-181384,181387-181388,181390-181395,181399-181400,181403,181405,181407-181411,181414,181416-181417,181419-181423,181425-181426,181431,181434,181436,181438,181441-181446,181451-181460,181464-181470,181473-181478,181480-181482,181489-181493,181495-181496,181501,181503,181505-181509,181511-181513,181517,181521,181523-181535,181537-181539,181543-181552,181555-181559,181561-181570,181572-181573,181575-181576,181579-181582,181584,181587-181588,181590,181592-181602,181606-181608,181610-181620,181623-181629,181631,181633-181634,181638-181640,181642-181643,181648,181653-181670,181674-181677,181683-181685,181690-181691,181694,181696-181698,181700-181702,181706-181707,181709,181713,181715,181718,181721-181725,181727-181728,181730-181731,181735,181738-181750,181754-181766,181770-181773,181775,181778-181779,181782,181784-181789,181793-181816,181818-181819,181821,181823-181825,181829-181833,181836-181837,181842-181843,181848-181849,181851-181857,181859-181863,181867-181870,181872,181874-181877,181879-181887,181889-181897,181901-181902,181906,181908,181912-181920,181922,181924,181926-181933,181937-181939,181949,181951,181955,181959,181964-181968,181970-181975,181979-181987,181990-181995,181999-182002,182004-182017,182020-182021,182023-182031,182033,182037-182039,182041-182045,182048-182056,182058-182061,182063-182068,182072-182077,182082-182086,182088-182092,182096-182097,182100,182102,182105,182107-182110,182115-182117,182119,182121,182123,182127,182131-182134,182136,182140-182144,182148,182151-182152,182154-182156,182158-182170,182174-182175,182177-182179,182183-182194,182198-182206,182208,182210-182212,182217-182221,182224-182235,182237-182242,182244,182246-182247,182249-182252,182256-182258,182262-182266,182270-182271,182275-182276,182278-182302,182306-182310,182313-182315,182319-182322,182324,182326-182332,182336-182338,182342-182343,182345-182347 via svnmerge from

svn+ssh://gcc.gnu.org/svn/gcc/trunk



git-svn-id: https://gcc.gnu.org/svn/gcc/branches/google/integration@182413 138bc75d-0d04-0410-961f-82ee72b054a4

2 files changed, 10 insertions, 6 deletions

diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index 15f079dd3a2..22ea666ce5e 100644
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,3 +1,7 @@
+2011-11-21  Andreas Tobler  <andreast@fgznet.ch>
+
+	* configure: Regenerate.
+
 2011-08-08  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
 	* configure.ac (THREADS): Remove posix95.
diff --git a/boehm-gc/configure b/boehm-gc/configure
index 24fbbedac32..c7253a39a51 100755
--- a/boehm-gc/configure
+++ b/boehm-gc/configure
@@ -9533,7 +9533,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct=yes
       hardcode_minus_L=yes
@@ -10449,7 +10449,7 @@ freebsd* | dragonfly*)
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[123]*) objformat=aout ;;
+    freebsd[23].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -10467,7 +10467,7 @@ freebsd* | dragonfly*)
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
@@ -12357,7 +12357,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
         esac
         ;;
 
-      freebsd[12]*)
+      freebsd2.*)
         # C++ shared libraries reported to be fairly broken before
 	# switch to ELF
         ld_shlibs_CXX=no
@@ -14132,7 +14132,7 @@ freebsd* | dragonfly*)
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[123]*) objformat=aout ;;
+    freebsd[23].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -14150,7 +14150,7 @@ freebsd* | dragonfly*)
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)