← Back to branch summary

~ubuntu-branches/ubuntu/wily/zeromq3/wily-proposed

~ubuntu-branches/ubuntu/wily/zeromq3/wily-proposed

« back to all changes in this revision

Viewing changes to debian/patches/03_fix-s390-rdtsc.patch

Committer: Package Import Robot
Author(s): Alessandro Ghedini
Date: 2014-03-16 14:02:28 UTC
mfrom: (1.1.6) (6.1.1 experimental)
Revision ID: package-import@ubuntu.com-20140316140228-ig1sgh7czk59m9ux

Tags: 4.0.4+dfsg-1

* QA upload; orphan the package
- Upload to unstable
* New upstream release
* Update repack.stub script
* Drop 02_fix-exported-symbols.patch and 03_fix-s390-rdtsc.patch
(merged upstream)

files added:
builds/msvc/properties/Static.props

builds/msvc/properties/ZeroMQ_Static.props

configure.ac

doc/zmq_ctx_term.3

doc/zmq_ctx_term.html

doc/zmq_ctx_term.txt

doc/zmq_curve.7

doc/zmq_curve.html

doc/zmq_curve.txt

doc/zmq_curve_keypair.3

doc/zmq_curve_keypair.html

doc/zmq_curve_keypair.txt

doc/zmq_null.7

doc/zmq_null.html

doc/zmq_null.txt

doc/zmq_plain.7

doc/zmq_plain.html

doc/zmq_plain.txt

doc/zmq_send_const.3

doc/zmq_send_const.html

doc/zmq_send_const.txt

doc/zmq_z85_decode.3

doc/zmq_z85_decode.html

doc/zmq_z85_decode.txt

doc/zmq_z85_encode.3

doc/zmq_z85_encode.html

doc/zmq_z85_encode.txt

src/curve_client.cpp

src/curve_client.hpp

src/curve_server.cpp

src/curve_server.hpp

src/dbuffer.hpp

src/mechanism.cpp

src/mechanism.hpp

src/null_mechanism.cpp

src/null_mechanism.hpp

src/plain_mechanism.cpp

src/plain_mechanism.hpp

src/raw_decoder.cpp

src/raw_decoder.hpp

src/raw_encoder.cpp

src/raw_encoder.hpp

src/stream.cpp

src/stream.hpp

src/v2_decoder.cpp

src/v2_decoder.hpp

src/v2_encoder.cpp

src/v2_encoder.hpp

src/v2_protocol.hpp

src/ypipe_base.hpp

src/ypipe_conflate.hpp

tests/test_abstract_ipc.cpp

tests/test_conflate.cpp

tests/test_ctx_destroy.cpp

tests/test_ctx_options.cpp

tests/test_fork.cpp

tests/test_immediate.cpp

tests/test_inproc_connect.cpp

tests/test_iov.cpp

tests/test_issue_566.cpp

tests/test_many_sockets.cpp

tests/test_probe_router.cpp

tests/test_req_correlate.cpp

tests/test_req_relaxed.cpp

tests/test_router_raw_empty.cpp

tests/test_security_curve.cpp

tests/test_security_null.cpp

tests/test_security_plain.cpp

tests/test_spec_dealer.cpp

tests/test_spec_pushpull.cpp

tests/test_spec_rep.cpp

tests/test_spec_req.cpp

tests/test_spec_router.cpp

tests/test_stream.cpp

tests/test_system.cpp

tools

tools/Makefile.am

tools/Makefile.in

tools/curve_keygen.c

files removed:
.pc/01_shutdown-race.patch

.pc/01_shutdown-race.patch/src

.pc/01_shutdown-race.patch/src/ctx.cpp

.pc/02_fix-exported-symbols.patch

.pc/02_fix-exported-symbols.patch/src

.pc/02_fix-exported-symbols.patch/src/Makefile.am

.pc/02_fix-exported-symbols.patch/src/libzmq.vers

.pc/03_fix-s390-rdtsc.patch

.pc/03_fix-s390-rdtsc.patch/src

.pc/03_fix-s390-rdtsc.patch/src/clock.cpp

