diff options
| author | LaMont Jones <lamont@debian.org> | 2013-10-29 15:05:56 -0600 |
|---|---|---|
| committer | LaMont Jones <lamont@debian.org> | 2013-10-29 15:05:56 -0600 |
| commit | d59ac9b93fe0aa91958305ef4175393e54db5e0b (patch) | |
| tree | 111841ce314e9ea3cef54fdd0f03f75ec3eefaf6 | |
| parent | 97708577459defa19444eac1369c17b4b5b20bb0 (diff) | |
| parent | d0eb52a8ac78f04978964cb90b1248dbc03edf82 (diff) | |
| download | bind9-d59ac9b93fe0aa91958305ef4175393e54db5e0b.tar.gz | |
Merge commit 'd0eb52a8ac78f04978964cb90b1248dbc03edf82' into stable/v9.9.4
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | lib/isc/mips/include/isc/atomic.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/configure.in b/configure.in index 59048d1c..da5a67b0 100644 --- a/configure.in +++ b/configure.in @@ -352,7 +352,7 @@ case "$host" in # as it breaks how the two halves (Basic and Advanced) of the IPv6 # Socket API were designed to be used but we have to live with it. # Define _GNU_SOURCE to pull in the IPv6 Advanced Socket API. - *-linux* | *-kfreebsd*-gnu) + *-linux*|*-gnu*) STD_CDEFINES="$STD_CDEFINES -D_GNU_SOURCE" CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" ;; @@ -1422,7 +1422,7 @@ then # LinuxThreads requires some changes to the way we # deal with signals. # - *-linux*) + *-linux*|*-kfreebsd*-gnu) AC_DEFINE(HAVE_LINUXTHREADS) ;; # diff --git a/lib/isc/mips/include/isc/atomic.h b/lib/isc/mips/include/isc/atomic.h index 9281c10f..e3657d73 100644 --- a/lib/isc/mips/include/isc/atomic.h +++ b/lib/isc/mips/include/isc/atomic.h @@ -40,7 +40,7 @@ isc_atomic_xadd(isc_int32_t *p, int val) { " addu %0, $1, %2 \n" " sc %0, %1 \n" " beqz %0, 1b \n" - " addu %0, $1, %2 \n" + " move %0, $1 \n" " .set pop \n" : "=&r" (orig), "+R" (*p) : "r" (val) @@ -74,10 +74,10 @@ isc_atomic_cmpxchg(isc_int32_t *p, int cmpval, int val) { " .set noat \n" "1: ll $1, %1 \n" " bne $1, %3, 2f \n" - " move %2, %4 \n" + " move %2, %4 \n" " sc %2, %1 \n" " beqz %2, 1b \n" - "2: move %0, $1 \n" + "2: move %0, $1 \n" " .set pop \n" : "=&r"(orig), "+R" (*p), "=r" (tmp) : "r"(cmpval), "r"(val) |