diff options
author | Brad Smith <brad@cvs.openbsd.org> | 2005-01-25 05:31:05 +0000 |
---|---|---|
committer | Brad Smith <brad@cvs.openbsd.org> | 2005-01-25 05:31:05 +0000 |
commit | 13d4c08a39faeab278fdc17dab9d3e10ca4a17c8 (patch) | |
tree | 7a85e1087d61867703880146bb0fbb16b0af0f81 /gnu/lib/libobjc | |
parent | ac81a348c54ff04e221ed6836be6ee763c6a9f8d (diff) |
simplify OpenBSD case by using arch(1) and sed to grab
the machine architecture. We now output amd64 instead
of x86_64 as it should be.
ok deraadt@ pvalchev@
Diffstat (limited to 'gnu/lib/libobjc')
-rwxr-xr-x | gnu/lib/libobjc/config.guess | 39 | ||||
-rwxr-xr-x | gnu/lib/libobjc/config.sub | 6 |
2 files changed, 8 insertions, 37 deletions
diff --git a/gnu/lib/libobjc/config.guess b/gnu/lib/libobjc/config.guess index e0173710349..c989465abca 100755 --- a/gnu/lib/libobjc/config.guess +++ b/gnu/lib/libobjc/config.guess @@ -196,44 +196,9 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" exit 0 ;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - cats:OpenBSD:*:*) - echo arm-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - luna88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - macppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvmeppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mips64-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sun3:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - zaurus:OpenBSD:*:*) - echo arm-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} exit 0 ;; *:MicroBSD:*:*) echo ${UNAME_MACHINE}-unknown-microbsd${UNAME_RELEASE} diff --git a/gnu/lib/libobjc/config.sub b/gnu/lib/libobjc/config.sub index 2ab7f25694c..53f9660a58a 100755 --- a/gnu/lib/libobjc/config.sub +++ b/gnu/lib/libobjc/config.sub @@ -371,6 +371,12 @@ case $basic_machine in basic_machine=a29k-none os=-bsd ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; amdahl) basic_machine=580-amdahl os=-sysv |