comparison make/linux/makefiles/rules.make @ 198:6470a2a42f92

6647068: libjvm.so is not built PIC Summary: Remove the preferred base address built with libjvm.so and unified the PIC approach on Solaris & Linux. Reviewed-by: never, kamg Contributed-by: xiaobin.lu@sun.com
author xlu
date Tue, 10 Jun 2008 16:39:20 -0700
parents a294fd0c4b38
children f232d7d67023
comparison
equal deleted inserted replaced
186:cf1821c649d9 198:6470a2a42f92
131 # With parallel makes, print a message at the end of compilation. 131 # With parallel makes, print a message at the end of compilation.
132 ifeq ($(findstring j,$(MFLAGS)),j) 132 ifeq ($(findstring j,$(MFLAGS)),j)
133 COMPILE_DONE = && { echo Done with $<; } 133 COMPILE_DONE = && { echo Done with $<; }
134 endif 134 endif
135 135
136 include $(GAMMADIR)/make/defs.make
137
138 # The non-PIC object files are only generated for 32 bit platforms.
139 ifdef LP64
136 %.o: %.cpp 140 %.o: %.cpp
137 @echo Compiling $< 141 @echo Compiling $<
138 $(QUIETLY) $(REMOVE_TARGET) 142 $(QUIETLY) $(REMOVE_TARGET)
139 $(QUIETLY) $(COMPILE.CC) -o $@ $< $(COMPILE_DONE) 143 $(QUIETLY) $(COMPILE.CC) -o $@ $< $(COMPILE_DONE)
144 else
145 %.o: %.cpp
146 @echo Compiling $<
147 $(QUIETLY) $(REMOVE_TARGET)
148 $(QUIETLY) $(if $(findstring $@, $(NONPIC_OBJ_FILES)), \
149 $(subst $(VM_PICFLAG), ,$(COMPILE.CC)) -o $@ $< $(COMPILE_DONE), \
150 $(COMPILE.CC) -o $@ $< $(COMPILE_DONE))
151 endif
140 152
141 %.o: %.s 153 %.o: %.s
142 @echo Assembling $< 154 @echo Assembling $<
143 $(QUIETLY) $(REMOVE_TARGET) 155 $(QUIETLY) $(REMOVE_TARGET)
144 $(QUIETLY) $(AS.S) -o $@ $< $(COMPILE_DONE) 156 $(QUIETLY) $(AS.S) -o $@ $< $(COMPILE_DONE)