RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 29-Sep-2014 20:26:49
Branch: rpm-5_4 Handle: 2014092918264404
Modified files: (Branch: rpm-5_4)
rpm CHANGES configure.ac
rpm/rpmio Makefile.am keccak.c librpmio.vers md6.c md6.h
pcrs.c pcrs.h rpmlog.h rpmsq.c rpmsq.h rpmsql.c
Log:
- rpmsq: add _rpm_{insque,remque} functions.
Summary:
Revision Changes Path
1.3501.2.450+1 -0 rpm/CHANGES
2.472.2.120 +7 -5 rpm/configure.ac
1.293.2.39 +11 -0 rpm/rpmio/Makefile.am
1.5.4.1 +6 -3 rpm/rpmio/keccak.c
2.199.2.46 +2 -0 rpm/rpmio/librpmio.vers
1.3.4.4 +4 -1 rpm/rpmio/md6.c
1.2.4.3 +6 -3 rpm/rpmio/md6.h
1.1.2.5 +2 -0 rpm/rpmio/pcrs.c
1.1.2.4 +2 -1 rpm/rpmio/pcrs.h
2.24.4.4 +1 -0 rpm/rpmio/rpmlog.h
1.42.6.7 +7 -4 rpm/rpmio/rpmsq.c
1.14.6.5 +10 -0 rpm/rpmio/rpmsq.h
2.59.2.14 +3 -1 rpm/rpmio/rpmsql.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.449 -r1.3501.2.450 CHANGES
--- rpm/CHANGES 23 Sep 2014 18:58:55 -0000 1.3501.2.449
+++ rpm/CHANGES 29 Sep 2014 18:26:44 -0000 1.3501.2.450
@@ -1,4 +1,5 @@
5.4.15 -> 5.4.16:
+ - jbj: rpmsq: add _rpm_{insque,remque} functions.
- jbj: gcc: make peace with 4.8.2.
- jbj: sed: add sed(1) (at least s/foo/bar/) object and macro embedding.
- jbj: rpmpopt: fix: add an '@' lead-in --qf args that begin with '/'.
@@ .
patch -p0 <<'@@ .'
Index: rpm/configure.ac
============================================================================
$ cvs diff -u -r2.472.2.119 -r2.472.2.120 configure.ac
--- rpm/configure.ac 28 Sep 2014 19:31:07 -0000 2.472.2.119
+++ rpm/configure.ac 29 Sep 2014 18:26:46 -0000 2.472.2.120
@@ -198,7 +198,6 @@
dnl # rpm_CFLAGS_ADD([-Wsequence-point],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-Wreturn-type],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-Wswitch],[RPM_CFLAGS])
- rpm_CFLAGS_ADD([-Wno-switch],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-Wswitch-default],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-Wswitch-enum],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-Wtrigraphs],[RPM_CFLAGS])
@@ -260,6 +259,7 @@
rpm_CFLAGS_ADD([-Wno-redundant-decls],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-Wnested-externs],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-Wunreachable-code],[RPM_CFLAGS])
+dnl # rpm_CFLAGS_ADD([-Wattributes],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-Winline],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-Wlong-long],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-Wdisabled-optimization],[RPM_CFLAGS])
@@ -269,7 +269,7 @@
dnl # rpm_CFLAGS_ADD([-Wmissing-declarations],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-Wmissing-prototypes],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-Wold-style-definition],[RPM_CFLAGS])
-dnl #XXX rpmio/set.c
+dnl # XXX rpmio/set.c
dnl # if test \( ".`$CC --version 2>&1 | grep 'clang'`" != . \); then
dnl # rpm_CFLAGS_ADD([-Wno-initializer-overrides], [RPM_CFLAGS])
dnl # fi
@@ -301,7 +301,6 @@
dnl # rpm_CFLAGS_ADD([-Wvla],[RPM_CFLAGS])
dnl # --- noisy and/or mostly useless
-dnl # rpm_CFLAGS_ADD([-Wattributes],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-Wbuiltin-macro-redefined],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-Wcoverage-mismatch],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-Wcpp],[RPM_CFLAGS])
@@ -330,6 +329,7 @@
dnl # rpm_CFLAGS_ADD([-fguess-branch-probability],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-fif-conversion2],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-fif-conversion],[RPM_CFLAGS])
+dnl # rpm_CFLAGS_ADD([-finline-functions-called-once],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-fipa-pure-const],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-fipa-profile],[RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-fipa-reference],[RPM_CFLAGS])
@@ -418,6 +418,10 @@
rpm_CFLAGS_ADD([-D_FORTIFY_SOURCE=2 -fstack-protector], [RPM_CFLAGS])
dnl # rpm_CFLAGS_ADD([-fstack-protector-all],[RPM_CFLAGS])
+ if test \( ".`$CC --version 2>&1 | grep 'GCC'`" != . \); then
+ rpm_CFLAGS_ADD([-fgnu-tm], [RPM_CFLAGS])
+ fi
+
dnl # --- options below are added to RPM_CFLAGS but _NOT_ added to CFLAGS
CFLAGS="$CFLAGS $RPM_CFLAGS"
dnl # --- configure --enable-build-pic
@@ -439,8 +443,6 @@
rpm_CFLAGS_ADD([-fsanitize=undefined], [RPM_CFLAGS])
rpm_CFLAGS_ADD([-fsanitize=undefined-trap], [RPM_CFLAGS])
- rpm_CFLAGS_ADD([-fgnu-tm], [RPM_CFLAGS])
-
elif test ".`$CC -V 2>&1 | grep 'Sun C'`" != .; then
dnl # Sun Studio (usually "cc")
CFLAGS="$CFLAGS -v"
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/Makefile.am
============================================================================
$ cvs diff -u -r1.293.2.38 -r1.293.2.39 Makefile.am
--- rpm/rpmio/Makefile.am 27 Sep 2014 15:51:21 -0000 1.293.2.38
+++ rpm/rpmio/Makefile.am 29 Sep 2014 18:26:48 -0000 1.293.2.39
@@ -262,6 +262,17 @@
done
endif
+# XXX __SSE2__ needs -O0 with -fgnu-tm
+cubehash.lo: $(top_srcdir)/rpmio/cubehash.c
+ @$(LTCOMPILE) -O0 -c $<
+jh.lo: $(top_srcdir)/rpmio/jh.c
+ @$(LTCOMPILE) -O0 -c $<
+keccak.lo: $(top_srcdir)/rpmio/keccak.c
+ @$(LTCOMPILE) -O0 -c $<
+# XXX JS_ALWAYS_INLINE needs -O0 with -fgnu-tm
+rpmjs.lo: $(top_srcdir)/rpmio/rpmjs.c
+ @$(LTCOMPILE) -O0 -c $<
+
getdate.c: getdate.y
@echo expect 10 shift/reduce conflicts
$(YACC) $(srcdir)/getdate.y
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/keccak.c
============================================================================
$ cvs diff -u -r1.5 -r1.5.4.1 keccak.c
--- rpm/rpmio/keccak.c 6 Dec 2009 16:40:02 -0000 1.5
+++ rpm/rpmio/keccak.c 29 Sep 2014 18:26:48 -0000 1.5.4.1
@@ -17,8 +17,8 @@
#if OPTIMIZED == 64
/* ===== "KeccakOpt64-settings.h" */
#define Unrolling 18
-#define UseBebigokimisa
-//#define UseSSE
+//#define UseBebigokimisa
+#define UseSSE
//#define UseMMX
/* ===== */
#endif
@@ -33,8 +33,10 @@
#include <stdio.h>
#include <stdlib.h>
-
#include <string.h>
+
+#include <rpmiotypes.h>
+
#include "keccak.h"
#define IS_BIG_ENDIAN 4321
@@ -2057,6 +2059,7 @@
#endif
}
+RPM_GNUC_CONST
void KeccakInitialize()
{
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/librpmio.vers
============================================================================
$ cvs diff -u -r2.199.2.45 -r2.199.2.46 librpmio.vers
--- rpm/rpmio/librpmio.vers 21 Sep 2014 21:40:55 -0000 2.199.2.45
+++ rpm/rpmio/librpmio.vers 29 Sep 2014 18:26:48 -0000 2.199.2.46
@@ -687,6 +687,8 @@
_rpmsp_debug;
_rpmspI;
rpmspNew;
+ _rpm_insque;
+ _rpm_remque;
_rpmsq_debug;
rpmsqAction;
rpmsqCaught;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/md6.c
============================================================================
$ cvs diff -u -r1.3.4.3 -r1.3.4.4 md6.c
--- rpm/rpmio/md6.c 10 Sep 2014 20:15:36 -0000 1.3.4.3
+++ rpm/rpmio/md6.c 29 Sep 2014 18:26:48 -0000 1.3.4.4
@@ -126,11 +126,14 @@
);
#endif
- #include <assert.h>
+
+#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <rpmiotypes.h>
+
#include "md6.h"
void (* compression_hook)(md6_word *C,
const md6_word *Q,
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/md6.h
============================================================================
$ cvs diff -u -r1.2.4.2 -r1.2.4.3 md6.h
--- rpm/rpmio/md6.h 23 Oct 2013 18:23:58 -0000 1.2.4.2
+++ rpm/rpmio/md6.h 29 Sep 2014 18:26:48 -0000 1.2.4.3
@@ -138,7 +138,8 @@
extern int md6_default_r( int d, /* returns default r for given d */
int keylen /* and keylen */
- );
+ )
+ RPM_GNUC_CONST;
void md6_main_compression_loop( md6_word *A, /* working array */
int r /* number of rounds */
@@ -158,12 +159,14 @@
int p, /* padding bits */
int keylen, /* bytes in key */
int d /* digest size */
- );
+ )
+ RPM_GNUC_CONST;
typedef uint64_t md6_nodeID; /* (ell,i) */
md6_nodeID md6_make_nodeID( int ell, /* level number */
int i /* index (0,1,2,...) within level */
- );
+ )
+ RPM_GNUC_CONST;
void md6_pack( md6_word* N, /* output */
const md6_word* Q, /* fractional part sqrt(6) */
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/pcrs.c
============================================================================
$ cvs diff -u -r1.1.2.4 -r1.1.2.5 pcrs.c
--- rpm/rpmio/pcrs.c 22 Sep 2014 18:24:27 -0000 1.1.2.4
+++ rpm/rpmio/pcrs.c 29 Sep 2014 18:26:48 -0000 1.1.2.5
@@ -33,6 +33,8 @@
#include "system.h"
+#include <rpmiotypes.h>
+
#include "pcrs.h"
#include "debug.h"
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/pcrs.h
============================================================================
$ cvs diff -u -r1.1.2.3 -r1.1.2.4 pcrs.h
--- rpm/rpmio/pcrs.h 22 Sep 2014 18:24:27 -0000 1.1.2.3
+++ rpm/rpmio/pcrs.h 29 Sep 2014 18:26:48 -0000 1.1.2.4
@@ -79,7 +79,8 @@
extern void pcrs_free_joblist(pcrs_job * joblist);
/* Info on errors: */
-extern const char *pcrs_strerror(const int error);
+extern const char *pcrs_strerror(const int error)
+ RPM_GNUC_CONST;
#ifdef __cplusplus
} /* extern "C" */
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmlog.h
============================================================================
$ cvs diff -u -r2.24.4.3 -r2.24.4.4 rpmlog.h
--- rpm/rpmio/rpmlog.h 27 Sep 2014 15:51:24 -0000 2.24.4.3
+++ rpm/rpmio/rpmlog.h 29 Sep 2014 18:26:48 -0000 2.24.4.4
@@ -197,6 +197,7 @@
/*@observer@*/
const char * rpmlogLevelPrefix(rpmlogLvl pri)
RPM_GNUC_CONST
+ RPM_GNUC_PURE
/*@*/;
/**
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmsq.c
============================================================================
$ cvs diff -u -r1.42.6.6 -r1.42.6.7 rpmsq.c
--- rpm/rpmio/rpmsq.c 29 Sep 2014 11:04:00 -0000 1.42.6.6
+++ rpm/rpmio/rpmsq.c 29 Sep 2014 18:26:48 -0000 1.42.6.7
@@ -63,8 +63,10 @@
};
#endif
-static void __insque(struct qelem * elem, struct qelem * pred)
+void _rpm_insque(void * __elem, void * __pred)
{
+ struct qelem * elem = (struct qelem *)__elem;
+ struct qelem * pred = (struct qelem *)__pred;
RPM_GNUC_TM_ATOMIC {
elem -> q_forw = pred -> q_forw;
pred -> q_forw -> q_back = elem;
@@ -73,8 +75,9 @@
}
}
-static void __remque(struct qelem * elem)
+void _rpm_remque(void * __elem)
{
+ struct qelem * elem = (struct qelem *)__elem;
RPM_GNUC_TM_ATOMIC {
elem -> q_forw -> q_back = elem -> q_back;
elem -> q_back -> q_forw = elem -> q_forw;
@@ -177,7 +180,7 @@
sq->pipes[0] = sq->pipes[1] = -1;
sq->id = ME();
- __insque(elem, (prev != NULL ? prev : rpmsqQueue));
+ _rpm_insque(elem, (prev != NULL ? prev : rpmsqQueue));
}
ret = sigrelse(SIGCHLD);
}
@@ -195,7 +198,7 @@
SPEW((stderr, " Remove(%p): %p\n", ME(), sq));
ret = sighold (SIGCHLD);
if (ret == 0) {
- __remque(elem);
+ _rpm_remque(elem);
sq->id = NULL;
if (sq->pipes[1] > 0) ret = close(sq->pipes[1]);
if (sq->pipes[0] > 0) ret = close(sq->pipes[0]);
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmsq.h
============================================================================
$ cvs diff -u -r1.14.6.4 -r1.14.6.5 rpmsq.h
--- rpm/rpmio/rpmsq.h 29 Sep 2014 11:04:00 -0000 1.14.6.4
+++ rpm/rpmio/rpmsq.h 29 Sep 2014 18:26:48 -0000 1.14.6.5
@@ -48,6 +48,16 @@
extern "C" {
#endif
+/* Insert ELEM into a doubly-linked list, after PREV. */
+RPM_GNUC_TM_CALLABLE
+void _rpm_insque (void *__elem, void *__prev)
+ RPM_GNUC_NONNULL(1, 2);
+
+/* Unlink ELEM from the doubly-linked list that it is in. */
+RPM_GNUC_TM_CALLABLE
+void _rpm_remque (void *__elem)
+ RPM_GNUC_NONNULL(1);
+
/**
* Insert node into from queue.
* @param elem node to link
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmsql.c
============================================================================
$ cvs diff -u -r2.59.2.13 -r2.59.2.14 rpmsql.c
--- rpm/rpmio/rpmsql.c 27 Sep 2014 15:51:24 -0000 2.59.2.13
+++ rpm/rpmio/rpmsql.c 29 Sep 2014 18:26:48 -0000 2.59.2.14
@@ -2959,7 +2959,9 @@
* @param z
* @retval *realnum
*/
-static int isNumber(const char *z, int *realnum)
+static
+RPM_GNUC_PURE
+int isNumber(const char *z, int *realnum)
{
if (*z == '-' || *z == '+')
z++;
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
