From: Gerald Pfeifer <gerald@gcc.gnu.org>
Date: Sun, 4 Nov 2007 20:09:45 +0000 (+0000)
Subject: freebsd-spec.h (FBSD_TARGET_OS_CPP_BUILTINS): Fix broken else-if chain.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f612c0bfb7a349e6d4b30a6bc26edb22ff9d29ac;p=thirdparty%2Fgcc.git

freebsd-spec.h (FBSD_TARGET_OS_CPP_BUILTINS): Fix broken else-if chain.

	* config/freebsd-spec.h (FBSD_TARGET_OS_CPP_BUILTINS): Fix
	broken else-if chain.

	* config.gcc: Proactively add FreeBSD 10 and FreeBSD 11.
	* config/freebsd-spec.h (FBSD_TARGET_OS_CPP_BUILTINS): Ditto.

From-SVN: r129887
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f342a636f5ed..70e4f3ef8e6f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2007-11-04  Hirohisa Yamaguchi  <umq@ueo.co.jp>
+
+	* config/freebsd-spec.h (FBSD_TARGET_OS_CPP_BUILTINS): Fix
+	broken else-if chain.
+
+2007-11-04  Gerald Pfeifer  <gerald@pfeifer.com>
+
+	* config.gcc: Proactively add FreeBSD 10 and FreeBSD 11.
+	* config/freebsd-spec.h (FBSD_TARGET_OS_CPP_BUILTINS): Ditto.
+
 2007-11-02  Eric Botcazou  <ebotcazou@libertysurf.fr>
 
 	Backport from mainline:
diff --git a/gcc/config.gcc b/gcc/config.gcc
index b4c8259b934d..3fdfdf521891 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -412,6 +412,10 @@ case ${target} in
       tm_defines="${tm_defines} FBSD_MAJOR=8" ;;
     *-*-freebsd9 | *-*-freebsd[9].*)
       tm_defines="${tm_defines} FBSD_MAJOR=9" ;;
+    *-*-freebsd10 | *-*-freebsd10.*)
+      tm_defines="${tm_defines} FBSD_MAJOR=10" ;;
+    *-*-freebsd11 | *-*-freebsd11.*)
+      tm_defines="${tm_defines} FBSD_MAJOR=11" ;;
     *)
       echo 'Please update *-*-freebsd* in gcc/config.gcc'
       exit 1
diff --git a/gcc/config/freebsd-spec.h b/gcc/config/freebsd-spec.h
index f0e0bcd2e132..e57c2fb06c0f 100644
--- a/gcc/config/freebsd-spec.h
+++ b/gcc/config/freebsd-spec.h
@@ -51,11 +51,15 @@ Boston, MA 02110-1301, USA.  */
 #define FBSD_TARGET_OS_CPP_BUILTINS()					\
   do									\
     {									\
-	if (FBSD_MAJOR == 9)						\
-	  builtin_define ("__FreeBSD__=9");			       	\
+	if (FBSD_MAJOR == 11)						\
+	  builtin_define ("__FreeBSD__=11");				\
+	else if (FBSD_MAJOR == 10)					\
+	  builtin_define ("__FreeBSD__=10");				\
+	else if (FBSD_MAJOR == 9)					\
+	  builtin_define ("__FreeBSD__=9");				\
 	else if (FBSD_MAJOR == 8)					\
 	  builtin_define ("__FreeBSD__=8");			       	\
-	if (FBSD_MAJOR == 7)						\
+	else if (FBSD_MAJOR == 7)                                       \
 	  builtin_define ("__FreeBSD__=7");			       	\
 	else if (FBSD_MAJOR == 6)					\
 	  builtin_define ("__FreeBSD__=6");			       	\