hg: jdk/sandbox: Merge

patrick.concannon at oracle.com patrick.concannon at oracle.com
Wed Apr 15 15:47:40 UTC 2020


Changeset: 658048595d7d
Author:    pconcannon
Date:      2020-04-15 16:47 +0100
URL:       https://hg.openjdk.java.net/jdk/sandbox/rev/658048595d7d

Merge

- src/hotspot/os_cpu/linux_aarch64/os_linux_aarch64.inline.hpp
! src/java.base/share/classes/sun/nio/ch/DatagramSocketAdaptor.java
- src/java.desktop/share/native/libawt/java2d/loops/MapAccelFunc.c
- src/java.desktop/unix/native/common/awt/medialib/mlib_v_ImageCopy_f.c
- src/java.desktop/unix/native/common/awt/medialib/mlib_v_ImageCopy_f.h
- src/java.desktop/unix/native/common/awt/medialib/vis_proto.h
- src/java.desktop/unix/native/libawt/java2d/loops/java2d_Mlib.c
- src/java.desktop/unix/native/libawt/java2d/loops/java2d_Mlib.h
- src/java.desktop/unix/native/libawt/java2d/loops/mlib_ImageCopy.h
- src/java.desktop/unix/native/libawt/java2d/loops/mlib_ImageLogic_proto.h
- src/java.desktop/unix/native/libawt/java2d/loops/mlib_ImageZoom.h
- src/java.desktop/unix/native/libawt/java2d/loops/mlib_ImageZoom_NN.c
- src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageClear.c
- src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageClear_f.c
- src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageClear_f.h
- src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageConstLogic.h
- src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageConstXor.c
- src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageLogic.h
- src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageLogic_proto.h
- src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageXor.c
- src/java.desktop/unix/native/libawt/java2d/loops/mlib_v_ImageZoom_NN_f.c
- src/java.desktop/unix/native/libawt/java2d/loops/vis_AlphaMacros.c
- src/java.desktop/unix/native/libawt/java2d/loops/vis_AlphaMacros.h
- src/java.desktop/unix/native/libawt/java2d/loops/vis_AlphaMaskBlit.c
- src/java.desktop/unix/native/libawt/java2d/loops/vis_AlphaMaskFill.c
- src/java.desktop/unix/native/libawt/java2d/loops/vis_ByteGray.c
- src/java.desktop/unix/native/libawt/java2d/loops/vis_ByteGray_FromRgb.c
- src/java.desktop/unix/native/libawt/java2d/loops/vis_ByteGray_Mask.c
- src/java.desktop/unix/native/libawt/java2d/loops/vis_ByteIndexed.c
- src/java.desktop/unix/native/libawt/java2d/loops/vis_DrawLine.c
- src/java.desktop/unix/native/libawt/java2d/loops/vis_FourByteAbgr.c
- src/java.desktop/unix/native/libawt/java2d/loops/vis_FourByteAbgrPre.c
- src/java.desktop/unix/native/libawt/java2d/loops/vis_FuncArray.c
- src/java.desktop/unix/native/libawt/java2d/loops/vis_GlyphList.c
- src/java.desktop/unix/native/libawt/java2d/loops/vis_GlyphListXor.c
- src/java.desktop/unix/native/libawt/java2d/loops/vis_IntArgb.c
- src/java.desktop/unix/native/libawt/java2d/loops/vis_IntArgbBm.c
- src/java.desktop/unix/native/libawt/java2d/loops/vis_IntArgbPre.c
- src/java.desktop/unix/native/libawt/java2d/loops/vis_IntArgbPre_Mask.c
- src/java.desktop/unix/native/libawt/java2d/loops/vis_IntBgr.c
- src/java.desktop/unix/native/libawt/java2d/loops/vis_IntRgb.c
- src/java.desktop/unix/native/libawt/java2d/loops/vis_IntRgbx.c
- src/java.desktop/unix/native/libawt/java2d/loops/vis_Interp.c
- src/java.desktop/unix/native/libawt/java2d/loops/vis_SrcMaskFill.c
- src/java.desktop/unix/native/libawt/java2d/loops/vis_SrcOverMaskBlit.c
- src/java.desktop/unix/native/libawt/java2d/loops/vis_SrcOverMaskFill.c
- src/java.desktop/unix/native/libawt/java2d/loops/vis_ThreeByteBgr.c
- src/java.desktop/unix/native/libawt/java2d/loops/vis_UshortGray.c
- src/java.desktop/unix/native/libawt/java2d/loops/vis_UshortGray_FromRgb.c
- src/java.desktop/unix/native/libawt/java2d/loops/vis_XorBlit.c
- src/java.desktop/unix/native/libmlib_image/mlib_ImageConvCopyEdge_Fp.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BC.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BC_S16.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BC_U16.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL_S16.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL_S16.h
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL_U16.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_NN.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract.h
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract_1.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract_43.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert.h
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert_1.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConv.h
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvClearEdge.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvCopyEdge.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvMxN_8.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvMxN_8ext.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvVersion.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConv_8nw.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageFilters.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageFilters.h
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUp.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpFunc.h
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS16S16Func.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS16S32Func.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS16U16Func.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS16U8Func.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS32S16Func.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS32S32Func.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS32U16Func.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS32U8Func.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS16S16Func.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS16S32Func.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS16U16Func.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS16U8Func.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS32S16Func.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS32S32Func.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS32U16Func.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS32U8Func.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU16S16Func.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU16S32Func.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU16U16Func.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU16U8Func.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU8S16Func.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU8S32Func.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU8U16Func.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU8U8Func.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU16S16Func.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU16S32Func.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU16U16Func.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU16U8Func.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU8S16Func.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU8S32Func.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU8U16Func.c
- src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU8U8Func.c
- src/java.desktop/unix/native/libmlib_image/vis_32.il
- src/java.desktop/unix/native/libmlib_image/vis_64.il
- test/hotspot/jtreg/applications/ctw/modules/jdk_rmic.java



More information about the jdk-sandbox-changes mailing list