* [PATCH] s390* and gcc-3.3
@ 2003-01-13 17:23 Martin Schwidefsky
2003-01-14 1:16 ` Ulrich Drepper
0 siblings, 1 reply; 2+ messages in thread
From: Martin Schwidefsky @ 2003-01-13 17:23 UTC (permalink / raw)
To: libc-hacker
Hi,
I tried to compile libc with a prerelease of gcc 3.3 and an experimental
TLS patch. It didn't compile because of unterminated string literals and
a problem with the 'L' define. These two problem can be fixed right now,
the TLS support will take some more days.
blue skies,
Martin.
libc/ChangeLog:
2003-01-13 Martin Schwidefsky <schwidefsky@de.ibm.com>
* sysdeps/s390/s390-64/initfini.c: Avoid unterminated string literals.
* sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h (L): Don't define it
here.
* sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h (L): Don't define it
here.
linuxthreads/ChangeLog:
2003-01-13 Martin Schwidefsky <schwidefsky@de.ibm.com>
* sysdeps/unix/sysv/linux/s390/s390-32/pt-initfini.c: Avoid
unterminated string literals.
* sysdeps/unix/sysv/linux/s390/s390-64/pt-initfini.c: Avoid
unterminated string literals.
diff -urN libc/linuxthreads/sysdeps/unix/sysv/linux/s390/s390-32/pt-initfini.c libc-s390/linuxthreads/sysdeps/unix/sysv/linux/s390/s390-32/pt-initfini.c
--- libc/linuxthreads/sysdeps/unix/sysv/linux/s390/s390-32/pt-initfini.c Tue Aug 27 00:39:29 2002
+++ libc-s390/linuxthreads/sysdeps/unix/sysv/linux/s390/s390-32/pt-initfini.c Mon Jan 13 10:37:22 2003
@@ -36,119 +36,119 @@
* crtn.s puts the corresponding function epilogues
in the .init and .fini sections. */
-__asm__ ("
-
-#include \"defs.h\"
-
-/*@HEADER_ENDS*/
-
-/*@TESTS_BEGIN*/
-
-/*@TESTS_END*/
-
-/*@_init_PROLOG_BEGINS*/
-
- .section .init
-#NO_APP
- .align 4
-.globl _init
- .type _init,@function
-_init:
-# leaf function 0
-# automatics 0
-# outgoing args 0
-# need frame pointer 0
-# call alloca 0
-# has varargs 0
-# incoming args (stack) 0
-# function length 36
- STM 6,15,24(15)
- BRAS 13,.LTN1_0
-.LT1_0:
-.LC13:
- .long __pthread_initialize_minimal@PLT-.LT1_0
-.LC14:
- .long __gmon_start__@GOT
-.LC15:
- .long _GLOBAL_OFFSET_TABLE_-.LT1_0
-.LTN1_0:
- LR 1,15
- AHI 15,-96
- ST 1,0(15)
- L 12,.LC15-.LT1_0(13)
- AR 12,13
- L 1,.LC13-.LT1_0(13)
- LA 1,0(1,13)
- BASR 14,1
- L 1,.LC14-.LT1_0(13)
- L 1,0(1,12)
- LTR 1,1
- JE .L22
- BASR 14,1
-.L22:
-#APP
- .align 4,0x07
- END_INIT
-
-/*@_init_PROLOG_ENDS*/
-
-/*@_init_EPILOG_BEGINS*/
- .align 4
- .section .init
-#NO_APP
- .align 4
- L 4,152(15)
- LM 6,15,120(15)
- BR 4
-#APP
- END_INIT
-
-/*@_init_EPILOG_ENDS*/
-
-/*@_fini_PROLOG_BEGINS*/
- .section .fini
-#NO_APP
- .align 4
-.globl _fini
- .type _fini,@function
-_fini:
-# leaf function 0
-# automatics 0
-# outgoing args 0
-# need frame pointer 0
-# call alloca 0
-# has varargs 0
-# incoming args (stack) 0
-# function length 30
- STM 6,15,24(15)
- BRAS 13,.LTN2_0
-.LT2_0:
-.LC17:
- .long _GLOBAL_OFFSET_TABLE_-.LT2_0
-.LTN2_0:
- LR 1,15
- AHI 15,-96
- ST 1,0(15)
- L 12,.LC17-.LT2_0(13)
- AR 12,13
-#APP
- .align 4,0x07
- END_FINI
-
-/*@_fini_PROLOG_ENDS*/
-
-/*@_fini_EPILOG_BEGINS*/
- .align 4
- .section .fini
-#NO_APP
- .align 4
- L 4,152(15)
- LM 6,15,120(15)
- BR 4
-#APP
- END_FINI
-
-/*@_fini_EPILOG_ENDS*/
-
-/*@TRAILER_BEGINS*/
+__asm__ ("\
+\n\
+#include \"defs.h\"\n\
+\n\
+/*@HEADER_ENDS*/\n\
+\n\
+/*@TESTS_BEGIN*/\n\
+\n\
+/*@TESTS_END*/\n\
+\n\
+/*@_init_PROLOG_BEGINS*/\n\
+\n\
+ .section .init\n\
+#NO_APP\n\
+ .align 4\n\
+.globl _init\n\
+ .type _init,@function\n\
+_init:\n\
+# leaf function 0\n\
+# automatics 0\n\
+# outgoing args 0\n\
+# need frame pointer 0\n\
+# call alloca 0\n\
+# has varargs 0\n\
+# incoming args (stack) 0\n\
+# function length 36\n\
+ STM 6,15,24(15)\n\
+ BRAS 13,.LTN1_0\n\
+.LT1_0:\n\
+.LC13:\n\
+ .long __pthread_initialize_minimal@PLT-.LT1_0\n\
+.LC14:\n\
+ .long __gmon_start__@GOT\n\
+.LC15:\n\
+ .long _GLOBAL_OFFSET_TABLE_-.LT1_0\n\
+.LTN1_0:\n\
+ LR 1,15\n\
+ AHI 15,-96\n\
+ ST 1,0(15)\n\
+ L 12,.LC15-.LT1_0(13)\n\
+ AR 12,13\n\
+ L 1,.LC13-.LT1_0(13)\n\
+ LA 1,0(1,13)\n\
+ BASR 14,1\n\
+ L 1,.LC14-.LT1_0(13)\n\
+ L 1,0(1,12)\n\
+ LTR 1,1\n\
+ JE .L22\n\
+ BASR 14,1\n\
+.L22:\n\
+#APP\n\
+ .align 4,0x07\n\
+ END_INIT\n\
+\n\
+/*@_init_PROLOG_ENDS*/\n\
+\n\
+/*@_init_EPILOG_BEGINS*/\n\
+ .align 4\n\
+ .section .init\n\
+#NO_APP\n\
+ .align 4\n\
+ L 4,152(15)\n\
+ LM 6,15,120(15)\n\
+ BR 4\n\
+#APP\n\
+ END_INIT\n\
+\n\
+/*@_init_EPILOG_ENDS*/\n\
+\n\
+/*@_fini_PROLOG_BEGINS*/\n\
+ .section .fini\n\
+#NO_APP\n\
+ .align 4\n\
+.globl _fini\n\
+ .type _fini,@function\n\
+_fini:\n\
+# leaf function 0\n\
+# automatics 0\n\
+# outgoing args 0\n\
+# need frame pointer 0\n\
+# call alloca 0\n\
+# has varargs 0\n\
+# incoming args (stack) 0\n\
+# function length 30\n\
+ STM 6,15,24(15)\n\
+ BRAS 13,.LTN2_0\n\
+.LT2_0:\n\
+.LC17:\n\
+ .long _GLOBAL_OFFSET_TABLE_-.LT2_0\n\
+.LTN2_0:\n\
+ LR 1,15\n\
+ AHI 15,-96\n\
+ ST 1,0(15)\n\
+ L 12,.LC17-.LT2_0(13)\n\
+ AR 12,13\n\
+#APP\n\
+ .align 4,0x07\n\
+ END_FINI\n\
+\n\
+/*@_fini_PROLOG_ENDS*/\n\
+\n\
+/*@_fini_EPILOG_BEGINS*/\n\
+ .align 4\n\
+ .section .fini\n\
+#NO_APP\n\
+ .align 4\n\
+ L 4,152(15)\n\
+ LM 6,15,120(15)\n\
+ BR 4\n\
+#APP\n\
+ END_FINI\n\
+\n\
+/*@_fini_EPILOG_ENDS*/\n\
+\n\
+/*@TRAILER_BEGINS*/\
");
diff -urN libc/linuxthreads/sysdeps/unix/sysv/linux/s390/s390-64/pt-initfini.c libc-s390/linuxthreads/sysdeps/unix/sysv/linux/s390/s390-64/pt-initfini.c
--- libc/linuxthreads/sysdeps/unix/sysv/linux/s390/s390-64/pt-initfini.c Tue Aug 27 00:39:28 2002
+++ libc-s390/linuxthreads/sysdeps/unix/sysv/linux/s390/s390-64/pt-initfini.c Mon Jan 13 10:37:22 2003
@@ -37,101 +37,101 @@
* crtn.s puts the corresponding function epilogues
in the .init and .fini sections. */
-__asm__ ("
-
-#include \"defs.h\"
-
-/*@HEADER_ENDS*/
-
-/*@TESTS_BEGIN*/
-
-/*@TESTS_END*/
-
-/*@_init_PROLOG_BEGINS*/
-
- .section .init
-#NO_APP
- .align 4
-.globl _init
- .type _init,@function
-_init:
-# leaf function 0
-# automatics 0
-# outgoing args 0
-# need frame pointer 0
-# call alloca 0
-# has varargs 0
-# incoming args (stack) 0
-# function length 36
- STMG 6,15,48(15)
- LGR 1,15
- AGHI 15,-160
- STG 1,0(15)
- LARL 12,_GLOBAL_OFFSET_TABLE_
- BRASL 14,__pthread_initialize_minimal@PLT
- LARL 1,__gmon_start__@GOTENT
- LG 1,0(1)
- LTGR 1,1
- JE .L22
- BASR 14,1
-.L22:
-#APP
- .align 4,0x07
- END_INIT
-
-/*@_init_PROLOG_ENDS*/
-
-/*@_init_EPILOG_BEGINS*/
- .align 4
- .section .init
-#NO_APP
- .align 4
- LG 4,272(15)
- LMG 6,15,208(15)
- BR 4
-#APP
- END_INIT
-
-/*@_init_EPILOG_ENDS*/
-
-/*@_fini_PROLOG_BEGINS*/
- .section .fini
-#NO_APP
- .align 4
-.globl _fini
- .type _fini,@function
-_fini:
-# leaf function 0
-# automatics 0
-# outgoing args 0
-# need frame pointer 0
-# call alloca 0
-# has varargs 0
-# incoming args (stack) 0
-# function length 30
- STMG 6,15,48(15)
- LGR 1,15
- AGHI 15,-160
- STG 1,0(15)
- LARL 12,_GLOBAL_OFFSET_TABLE_
-#APP
- .align 4,0x07
- END_FINI
-
-/*@_fini_PROLOG_ENDS*/
-
-/*@_fini_EPILOG_BEGINS*/
- .align 4
- .section .fini
-#NO_APP
- .align 4
- LG 4,272(15)
- LMG 6,15,208(15)
- BR 4
-#APP
- END_FINI
-
-/*@_fini_EPILOG_ENDS*/
-
-/*@TRAILER_BEGINS*/
-");
+__asm__ ("\
+\n\
+#include \"defs.h\"\n\
+\n\
+/*@HEADER_ENDS*/\n\
+\n\
+/*@TESTS_BEGIN*/\n\
+\n\
+/*@TESTS_END*/\n\
+\n\
+/*@_init_PROLOG_BEGINS*/\n\
+\n\
+ .section .init\n\
+#NO_APP\n\
+ .align 4\n\
+.globl _init\n\
+ .type _init,@function\n\
+_init:\n\
+# leaf function 0\n\
+# automatics 0\n\
+# outgoing args 0\n\
+# need frame pointer 0\n\
+# call alloca 0\n\
+# has varargs 0\n\
+# incoming args (stack) 0\n\
+# function length 36\n\
+ STMG 6,15,48(15)\n\
+ LGR 1,15\n\
+ AGHI 15,-160\n\
+ STG 1,0(15)\n\
+ LARL 12,_GLOBAL_OFFSET_TABLE_\n\
+ BRASL 14,__pthread_initialize_minimal@PLT\n\
+ LARL 1,__gmon_start__@GOTENT\n\
+ LG 1,0(1)\n\
+ LTGR 1,1\n\
+ JE .L22\n\
+ BASR 14,1\n\
+.L22:\n\
+#APP\n\
+ .align 4,0x07\n\
+ END_INIT\n\
+\n\
+/*@_init_PROLOG_ENDS*/\n\
+\n\
+/*@_init_EPILOG_BEGINS*/\n\
+ .align 4\n\
+ .section .init\n\
+#NO_APP\n\
+ .align 4\n\
+ LG 4,272(15)\n\
+ LMG 6,15,208(15)\n\
+ BR 4\n\
+#APP\n\
+ END_INIT\n\
+\n\
+/*@_init_EPILOG_ENDS*/\n\
+\n\
+/*@_fini_PROLOG_BEGINS*/\n\
+ .section .fini\n\
+#NO_APP\n\
+ .align 4\n\
+.globl _fini\n\
+ .type _fini,@function\n\
+_fini:\n\
+# leaf function 0\n\
+# automatics 0\n\
+# outgoing args 0\n\
+# need frame pointer 0\n\
+# call alloca 0\n\
+# has varargs 0\n\
+# incoming args (stack) 0\n\
+# function length 30\n\
+ STMG 6,15,48(15)\n\
+ LGR 1,15\n\
+ AGHI 15,-160\n\
+ STG 1,0(15)\n\
+ LARL 12,_GLOBAL_OFFSET_TABLE_\n\
+#APP\n\
+ .align 4,0x07\n\
+ END_FINI\n\
+\n\
+/*@_fini_PROLOG_ENDS*/\n\
+\n\
+/*@_fini_EPILOG_BEGINS*/\n\
+ .align 4\n\
+ .section .fini\n\
+#NO_APP\n\
+ .align 4\n\
+ LG 4,272(15)\n\
+ LMG 6,15,208(15)\n\
+ BR 4\n\
+#APP\n\
+ END_FINI\n\
+\n\
+/*@_fini_EPILOG_ENDS*/\n\
+\n\
+/*@TRAILER_BEGINS*/\n\
+ ");
diff -urN libc/sysdeps/s390/s390-64/initfini.c libc-s390/sysdeps/s390/s390-64/initfini.c
--- libc/sysdeps/s390/s390-64/initfini.c Fri Jul 6 06:56:03 2001
+++ libc-s390/sysdeps/s390/s390-64/initfini.c Mon Jan 13 10:37:22 2003
@@ -28,100 +28,100 @@
* crtn.s puts the corresponding function epilogues
in the .init and .fini sections. */
-__asm__ ("
-
-#include \"defs.h\"
-
-/*@HEADER_ENDS*/
-
-/*@TESTS_BEGIN*/
-
-/*@TESTS_END*/
-
-/*@_init_PROLOG_BEGINS*/
-
- .section .init
-#NO_APP
- .align 4
-.globl _init
- .type _init,@function
-_init:
-# leaf function 0
-# automatics 0
-# outgoing args 0
-# need frame pointer 0
-# call alloca 0
-# has varargs 0
-# incoming args (stack) 0
-# function length 36
- STMG 6,15,48(15)
- LGR 1,15
- AGHI 15,-160
- STG 1,0(15)
- LARL 12,_GLOBAL_OFFSET_TABLE_
- LARL 1,__gmon_start__@GOTENT
- LG 1,0(1)
- LTGR 1,1
- JE .L22
- BASR 14,1
-.L22:
-#APP
- .align 4,0x07
- END_INIT
-
-/*@_init_PROLOG_ENDS*/
-
-/*@_init_EPILOG_BEGINS*/
- .align 4
- .section .init
-#NO_APP
- .align 4
- LG 4,272(15)
- LMG 6,15,208(15)
- BR 4
-#APP
- END_INIT
-
-/*@_init_EPILOG_ENDS*/
-
-/*@_fini_PROLOG_BEGINS*/
- .section .fini
-#NO_APP
- .align 4
-.globl _fini
- .type _fini,@function
-_fini:
-# leaf function 0
-# automatics 0
-# outgoing args 0
-# need frame pointer 0
-# call alloca 0
-# has varargs 0
-# incoming args (stack) 0
-# function length 30
- STMG 6,15,48(15)
- LGR 1,15
- AGHI 15,-160
- STG 1,0(15)
- LARL 12,_GLOBAL_OFFSET_TABLE_
-#APP
- .align 4,0x07
- END_FINI
-
-/*@_fini_PROLOG_ENDS*/
-
-/*@_fini_EPILOG_BEGINS*/
- .align 4
- .section .fini
-#NO_APP
- .align 4
- LG 4,272(15)
- LMG 6,15,208(15)
- BR 4
-#APP
- END_FINI
-
-/*@_fini_EPILOG_ENDS*/
-
-/*@TRAILER_BEGINS*/
+__asm__ ("\
+\n\
+#include \"defs.h\"\n\
+\n\
+/*@HEADER_ENDS*/\n\
+\n\
+/*@TESTS_BEGIN*/\n\
+\n\
+/*@TESTS_END*/\n\
+\n\
+/*@_init_PROLOG_BEGINS*/\n\
+\n\
+ .section .init\n\
+#NO_APP\n\
+ .align 4\n\
+.globl _init\n\
+ .type _init,@function\n\
+_init:\n\
+# leaf function 0\n\
+# automatics 0\n\
+# outgoing args 0\n\
+# need frame pointer 0\n\
+# call alloca 0\n\
+# has varargs 0\n\
+# incoming args (stack) 0\n\
+# function length 36\n\
+ STMG 6,15,48(15)\n\
+ LGR 1,15\n\
+ AGHI 15,-160\n\
+ STG 1,0(15)\n\
+ LARL 12,_GLOBAL_OFFSET_TABLE_\n\
+ LARL 1,__gmon_start__@GOTENT\n\
+ LG 1,0(1)\n\
+ LTGR 1,1\n\
+ JE .L22\n\
+ BASR 14,1\n\
+.L22:\n\
+#APP\n\
+ .align 4,0x07\n\
+ END_INIT\n\
+\n\
+/*@_init_PROLOG_ENDS*/\n\
+\n\
+/*@_init_EPILOG_BEGINS*/\n\
+ .align 4\n\
+ .section .init\n\
+#NO_APP\n\
+ .align 4\n\
+ LG 4,272(15)\n\
+ LMG 6,15,208(15)\n\
+ BR 4\n\
+#APP\n\
+ END_INIT\n\
+\n\
+/*@_init_EPILOG_ENDS*/\n\
+\n\
+/*@_fini_PROLOG_BEGINS*/\n\
+ .section .fini\n\
+#NO_APP\n\
+ .align 4\n\
+.globl _fini\n\
+ .type _fini,@function\n\
+_fini:\n\
+# leaf function 0\n\
+# automatics 0\n\
+# outgoing args 0\n\
+# need frame pointer 0\n\
+# call alloca 0\n\
+# has varargs 0\n\
+# incoming args (stack) 0\n\
+# function length 30\n\
+ STMG 6,15,48(15)\n\
+ LGR 1,15\n\
+ AGHI 15,-160\n\
+ STG 1,0(15)\n\
+ LARL 12,_GLOBAL_OFFSET_TABLE_\n\
+#APP\n\
+ .align 4,0x07\n\
+ END_FINI\n\
+\n\
+/*@_fini_PROLOG_ENDS*/\n\
+\n\
+/*@_fini_EPILOG_BEGINS*/\n\
+ .align 4\n\
+ .section .fini\n\
+#NO_APP\n\
+ .align 4\n\
+ LG 4,272(15)\n\
+ LMG 6,15,208(15)\n\
+ BR 4\n\
+#APP\n\
+ END_FINI\n\
+\n\
+/*@_fini_EPILOG_ENDS*/\n\
+\n\
+ /*@TRAILER_BEGINS*/\
");
diff -urN libc/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h libc-s390/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
--- libc/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h Thu Jan 9 05:09:26 2003
+++ libc-s390/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h Mon Jan 13 10:37:22 2003
@@ -33,10 +33,6 @@
#undef SYS_ify
#define SYS_ify(syscall_name) __NR_##syscall_name
-/* ELF-like local names start with `.L'. */
-#undef L
-#define L(name) .L##name
-
#ifdef __ASSEMBLER__
/* Linux uses a negative return value to indicate syscall errors, unlike
diff -urN libc/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h libc-s390/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
--- libc/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h Thu Jan 9 05:09:26 2003
+++ libc-s390/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h Mon Jan 13 10:37:22 2003
@@ -34,10 +34,6 @@
#undef SYS_ify
#define SYS_ify(syscall_name) __NR_##syscall_name
-/* ELF-like local names start with `.L'. */
-#undef L
-#define L(name) .L##name
-
#ifdef __ASSEMBLER__
/* Linux uses a negative return value to indicate syscall errors, unlike
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] s390* and gcc-3.3
2003-01-13 17:23 [PATCH] s390* and gcc-3.3 Martin Schwidefsky
@ 2003-01-14 1:16 ` Ulrich Drepper
0 siblings, 0 replies; 2+ messages in thread
From: Ulrich Drepper @ 2003-01-14 1:16 UTC (permalink / raw)
To: Martin Schwidefsky; +Cc: libc-hacker
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Martin Schwidefsky wrote:
> I tried to compile libc with a prerelease of gcc 3.3 and an experimental
> TLS patch. It didn't compile because of unterminated string literals and
> a problem with the 'L' define. These two problem can be fixed right now,
Thanks, I've applied the patch.
- --
- --------------. ,-. 444 Castro Street
Ulrich Drepper \ ,-----------------' \ Mountain View, CA 94041 USA
Red Hat `--' drepper at redhat.com `---------------------------
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)
iD8DBQE+I2TW2ijCOnn/RHQRAlQbAKC0PJSd2kq9CVdnAPnanBAiQRF0ywCgiAEl
D0wNZLoThaqUypZs5kBO57M=
=zZ40
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2003-01-14 1:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-01-13 17:23 [PATCH] s390* and gcc-3.3 Martin Schwidefsky
2003-01-14 1:16 ` Ulrich Drepper
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).