epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Merged changes from the 3.14 branch to revno 12664

Browse Source
This commit is contained in:
Andrew Johnson
2016-10-03 15:21:48 -05:00
parent 8fb2267218 5ad61d25f6
commit 8d6875fe15
6 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure/os/CONFIG.linux-x86.windows-x64-mingw
View File

@@ -22,7 +22,3 @@ GNU_LDLIBS_YES =
# Link with winsock2
OP_SYS_LDLIBS = -lws2_32
# Use static compiler-support libraries
OP_SYS_LDFLAGS += -static-libgcc -static-libstdc++
# There is no compiler flag for static libwinpthread

11
configure/os/CONFIG_SITE.linux-x86.win32-x86-mingw
View File

@@ -4,10 +4,10 @@
#-------------------------------------------------------
# Early versions of the MinGW cross-build tools can only build
# static (non-DLL) libraries. For example RHEL's cross-gcc 4.4.6
# needs these uncommented, cross-gcc 4.6.3 for Ubuntu does not:
SHARED_LIBRARIES = NO
STATIC_BUILD = YES
# static (non-DLL) libraries. RHEL's cross-build of gcc 4.4.6
# needs these uncommented, cross-gcc 4.6.3 from Ubuntu does not:
#SHARED_LIBRARIES = NO
#STATIC_BUILD = YES
# The cross-build tools are in $(GNU_DIR)/bin
# Default is /usr
@@ -20,3 +20,6 @@ STATIC_BUILD = YES
CMPLR_PREFIX = i686-pc-mingw32-
# Debian?
#CMPLR_PREFIX = i586-mingw32msvc-
# Use static compiler-support libraries
OP_SYS_LDFLAGS += -static-libgcc -static-libstdc++

3
configure/os/CONFIG_SITE.linux-x86.windows-x64-mingw
View File

@@ -18,3 +18,6 @@
#CMPLR_PREFIX = i686-w64-mingw32-
# RHEL:
CMPLR_PREFIX = x86_64-w64-mingw32-
# Use static compiler-support libraries
OP_SYS_LDFLAGS += -static-libgcc -static-libstdc++

10
documentation/RELEASE_NOTES.html
View File

@@ -18,6 +18,16 @@
<h2 align="center">Changes from the 3.14 branch since 3.15.4</h2>
<!-- Insert inherited items immediately below here ... -->
<h3>MinGW Cross-builds from Linux</h3>
<p>The build configuration files that allow cross-building of the 32-bit
win32-x86-mingw cross-target have been adjusted to default to building shared
libraries (DLLs) as this is now supported by recent MinGW compilers. The 64-bit
windows-x64-mingw cross-target was already being built that way by default. The
configuration options to tell the minGW cross-compiler to link programs with
static versions of the compiler support libraries have now been moved into the
CONFIG_SITE.linux-x86.<i>target</i> files.</p>
<h3>General Time updates</h3>
<p>The <tt>iocInit</tt> code now performs a sanity check of the current time

2
src/ca/legacy/gdd/gddAppTable.cc
View File

@@ -418,8 +418,10 @@ gddStatus gddApplicationTypeTable::freeDD(gdd* dd)
}
// fprintf(stderr,"Adding DD to free_list %d\n",app);
attr_table[group][app].sem.lock ();
dd->setNext(attr_table[group][app].free_list);
attr_table[group][app].free_list=dd;
attr_table[group][app].sem.unlock ();
}
else if (attr_table[group][app].type==gddApplicationTypeNormal)
{

1
src/libCom/osi/os/RTEMS/osdThread.c
View File

@@ -672,6 +672,7 @@ void epicsThreadShow (epicsThreadId id, unsigned int level)
for (v = taskVarHead ; v != NULL ; v = v->forw) {
if ((rtems_id)id == v->id) {
epicsThreadShowInfo (v, level);
taskVarUnlock ();
return;
}
}