Merge remote-tracking branch 'gnu/gcc-4_7-branch' into rework

[pf3gnuchains/gcc-fork.git] / gcc / config / m32r / linux.h

diff --git a/gcc/config/m32r/linux.h b/gcc/config/m32r/linux.h
index 55f6619..bc7802b 100644 (file)
--- a/gcc/config/m32r/linux.h
+++ b/gcc/config/m32r/linux.h
@@ -18,15 +18,6 @@
    along with GCC; see the file COPYING3.  If not see
    <http://www.gnu.org/licenses/>.  */
 
-#define LINUX_DEFAULT_ELF
-
-/* A lie, I guess, but the general idea behind linux/ELF is that we are
-   supposed to be outputting something that will assemble under SVr4.
-   This gets us pretty close.  */
-
-#undef  TARGET_VERSION
-#define TARGET_VERSION fprintf (stderr, " (M32R GNU/Linux with ELF)");
-
 #undef  SIZE_TYPE
 #define SIZE_TYPE "unsigned int"
  
@@ -55,14 +46,14 @@
   %{!shared: \
     %{!static: \
       %{rdynamic:-export-dynamic} \
-      -dynamic-linker " LINUX_DYNAMIC_LINKER "} \
+      -dynamic-linker " GNU_USER_DYNAMIC_LINKER "} \
       %{static:-static}}"
 #else
 #define LINK_SPEC "%(link_cpu) -m m32relf_linux %{shared:-shared} \
   %{!shared: \
     %{!static: \
       %{rdynamic:-export-dynamic} \
-      -dynamic-linker " LINUX_DYNAMIC_LINKER "} \
+      -dynamic-linker " GNU_USER_DYNAMIC_LINKER "} \
       %{static:-static}}"
 #endif
 
@@ -96,6 +87,6 @@
    %{pthread:-D_REENTRANT -D_PTHREADS} \
 "
                                                                                 
-#define TARGET_OS_CPP_BUILTINS() LINUX_TARGET_OS_CPP_BUILTINS()
+#define TARGET_OS_CPP_BUILTINS() GNU_USER_TARGET_OS_CPP_BUILTINS()
 
 #define TARGET_ASM_FILE_END file_end_indicate_exec_stack