* config/s390/s390.h (TARGET_DEFAULT_BACKCHAIN): New define.

	(TARGET_DEFAULT): Use symbolic values.
	* config/s390/tpf.h (TARGET_DEFAULT_BACKCHAIN): Redefine.
	(TARGET_DEFAULT): Use symbolic values.
	* config/s390/s390.c (s390_backchain_string): Initialize to
	TARGET_DEFAULT_BACKCHAIN.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@88763 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b96342b..4c4dda6 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2004-10-08  Ulrich Weigand  <uweigand@de.ibm.com>
+
+       * config/s390/s390.h (TARGET_DEFAULT_BACKCHAIN): New define.
+       (TARGET_DEFAULT): Use symbolic values.
+       * config/s390/tpf.h (TARGET_DEFAULT_BACKCHAIN): Redefine.
+       (TARGET_DEFAULT): Use symbolic values.
+       * config/s390/s390.c (s390_backchain_string): Initialize to
+       TARGET_DEFAULT_BACKCHAIN.
+
 2004-10-08  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
        * builtins.c (expand_builtin_mempcpy): Move tree handling code to

diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index 08363c8..c2fb505 100644 (file)
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -195,9 +195,9 @@ enum processor_flags s390_arch_flags;
 const char *s390_tune_string;          /* for -mtune=<xxx> */
 const char *s390_arch_string;          /* for -march=<xxx> */
 
-/* String to specify backchain mode.  */
-const char *s390_backchain_string = ""; /* "" no-backchain ,"1" backchain,
-                                          "2" kernel-backchain */
+/* String to specify backchain mode: 
+   "" no-backchain, "1" backchain, "2" kernel-backchain.  */
+const char *s390_backchain_string = TARGET_DEFAULT_BACKCHAIN;
 
 const char *s390_warn_framesize_string;
 const char *s390_warn_dynamicstack_string;

diff --git a/gcc/config/s390/s390.h b/gcc/config/s390/s390.h
index cbb28e8..11b6d84 100644 (file)
--- a/gcc/config/s390/s390.h
+++ b/gcc/config/s390/s390.h
@@ -126,11 +126,13 @@ extern int target_flags;
 #define TARGET_IEEE_FLOAT          1
 
 #ifdef DEFAULT_TARGET_64BIT
-#define TARGET_DEFAULT             0x31
+#define TARGET_DEFAULT             (MASK_64BIT | MASK_ZARCH | MASK_HARD_FLOAT)
 #else
-#define TARGET_DEFAULT             0x1
+#define TARGET_DEFAULT             MASK_HARD_FLOAT
 #endif
 
+#define TARGET_DEFAULT_BACKCHAIN ""
+
 #define TARGET_SWITCHES                                                  \
 { { "hard-float",      1, N_("Use hardware fp")},                        \
   { "soft-float",     -1, N_("Don't use hardware fp")},                  \

diff --git a/gcc/config/s390/tpf.h b/gcc/config/s390/tpf.h
index 8ba13e2..e6a016a 100644 (file)
--- a/gcc/config/s390/tpf.h
+++ b/gcc/config/s390/tpf.h
@@ -54,9 +54,13 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #undef STACK_POINTER_OFFSET
 #define STACK_POINTER_OFFSET           448
 
-/* When building for TPF, set a generic default target that is 64 bits.  */
+/* When building for TPF, set a generic default target that is 64 bits.
+   Also, enable TPF profiling support and the standard backchain by default.  */
 #undef TARGET_DEFAULT
-#define TARGET_DEFAULT             0xb3
+#define TARGET_DEFAULT         (MASK_64BIT | MASK_ZARCH | MASK_HARD_FLOAT \
+                                | MASK_TPF_PROFILING)
+#undef TARGET_DEFAULT_BACKCHAIN
+#define TARGET_DEFAULT_BACKCHAIN "1"
 
 /* Exception handling.  */