am 8c4947ee: am 227e95b2: am 70cf2077: Merge "Build the linker with the same -std flags as the rest of bionic."

* commit '8c4947ee7f4f33de477d8de848c8017cbd792e90':
  Build the linker with the same -std flags as the rest of bionic.

linker/Android.mk

@@ -18,10 +18,17 @@ LOCAL_SRC_FILES:= \
 
 LOCAL_LDFLAGS := -shared -Wl,--exclude-libs,ALL
 
-LOCAL_CFLAGS += -fno-stack-protector \
-        -Wstrict-overflow=5 \
-        -fvisibility=hidden \
-        -Wall -Wextra -Werror \
+LOCAL_CFLAGS += \
+    -fno-stack-protector \
+    -Wstrict-overflow=5 \
+    -fvisibility=hidden \
+    -Wall -Wextra -Werror \
+
+LOCAL_CONLYFLAGS += \
+    -std=gnu99 \
+
+LOCAL_CPPFLAGS += \
+    -std=gnu++11 \
 
 # We need to access Bionic private headers in the linker.
 LOCAL_CFLAGS += -I$(LOCAL_PATH)/../libc/