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

Volker Simonis volker.simonis at gmail.com
Sat Aug 23 06:08:48 UTC 2014


Hi Erik,

I'll be back in office and have a closer look at your change on Tuesday.

Until then - which change moved porting_aix.* to the two new locations?

It seems strange that a "modularization change" requires code
duplication - that's not how I understand modularization:)

Regards,
Volker

On Thu, Aug 21, 2014 at 3:02 PM, 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



More information about the build-dev mailing list