Remove duplication from specs.

Call the compile/ferment one "compile-or-ferment". We need that one to serve both roles, because "cc -o foo.c". Remove the cpp/cc1 bits from the stub and bake "pure linker specs".
rumpkernel · Jun 24, 2015 · 8482a42 · 8482a42
1 parent 00014ec
commit 8482a42
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 25 deletions.
diff --git a/app-tools/Makefile.app-tools b/app-tools/Makefile.app-tools
@@ -12,7 +12,7 @@ $(error ${_APPTOOLS_MISSING} not defined)
 endif
 
 APP_TOOL_FILES=		cc c++ configure make gmake
-APP_TOOL_FILES+=	specs-ferment specs-stub specs-bake
+APP_TOOL_FILES+=	specs-compile_or_ferment specs-stub specs-bake
 
 APP_TOOL_PASSTHROUGH=	ar as cpp ld nm objcopy objdump ranlib readelf
 APP_TOOL_PASSTHROUGH+=	size strings strip

diff --git a/app-tools/cc.in b/app-tools/cc.in
@@ -74,10 +74,8 @@ done
 
 case ${MODE} in
 compile)
-	# If we're compiling we don't really care which specs get used, might
-	# as well use the -bake ones.
 	exec ${CC} ${CFLAGS} -no-integrated-cpp \
-	    -specs=!APPTOOLS!/rumprun-!APPTOOLS_PLATFORM!-specs-bake \
+	    -specs=!APPTOOLS!/rumprun-!APPTOOLS_PLATFORM!-specs-compile_or_ferment \
 	    "$@" ${EXTRALIBS}
 	;;
 bake)
@@ -91,7 +89,7 @@ ferment)
 	# with no rump components. '-u main' is necessary to pull in main if the
 	# user is linking it in from a library.
 	${CC} ${CFLAGS} -no-integrated-cpp \
-	    -specs=!APPTOOLS!/rumprun-!APPTOOLS_PLATFORM!-specs-ferment \
+	    -specs=!APPTOOLS!/rumprun-!APPTOOLS_PLATFORM!-specs-compile_or_ferment \
 	    -Wl,-r -Wl,-u,main \
 	    -Wl,--defsym=__RuMpRuN_fermented__=0 \
 	    "$@" ${EXTRALIBS} || die

diff --git a/app-tools/specs-bake.in b/app-tools/specs-bake.in
@@ -1,13 +1,3 @@
-%rename cpp_options old_cpp_options
-
-*cpp_options:
--nostdinc -isystem !BASE!/rumprun/include -isystem !BASE!/rumprun/include/c++ %(old_cpp_options) !CPPFLAGS! -D__RUMPRUN__
-
-%rename cc1_options old_cc1_options
-
-*cc1_options:
-%(old_cc1_options) -fno-stack-protector -fno-builtin-sin -fno-builtin-sinf -fno-builtin-cos -fno-builtin-cosf
-
 *startfile:
 !HEAD_OBJ! !OBJS!
 

diff --git a/app-tools/specs-ferment.in → app-tools/specs-compile_or_ferment.in b/app-tools/specs-ferment.in → app-tools/specs-compile_or_ferment.in
diff --git a/app-tools/specs-stub.in b/app-tools/specs-stub.in
@@ -1,13 +1,3 @@
-%rename cpp_options old_cpp_options
-
-*cpp_options:
--nostdinc -isystem !BASE!/rumprun/include -isystem !BASE!/rumprun/include/c++ %(old_cpp_options) !CPPFLAGS! -D__RUMPRUN__
-
-%rename cc1_options old_cc1_options
-
-*cc1_options:
-%(old_cc1_options) -fno-stack-protector -fno-builtin-sin -fno-builtin-sinf -fno-builtin-cos -fno-builtin-cosf
-
 *startfile: