commit | 33df75987bc63870ff6d82cb06c231509ae471c3 | [log] [tgz] |
---|---|---|
author | Doug Schaefer <dschaefer@blackberry.com> | Thu Aug 25 22:09:48 2016 -0400 |
committer | Doug Schaefer <dschaefer@blackberry.com> | Fri Aug 26 10:43:20 2016 -0400 |
tree | 26f8ec553fede524ca4c25ca770e1f3c8a62ee8a | |
parent | 50bc082f8413b14cd7f5c5c6b72b493c6e43539e [diff] |
Fix Windows 32-bit serial.dll. Change-Id: I4bccdf56a7317bf5f64209c58edfd7991081bc82 (cherry picked from commit dbd2b70814f822e5e2eea79bab2f9c89a964b8a2)
diff --git a/native/org.eclipse.cdt.native.serial/jni/Makefile b/native/org.eclipse.cdt.native.serial/jni/Makefile index 5069304..926ee23 100644 --- a/native/org.eclipse.cdt.native.serial/jni/Makefile +++ b/native/org.eclipse.cdt.native.serial/jni/Makefile
@@ -39,7 +39,7 @@ $(OS_DIR)/win32/x86/serial.dll: serial.c mkdir -p $(dir $@) - i686-w64-mingw32-gcc -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/win32 -shared -o $@ serial.c + i686-w64-mingw32-gcc -Wl,--kill-at -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/win32 -shared -o $@ serial.c $(OS_DIR)/win32/x86_64/serial.dll: serial.c mkdir -p $(dir $@)
diff --git a/native/org.eclipse.cdt.native.serial/os/linux/x86/libserial.so b/native/org.eclipse.cdt.native.serial/os/linux/x86/libserial.so index f834601..951d00d 100755 --- a/native/org.eclipse.cdt.native.serial/os/linux/x86/libserial.so +++ b/native/org.eclipse.cdt.native.serial/os/linux/x86/libserial.so Binary files differ
diff --git a/native/org.eclipse.cdt.native.serial/os/linux/x86_64/libserial.so b/native/org.eclipse.cdt.native.serial/os/linux/x86_64/libserial.so index 1ab5216..71e25cd 100755 --- a/native/org.eclipse.cdt.native.serial/os/linux/x86_64/libserial.so +++ b/native/org.eclipse.cdt.native.serial/os/linux/x86_64/libserial.so Binary files differ
diff --git a/native/org.eclipse.cdt.native.serial/os/win32/x86/serial.dll b/native/org.eclipse.cdt.native.serial/os/win32/x86/serial.dll index 1a0a008..336c922 100755 --- a/native/org.eclipse.cdt.native.serial/os/win32/x86/serial.dll +++ b/native/org.eclipse.cdt.native.serial/os/win32/x86/serial.dll Binary files differ
diff --git a/native/org.eclipse.cdt.native.serial/os/win32/x86_64/serial.dll b/native/org.eclipse.cdt.native.serial/os/win32/x86_64/serial.dll index 04a5f46..988cc17 100755 --- a/native/org.eclipse.cdt.native.serial/os/win32/x86_64/serial.dll +++ b/native/org.eclipse.cdt.native.serial/os/win32/x86_64/serial.dll Binary files differ