Module Name:    src
Committed By:   matt
Date:           Wed May 27 15:33:41 UTC 2015

Modified Files:
        src/external/gpl3/gcc/dist/gcc: config.gcc
        src/external/gpl3/gcc/dist/gcc/config/arm: netbsd-eabi.h
Added Files:
        src/external/gpl3/gcc/dist/gcc/config/arm: t-netbsdeabi

Log Message:
Make MULTILIBS work for oabi


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/external/gpl3/gcc/dist/gcc/config.gcc
cvs rdiff -u -r1.13 -r1.14 \
    src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsdeabi

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/gcc/dist/gcc/config.gcc
diff -u src/external/gpl3/gcc/dist/gcc/config.gcc:1.32 src/external/gpl3/gcc/dist/gcc/config.gcc:1.33
--- src/external/gpl3/gcc/dist/gcc/config.gcc:1.32	Sat Jan 10 01:06:41 2015
+++ src/external/gpl3/gcc/dist/gcc/config.gcc	Wed May 27 15:33:41 2015
@@ -897,7 +897,7 @@ arm*-*-netbsdelf*)
 	case ${target} in
 	arm*-*-netbsdelf-*eabi*)
 	    tm_file="$tm_file arm/bpabi.h arm/netbsd-elf.h arm/netbsd-eabi.h"
-	    tmake_file="$tmake_file arm/t-bpabi"
+	    tmake_file="$tmake_file arm/t-bpabi arm/t-netbsdeabi"
 	    # The BPABI long long divmod functions return a 128-bit value in
 	    # registers r0-r3.  Correctly modeling that requires the use of
 	    # TImode.

Index: src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h
diff -u src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h:1.13 src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h:1.14
--- src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h:1.13	Fri May 30 18:31:31 2014
+++ src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h	Wed May 27 15:33:41 2015
@@ -40,8 +40,6 @@
 #define TARGET_LINKER_EMULATION TARGET_LINKER_LITTLE_EMULATION
 #endif
 
-#undef MULTILIB_DEFAULTS
-
 #undef ARM_DEFAULT_ABI
 #define ARM_DEFAULT_ABI ARM_ABI_AAPCS_LINUX
 

Added files:

Index: src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsdeabi
diff -u /dev/null src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsdeabi:1.1
--- /dev/null	Wed May 27 15:33:41 2015
+++ src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsdeabi	Wed May 27 15:33:41 2015
@@ -0,0 +1,8 @@
+# NetBSD has (will have) "non-native" libraries in /usr/lib/<arch>.
+
+MULTILIB_OPTIONS = mabi=aapcs-linux/mabi=apcs-gnu
+MULTILIB_DIRNAMES = eabi oabi
+MULTILIB_OSDIRNAMES = . ../lib/oabi
+
+LIBGCC = stmp-multilib
+INSTALL_LIBGCC = install-multilib

Reply via email to