From: Alan Modra <amodra@gmail.com>
Date: Wed, 17 Mar 2010 04:44:37 +0000 (+1030)
Subject: linux64.opt (mprofile-kernel): Use profile_kernel var.
X-Git-Tag: upstream/12.2.0~94208
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=60ac95117ecc4790b5aef4a9005c6fec8936debf;p=platform%2Fupstream%2Fgcc.git

linux64.opt (mprofile-kernel): Use profile_kernel var.

	* config/rs6000/linux64.opt (mprofile-kernel): Use profile_kernel var.
	* config/rs6000/linux64.h (TARGET_PROFILE_KERNEL): Define.
	(SUBSUBTARGET_OVERRIDE_OPTIONS): Don't use SET_PROFILE_KERNEL.
	* config/rs6000/rs6000.c (SET_PROFILE_KERNEL): Don't define.

From-SVN: r157507
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6d39e6d..de2b455 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2010-03-17  Alan Modra  <amodra@gmail.com>
+
+	* config/rs6000/linux64.opt (mprofile-kernel): Use profile_kernel var.
+	* config/rs6000/linux64.h (TARGET_PROFILE_KERNEL): Define.
+	(SUBSUBTARGET_OVERRIDE_OPTIONS): Don't use SET_PROFILE_KERNEL.
+	* config/rs6000/rs6000.c (SET_PROFILE_KERNEL): Don't define.
+
 2010-03-16  Richard Henderson  <rth@redhat.com>
 
 	PR middle-end/43365
diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
index 37148c6..da7bca3 100644
--- a/gcc/config/rs6000/linux64.h
+++ b/gcc/config/rs6000/linux64.h
@@ -1,7 +1,7 @@
 /* Definitions of target machine for GNU compiler,
    for 64 bit PowerPC linux.
    Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-   2009  Free Software Foundation, Inc.
+   2009, 2010  Free Software Foundation, Inc.
 
    This file is part of GCC.
 
@@ -61,6 +61,8 @@ extern int dot_symbols;
 #define DOT_SYMBOLS dot_symbols
 #endif
 
+#define TARGET_PROFILE_KERNEL profile_kernel
+
 #undef  PROCESSOR_DEFAULT
 #define PROCESSOR_DEFAULT PROCESSOR_POWER6
 #undef  PROCESSOR_DEFAULT64
@@ -119,7 +121,7 @@ extern int dot_symbols;
 	    error (INVALID_32BIT, "32");			\
 	  if (TARGET_PROFILE_KERNEL)				\
 	    {							\
-	      SET_PROFILE_KERNEL (0);				\
+	      TARGET_PROFILE_KERNEL = 0;			\
 	      error (INVALID_32BIT, "profile-kernel");		\
 	    }							\
 	}							\
diff --git a/gcc/config/rs6000/linux64.opt b/gcc/config/rs6000/linux64.opt
index 1eac738..0d52820 100644
--- a/gcc/config/rs6000/linux64.opt
+++ b/gcc/config/rs6000/linux64.opt
@@ -1,6 +1,6 @@
 ; Options for 64-bit PowerPC Linux.
 ;
-; Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
+; Copyright (C) 2005, 2007, 2009, 2010 Free Software Foundation, Inc.
 ; Contributed by Aldy Hernandez <aldy@quesejoda.com>.
 ;
 ; This file is part of GCC.
@@ -20,5 +20,5 @@
 ; <http://www.gnu.org/licenses/>.
 
 mprofile-kernel
-Target Report Var(TARGET_PROFILE_KERNEL)
+Target Report Var(profile_kernel)
 Call mcount for profiling before a function prologue
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index ce38a8a..4754502 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -1269,9 +1269,6 @@ static const struct attribute_spec rs6000_attribute_table[] =
 #endif
 #ifndef TARGET_PROFILE_KERNEL
 #define TARGET_PROFILE_KERNEL 0
-#define SET_PROFILE_KERNEL(N)
-#else
-#define SET_PROFILE_KERNEL(N) TARGET_PROFILE_KERNEL = (N)
 #endif
 
 /* The VRSAVE bitmask puts bit %v0 as the most significant bit.  */