RFR: JDK-8055352: AIX hprof should include its own copy of dladdr in porting_aix.c

[Staffan Larsen]

I have just sent out a review request for JDK-8043936: "Drop HPROF as demo, keep as HPROF agent shipped with JDK”.

That change removes hprof completely from the demos which makes the change below obsolete. So if my change is accepted, the change below is no longer needed.

Thanks,
/Staffan

On 21 aug 2014, at 13:02, Erik Joelsson <erik.joelsson at oracle.com> wrote:

> Hello,
> 
> Please review this minor fix for hprof demo on aix. When reorganizing the source code for modules, we put a copy of src/aix/porting/porting_aix.* in each of the two locations using it. One of them was the hprof demo. This patch removes the now unused extra source dir declaration for hprof.
> 
> Bug: https://bugs.openjdk.java.net/browse/JDK-8055352
> Patch inline:
> 
> diff -r b8f27b54cc51 make/CompileDemos.gmk
> --- a/make/CompileDemos.gmk
> +++ b/make/CompileDemos.gmk
> @@ -315,17 +315,8 @@
> $(eval $(call SetupJVMTIDemo,heapTracker, agent_util java_crw_demo))
> $(eval $(call SetupJVMTIDemo,heapViewer, agent_util))
> 
> -# On AIX, hprof requires 'dladdr' from src/aix/porting/porting_aix.cpp
> -BUILD_LIBHPROF_AIX_EXTRA_SRC :=
> -BUILD_LIBHPROF_AIX_EXTRA_CFLAGS :=
> -ifeq ($(OPENJDK_TARGET_OS), aix)
> -  BUILD_LIBHPROF_AIX_EXTRA_SRC += $(JDK_TOPDIR)/src/aix/porting
> -  BUILD_LIBHPROF_AIX_EXTRA_CFLAGS += -I$(JDK_TOPDIR)/src/aix/porting
> -endif
> -
> -$(eval $(call SetupJVMTIDemo,hprof, java_crw_demo, \
> -    $(BUILD_LIBHPROF_AIX_EXTRA_CFLAGS), C, \
> -    -ldl, ws2_32.lib winmm.lib, -lsocket -lnsl, -lpthread, $(BUILD_LIBHPROF_AIX_EXTRA_SRC)))
> +$(eval $(call SetupJVMTIDemo,hprof, java_crw_demo,, \
> +    C, -ldl, ws2_32.lib winmm.lib, -lsocket -lnsl, -lpthread))
> 
> $(eval $(call SetupJVMTIDemo,minst, agent_util java_crw_demo))
> $(eval $(call SetupJVMTIDemo,mtrace, agent_util java_crw_demo))
> 
> /Erik