rpms/dietlibc/devel dietlibc-0.28-ppc.patch, NONE, 1.1 dietlibc.spec, 1.5, 1.6
Enrico Scholz (ensc)
fedora-extras-commits at redhat.com
Sun Mar 6 21:39:20 UTC 2005
Author: ensc
Update of /cvs/extras/rpms/dietlibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14327
Modified Files:
dietlibc.spec
Added Files:
dietlibc-0.28-ppc.patch
Log Message:
fixed PPC issues in ISO mode (do not use the 'powerpc' macro but the '__powerpc__' one)
dietlibc-0.28-ppc.patch:
--- NEW FILE dietlibc-0.28-ppc.patch ---
diff -rup dietlibc-0.28.ppc/include/asm/sigcontext.h dietlibc-0.28/include/asm/sigcontext.h
--- dietlibc-0.28.ppc/include/asm/sigcontext.h 2003-10-10 15:37:34.000000000 +0200
+++ dietlibc-0.28/include/asm/sigcontext.h 2005-03-06 22:21:43.000000000 +0100
@@ -21,7 +21,7 @@ __BEGIN_DECLS
#include <asm/mips-sigcontext.h>
#endif
-#if defined(powerpc) || defined(__powerpc64__)
+#if defined(__powerpc__) || defined(__powerpc64__)
#include <asm/ppc-sigcontext.h>
#endif
diff -rup dietlibc-0.28.ppc/include/fcntl.h dietlibc-0.28/include/fcntl.h
--- dietlibc-0.28.ppc/include/fcntl.h 2004-01-03 03:10:02.000000000 +0100
+++ dietlibc-0.28/include/fcntl.h 2005-03-06 22:21:43.000000000 +0100
@@ -322,7 +322,7 @@ struct flock64 {
};
#endif
-#elif defined(powerpc) || defined(__powerpc64__)
+#elif defined(__powerpc__) || defined(__powerpc64__)
/* open/fcntl - O_SYNC is only implemented on blocks devices and on files
located on an ext2 file system */
diff -rup dietlibc-0.28.ppc/include/setjmp.h dietlibc-0.28/include/setjmp.h
--- dietlibc-0.28.ppc/include/setjmp.h 2003-10-10 15:37:34.000000000 +0200
+++ dietlibc-0.28/include/setjmp.h 2005-03-06 22:21:43.000000000 +0100
@@ -170,7 +170,7 @@ typedef int __jmp_buf[24];
#endif
#endif
-#if defined(powerpc) || defined(__powerpc64__)
+#if defined(__powerpc__) || defined(__powerpc64__)
# define JB_GPR1 0 /* Also known as the stack pointer */
# define JB_GPR2 1
# define JB_LR 2 /* The address we will return to */
diff -rup dietlibc-0.28.ppc/include/signal.h dietlibc-0.28/include/signal.h
--- dietlibc-0.28.ppc/include/signal.h 2004-12-17 20:14:49.000000000 +0100
+++ dietlibc-0.28/include/signal.h 2005-03-06 22:21:43.000000000 +0100
@@ -31,7 +31,7 @@ __BEGIN_DECLS
#define SIGALRM 14
#define SIGTERM 15
#define SIGUNUSED 31
-#if defined(__i386__) || defined(__x86_64__) || defined(powerpc) || defined(__arm__) \
+#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc__) || defined(__arm__) \
|| defined(__s390__) || defined(__ia64__) || defined(__powerpc64__)
#define SIGBUS 7
#define SIGUSR1 10
diff -rup dietlibc-0.28.ppc/include/stdarg-cruft.h dietlibc-0.28/include/stdarg-cruft.h
--- dietlibc-0.28.ppc/include/stdarg-cruft.h 2003-10-10 15:37:34.000000000 +0200
+++ dietlibc-0.28/include/stdarg-cruft.h 2005-03-06 22:21:43.000000000 +0100
@@ -109,7 +109,7 @@ typedef char * va_list;
#endif
#endif
-#elif defined(powerpc)
+#elif defined(__powerpc__)
typedef struct __va_list_tag {
unsigned char gpr; /* index into the array of 8 GPRs stored in the
diff -rup dietlibc-0.28.ppc/include/sys/ioctl.h dietlibc-0.28/include/sys/ioctl.h
--- dietlibc-0.28.ppc/include/sys/ioctl.h 2003-10-10 15:37:34.000000000 +0200
+++ dietlibc-0.28/include/sys/ioctl.h 2005-03-06 22:21:43.000000000 +0100
@@ -15,7 +15,7 @@ __BEGIN_DECLS
#include <sys/sparc-ioctl.h>
#elif defined(__mips__)
#include <sys/mips-ioctl.h>
-#elif defined(powerpc) || defined(__powerpc64__)
+#elif defined(__powerpc__) || defined(__powerpc64__)
#include <sys/ppc-ioctl.h>
#elif defined(__s390__)
#include <sys/s390-ioctl.h>
diff -rup dietlibc-0.28.ppc/include/sys/mman.h dietlibc-0.28/include/sys/mman.h
--- dietlibc-0.28.ppc/include/sys/mman.h 2004-11-30 16:37:29.000000000 +0100
+++ dietlibc-0.28/include/sys/mman.h 2005-03-06 22:21:43.000000000 +0100
@@ -73,7 +73,7 @@ __BEGIN_DECLS
#define MADV_SEQUENTIAL 0x2 /* read-ahead aggressively */
#define MADV_WILLNEED 0x3 /* pre-fault pages */
#define MADV_DONTNEED 0x4 /* discard these pages */
-#elif defined(__sparc__) || defined (powerpc) || defined (__powerpc64__)
+#elif defined(__sparc__) || defined (__powerpc__) || defined (__powerpc64__)
#define MAP_FIXED 0x10 /* Interpret addr exactly */
#define MAP_ANONYMOUS 0x20 /* don't use a file */
#define MAP_RENAME MAP_ANONYMOUS /* In SunOS terminology */
diff -rup dietlibc-0.28.ppc/include/sys/ptrace.h dietlibc-0.28/include/sys/ptrace.h
--- dietlibc-0.28.ppc/include/sys/ptrace.h 2004-11-18 17:44:39.000000000 +0100
+++ dietlibc-0.28/include/sys/ptrace.h 2005-03-06 22:21:43.000000000 +0100
@@ -637,7 +637,7 @@ struct sparc_stackf {
#define PTRACE_GETUCODE 29 /* stupid bsd-ism */
-#elif defined(powerpc) || defined (__powerpc64__)
+#elif defined(__powerpc__) || defined (__powerpc64__)
#include <asm/sigcontext.h>
diff -rup dietlibc-0.28.ppc/include/sys/shm.h dietlibc-0.28/include/sys/shm.h
--- dietlibc-0.28.ppc/include/sys/shm.h 2003-10-10 15:37:34.000000000 +0200
+++ dietlibc-0.28/include/sys/shm.h 2005-03-06 22:21:43.000000000 +0100
@@ -60,7 +60,7 @@ struct shm_info {
unsigned long swap_successes;
};
-#if defined(__i386__) || defined(__mips__) || defined(__arm__) || defined(powerpc) || defined (__powerpc64__) || defined(__s390__) || defined(__hppa__) || defined(__x86_64__) || defined(__ia64__)
+#if defined(__i386__) || defined(__mips__) || defined(__arm__) || defined(__powerpc__) || defined (__powerpc64__) || defined(__s390__) || defined(__hppa__) || defined(__x86_64__) || defined(__ia64__)
#define PAGE_SIZE 4096UL
#define PAGE_SHIFT 12
#elif defined(__alpha__) || defined(__sparc__)
diff -rup dietlibc-0.28.ppc/include/sys/stat.h dietlibc-0.28/include/sys/stat.h
--- dietlibc-0.28.ppc/include/sys/stat.h 2004-03-26 16:25:15.000000000 +0100
+++ dietlibc-0.28/include/sys/stat.h 2005-03-06 22:21:43.000000000 +0100
@@ -248,8 +248,8 @@ __extension__ long long st_size;
unsigned long st_pad2;
__extension__ long long st_blocks;
};
-#elif defined(powerpc) || defined(__powerpc64__)
-#if defined(powerpc)
+#elif defined(__powerpc__) || defined(__powerpc64__)
+#if defined(__powerpc__)
struct stat {
dev_t st_dev;
ino_t st_ino;
diff -rup dietlibc-0.28.ppc/include/sys/types.h dietlibc-0.28/include/sys/types.h
--- dietlibc-0.28.ppc/include/sys/types.h 2004-04-14 15:33:41.000000000 +0200
+++ dietlibc-0.28/include/sys/types.h 2005-03-06 22:21:43.000000000 +0100
@@ -67,7 +67,7 @@ typedef unsigned long int clock_t; /* Us
typedef unsigned int mode_t;
typedef int nlink_t;
typedef int uid_t;
-#elif defined(powerpc)
+#elif defined(__powerpc__)
typedef unsigned int dev_t;
typedef unsigned int gid_t;
typedef unsigned int mode_t;
diff -rup dietlibc-0.28.ppc/include/sys/ucontext.h dietlibc-0.28/include/sys/ucontext.h
--- dietlibc-0.28.ppc/include/sys/ucontext.h 2003-10-10 15:37:34.000000000 +0200
+++ dietlibc-0.28/include/sys/ucontext.h 2005-03-06 22:21:43.000000000 +0100
@@ -10,7 +10,7 @@ __BEGIN_DECLS
typedef struct sigcontext mcontext_t;
#endif
-#if defined(__i386__) || defined(__arm__) || defined(__mips__) || defined(__mips64__) || defined(powerpc) || defined(__powerpc64__) || defined(__hppa__)
+#if defined(__i386__) || defined(__arm__) || defined(__mips__) || defined(__mips64__) || defined(__powerpc__) || defined(__powerpc64__) || defined(__hppa__)
struct ucontext {
unsigned long uc_flags;
struct ucontext *uc_link;
diff -rup dietlibc-0.28.ppc/include/termios.h dietlibc-0.28/include/termios.h
--- dietlibc-0.28.ppc/include/termios.h 2004-08-04 00:28:46.000000000 +0200
+++ dietlibc-0.28/include/termios.h 2005-03-06 22:21:43.000000000 +0100
@@ -103,7 +103,7 @@ struct termios {
cc_t c_line; /* line discipline */
cc_t c_cc[NCCS]; /* control characters */
};
-#elif defined(powerpc) || defined(__powerpc64__) || defined(__alpha__)
+#elif defined(__powerpc__) || defined(__powerpc64__) || defined(__alpha__)
#define NCCS 19
struct termios {
tcflag_t c_iflag; /* input mode flags */
@@ -167,7 +167,7 @@ struct termios {
#define VLNEXT 15
#define VEOF 16
#define VEOL 17
-#elif defined(powerpc) || defined(__powerpc64__)
+#elif defined(__powerpc__) || defined(__powerpc64__)
#define VINTR 0
#define VQUIT 1
#define VERASE 2
diff -rup dietlibc-0.28.ppc/syscalls.h dietlibc-0.28/syscalls.h
--- dietlibc-0.28.ppc/syscalls.h 2003-10-10 15:37:34.000000000 +0200
+++ dietlibc-0.28/syscalls.h 2005-03-06 22:21:43.000000000 +0100
@@ -11,7 +11,7 @@
#include "sparc/syscalls.h"
#endif
-#elif defined(powerpc)
+#elif defined(__powerpc__)
#include "ppc/syscalls.h"
#elif defined(__powerpc64__)
Index: dietlibc.spec
===================================================================
RCS file: /cvs/extras/rpms/dietlibc/devel/dietlibc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dietlibc.spec 6 Mar 2005 16:57:55 -0000 1.5
+++ dietlibc.spec 6 Mar 2005 21:39:18 -0000 1.6
@@ -2,7 +2,7 @@
## This package understands the following switches:
## --with cross ... enable crossbuild
-## --define crossarch <arch> ... set cross-architecture (only valid with
+## --define 'crossarch <arch>' ... set cross-architecture (only valid with
## '--with cross'; defaults to 'arm-linux')
## Fedora Extras specific customization below...
@@ -44,6 +44,7 @@
Source1: http://www.fefe.de/dietlibc/%NAME-%version.tar.bz2.sig
Patch0: dietlibc-0.28-gcc4.patch
Patch1: dietlibc-0.28-setpriority.patch
+Patch2: dietlibc-0.28-ppc.patch
BuildRoot: %_tmppath/%name-%version-buildroot
%{?with_dyn:Requires: dietlibc-lib = %version-%release}
@@ -75,6 +76,7 @@
%setup -q -n %NAME-%version
%patch0 -p1 -b .gcc4
%patch1 -p1 -b .nice
+%patch2 -p1 -b .ppc
## only for 0.28; remove it in 0.29
sed -i -e 's!LD_RUN_PATH= !env -u LD_RUN_PATH !' Makefile
@@ -143,6 +145,8 @@
- made nice(2) SUSv3 compliantly on x86_64 and other platforms (patch
provided by Colin Hill)
- build the dynamic libs for x86, x86_64 and arm only
+- fixed PPC issues in ISO mode (do not use the 'powerpc' macro but the
+ '__powerpc__' one)
* Tue Feb 1 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1:0.28-1
- updated to 0.28
More information about the fedora-extras-commits
mailing list