Merge "Enable NX protections"
diff --git a/core/combo/TARGET_linux-aarch64.mk b/core/combo/TARGET_linux-aarch64.mk
index bdb3017..1b24435 100644
--- a/core/combo/TARGET_linux-aarch64.mk
+++ b/core/combo/TARGET_linux-aarch64.mk
@@ -77,12 +77,6 @@
TARGET_GLOBAL_CFLAGS += \
-fpic -fPIE \
- $(arch_variant_cflags) \
- -include $(android_config_h) \
- -I $(dir $(android_config_h))
-
-TARGET_GLOBAL_CFLAGS += \
- -fpic -fPIE \
-ffunction-sections \
-fdata-sections \
-funwind-tables \
@@ -94,6 +88,9 @@
-include $(android_config_h) \
-I $(dir $(android_config_h))
+# TODO - remove __ANDROID__ after the next aarch64 toolchain refresh
+TARGET_GLOBAL_CFLAGS += -D__ANDROID__=1
+
TARGET_GLOBAL_CFLAGS += -fno-strict-volatile-bitfields
# This is to avoid the dreaded warning compiler message:
diff --git a/tools/adbs b/tools/adbs
index 37c520c..a9bc7c2 100755
--- a/tools/adbs
+++ b/tools/adbs
@@ -20,9 +20,9 @@
import sys
###############################################################################
-# match "#00 pc 0003f52e /system/lib/libdvm.so" for example
+# match "#00 pc 0003f52e /system/lib/libdvm.so" for example
###############################################################################
-trace_line = re.compile("(.*)(\#[0-9]+) (..) ([0-9a-f]{8}) ([^\r\n \t]*)")
+trace_line = re.compile("(.*)(\#[0-9]+) {1,2}(..) ([0-9a-f]{8}) ([^\r\n \t]*)")
# returns a list containing the function name and the file/lineno
def CallAddr2Line(lib, addr):