README

configure.in

debian/patches

debian/patches/01_shutdown-race.patch

debian/patches/02_fix-exported-symbols.patch

debian/patches/03_fix-s390-rdtsc.patch

debian/patches/series

src/decoder.cpp

src/encoder.cpp

src/i_msg_sink.hpp

src/i_msg_source.hpp

src/v1_protocol.hpp

tests/test_connect_delay.cpp

files modified:
.pc/applied-patches

AUTHORS

COPYING.LESSER

ChangeLog

Makefile.am

Makefile.in

NEWS

aclocal.m4

builds/msvc/Makefile.am

builds/msvc/Makefile.in

builds/msvc/c_local_lat/c_local_lat.vcxproj

builds/msvc/c_local_thr/c_local_thr.vcproj

builds/msvc/c_local_thr/c_local_thr.vcxproj

builds/msvc/c_remote_lat/c_remote_lat.vcxproj

builds/msvc/c_remote_thr/c_remote_thr.vcproj

builds/msvc/c_remote_thr/c_remote_thr.vcxproj

builds/msvc/errno.cpp

builds/msvc/errno.hpp

builds/msvc/inproc_lat/inproc_lat.vcproj

builds/msvc/inproc_lat/inproc_lat.vcxproj

builds/msvc/inproc_thr/inproc_thr.vcproj

builds/msvc/inproc_thr/inproc_thr.vcxproj

builds/msvc/libzmq/libzmq.vcproj

builds/msvc/libzmq/libzmq.vcxproj

builds/msvc/libzmq/libzmq.vcxproj.filters

builds/msvc/msvc.sln

builds/msvc/msvc10.sln

builds/msvc/properties/ZeroMQ.props

builds/redhat/zeromq.spec.in

config/compile

config/config.sub

config/depcomp

config/libtool.m4

config/ltmain.sh

configure

debian/changelog

debian/control

debian/copyright

debian/libzmq3.docs

debian/libzmq3.symbols

debian/repack.local

debian/repack.stub

debian/watch

doc/Makefile.am

doc/Makefile.in

doc/zmq.7

doc/zmq.html

doc/zmq.txt

doc/zmq_bind.3

doc/zmq_bind.html

doc/zmq_bind.txt

doc/zmq_close.3

doc/zmq_close.html

doc/zmq_close.txt

doc/zmq_connect.3

doc/zmq_connect.html

doc/zmq_connect.txt

doc/zmq_ctx_destroy.3

doc/zmq_ctx_destroy.html

doc/zmq_ctx_destroy.txt

doc/zmq_ctx_get.3

doc/zmq_ctx_get.html

doc/zmq_ctx_get.txt

doc/zmq_ctx_new.3

doc/zmq_ctx_new.html

doc/zmq_ctx_new.txt

doc/zmq_ctx_set.3

doc/zmq_ctx_set.html

doc/zmq_ctx_set.txt

doc/zmq_disconnect.3

doc/zmq_disconnect.html

doc/zmq_disconnect.txt

doc/zmq_epgm.7

doc/zmq_epgm.html

doc/zmq_epgm.txt

doc/zmq_errno.3

doc/zmq_errno.html

doc/zmq_errno.txt

doc/zmq_getsockopt.3

doc/zmq_getsockopt.html

doc/zmq_getsockopt.txt

doc/zmq_init.3

doc/zmq_init.html

doc/zmq_init.txt

doc/zmq_inproc.7

doc/zmq_inproc.html

doc/zmq_inproc.txt

doc/zmq_ipc.7

doc/zmq_ipc.html

doc/zmq_ipc.txt

doc/zmq_msg_close.3

doc/zmq_msg_close.html

doc/zmq_msg_close.txt

doc/zmq_msg_copy.3

doc/zmq_msg_copy.html

doc/zmq_msg_copy.txt

doc/zmq_msg_data.3

doc/zmq_msg_data.html

doc/zmq_msg_data.txt

doc/zmq_msg_get.3

doc/zmq_msg_get.html

doc/zmq_msg_get.txt

