浏览代码

update config.mak presets to sync with modern expectations

config.mak no longer needs to do so much explicitly; the mandatory
options for the target or for musl are auto-selected by the makefile.
Rich Felker 8 年之前
父节点
当前提交
347bfc9f61
共有 2 个文件被更改,包括 15 次插入23 次删除
  1. 4 12
      presets/j2-fdpic
  2. 11 11
      presets/j2-pie-gplv2

+ 4 - 12
presets/j2-fdpic

@@ -1,14 +1,6 @@
-OUTPUT = $(PWD)/output
 TARGET = sh2eb-linux-muslfdpic
-
-BINUTILS_VER = 2.25.1
-GCC_VER = 5.2.0
-
-COMMON_CONFIG += --disable-nls
-COMMON_CONFIG += MAKEINFO=/bin/false
-GCC_CONFIG += --enable-languages=c,c++
-GCC_CONFIG += --disable-libquadmath --disable-decimal-float
-GCC_CONFIG += --disable-multilib
-
 GCC_CONFIG += --with-cpu=mj2
-GCC_CONFIG += --enable-fdpic
+
+# Optional to produce a smaller toolchain:
+# COMMON_CONFIG += --disable-nls
+# GCC_CONFIG += --disable-libquadmath --disable-decimal-float

+ 11 - 11
presets/j2-pie-gplv2

@@ -1,14 +1,14 @@
-OUTPUT = $(PWD)/output
 TARGET = sh2eb-linux-musl
+GCC_CONFIG += --with-cpu=mj2
+GCC_CONFIG += --enable-default-pie
 
-GCC_VER = 4.2.1
-BINUTILS_VER = 397a64b3
-BINUTILS_SITE = http://landley.net/aboriginal/mirror
-
-COMMON_CONFIG += --disable-nls
-BINUTILS_CONFIG += MAKEINFO=/bin/false
-GCC_CONFIG += --enable-languages=c,c++
-GCC_CONFIG += --disable-libquadmath --disable-decimal-float
-GCC_CONFIG += --disable-multilib
+# This configuration should be compatible with the old GPLv2 tools,
+# but it is not regularly tested. Uncomment the following and remove
+# the above --with-cpu=mj2 in order to try:
+# GCC_VER = 4.2.1
+# BINUTILS_VER = 397a64b3
+# BINUTILS_SITE = http://landley.net/aboriginal/mirror
 
-GCC_CONFIG += --enable-default-pie
+# Optional to produce a smaller toolchain:
+# COMMON_CONFIG += --disable-nls
+# GCC_CONFIG += --disable-libquadmath --disable-decimal-float