# HG changeset patch
# User Omair Majid <omajid@redhat.com>
# Date 1229697319 18000
# Node ID 557ccffda8c5d3eeac0cb7a91a92b6d23b00df94
# Parent  fc3dc99a545d5563b8d3520ded8a01c00de83620
2008-12-19  Omair Majid  <omajid@redhat.com>

    * patches/hotspot/14.0b08/icedtea-text-relocations.patch: Build libjvm.so
    as PIC.

diff -r fc3dc99a545d -r 557ccffda8c5 ChangeLog
--- a/ChangeLog	Fri Dec 19 14:02:38 2008 +0000
+++ b/ChangeLog	Fri Dec 19 09:35:19 2008 -0500
@@ -1,3 +1,8 @@
+2008-12-19  Omair Majid  <omajid@redhat.com>
+
+	* patches/hotspot/14.0b08/icedtea-text-relocations.patch: Build libjvm.so
+	as PIC.
+
 2008-12-19  Andrew Haley  <aph@redhat.com>
 
 	* Makefile.am (stamps/download.stamp): Check MD5sum on hotspot.tar.gz.
diff -r fc3dc99a545d -r 557ccffda8c5 patches/hotspot/14.0b08/icedtea-text-relocations.patch
--- a/patches/hotspot/14.0b08/icedtea-text-relocations.patch	Fri Dec 19 14:02:38 2008 +0000
+++ b/patches/hotspot/14.0b08/icedtea-text-relocations.patch	Fri Dec 19 09:35:19 2008 -0500
@@ -13,3 +13,49 @@
  
  VM_PICFLAG/LIBJVM = $(PICFLAG)
  VM_PICFLAG/AOUT   =
+--- rules.make.orig	2008-12-12 11:23:31.000000000 -0500
++++ openjdk/hotspot/make/linux/makefiles/rules.make	2008-12-12 11:32:26.000000000 -0500
+@@ -138,20 +138,10 @@
+ include $(GAMMADIR)/make/pic.make
+ endif
+ 
+-# The non-PIC object files are only generated for 32 bit platforms.
+-ifdef LP64
+ %.o: %.cpp
+ 	@echo Compiling $<
+ 	$(QUIETLY) $(REMOVE_TARGET)
+ 	$(QUIETLY) $(COMPILE.CC) -o $@ $< $(COMPILE_DONE)
+-else
+-%.o: %.cpp
+-	@echo Compiling $<
+-	$(QUIETLY) $(REMOVE_TARGET)
+-	$(QUIETLY) $(if $(findstring $@, $(NONPIC_OBJ_FILES)), \
+-	   $(subst $(VM_PICFLAG), ,$(COMPILE.CC)) -o $@ $< $(COMPILE_DONE), \
+-	   $(COMPILE.CC) -o $@ $< $(COMPILE_DONE))
+-endif
+ 
+ %.o: %.s
+ 	@echo Assembling $<
+--- rules.make.orig	2008-12-12 11:42:55.000000000 -0500
++++ openjdk/hotspot/make/solaris/makefiles/rules.make	2008-12-12 11:44:01.000000000 -0500
+@@ -138,20 +138,10 @@
+ include $(GAMMADIR)/make/pic.make
+ endif
+ 
+-# Sun compiler for 64 bit Solaris does not support building non-PIC object files.
+-ifdef LP64
+ %.o: %.cpp
+ 	@echo Compiling $<
+ 	$(QUIETLY) $(REMOVE_TARGET)
+ 	$(QUIETLY) $(COMPILE.CC) -o $@ $< $(COMPILE_DONE)
+-else
+-%.o: %.cpp
+-	@echo Compiling $<
+-	$(QUIETLY) $(REMOVE_TARGET)
+-	$(QUIETLY) $(if $(findstring $@, $(NONPIC_OBJ_FILES)), \
+-         $(subst $(VM_PICFLAG), ,$(COMPILE.CC)) -o $@ $< $(COMPILE_DONE), \
+-         $(COMPILE.CC) -o $@ $< $(COMPILE_DONE))
+-endif
+ 
+ %.o: %.s
+ 	@echo Assembling $<