'[LTP] [PATCH] Compiling LTP with gcc 2.95.2'

[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ltp-list
Subject:    [LTP] [PATCH] Compiling LTP with gcc 2.95.2
From:       "Will Newton" <will.newton () gmail ! com>
Date:       2006-12-06 10:18:01
Message-ID: 87a5b0800612060218s457151d9t354dc1ce2fcbd214 () mail ! gmail ! com
[Download RAW message or body]

Hi all,

I have attached my updated patch to make LTP CVS build with gcc
2.95.2. There should be no functional changes, just syntax and build
fixes.

["gcc-2.95-2.patch" (application/octet-stream)]

Index: testcases/kernel/mem/hugetlb/lib/Makefile
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/mem/hugetlb/lib/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- testcases/kernel/mem/hugetlb/lib/Makefile	2 Aug 2005 18:05:55 -0000	1.2
+++ testcases/kernel/mem/hugetlb/lib/Makefile	5 Dec 2006 16:28:26 -0000
@@ -25,6 +25,7 @@
 OBJS=$(SRCS:.c=.o)
 MAINS=libipc.a
 CFLAGS+=-I../../../../../include -g -Wall
+CFLAGS+=-D_USC_LIB_
 
 all: libipc.a
 
Index: testcases/kernel/syscalls/ipc/lib/Makefile
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/ipc/lib/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- testcases/kernel/syscalls/ipc/lib/Makefile	21 Aug 2006 06:58:39 -0000	1.11
+++ testcases/kernel/syscalls/ipc/lib/Makefile	5 Dec 2006 16:28:35 -0000
@@ -21,6 +21,7 @@
 LIBIPC = ../libipc.a
 
 CFLAGS += -I../../../../../include -Wall
+CFLAGS += -D_USC_LIB_
 
 all: $(LIBIPC)
 
Index: testcases/kernel/syscalls/ipc/lib/ipcmsg.h
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/ipc/lib/ipcmsg.h,v
retrieving revision 1.3
diff -u -r1.3 ipcmsg.h
--- testcases/kernel/syscalls/ipc/lib/ipcmsg.h	22 Dec 2005 20:18:23 -0000	1.3
+++ testcases/kernel/syscalls/ipc/lib/ipcmsg.h	5 Dec 2006 16:28:35 -0000
@@ -46,7 +46,7 @@
 	char mtext[MSGSIZE + 1];  /* add 1 here so the message can be 1024   */
 } MSGBUF;			  /* characters long with a '\0' termination */
 
-#if (!defined CONFIG_COLDFIRE || defined LIBIPC)
+#ifdef LIBIPC
 key_t msgkey;                   /* the ftok() generated message key */
 #else
 extern key_t msgkey;                   /* the ftok() generated message key */
Index: testcases/kernel/syscalls/ipc/lib/ipcsem.h
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/ipc/lib/ipcsem.h,v
retrieving revision 1.3
diff -u -r1.3 ipcsem.h
--- testcases/kernel/syscalls/ipc/lib/ipcsem.h	22 Dec 2005 20:18:23 -0000	1.3
+++ testcases/kernel/syscalls/ipc/lib/ipcsem.h	5 Dec 2006 16:28:35 -0000
@@ -42,7 +42,7 @@
 #define PSEMS	10		/* a reasonable value for the number of */
 				/* "primitive semaphores" per ID 	*/
 
-#if (!defined CONFIG_COLDFIRE || defined LIBIPC)
+#ifdef LIBIPC
 key_t semkey;			/* an IPC key generated by ftok() */
 #else
 extern key_t semkey;	 	 /* an IPC key generated by ftok() */
Index: testcases/kernel/syscalls/kill/kill05.c
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/kill/kill05.c,v
retrieving revision 1.5
diff -u -r1.5 kill05.c
--- testcases/kernel/syscalls/kill/kill05.c	11 Jul 2005 22:28:29 -0000	1.5
+++ testcases/kernel/syscalls/kill/kill05.c	5 Dec 2006 16:28:36 -0000
@@ -82,7 +82,7 @@
 char *TCID= "kill05";
 int TST_TOTAL = 1;
 int shmid1 = -1;
-key_t semkey;
+extern key_t semkey;
 int *flag;
 
 int exp_enos[] = {EPERM, 0};
Index: testcases/kernel/syscalls/kill/kill07.c
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/kill/kill07.c,v
retrieving revision 1.5
diff -u -r1.5 kill07.c
--- testcases/kernel/syscalls/kill/kill07.c	22 Dec 2005 20:18:23 -0000	1.5
+++ testcases/kernel/syscalls/kill/kill07.c	5 Dec 2006 16:28:36 -0000
@@ -76,11 +76,7 @@
 char *TCID= "kill07";
 int TST_TOTAL = 1;
 int shmid1;
-#ifndef CONFIG_COLDFIRE
-key_t semkey;
-#else
 extern key_t semkey;
-#endif
 int *flag;
 
 extern int Tst_count;
Index: testcases/kernel/syscalls/lib/Makefile
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/lib/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- testcases/kernel/syscalls/lib/Makefile	21 Aug 2006 06:58:40 -0000	1.8
+++ testcases/kernel/syscalls/lib/Makefile	5 Dec 2006 16:28:36 -0000
@@ -18,6 +18,7 @@
 
 DIR=lib
 CFLAGS += -I../../../../include -Wall
+CFLAGS += -D_USC_LIB_
 SRC=libtestsuite.c
 OBJS=$(SRC:.c=.o)
 MAINS=../libtestsuite.a
Index: testcases/kernel/syscalls/nftw/lib.c
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/nftw/lib.c,v
retrieving revision 1.3
diff -u -r1.3 lib.c
--- testcases/kernel/syscalls/nftw/lib.c	28 Jun 2006 05:05:10 -0000	1.3
+++ testcases/kernel/syscalls/nftw/lib.c	5 Dec 2006 16:28:37 -0000
@@ -25,6 +25,7 @@
  *      lib.c - This file contains code for common failure conditions 
  */
 
+#define _USC_LIB_
 
 #include "nftw.h"
 
Index: testcases/network/sctp/testlib/Makefile
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/network/sctp/testlib/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- testcases/network/sctp/testlib/Makefile	2 Aug 2005 18:05:57 -0000	1.3
+++ testcases/network/sctp/testlib/Makefile	5 Dec 2006 16:28:44 -0000
@@ -24,7 +24,7 @@
 INCLUDES+=-I../../../../include -I../include -I.
 LIBS+=-L../../../../lib -L../lib
 
-CFLAGS += -g $(INCLUDES) -DLTP
+CFLAGS += -g $(INCLUDES) -DLTP -D_USC_LIB_
 LOADLIBES += $(LIBS) -lltp -lsctp
 SRCS=sctputil.c
 OBJS=$(SRCS:.c=.o)
Index: testcases/network/nfsv4/locks/locktests.c
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/network/nfsv4/locks/locktests.c,v
retrieving revision 1.3
diff -u -r1.3 locktests.c
--- testcases/network/nfsv4/locks/locktests.c	11 Sep 2006 20:40:52 -0000	1.3
+++ testcases/network/nfsv4/locks/locktests.c	5 Dec 2006 16:41:31 -0000
@@ -1037,11 +1037,11 @@
     char *tmp;
     int type=0;
     int clients;
+    int serveur=1;
+    char *host;
     type=PROCESS;
     dp.fname=NULL;
     dp.verbose=0;
-    int serveur=1;
-    char *host;
    
     clients=0;
     


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV

_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list


[prev in list] [next in list] [prev in thread] [next in thread]
Configure | About | News | Add a list | Sponsored by KoreLogic