diff options
Diffstat (limited to 'gcc')
-rwxr-xr-x | gcc/assert.h | 54 | ||||
-rwxr-xr-x | gcc/doprint.c | 295 | ||||
-rwxr-xr-x | gcc/dostage2 | 2 | ||||
-rwxr-xr-x | gcc/dostage3 | 3 | ||||
-rwxr-xr-x | gcc/dwarf2out.c | 10 |
5 files changed, 1 insertions, 363 deletions
diff --git a/gcc/assert.h b/gcc/assert.h deleted file mode 100755 index ecc02ee..0000000 --- a/gcc/assert.h +++ /dev/null @@ -1,54 +0,0 @@ -/* Allow this file to be included multiple times - with different settings of NDEBUG. */ -#undef assert -#undef __assert - -#ifdef NDEBUG -#define assert(ignore) ((void) 0) -#else - -#ifndef __GNUC__ - -#define assert(expression) \ - ((void) ((expression) ? 0 : __assert (expression, __FILE__, __LINE__))) - -#define __assert(expression, file, lineno) \ - (printf ("%s:%u: failed assertion\n", file, lineno), \ - abort (), 0) - -#else - -#if defined(__STDC__) || defined (__cplusplus) - -/* Defined in libgcc.a */ -#ifdef __cplusplus -extern "C" { -extern void __eprintf (const char *, const char *, unsigned, const char *) - __attribute__ ((noreturn)); -} -#else -extern void __eprintf (const char *, const char *, unsigned, const char *) - __attribute__ ((noreturn)); -#endif - -#define assert(expression) \ - ((void) ((expression) ? 0 : __assert (#expression, __FILE__, __LINE__))) - -#define __assert(expression, file, line) \ - (__eprintf ("%s:%u: failed assertion `%s'\n", \ - file, line, expression), 0) - -#else /* no __STDC__ and not C++; i.e. -traditional. */ - -extern void __eprintf () __attribute__ ((noreturn)); /* Defined in libgcc.a */ - -#define assert(expression) \ - ((void) ((expression) ? 0 : __assert (expression, __FILE__, __LINE__))) - -#define __assert(expression, file, lineno) \ - (__eprintf ("%s:%u: failed assertion `%s'\n", \ - file, lineno, "expression"), 0) - -#endif /* no __STDC__ and not C++; i.e. -traditional. */ -#endif /* no __GNU__; i.e., /bin/cc. */ -#endif diff --git a/gcc/doprint.c b/gcc/doprint.c deleted file mode 100755 index 2dc4dde..0000000 --- a/gcc/doprint.c +++ /dev/null @@ -1,295 +0,0 @@ -/* Provide a version _doprnt in terms of fprintf. - Copyright (C) 1998 Free Software Foundation, Inc. - Contributed by Kaveh Ghazi (ghazi@caip.rutgers.edu) 3/29/98 - -This program is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 2, or (at your option) any -later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - - */ - -#include "config.h" -#include "system.h" -#undef _doprnt - -#ifdef TEST /* Make sure to use the internal one. */ -#define _doprnt my_doprnt -#endif - -#define COPY_VA_INT \ - do { \ - const int value = abs (va_arg (ap, int)); \ - char buf[32]; \ - ptr++; /* Go past the asterisk. */ \ - *sptr = '\0'; /* NULL terminate sptr. */ \ - sprintf(buf, "%d", value); \ - strcat(sptr, buf); \ - while (*sptr) sptr++; \ - } while (0) - -#define PRINT_CHAR(CHAR) \ - do { \ - putc(CHAR, stream); \ - ptr++; \ - total_printed++; \ - continue; \ - } while (0) - -#define PRINT_TYPE(TYPE) \ - do { \ - int result; \ - TYPE value = va_arg (ap, TYPE); \ - *sptr++ = *ptr++; /* Copy the type specifier. */ \ - *sptr = '\0'; /* NULL terminate sptr. */ \ - result = fprintf(stream, specifier, value); \ - if (result == -1) \ - return -1; \ - else \ - { \ - total_printed += result; \ - continue; \ - } \ - } while (0) - -int -_doprnt (format, ap, stream) - const char * format; - va_list ap; - FILE * stream; -{ - const char * ptr = format; - char specifier[128]; - int total_printed = 0; - - while (*ptr != '\0') - { - if (*ptr != '%') /* While we have regular characters, print them. */ - PRINT_CHAR(*ptr); - else /* We got a format specifier! */ - { - char * sptr = specifier; - int wide_width = 0, short_width = 0; - - *sptr++ = *ptr++; /* Copy the % and move forward. */ - - while (strchr ("-+ #0", *ptr)) /* Move past flags. */ - *sptr++ = *ptr++; - - if (*ptr == '*') - COPY_VA_INT; - else - while (isdigit(*ptr)) /* Handle explicit numeric value. */ - *sptr++ = *ptr++; - - if (*ptr == '.') - { - *sptr++ = *ptr++; /* Copy and go past the period. */ - if (*ptr == '*') - COPY_VA_INT; - else - while (isdigit(*ptr)) /* Handle explicit numeric value. */ - *sptr++ = *ptr++; - } - while (strchr ("hlL", *ptr)) - { - switch (*ptr) - { - case 'h': - short_width = 1; - break; - case 'l': - wide_width++; - break; - case 'L': - wide_width = 2; - break; - default: - abort(); - } - *sptr++ = *ptr++; - } - - switch (*ptr) - { - case 'd': - case 'i': - case 'o': - case 'u': - case 'x': - case 'X': - case 'c': - { - /* Short values are promoted to int, so just copy it - as an int and trust the C library printf to cast it - to the right width. */ - if (short_width) - PRINT_TYPE(int); - else - { - switch (wide_width) - { - case 0: - PRINT_TYPE(int); - break; - case 1: - PRINT_TYPE(long); - break; - case 2: - default: -#if defined(__GNUC__) || defined(HAVE_LONG_LONG) - PRINT_TYPE(long long); -#else - PRINT_TYPE(long); /* Fake it and hope for the best. */ -#endif - break; - } /* End of switch (wide_width) */ - } /* End of else statement */ - } /* End of integer case */ - break; - case 'f': - case 'e': - case 'E': - case 'g': - case 'G': - { - if (wide_width == 0) - PRINT_TYPE(double); - else - { -#if defined(__GNUC__) || defined(HAVE_LONG_DOUBLE) - PRINT_TYPE(long double); -#else - PRINT_TYPE(double); /* Fake it and hope for the best. */ -#endif - } - } - break; - case 's': - PRINT_TYPE(char *); - break; - case 'p': - PRINT_TYPE(void *); - break; - case '%': - PRINT_CHAR('%'); - break; - default: - abort(); - } /* End of switch (*ptr) */ - } /* End of else statement */ - } - - return total_printed; -} - -#ifdef TEST - -#include <math.h> -#ifndef M_PI -#define M_PI (3.1415926535897932385) -#endif - -#define RESULT(x) do \ -{ \ - int i = (x); \ - printf ("printed %d characters\n", i); \ - fflush(stdin); \ -} while (0) - -static int checkit PVPROTO ((const char * format, ...)) ATTRIBUTE_PRINTF_1; - -static int -checkit VPROTO ((const char* format, ...)) -{ - va_list args; - int result; - -#ifndef ANSI_PROTOTYPES - char *format; -#endif - - VA_START (args, format); - -#ifndef ANSI_PROTOTYPES - format = va_arg (args, char *); -#endif - - result = _doprnt (format, args, stdout); - va_end(args); - - return result; -} - -int -main () -{ - RESULT(checkit ("<%d>\n", 0x12345678)); - RESULT(printf ("<%d>\n", 0x12345678)); - - RESULT(checkit ("<%200d>\n", 5)); - RESULT(printf ("<%200d>\n", 5)); - - RESULT(checkit ("<%.300d>\n", 6)); - RESULT(printf ("<%.300d>\n", 6)); - - RESULT(checkit ("<%100.150d>\n", 7)); - RESULT(printf ("<%100.150d>\n", 7)); - - RESULT(checkit ("<%s>\n", - "jjjjjjjjjiiiiiiiiiiiiiiioooooooooooooooooppppppppppppaa\n\ -777777777777777777333333333333366666666666622222222222777777777777733333")); - RESULT(printf ("<%s>\n", - "jjjjjjjjjiiiiiiiiiiiiiiioooooooooooooooooppppppppppppaa\n\ -777777777777777777333333333333366666666666622222222222777777777777733333")); - - RESULT(checkit ("<%f><%0+#f>%s%d%s>\n", - 1.0, 1.0, "foo", 77, "asdjffffffffffffffiiiiiiiiiiixxxxx")); - RESULT(printf ("<%f><%0+#f>%s%d%s>\n", - 1.0, 1.0, "foo", 77, "asdjffffffffffffffiiiiiiiiiiixxxxx")); - - RESULT(checkit ("<%4f><%.4f><%%><%4.4f>\n", M_PI, M_PI, M_PI)); - RESULT(printf ("<%4f><%.4f><%%><%4.4f>\n", M_PI, M_PI, M_PI)); - - RESULT(checkit ("<%*f><%.*f><%%><%*.*f>\n", 3, M_PI, 3, M_PI, 3, 3, M_PI)); - RESULT(printf ("<%*f><%.*f><%%><%*.*f>\n", 3, M_PI, 3, M_PI, 3, 3, M_PI)); - - RESULT(checkit ("<%d><%i><%o><%u><%x><%X><%c>\n", - 75, 75, 75, 75, 75, 75, 75)); - RESULT(printf ("<%d><%i><%o><%u><%x><%X><%c>\n", - 75, 75, 75, 75, 75, 75, 75)); - - RESULT(checkit ("<%d><%i><%o><%u><%x><%X><%c>\n", - 75, 75, 75, 75, 75, 75, 75)); - RESULT(printf ("<%d><%i><%o><%u><%x><%X><%c>\n", - 75, 75, 75, 75, 75, 75, 75)); - - RESULT(checkit ("Testing (hd) short: <%d><%ld><%hd><%hd><%d>\n", 123, (long)234, 345, 123456789, 456)); - RESULT(printf ("Testing (hd) short: <%d><%ld><%hd><%hd><%d>\n", 123, (long)234, 345, 123456789, 456)); - -#if defined(__GNUC__) || defined (HAVE_LONG_LONG) - RESULT(checkit ("Testing (lld) long long: <%d><%lld><%d>\n", 123, 234234234234234234LL, 345)); - RESULT(printf ("Testing (lld) long long: <%d><%lld><%d>\n", 123, 234234234234234234LL, 345)); - RESULT(checkit ("Testing (Ld) long long: <%d><%Ld><%d>\n", 123, 234234234234234234LL, 345)); - RESULT(printf ("Testing (Ld) long long: <%d><%Ld><%d>\n", 123, 234234234234234234LL, 345)); -#endif - -#if defined(__GNUC__) || defined (HAVE_LONG_DOUBLE) - RESULT(checkit ("Testing (Lf) long double: <%.20f><%.20Lf><%0+#.20f>\n", - 1.23456, 1.234567890123456789L, 1.23456)); - RESULT(printf ("Testing (Lf) long double: <%.20f><%.20Lf><%0+#.20f>\n", - 1.23456, 1.234567890123456789L, 1.23456)); -#endif - - return 0; -} -#endif /* TEST */ diff --git a/gcc/dostage2 b/gcc/dostage2 deleted file mode 100755 index bb33f7d..0000000 --- a/gcc/dostage2 +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -make -k LANGUAGES=c $1 CC=stage1/xgcc XCFLAGS=-Bstage1/ CFLAGS="-g $2" >log2 2>&1 diff --git a/gcc/dostage3 b/gcc/dostage3 deleted file mode 100755 index 21f17fc..0000000 --- a/gcc/dostage3 +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -make -k LANGUAGES=c $1 CC=stage2/xgcc XCFLAGS=-Bstage2/ CFLAGS="-g $2" >log3 2>&1 - diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index 21404e1..e98380c 100755 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -27,6 +27,7 @@ Boston, MA 02111-1307, USA. */ DWARF2_DEBUGGING_INFO, deals with the other DWARF 2 debugging information. */ +#include <assert.h> #include "config.h" #include "system.h" #include "defaults.h" @@ -45,15 +46,6 @@ Boston, MA 02111-1307, USA. */ #include "toplev.h" #include "dyn-string.h" -/* We cannot use <assert.h> in GCC source, since that would include - GCC's assert.h, which may not be compatible with the host compiler. */ -#undef assert -#ifdef NDEBUG -# define assert(e) -#else -# define assert(e) do { if (! (e)) abort (); } while (0) -#endif - /* Decide whether we want to emit frame unwind information for the current translation unit. */ |