Changed common directory into lib to save re-compiling common

code for each cc1

diff --git a/gnu/usr.bin/cc/Makefile b/gnu/usr.bin/cc/Makefile
index 6921793..c93ffa6 100644 (file)
--- a/gnu/usr.bin/cc/Makefile
+++ b/gnu/usr.bin/cc/Makefile
@@ -1,2 +1,2 @@
-SUBDIR= cc cpp cc1 libgcc cc1plus cc1obj #libobjc
+SUBDIR= cc cpp lib cc1 libgcc cc1plus cc1obj #libobjc

 .include <bsd.subdir.mk>
 .include <bsd.subdir.mk>

diff --git a/gnu/usr.bin/cc/TODO b/gnu/usr.bin/cc/TODO
new file mode 100644 (file)
index 0000000..6678353
--- /dev/null
+++ b/gnu/usr.bin/cc/TODO
@@ -0,0 +1,3 @@
+Fix obj library -- doesn't compile with b-make
+Move i386 sources to arch dependant directory
+Fix up make to build insn files from config files.

diff --git a/gnu/usr.bin/cc/cc/Makefile b/gnu/usr.bin/cc/cc/Makefile
index 5c5fcc7..dd60c05 100644 (file)
--- a/gnu/usr.bin/cc/cc/Makefile
+++ b/gnu/usr.bin/cc/cc/Makefile
@@ -4,8 +4,8 @@ PROG=           gcc
 SRCS=           gcc.c version.c obstack.c
 MAN1=          gcc.1 g++.1
 BINDIR=                /usr/bin
 SRCS=           gcc.c version.c obstack.c
 MAN1=          gcc.1 g++.1
 BINDIR=                /usr/bin

-CFLAGS+=        -I$(.CURDIR) -I$(.CURDIR)/../common
-.PATH:          $(.CURDIR)/../common 
+CFLAGS+=        -I$(.CURDIR) -I$(.CURDIR)/../lib
+.PATH:          $(.CURDIR)/../lib 

 
 afterinstall:
        install -c -o $(BINOWN) -g $(BINGRP) -m $(BINMODE) \
 
 afterinstall:
        install -c -o $(BINOWN) -g $(BINGRP) -m $(BINMODE) \

diff --git a/gnu/usr.bin/cc/cc1/Makefile b/gnu/usr.bin/cc/cc1/Makefile
index 4ba2e96..bae9026 100644 (file)
--- a/gnu/usr.bin/cc/cc1/Makefile
+++ b/gnu/usr.bin/cc/cc1/Makefile
@@ -3,11 +3,16 @@
 PROG=          gcc1
 BINDIR=                /usr/libexec
 SRCS=          c-parse.c c-lang.c  c-lex.c c-pragma.c c-decl.c \
 PROG=          gcc1
 BINDIR=                /usr/libexec
 SRCS=          c-parse.c c-lang.c  c-lex.c c-pragma.c c-decl.c \

-               c-typeck.c c-convert.c c-aux-info.c c-iterate.c \
-               $(COMMON_SRC)
+               c-typeck.c c-convert.c c-aux-info.c c-iterate.c 

        
        

-CFLAGS+=       -I. -I$(.CURDIR) -I$(.CURDIR)/../common
+CFLAGS+=       -I. -I$(.CURDIR) -I$(.CURDIR)/../lib

 YFLAGS=
 NOMAN=         noman
 YFLAGS=
 NOMAN=         noman

-.PATH:         $(.CURDIR)/../common
+
+.if exists(${.CURDIR}/../lib/obj)
+LDADD=  -L${.CURDIR}/../lib/obj -lgcc2
+.else
+LDADD=  -L${.CURDIR}/../lib/ -lgcc2
+.endif
+

 .include <bsd.prog.mk>
 .include <bsd.prog.mk>

diff --git a/gnu/usr.bin/cc/cc1obj/Makefile b/gnu/usr.bin/cc/cc1obj/Makefile
index c0b70d9..a06538e 100644 (file)
--- a/gnu/usr.bin/cc/cc1obj/Makefile
+++ b/gnu/usr.bin/cc/cc1obj/Makefile
@@ -2,11 +2,16 @@ PROG=           gcc1obj
 BINDIR=         /usr/libexec
 SRCS=          objc-parse.c objc-act.c  \
                c-lex.c c-pragma.c c-decl.c c-typeck.c c-convert.c\
 BINDIR=         /usr/libexec
 SRCS=          objc-parse.c objc-act.c  \
                c-lex.c c-pragma.c c-decl.c c-typeck.c c-convert.c\

