Skip to content

Commit

Permalink
update gcc to 13.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
BartmanAbyss committed Sep 10, 2023
1 parent 6d815ba commit 09f6d32
Show file tree
Hide file tree
Showing 31 changed files with 22 additions and 19 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
All notable changes to the "amiga-debug" extension will be documented in this file.
See PR links for more information.

## 1.7.3
- NEW: update gcc to 13.2.0

## 1.7.2
- NEW: update gcc to 13.1.0, binutils, GNU gdb (GDB) 14.0.50.20230511-git
- CHG: replaced MicroKnight debug font with Topaz [#227](https://github.com/BartmanAbyss/vscode-amiga-debug/issues/227)
Expand Down
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# _amiga-debug_ Visual Studio Code Extension

**One-stop Visual Studio Code Extention to compile, debug and profile Amiga C/C++ programs compiled by the bundled gcc 13.1 with the bundled WinUAE/FS-UAE and GDB.**
**One-stop Visual Studio Code Extention to compile, debug and profile Amiga C/C++ programs compiled by the bundled gcc 13.2 with the bundled WinUAE/FS-UAE and GDB.**

## Overview
This fully self-contained extension will help you to quickly develop demos, intros, games, etc. for the Amiga 500, 1200, 4000. It supports C and C++, however no standard library is available. It comes with advanced productivity features like debug overlay, frame profiler, graphics debugger and size profiler.
Expand Down Expand Up @@ -120,7 +120,7 @@ Here's a video showing off all the new features of v1.1, including the frame pro
- `68k-dis.ts` is based on [binutils-gdb/include/opcode/m68k.h](https://github.com/BartmanAbyss/binutils-gdb/blob/master/include/opcode/m68k.h), Copyright (C) 1989-2021 Free Software Foundation, Inc. GPLv3

This extension contains binaries of:
- modified [GCC 13.1.0](https://ftp.gwdg.de/pub/misc/gcc/releases/gcc-13.1.0) (patch included)
- modified [GCC 13.2.0](https://ftp.gwdg.de/pub/misc/gcc/releases/gcc-13.2.0) (patch included)
- Copyright (C) 2023 Free Software Foundation, Inc.
- This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- modified [GNU gdb (GDB) 14.0.50.20230511-git](https://github.com/BartmanAbyss/binutils-gdb)
Expand Down Expand Up @@ -188,15 +188,15 @@ make install

### GCC
```bash
wget https://ftp.gwdg.de/pub/misc/gcc/releases/gcc-13.1.0/gcc-13.1.0.tar.xz
tar -xf gcc-13.1.0.tar.xz
cd gcc-13.1.0
wget https://ftp.gwdg.de/pub/misc/gcc/releases/gcc-13.2.0/gcc-13.2.0.tar.xz
tar -xf gcc-13.2.0.tar.xz
cd gcc-13.2.0
patch -p1 < ../gcc-barto.patch
bash ./contrib/download_prerequisites
cd ..
mkdir -p build-gcc-13.1.0
cd build-gcc-13.1.0
LDFLAGS="-static -static-libgcc -static-libstdc++" ../gcc-13.1.0/configure \
mkdir -p build-gcc-13.2.0
cd build-gcc-13.2.0
LDFLAGS="-static -static-libgcc -static-libstdc++" ../gcc-13.2.0/configure \
--disable-clocale \
--disable-gcov \
--disable-libada \
Expand All @@ -215,9 +215,9 @@ LDFLAGS="-static -static-libgcc -static-libstdc++" ../gcc-13.1.0/configure \
--with-cpu=68000 \
--host=x86_64-w64-mingw32
make all-gcc -j16
# at this point, you're getting an error about not finding gcc-cross. This is okay.
sed 's/selftest # srcextra/# selftest srcextra/' gcc/Makefile >gcc/Makefile.tmp
mv gcc/Makefile.tmp gcc/Makefile
# at this point, you're getting an error about not finding gcc-cross. This is okay.
gcc/gcc-cross.exe -dumpspecs >gcc/specs
# continue the build
make all-gcc -j16
Expand Down Expand Up @@ -255,7 +255,7 @@ WinUAE builds with Visual Studio 2022.

### Create new GCC patch
```bash
diff -ruN gcc-13.1.0 gcc-13.1.0-barto > gcc-barto.patch
diff -ruN gcc-13.2.0 gcc-13.2.0-barto > gcc-barto.patch
```

## Known Issues/TODOs
Expand Down
Binary file modified bin/win32/opt/bin/m68k-amiga-elf-gcc.exe
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (C) 1997-2022 Free Software Foundation, Inc.
/* Copyright (C) 1997-2023 Free Software Foundation, Inc.
This file is part of GCC.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (C) 2007-2022 Free Software Foundation, Inc.
/* Copyright (C) 2007-2023 Free Software Foundation, Inc.
This file is part of GCC.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (C) 2011-2022 Free Software Foundation, Inc.
/* Copyright (C) 2011-2023 Free Software Foundation, Inc.
This file is part of GCC.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* Copyright (C) 2004-2022 Free Software Foundation, Inc.
/* Copyright (C) 2004-2023 Free Software Foundation, Inc.
Contributed by Apple, Inc.
This file is part of GCC.
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ dlopen=''
dlpreopen=''

# Directory that this library needs to be installed in:
libdir='/mnt/c/amiga-mingw/opt/libexec/gcc/m68k-amiga-elf/13.1.0'
libdir='/mnt/c/amiga-mingw/opt/libexec/gcc/m68k-amiga-elf/13.2.0'
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion ci/clean-up.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ IFS=$'\n\t'
set -x

# also change in download.sh
export GCC_VERSION="12.2.0"
export GCC_VERSION="13.2.0"

cd output
rm -rf include
Expand Down
2 changes: 1 addition & 1 deletion ci/gcc/download.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ set -euo pipefail
IFS=$'\n\t'
set -x

export GCC_VERSION="gcc-13.1.0"
export GCC_VERSION="gcc-13.2.0"

wget --no-verbose https://ftp.gwdg.de/pub/misc/gcc/releases/$GCC_VERSION/$GCC_VERSION.tar.xz
tar -xf $GCC_VERSION.tar.xz
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"name": "amiga-debug",
"displayName": "Amiga C/C++ Compile, Debug & Profile",
"publisher": "BartmanAbyss",
"description": "One-stop VS Code Extension to compile, debug and profile Amiga C/C++ programs compiled by the bundled gcc 13.1 with the bundled WinUAE/FS-UAE and GDB",
"description": "One-stop VS Code Extension to compile, debug and profile Amiga C/C++ programs compiled by the bundled gcc 13.2 with the bundled WinUAE/FS-UAE and GDB",
"repository": {
"url": "https://github.com/BartmanAbyss/vscode-amiga-debug"
},
"version": "1.7.2",
"version": "1.7.3",
"license": "GPL-3.0-or-later",
"engines": {
"vscode": "^1.46.0"
Expand Down
Empty file removed template/obj/DELETE.ME
Empty file.
Empty file removed template/out/DELETE.ME
Empty file.

0 comments on commit 09f6d32

Please sign in to comment.