| 1 | --- ./jdk/make/lib/NioLibraries.gmk 2017-03-30 20:45:48.000000000 +0530 |
| 2 | +++ ../NioLibraries.gmk 2017-04-02 18:02:51.838192783 +0530 |
| 3 | @@ -80,7 +80,7 @@ |
| 4 | LDFLAGS := $(LDFLAGS_JDKLIB) \ |
| 5 | $(call SET_SHARED_LIBRARY_ORIGIN), \ |
| 6 | LIBS_unix := -ljava -lnet, \ |
| 7 | - LIBS_linux := -lpthread $(LIBDL), \ |
| 8 | + LIBS_linux := -lc $(LIBDL), \ |
| 9 | LIBS_solaris := -ljvm -lsocket -lposix4 $(LIBDL) \ |
| 10 | -lsendfile -lc, \ |
| 11 | LIBS_aix := $(LIBDL), \ |
| 12 | --- ./jdk/make/lib/Lib-jdk.sctp.gmk 2017-03-30 20:45:48.000000000 +0530 |
| 13 | +++ ../Lib-jdk.sctp.gmk 2017-04-02 18:04:18.014072129 +0530 |
| 14 | @@ -50,7 +50,7 @@ |
| 15 | $(call SET_SHARED_LIBRARY_ORIGIN), \ |
| 16 | LDFLAGS := $(LDFLAGS_JDKLIB), \ |
| 17 | LIBS_unix := -lnio -lnet -ljava -ljvm, \ |
| 18 | - LIBS_linux := -lpthread $(LIBDL), \ |
| 19 | + LIBS_linux := -lc $(LIBDL), \ |
| 20 | LIBS_solaris := -lsocket -lc, \ |
| 21 | OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libsctp, \ |
| 22 | )) |
| 23 | --- ./jdk/make/lib/Lib-jdk.jdwp.agent.gmk 2017-03-30 20:45:48.000000000 +0530 |
| 24 | +++ ../Lib-jdk.jdwp.agent.gmk 2017-04-02 18:05:56.109871847 +0530 |
| 25 | @@ -47,7 +47,7 @@ |
| 26 | LDFLAGS := $(LDFLAGS_JDKLIB) \ |
| 27 | $(call SET_SHARED_LIBRARY_ORIGIN), \ |
| 28 | LDFLAGS_windows := -export:jdwpTransport_OnLoad, \ |
| 29 | - LIBS_linux := -lpthread, \ |
| 30 | + LIBS_linux := -lc, \ |
| 31 | LIBS_solaris := -lnsl -lsocket -lc, \ |
| 32 | LIBS_windows := $(JDKLIB_LIBS) ws2_32.lib, \ |
| 33 | VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \ |
| 34 | --- ./jdk/make/lib/CoreLibraries.gmk 2017-03-30 20:45:48.000000000 +0530 |
| 35 | +++ ../CoreLibraries.gmk 2017-04-02 18:06:45.519445303 +0530 |
| 36 | @@ -407,7 +407,7 @@ |
| 37 | -export:JLI_AddArgsFromEnvVar \ |
| 38 | -export:JLI_GetAppArgIndex, \ |
| 39 | LIBS_unix := $(LIBZ), \ |
| 40 | - LIBS_linux := $(LIBDL) -lc -lpthread, \ |
| 41 | + LIBS_linux := $(LIBDL) -lc, \ |
| 42 | LIBS_android := $(LIBDL) -lc -llog, \ |
| 43 | LIBS_solaris := $(LIBDL) -lc, \ |
| 44 | LIBS_aix := $(LIBDL),\ |
| 45 | --- ./jdk/make/lib/NetworkingLibraries.gmk 2017-03-30 20:45:48.000000000 +0530 |
| 46 | +++ ../NetworkingLibraries.gmk 2017-04-02 18:08:05.098770606 +0530 |
| 47 | @@ -46,7 +46,7 @@ |
| 48 | LDFLAGS_windows := -delayload:secur32.dll -delayload:iphlpapi.dll, \ |
| 49 | LIBS_unix := -ljvm -ljava, \ |
| 50 | LIBS_android := -llog, \ |
| 51 | - LIBS_linux := $(LIBDL) -lpthread, \ |
| 52 | + LIBS_linux := -lc, \ |
| 53 | LIBS_solaris := -lnsl -lsocket $(LIBDL) -lc, \ |
| 54 | LIBS_aix := $(LIBDL),\ |
| 55 | LIBS_windows := ws2_32.lib jvm.lib secur32.lib iphlpapi.lib winhttp.lib \ |
| 56 | --- ./jdk/make/launcher/LauncherCommon.gmk 2017-03-30 20:45:48.000000000 +0530 |
| 57 | +++ ../LauncherCommon.gmk 2017-04-02 18:09:02.258294282 +0530 |
| 58 | @@ -201,7 +201,7 @@ |
| 59 | LIBS := $(JDKEXE_LIBS) $$($1_LIBS), \ |
| 60 | LIBS_unix := $$($1_LIBS_unix), \ |
| 61 | LIBS_android := -llog -ljli $(LIBDL) -lc, \ |
| 62 | - LIBS_linux := -lpthread -ljli $(LIBDL) -lc, \ |
| 63 | + LIBS_linux := -ljli $(LIBDL) -lc, \ |
| 64 | LIBS_solaris := -ljli -lthread $(LIBDL) -lc, \ |
| 65 | LIBS_windows := $$($1_WINDOWS_JLI_LIB) \ |
| 66 | $(SUPPORT_OUTPUTDIR)/native/java.base/libjava/java.lib advapi32.lib \ |
| 67 | --- ./jdk/make/lib/Awt2dLibraries.gmk 2017-03-30 20:45:48.000000000 +0530 |
| 68 | +++ ../Awt2dLibraries.gmk 2017-04-02 18:36:12.582240305 +0530 |
| 69 | @@ -145,7 +145,7 @@ |
| 70 | LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/utility |
| 71 | endif |
| 72 | |
| 73 | -ifneq ($(filter $(OPENJDK_TARGET_OS), solaris linux macosx aix), ) |
| 74 | +ifneq ($(filter $(OPENJDK_TARGET_OS), solaris macosx aix), ) |
| 75 | LIBAWT_EXFILES += awt_Font.c CUPSfuncs.c fontpath.c X11Color.c |
| 76 | endif |
| 77 | |
| 78 | @@ -212,7 +212,7 @@ |
| 79 | LIBAWT_VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/java.desktop/windows/native/libawt/windows/awt.rc |
| 80 | endif |
| 81 | |
| 82 | -ifeq ($(OPENJDK_TARGET_OS), android) |
| 83 | +ifeq ($(OPENJDK_TARGET_OS), linux) |
| 84 | LIBAWT_EXFILES += \ |
| 85 | java2d/loops/TransformHelper.c \ |
| 86 | java2d/loops/ScaledBlit.c \ |
| 87 | @@ -347,10 +347,10 @@ |
| 88 | endif |
| 89 | endif |
| 90 | |
| 91 | - LIBAWT_XAWT_LIBS := $(LIBM) -lawt -lXext -lX11 -lXrender $(LIBDL) -lXtst -lXi -ljava -ljvm -lc |
| 92 | + LIBAWT_XAWT_LIBS := $(LIBM) $(LIBDL) -ljava -ljvm -lc |
| 93 | |
| 94 | ifeq ($(OPENJDK_TARGET_OS), linux) |
| 95 | - LIBAWT_XAWT_LIBS += -lpthread |
| 96 | + LIBAWT_XAWT_LIBS += -lc |
| 97 | endif |
| 98 | |
| 99 | ifeq ($(TOOLCHAIN_TYPE), gcc) |
| 100 | @@ -669,7 +669,7 @@ |
| 101 | X11TextRenderer.c \ |
| 102 | fontpath.c \ |
| 103 | lcdglyph.c |
| 104 | -else ifeq ($(OPENJDK_TARGET_OS), android) |
| 105 | +else ifeq ($(OPENJDK_TARGET_OS), linux) |
| 106 | LIBFONTMANAGER_EXCLUDE_FILES += X11TextRenderer.c |
| 107 | else |
| 108 | LIBFONTMANAGER_EXCLUDE_FILES += fontpath.c \ |
| 109 | @@ -939,7 +939,7 @@ |
| 110 | LIBSPLASHSCREEN_LDFLAGS := -delayload:user32.dll |
| 111 | LIBSPLASHSCREEN_LIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib $(WIN_JAVA_LIB) jvm.lib |
| 112 | else |
| 113 | - LIBSPLASHSCREEN_LIBS += $(X_LIBS) -lX11 -lXext $(LIBM) -lpthread -ldl |
| 114 | + LIBSPLASHSCREEN_LIBS += $(LIBM) -lc -ldl |
| 115 | endif |
| 116 | |
| 117 | $(eval $(call SetupNativeCompilation,BUILD_LIBSPLASHSCREEN, \ |
| 118 | --- ./jdk/make/lib/Lib-java.desktop.gmk 2017-03-30 20:45:48.000000000 +0530 |
| 119 | +++ ../Lib-java.desktop.gmk 2017-04-02 19:01:58.000696690 +0530 |
| 120 | @@ -31,7 +31,7 @@ |
| 121 | |
| 122 | include LibosxLibraries.gmk |
| 123 | include PlatformLibraries.gmk |
| 124 | -ifeq (,$(filter $(OPENJDK_TARGET_OS), android ios)) |
| 125 | +ifeq (,$(filter $(OPENJDK_TARGET_OS), android ios linux)) |
| 126 | include Awt2dLibraries.gmk |
| 127 | endif |
| 128 | include SoundLibraries.gmk |
| 129 | --- ./jdk/make/lib/SoundLibraries.gmk 2017-03-30 20:45:48.000000000 +0530 |
| 130 | +++ ../SoundLibraries.gmk 2017-04-02 19:14:25.382032835 +0530 |
| 131 | @@ -69,16 +69,11 @@ |
| 132 | LIBJSOUND_SRC_FILES += $(LIBJSOUND_PORTFILES) |
| 133 | endif # OPENJDK_TARGET_OS windows |
| 134 | |
| 135 | -ifeq ($(OPENJDK_TARGET_OS), linux) |
| 136 | - EXTRA_SOUND_JNI_LIBS += jsoundalsa |
| 137 | - LIBJSOUND_CFLAGS += -DX_PLATFORM=X_LINUX |
| 138 | -endif # OPENJDK_TARGET_OS linux |
| 139 | - |
| 140 | ifeq ($(OPENJDK_TARGET_OS), aix) |
| 141 | LIBJSOUND_CFLAGS += -DX_PLATFORM=X_AIX |
| 142 | endif # OPENJDK_TARGET_OS aix |
| 143 | |
| 144 | -ifeq ($(OPENJDK_TARGET_OS), android) |
| 145 | +ifeq ($(OPENJDK_TARGET_OS), linux) |
| 146 | LIBJSOUND_CFLAGS += -DX_PLATFORM=X_LINUX |
| 147 | endif |
| 148 | |