changeset 5229:ae99b9328cf3

Merge
author asaha
date Tue, 04 Mar 2014 15:35:18 -0800
parents 49f4a81eabd5 2c47e6310e00
children 939f46908506 6e5d97fc1fcd
files .hgtags make/hotspot_version
diffstat 3 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Mar 03 11:56:00 2014 -0800
+++ b/.hgtags	Tue Mar 04 15:35:18 2014 -0800
@@ -621,6 +621,7 @@
 9b238ab164e6d1cf9cfb560827d88ef8a7d8c898 jdk7u55-b09
 573d8d080af9eff48aa3b8f0696d8874ce36fbb1 jdk7u55-b09
 36f8bd4dd467ae4183340842fd7158ac3309b826 jdk7u55-b10
+49cada8e39b9215b9fd8b9183743f92625587cfc jdk7u55-b11
 ae4adc1492d1c90a70bd2d139a939fc0c8329be9 jdk7u60-b00
 af1fc2868a2b919727bfbb0858449bd991bbee4a jdk7u40-b60
 cc83359f5e5eb46dd9176b0a272390b1a0a51fdc hs24.60-b01
--- a/make/bsd/makefiles/arm.make	Mon Mar 03 11:56:00 2014 -0800
+++ b/make/bsd/makefiles/arm.make	Tue Mar 04 15:35:18 2014 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,8 @@
 
 Obj_Files += bsd_arm.o
 
-LIBS += $(EXT_LIBS_PATH)/sflt_glibc.a 
+ifneq ($(EXT_LIBS_PATH),)
+  LIBS += $(EXT_LIBS_PATH)/sflt_glibc.a 
+endif
 
 CFLAGS += -DVM_LITTLE_ENDIAN
--- a/make/linux/makefiles/arm.make	Mon Mar 03 11:56:00 2014 -0800
+++ b/make/linux/makefiles/arm.make	Tue Mar 04 15:35:18 2014 -0800
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,8 @@
 
 Obj_Files += linux_arm.o
 
-LIBS += $(EXT_LIBS_PATH)/sflt_glibc.a 
+ifneq ($(EXT_LIBS_PATH),)
+  LIBS += $(EXT_LIBS_PATH)/sflt_glibc.a 
+endif
 
 CFLAGS += -DVM_LITTLE_ENDIAN