config.gcc (*-*-freebsd*): Use tm_defines instead of tiny config files which do the...

	* config.gcc (*-*-freebsd*): Use tm_defines instead of tiny
	config files which do the same thing.
	* config/freebsd3.h, config/freebsd4.h, config/freebsd5.h,
	config/freebsd6.h: Remove now unnecessary files.

OK, I don't know what happened, but get this to commit properly.

From-SVN: r72417

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 052e74c196eb38e4aa930fe04624efa95e069133..e0ca8b72bfa9812aa7a1cdf879447e6cfa0cd435 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2003-10-12  Nathanael Nerode  <neroden@gcc.gnu.org>
+
+       * config.gcc (*-*-freebsd*): Use tm_defines instead of tiny
+       config files which do the same thing.
+       * config/freebsd3.h, config/freebsd4.h, config/freebsd5.h,
+       config/freebsd6.h: Remove now unnecessary files.
+
 2003-10-12  Steven Bosscher  <steven@gcc.gnu.org>
 
        * c-common.c (c_common_truthvalue_conversion): Warn if the
@@ -10,13 +17,6 @@
        * config/h8300/h8300.h (REGNO_OK_FOR_BASE_P): Use MAC_REG
        instead of a literal.
 
-2003-10-12  Nathanael Nerode  <neroden@gcc.gnu.org>
-
-       * config.gcc (*-*-freebsd*): Use tm_defines instead of tiny
-       config files which do the same thing.
-       * config/freebsd3.h, config/freebsd4.h, config/freebsd5.h,
-       config/freebsd6.h: Remove now unnecessary files.
-
 2003-10-12  Hans-Peter Nilsson  <hp@bitrange.com>
 
        * doc/extend.texi (Function Attributes): Mention the exceptional

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 3a51b08d25ad76c1a98d0d64a83c500c78f06bea..b16629456674c4fe250f5afe745b43f9915c36ef 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -370,11 +370,18 @@ case ${target} in
   gnu_ld=yes
   extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o"
   case ${target} in
-    *-*-freebsd3 | *-*-freebsd[3].*) fbsd_tm_file="freebsd3.h";;
-    *-*-freebsd4 | *-*-freebsd[4].*) fbsd_tm_file="freebsd4.h";;
-    *-*-freebsd5 | *-*-freebsd[5].*) fbsd_tm_file="freebsd5.h";;
-    *-*-freebsd6 | *-*-freebsd[6].*) fbsd_tm_file="freebsd6.h";;
-    *) echo 'Please update *-*-freebsd* in gcc/config.gcc'; exit 1;;
+    *-*-freebsd3 | *-*-freebsd[3].*)
+      tm_defines="${tm_defines} FBSD_MAJOR=3" ;;
+    *-*-freebsd4 | *-*-freebsd[4].*)
+      tm_defines="${tm_defines} FBSD_MAJOR=4" ;;
+    *-*-freebsd5 | *-*-freebsd[5].*)
+      tm_defines="${tm_defines} FBSD_MAJOR=5" ;;
+    *-*-freebsd6 | *-*-freebsd[6].*)
+      tm_defines="${tm_defines} FBSD_MAJOR=6" ;;
+    *)
+      echo 'Please update *-*-freebsd* in gcc/config.gcc'
+      exit 1
+      ;;
   esac
   tmake_file="t-slibgcc-elf-ver t-freebsd"
   case ${enable_threads} in