-               c-aux-info.c c-iterate.c \
-               $(COMMON_SRC)
-CFLAGS+=        -I. -I$(.CURDIR) -I$(.CURDIR)/../common
+               c-aux-info.c c-iterate.c 
+CFLAGS+=        -I. -I$(.CURDIR) -I$(.CURDIR)/../lib

 YFLAGS=
 NOMAN=          noman
 YFLAGS=
 NOMAN=          noman

-.PATH:          $(.CURDIR)/../common $(.CURDIR)/../cc1
+.PATH:          $(.CURDIR)/../cc1
+
+.if exists(${.CURDIR}/../lib/obj)
+LDADD=  -L${.CURDIR}/../lib/obj -lgcc2
+.else
+LDADD=  -L${.CURDIR}/../lib/ -lgcc2
+.endif

 
 .include <bsd.prog.mk>
 
 .include <bsd.prog.mk>

diff --git a/gnu/usr.bin/cc/cc1plus/Makefile b/gnu/usr.bin/cc/cc1plus/Makefile
index 9fec38b..46388e3 100644 (file)
--- a/gnu/usr.bin/cc/cc1plus/Makefile
+++ b/gnu/usr.bin/cc/cc1plus/Makefile
@@ -4,11 +4,16 @@ SRCS=         cp-parse.c cp-decl.c cp-decl2.c cp-typeck.c cp-type2.c \
                cp-tree.c cp-ptree.c cp-cvt.c cp-search.c cp-lex.c \
                cp-gc.c cp-call.c cp-class.c cp-init.c cp-method.c \
                cp-except.c cp-expr.c cp-pt.c cp-edsel.c cp-xref.c \
                cp-tree.c cp-ptree.c cp-cvt.c cp-search.c cp-lex.c \
                cp-gc.c cp-call.c cp-class.c cp-init.c cp-method.c \
                cp-except.c cp-expr.c cp-pt.c cp-edsel.c cp-xref.c \

-               cp-spew.c $(COMMON_SRC)
+               cp-spew.c 

 
 

-CFLAGS+=        -I. -I$(.CURDIR) -I$(.CURDIR)/../common
+CFLAGS+=        -I. -I$(.CURDIR) -I$(.CURDIR)/../lib

 NOMAN=         noman
 YFLAGS=
 NOMAN=         noman
 YFLAGS=

-.PATH:          $(.CURDIR)/../common
+
+.if exists(${.CURDIR}/../lib/obj)
+LDADD=  -L${.CURDIR}/../lib/obj -lgcc2
+.else
+LDADD=  -L${.CURDIR}/../lib/ -lgcc2
+.endif

 
 .include <bsd.prog.mk>
 
 .include <bsd.prog.mk>

diff --git a/gnu/usr.bin/cc/cpp/Makefile b/gnu/usr.bin/cc/cpp/Makefile
index e124be8..e564bdf 100644 (file)
--- a/gnu/usr.bin/cc/cpp/Makefile
+++ b/gnu/usr.bin/cc/cpp/Makefile
@@ -4,10 +4,10 @@ PROG=         gcpp
 BINDIR=                /usr/libexec
 SRCS=          cccp.c cexp.y version.c
 MAN1=          gcpp.1
 BINDIR=                /usr/libexec
 SRCS=          cccp.c cexp.y version.c
 MAN1=          gcpp.1

-CFLAGS+=       -I. -I$(.CURDIR) -I$(.CURDIR)/../common \
+CFLAGS+=       -I. -I$(.CURDIR) -I$(.CURDIR)/../lib \

                -DGCC_INCLUDE_DIR=\"\" \
                -DGPLUSPLUS_INCLUDE_DIR=\"/usr/include/g++\"
 YFLAGS=
                -DGCC_INCLUDE_DIR=\"\" \
                -DGPLUSPLUS_INCLUDE_DIR=\"/usr/include/g++\"
 YFLAGS=

-.PATH:         $(.CURDIR)/../common
+.PATH:         $(.CURDIR)/../lib

 
 .include <bsd.prog.mk>
 
 .include <bsd.prog.mk>