diff gcc/config/linux-android.h @ 111:04ced10e8804

gcc 7
author kono
date Fri, 27 Oct 2017 22:46:09 +0900
parents 561a7518be6b
children 84e7813d76e9
line wrap: on
line diff
--- a/gcc/config/linux-android.h	Sun Aug 21 07:07:55 2011 +0900
+++ b/gcc/config/linux-android.h	Fri Oct 27 22:46:09 2017 +0900
@@ -1,6 +1,5 @@
 /* Configuration file for Linux Android targets.
-   Copyright (C) 2008, 2010
-   Free Software Foundation, Inc.
+   Copyright (C) 2008-2017 Free Software Foundation, Inc.
    Contributed by Doug Kwan (dougkwan@google.com)
    Rewritten by CodeSourcery, Inc.
 
@@ -22,7 +21,7 @@
 
 #define ANDROID_TARGET_OS_CPP_BUILTINS()			\
     do {							\
-	if (OPTION_ANDROID)					\
+	if (TARGET_ANDROID)					\
 	  builtin_define ("__ANDROID__");			\
     } while (0)
 
@@ -53,8 +52,8 @@
   "%{!static: -ldl}"
 
 #define ANDROID_STARTFILE_SPEC						\
-  "%{!shared:"								\
+  "%{shared: crtbegin_so%O%s;:"						\
   "  %{static: crtbegin_static%O%s;: crtbegin_dynamic%O%s}}"
 
 #define ANDROID_ENDFILE_SPEC \
-  "%{!shared: crtend_android%O%s}"
+  "%{shared: crtend_so%O%s;: crtend_android%O%s}"