Couple of common to lib changes I missed.

diff --git a/gnu/usr.bin/cc/libgcc/Makefile b/gnu/usr.bin/cc/libgcc/Makefile
index 4c51d2e..e6c44dd 100644 (file)
--- a/gnu/usr.bin/cc/libgcc/Makefile
+++ b/gnu/usr.bin/cc/libgcc/Makefile
@@ -1,6 +1,5 @@
 LIB=   gcc
 CC=    gcc
 LIB=   gcc
 CC=    gcc

-CFLAGS=                -I../common

 
 SRCS= _mulsi3.c _udivsi3.c _divsi3.c _umodsi3.c _modsi3.c \
    _lshrsi3.c _lshlsi3.c _ashrsi3.c _ashlsi3.c \
 
 SRCS= _mulsi3.c _udivsi3.c _divsi3.c _umodsi3.c _modsi3.c \
    _lshrsi3.c _lshlsi3.c _ashrsi3.c _ashlsi3.c \


@@ -49,7 +48,7 @@ libgcc1:
        for name in $(LIB1FUNCS); \
         do \
        echo $${name}; \
        for name in $(LIB1FUNCS); \
         do \
        echo $${name}; \

-       gcc -E -I../common -DL$${name} libgcc1.c | \
+       gcc -E -I../lib -DL$${name} libgcc1.c | \

        sed -f clean.sed >$${name}.c; \
        done
 
        sed -f clean.sed >$${name}.c; \
        done
 


@@ -58,6 +57,6 @@ libgcc2:
        for name in $(LIB2FUNCS); \
         do \
        echo $${name}; \
        for name in $(LIB2FUNCS); \
         do \
        echo $${name}; \

-       gcc -E -I../common -DL$${name} libgcc2.c | \
+       gcc -E -I../lib -DL$${name} libgcc2.c | \

        sed -f clean.sed >$${name}.c; \
        done
        sed -f clean.sed >$${name}.c; \
        done

diff --git a/gnu/usr.bin/cc/libgcc/_eprintf.c b/gnu/usr.bin/cc/libgcc/_eprintf.c
index 3352a4a..7b6ffb6 100644 (file)
--- a/gnu/usr.bin/cc/libgcc/_eprintf.c
+++ b/gnu/usr.bin/cc/libgcc/_eprintf.c
@@ -184,7 +184,7 @@ FILE        *funopen  (const void *,
 int    __srget  (FILE *)               ;
 int    __svfscanf  (FILE *, const char *, char *                       )               ;
 int    __swbuf  (int, FILE *)          ;
 int    __srget  (FILE *)               ;
 int    __svfscanf  (FILE *, const char *, char *                       )               ;
 int    __swbuf  (int, FILE *)          ;

-static inline int __sputc(int _c, FILE *_p) {
+static __inline__ int __sputc(int _c, FILE *_p) {

        if (--_p->_w >= 0 || (_p->_w >= _p->_lbfsize && (char)_c != '\n'))
                return (*_p->_p++ = _c);
        else
        if (--_p->_w >= 0 || (_p->_w >= _p->_lbfsize && (char)_c != '\n'))
                return (*_p->_p++ = _c);
        else

diff --git a/gnu/usr.bin/cc/libgcc/_fixunsdfdi.c b/gnu/usr.bin/cc/libgcc/_fixunsdfdi.c
index dd5369f..ca40d0e 100644 (file)
--- a/gnu/usr.bin/cc/libgcc/_fixunsdfdi.c
+++ b/gnu/usr.bin/cc/libgcc/_fixunsdfdi.c
@@ -83,7 +83,8 @@ typedef union
 extern DItype __fixunssfdi (SFtype a);
 extern DItype __fixunsdfdi (DFtype a);
 DItype
 extern DItype __fixunssfdi (SFtype a);
 extern DItype __fixunsdfdi (DFtype a);
 DItype

-__fixunsdfdi (DFtype a)
+__fixunsdfdi (a)
+     DFtype a;

 {
   DFtype b;
   UDItype v;
 {
   DFtype b;
   UDItype v;

diff --git a/gnu/usr.bin/cc/libgcc/_new_handler.c b/gnu/usr.bin/cc/libgcc/_new_handler.c
index 4ae3226..c65a0cc 100644 (file)
--- a/gnu/usr.bin/cc/libgcc/_new_handler.c
+++ b/gnu/usr.bin/cc/libgcc/_new_handler.c
@@ -184,7 +184,7 @@ FILE        *funopen  (const void *,
 int    __srget  (FILE *)               ;
 int    __svfscanf  (FILE *, const char *, char *                       )               ;
 int    __swbuf  (int, FILE *)          ;
 int    __srget  (FILE *)               ;
 int    __svfscanf  (FILE *, const char *, char *                       )               ;
 int    __swbuf  (int, FILE *)          ;

-static inline int __sputc(int _c, FILE *_p) {
+static __inline__ int __sputc(int _c, FILE *_p) {

        if (--_p->_w >= 0 || (_p->_w >= _p->_lbfsize && (char)_c != '\n'))
                return (*_p->_p++ = _c);
        else
        if (--_p->_w >= 0 || (_p->_w >= _p->_lbfsize && (char)_c != '\n'))
                return (*_p->_p++ = _c);
        else