doc/zmq_msg_init.3

doc/zmq_msg_init.html

doc/zmq_msg_init.txt

doc/zmq_msg_init_data.3

doc/zmq_msg_init_data.html

doc/zmq_msg_init_data.txt

doc/zmq_msg_init_size.3

doc/zmq_msg_init_size.html

doc/zmq_msg_init_size.txt

doc/zmq_msg_more.3

doc/zmq_msg_more.html

doc/zmq_msg_more.txt

doc/zmq_msg_move.3

doc/zmq_msg_move.html

doc/zmq_msg_move.txt

doc/zmq_msg_recv.3

doc/zmq_msg_recv.html

doc/zmq_msg_recv.txt

doc/zmq_msg_send.3

doc/zmq_msg_send.html

doc/zmq_msg_send.txt

doc/zmq_msg_set.3

doc/zmq_msg_set.html

doc/zmq_msg_set.txt

doc/zmq_msg_size.3

doc/zmq_msg_size.html

doc/zmq_msg_size.txt

doc/zmq_pgm.7

doc/zmq_pgm.html

doc/zmq_pgm.txt

doc/zmq_poll.3

doc/zmq_poll.html

doc/zmq_poll.txt

doc/zmq_proxy.3

doc/zmq_proxy.html

doc/zmq_proxy.txt

doc/zmq_recv.3

doc/zmq_recv.html

doc/zmq_recv.txt

doc/zmq_recvmsg.3

doc/zmq_recvmsg.html

doc/zmq_recvmsg.txt

doc/zmq_send.3

doc/zmq_send.html

doc/zmq_send.txt

doc/zmq_sendmsg.3

doc/zmq_sendmsg.html

doc/zmq_sendmsg.txt

doc/zmq_setsockopt.3

doc/zmq_setsockopt.html

doc/zmq_setsockopt.txt

doc/zmq_socket.3

doc/zmq_socket.html

doc/zmq_socket.txt

doc/zmq_socket_monitor.3

doc/zmq_socket_monitor.html

doc/zmq_socket_monitor.txt

doc/zmq_strerror.3

doc/zmq_strerror.html

doc/zmq_strerror.txt

doc/zmq_tcp.7

doc/zmq_tcp.html

doc/zmq_tcp.txt

doc/zmq_term.3

doc/zmq_term.html

doc/zmq_term.txt

doc/zmq_unbind.3

doc/zmq_unbind.html

doc/zmq_unbind.txt

doc/zmq_version.3

doc/zmq_version.html

doc/zmq_version.txt

foreign/openpgm/Makefile.in

include/zmq.h

include/zmq_utils.h

perf/Makefile.in

perf/inproc_lat.cpp

perf/inproc_thr.cpp

perf/local_lat.cpp

perf/local_thr.cpp

perf/remote_lat.cpp

perf/remote_thr.cpp

src/Makefile.am

src/Makefile.in

src/address.cpp

src/address.hpp

src/array.hpp

src/atomic_counter.hpp

src/atomic_ptr.hpp

src/blob.hpp

src/clock.cpp

src/clock.hpp

src/command.hpp

src/config.hpp

src/ctx.cpp

src/ctx.hpp

src/dealer.cpp

src/dealer.hpp

src/decoder.hpp

src/devpoll.cpp

src/devpoll.hpp

src/dist.cpp

src/dist.hpp

src/encoder.hpp

src/epoll.cpp

src/epoll.hpp

src/err.cpp

src/err.hpp

src/fd.hpp

src/fq.cpp

src/fq.hpp

src/i_decoder.hpp

src/i_encoder.hpp

src/i_engine.hpp

src/i_poll_events.hpp

src/io_object.cpp

src/io_object.hpp

src/io_thread.cpp

src/io_thread.hpp

src/ip.cpp

src/ip.hpp

src/ipc_address.cpp

src/ipc_address.hpp

src/ipc_connecter.cpp

src/ipc_connecter.hpp

src/ipc_listener.cpp

src/ipc_listener.hpp

src/kqueue.cpp

src/kqueue.hpp

src/lb.cpp

