aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoushik Dutta <koushd@gmail.com>2013-07-10 11:47:42 -0700
committerKoushik Dutta <koushd@gmail.com>2013-07-10 11:47:42 -0700
commite829df9229cdc9ffbdfce69009bfdaae05caa58a (patch)
tree357353ba568fdf00b1edae1091c0e22e4606ff63
parentdc061bc9a5eb7ad462b78e5806088648b787dbee (diff)
downloadandroid_frameworks_compile_slang-cm-10.1.tar.gz
android_frameworks_compile_slang-cm-10.1.tar.bz2
android_frameworks_compile_slang-cm-10.1.zip
clang and 10.9 assembler fixes:cm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1
Warnings are treated as errors (-Werror), so do not warn on nested anon types or unused private fields. gcc does not, so that is why gcc does not error out. Darwin 10.9 assembler requires a section name and segment name. Just leave the latter as blank./ Change-Id: I47dd21076f8b2a5e7beb6da74a0a187555b398eb
-rw-r--r--Android.mk4
-rwxr-xr-xslangdata.py2
2 files changed, 5 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index da28351..123ac7a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -25,6 +25,10 @@ local_cflags_for_slang += -D__DISABLE_ASSERTS
endif
local_cflags_for_slang += -DTARGET_BUILD_VARIANT=$(TARGET_BUILD_VARIANT)
+ifeq ($(mac_sdk_version),10.9)
+local_cflags_for_slang += -Wno-nested-anon-types -Wno-unused-private-field
+endif
+
ifeq "REL" "$(PLATFORM_VERSION_CODENAME)"
RS_VERSION := $(PLATFORM_SDK_VERSION)
else
diff --git a/slangdata.py b/slangdata.py
index 2fb038a..7d5d469 100755
--- a/slangdata.py
+++ b/slangdata.py
@@ -33,7 +33,7 @@ def PrintHeader(var_name):
* prefixing for you.\n\
*/\n\
.globl _%s\n\
- .section .rodata,\n\
+ .section .rodata,\"\"\n\
.align 8\n\
_%s:\n\
#else\n\