changeset 7153:c126b93408a6

Merge
author asaha
date Tue, 04 Mar 2014 15:38:27 -0800
parents c25c7b84ca1b 5185723546d5
children ed45af764a8a 177d11da2566
files .hgtags
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Mar 03 11:56:43 2014 -0800
+++ b/.hgtags	Tue Mar 04 15:38:27 2014 -0800
@@ -396,6 +396,7 @@
 534eeff29ac9fcbbb99ef8908548dbb368d04baf jdk7u55-b09
 d39dd4135844ca5c707bc39ae1d7e020d49880ce jdk7u55-b09
 b231536550067c3b00c77d0e035afe8faaa15581 jdk7u55-b10
+2d80b7cd7aae76f0909a210414317dcf846ad651 jdk7u55-b11
 db5a29c812ee25c34ce9cd97de6e0dae284a4e34 jdk7u60-b00
 def34c4a798678c424786a8f0d0508e90185958d jdk7u60-b01
 ff67c89658525e8903fb870861ed3645befd6bc5 jdk7u60-b02
--- a/make/common/Defs-embedded.gmk	Mon Mar 03 11:56:43 2014 -0800
+++ b/make/common/Defs-embedded.gmk	Tue Mar 04 15:38:27 2014 -0800
@@ -71,7 +71,9 @@
 # and it must be linked after fdlibm - this places it at the end after libc
 # -z muldefs avoids linker errors for duplicate symbols.
 ifeq ($(CROSS_COMPILE_ARCH), arm)
-  EXTRA_LIBS += $(EXT_LIBS_PATH)/sflt_glibc_jdk.a -Xlinker -z -Xlinker muldefs
+  ifneq ($(EXT_LIBS_PATH),)
+    EXTRA_LIBS += $(EXT_LIBS_PATH)/sflt_glibc_jdk.a -Xlinker -z -Xlinker muldefs
+  endif
 endif 
 endif