src/lb.hpp

src/likely.hpp

src/mailbox.cpp

src/mailbox.hpp

src/msg.cpp

src/msg.hpp

src/mtrie.cpp

src/mtrie.hpp

src/mutex.hpp

src/object.cpp

src/object.hpp

src/options.cpp

src/options.hpp

src/own.cpp

src/own.hpp

src/pair.cpp

src/pair.hpp

src/pgm_receiver.cpp

src/pgm_receiver.hpp

src/pgm_sender.cpp

src/pgm_sender.hpp

src/pgm_socket.cpp

src/pgm_socket.hpp

src/pipe.cpp

src/pipe.hpp

src/platform.hpp.in

src/poll.cpp

src/poll.hpp

src/poller.hpp

src/poller_base.cpp

src/poller_base.hpp

src/precompiled.cpp

src/precompiled.hpp

src/proxy.cpp

src/proxy.hpp

src/pub.cpp

src/pub.hpp

src/pull.cpp

src/pull.hpp

src/push.cpp

src/push.hpp

src/random.cpp

src/random.hpp

src/reaper.cpp

src/reaper.hpp

src/rep.cpp

src/rep.hpp

src/req.cpp

src/req.hpp

src/router.cpp

src/router.hpp

src/select.cpp

src/select.hpp

src/session_base.cpp

src/session_base.hpp

src/signaler.cpp

src/signaler.hpp

src/socket_base.cpp

src/socket_base.hpp

src/stdint.hpp

src/stream_engine.cpp

src/stream_engine.hpp

src/sub.cpp

src/sub.hpp

src/tcp.cpp *

src/tcp.hpp

src/tcp_address.cpp

src/tcp_address.hpp

src/tcp_connecter.cpp

src/tcp_connecter.hpp

src/tcp_listener.cpp

src/tcp_listener.hpp

src/thread.cpp

src/thread.hpp

src/trie.cpp

src/trie.hpp

src/v1_decoder.cpp

src/v1_decoder.hpp

src/v1_encoder.cpp

src/v1_encoder.hpp

src/windows.hpp *

src/wire.hpp

src/xpub.cpp

src/xpub.hpp

src/xsub.cpp

src/xsub.hpp

src/ypipe.hpp

src/yqueue.hpp

src/zmq.cpp

src/zmq_utils.cpp

tests/Makefile.am

tests/Makefile.in

tests/test_connect_resolve.cpp

tests/test_disconnect_inproc.cpp

tests/test_hwm.cpp

tests/test_invalid_rep.cpp

tests/test_last_endpoint.cpp

tests/test_monitor.cpp

tests/test_msg_flags.cpp

tests/test_pair_inproc.cpp

tests/test_pair_ipc.cpp

tests/test_pair_tcp.cpp

tests/test_reqrep_device.cpp

tests/test_reqrep_inproc.cpp

tests/test_reqrep_ipc.cpp

tests/test_reqrep_tcp.cpp

tests/test_router_mandatory.cpp

tests/test_shutdown_stress.cpp

tests/test_sub_forward.cpp

tests/test_term_endpoint.cpp

tests/test_timeo.cpp

tests/testutil.hpp

zeromq.spec

Show diffs side-by-side

added added

removed removed

debian/patches/03_fix-s390-rdtsc.patch

1

Description: Fix timestamp counter on s390(x)

2

Origin: vendor

3

Bug: https://github.com/zeromq/libzmq/issues/811

4

Bug-Debian: http://bugs.debian.org/734521

5

Forwarded: https://github.com/zeromq/libzmq/pull/818

6

Author: Alessandro Ghedini <ghedo@debian.org>

7

Last-Update: 2014-01-12

8

9

--- a/src/clock.cpp

10

+++ b/src/clock.cpp

11

@@ -139,7 +139,6 @@

12

#elif defined(__s390__)

13

uint64_t tsc;

14

asm("\tstck\t%0\n" : "=Q" (tsc) : : "cc");

15

- tsc >>= 12; /* convert to microseconds just to be consistent */

16

return(tsc);

17

#else

18

return 0;

Older »