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: 05-Apr-2009 14:56:59
Branch: rpm-5_1 Handle: 2009040512565801
Modified files: (Branch: rpm-5_1)
rpm CHANGES VENDOR
rpm/rpmio rpmsw.c
Log:
- PLD: rpm-notsc: Don't use rdtsc timing.
Summary:
Revision Changes Path
1.2288.2.276+1 -0 rpm/CHANGES
2.47.2.8 +5 -0 rpm/VENDOR
2.16.2.2 +1 -1 rpm/rpmio/rpmsw.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2288.2.275 -r1.2288.2.276 CHANGES
--- rpm/CHANGES 4 Apr 2009 21:57:31 -0000 1.2288.2.275
+++ rpm/CHANGES 5 Apr 2009 12:56:58 -0000 1.2288.2.276
@@ -1,4 +1,5 @@
5.1.7 -> 5.1.8:
+ - jbj: PLD: rpm-notsc: Don't use rdtsc timing.
- jbj: enable the PLD dependency filtering.
- jbj: PLD: rpm-pld-autodep: add run-time disablers, attempt miRE's
instead.
- jbj: PLD: rpm-pld-autodep: merge and simplify. entirely dysfunctional
...
@@ .
patch -p0 <<'@@ .'
Index: rpm/VENDOR
============================================================================
$ cvs diff -u -r2.47.2.7 -r2.47.2.8 VENDOR
--- rpm/VENDOR 3 Apr 2009 20:04:50 -0000 2.47.2.7
+++ rpm/VENDOR 5 Apr 2009 12:56:58 -0000 2.47.2.8
@@ -521,3 +521,8 @@
Change: rpm-epoch0
Purpose: Explictly add Epoch: 0 in all packages.
Reason: Avoids compatibility issues with ancient versions of RPM
+ ________________________________________________________________________
+
+ Change: rpm-notsc
+ Purpose: Don't use rdtsc instruction for timing.
+ Reason: Avoids compatibility issues with i386 processors.
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmsw.c
============================================================================
$ cvs diff -u -r2.16.2.1 -r2.16.2.2 rpmsw.c
--- rpm/rpmio/rpmsw.c 24 Apr 2008 13:07:38 -0000 2.16.2.1
+++ rpm/rpmio/rpmsw.c 5 Apr 2009 12:56:59 -0000 2.16.2.2
@@ -30,7 +30,7 @@
/*...@unchecked@*/
static int rpmsw_initialized = 0;
-#if defined(__linux__) && defined(__i386__)
+#if defined(__linux__) && defined(__i386__) && !defined(RPM_VENDOR_PLD)
/* Swiped from glibc-2.3.2 sysdeps/i386/i686/hp-timing.h */
#define HP_TIMING_ZERO(Var) (Var) = (0)
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
