netsurf: branch master updated. release/3.3-512-g6d474e7
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/6d474e74e6a967563ea1b...
...commit http://git.netsurf-browser.org/netsurf.git/commit/6d474e74e6a967563ea1b85...
...tree http://git.netsurf-browser.org/netsurf.git/tree/6d474e74e6a967563ea1b85f4...
The branch, master has been updated
via 6d474e74e6a967563ea1b85f4d8576ebc41153f1 (commit)
from 479b8acce8cdc4009c83aaed2849fe48528d4603 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=6d474e74e6a967563ea...
commit 6d474e74e6a967563ea1b85f4d8576ebc41153f1
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Prettier hotlist toolbar
diff --git a/amiga/gui.c b/amiga/gui.c
index 31339fb..f9dcec8 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -59,6 +59,7 @@
#include <proto/button.h>
#include <proto/chooser.h>
#include <proto/clicktab.h>
+#include <proto/label.h>
#include <proto/layout.h>
#include <proto/scroller.h>
#include <proto/space.h>
@@ -77,6 +78,7 @@
#include <gadgets/string.h>
#include <images/bevel.h>
#include <images/bitmap.h>
+#include <images/label.h>
#include <reaction/reaction_macros.h>
@@ -3038,15 +3040,44 @@ static bool ami_gui_hotlist_add(void *userdata, int level, int item, const char
{
struct ami_gui_tb_userdata *tb_userdata = (struct ami_gui_tb_userdata *)userdata;
struct Node *speed_button_node;
+ char menu_icon[1024];
if(level != 1) return false;
if(item > AMI_GUI_TOOLBAR_MAX) return false;
if(is_folder == true) return false;
- tb_userdata->gw->hotlist_toolbar_lab[item] = ami_utf8_easy(title);
+ char *utf8title = ami_utf8_easy(title);
+ if(utf8title == NULL) return false;
+
+ char *iconname = ami_gui_get_cache_favicon_name(url, true);
+ if (iconname == NULL) iconname = ASPrintf("icons/content.png");
+ ami_locate_resource(menu_icon, iconname);
+
+ tb_userdata->gw->hotlist_toolbar_lab[item] = BitMapObj,
+ IA_Scalable, TRUE,
+ BITMAP_Screen, scrn,
+ BITMAP_SourceFile, menu_icon,
+ BITMAP_Masking, TRUE,
+ BitMapEnd;
+
+ /* \todo make this scale the bitmap to these dimensions */
+ SetAttrs(tb_userdata->gw->hotlist_toolbar_lab[item],
+ BITMAP_Width, 16,
+ BITMAP_Height, 16,
+ TAG_DONE);
+
+ Object *lab_item = LabelObj,
+ // LABEL_DrawInfo, dri,
+ LABEL_DisposeImage, TRUE,
+ LABEL_Image, tb_userdata->gw->hotlist_toolbar_lab[item],
+ LABEL_Text, " ",
+ LABEL_Text, utf8title,
+ LabelEnd;
+
+ free(utf8title);
speed_button_node = AllocSpeedButtonNode(item,
- SBNA_Text, tb_userdata->gw->hotlist_toolbar_lab[item],
+ SBNA_Image, lab_item,
SBNA_UserData, (void *)url,
TAG_DONE);
@@ -3134,7 +3165,7 @@ static void ami_gui_hotlist_toolbar_free(struct gui_window_2 *gwin, struct List
for(i = 0; i < AMI_GUI_TOOLBAR_MAX; i++) {
if(gwin->hotlist_toolbar_lab[i]) {
- free(gwin->hotlist_toolbar_lab[i]);
+ DisposeObject(gwin->hotlist_toolbar_lab[i]);
gwin->hotlist_toolbar_lab[i] = NULL;
}
}
diff --git a/amiga/gui.h b/amiga/gui.h
index 6a01082..86dedcb 100644
--- a/amiga/gui.h
+++ b/amiga/gui.h
@@ -117,7 +117,7 @@ struct gui_window_2 {
UBYTE *menutype;
struct NewMenu *menu;
ULONG hotlist_items;
- char *hotlist_toolbar_lab[AMI_GUI_TOOLBAR_MAX];
+ Object *hotlist_toolbar_lab[AMI_GUI_TOOLBAR_MAX];
struct List hotlist_toolbar_list;
struct List *web_search_list;
Object *search_bm;
-----------------------------------------------------------------------
Summary of changes:
amiga/gui.c | 37 ++++++++++++++++++++++++++++++++++---
amiga/gui.h | 2 +-
2 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/amiga/gui.c b/amiga/gui.c
index 31339fb..f9dcec8 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -59,6 +59,7 @@
#include <proto/button.h>
#include <proto/chooser.h>
#include <proto/clicktab.h>
+#include <proto/label.h>
#include <proto/layout.h>
#include <proto/scroller.h>
#include <proto/space.h>
@@ -77,6 +78,7 @@
#include <gadgets/string.h>
#include <images/bevel.h>
#include <images/bitmap.h>
+#include <images/label.h>
#include <reaction/reaction_macros.h>
@@ -3038,15 +3040,44 @@ static bool ami_gui_hotlist_add(void *userdata, int level, int item, const char
{
struct ami_gui_tb_userdata *tb_userdata = (struct ami_gui_tb_userdata *)userdata;
struct Node *speed_button_node;
+ char menu_icon[1024];
if(level != 1) return false;
if(item > AMI_GUI_TOOLBAR_MAX) return false;
if(is_folder == true) return false;
- tb_userdata->gw->hotlist_toolbar_lab[item] = ami_utf8_easy(title);
+ char *utf8title = ami_utf8_easy(title);
+ if(utf8title == NULL) return false;
+
+ char *iconname = ami_gui_get_cache_favicon_name(url, true);
+ if (iconname == NULL) iconname = ASPrintf("icons/content.png");
+ ami_locate_resource(menu_icon, iconname);
+
+ tb_userdata->gw->hotlist_toolbar_lab[item] = BitMapObj,
+ IA_Scalable, TRUE,
+ BITMAP_Screen, scrn,
+ BITMAP_SourceFile, menu_icon,
+ BITMAP_Masking, TRUE,
+ BitMapEnd;
+
+ /* \todo make this scale the bitmap to these dimensions */
+ SetAttrs(tb_userdata->gw->hotlist_toolbar_lab[item],
+ BITMAP_Width, 16,
+ BITMAP_Height, 16,
+ TAG_DONE);
+
+ Object *lab_item = LabelObj,
+ // LABEL_DrawInfo, dri,
+ LABEL_DisposeImage, TRUE,
+ LABEL_Image, tb_userdata->gw->hotlist_toolbar_lab[item],
+ LABEL_Text, " ",
+ LABEL_Text, utf8title,
+ LabelEnd;
+
+ free(utf8title);
speed_button_node = AllocSpeedButtonNode(item,
- SBNA_Text, tb_userdata->gw->hotlist_toolbar_lab[item],
+ SBNA_Image, lab_item,
SBNA_UserData, (void *)url,
TAG_DONE);
@@ -3134,7 +3165,7 @@ static void ami_gui_hotlist_toolbar_free(struct gui_window_2 *gwin, struct List
for(i = 0; i < AMI_GUI_TOOLBAR_MAX; i++) {
if(gwin->hotlist_toolbar_lab[i]) {
- free(gwin->hotlist_toolbar_lab[i]);
+ DisposeObject(gwin->hotlist_toolbar_lab[i]);
gwin->hotlist_toolbar_lab[i] = NULL;
}
}
diff --git a/amiga/gui.h b/amiga/gui.h
index 6a01082..86dedcb 100644
--- a/amiga/gui.h
+++ b/amiga/gui.h
@@ -117,7 +117,7 @@ struct gui_window_2 {
UBYTE *menutype;
struct NewMenu *menu;
ULONG hotlist_items;
- char *hotlist_toolbar_lab[AMI_GUI_TOOLBAR_MAX];
+ Object *hotlist_toolbar_lab[AMI_GUI_TOOLBAR_MAX];
struct List hotlist_toolbar_list;
struct List *web_search_list;
Object *search_bm;
--
NetSurf Browser
7 years, 6 months
netsurf: branch master updated. release/3.3-511-g479b8ac
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/479b8acce8cdc4009c83a...
...commit http://git.netsurf-browser.org/netsurf.git/commit/479b8acce8cdc4009c83aae...
...tree http://git.netsurf-browser.org/netsurf.git/tree/479b8acce8cdc4009c83aaed2...
The branch, master has been updated
via 479b8acce8cdc4009c83aaed2849fe48528d4603 (commit)
from 5ad337a7b5b4793dfebc8a4d333f8995f6c8877b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=479b8acce8cdc4009c8...
commit 479b8acce8cdc4009c83aaed2849fe48528d4603
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Don't position the statusbar based on font height
The statusbar has a finite height because it is sitting in a window border which does not adjust with font size.
diff --git a/amiga/gui.c b/amiga/gui.c
index edb5220..31339fb 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -4240,9 +4240,9 @@ gui_window_create(struct browser_window *bw,
"frameiclass",
IA_Recessed, TRUE,
#endif
- IA_Top, - dri->dri_Font->tf_Baseline - 3,
+ IA_Top, (int)(- ceil((scrn->WBorBottom + height) / 2)),
IA_Left, -4,
- IA_Height, 1 + height - scrn->WBorBottom,
+ IA_Height, 2 + height - scrn->WBorBottom,
IA_Label, NULL,
IA_InBorder, TRUE,
IA_Screen, scrn,
-----------------------------------------------------------------------
Summary of changes:
amiga/gui.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/amiga/gui.c b/amiga/gui.c
index edb5220..31339fb 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -4240,9 +4240,9 @@ gui_window_create(struct browser_window *bw,
"frameiclass",
IA_Recessed, TRUE,
#endif
- IA_Top, - dri->dri_Font->tf_Baseline - 3,
+ IA_Top, (int)(- ceil((scrn->WBorBottom + height) / 2)),
IA_Left, -4,
- IA_Height, 1 + height - scrn->WBorBottom,
+ IA_Height, 2 + height - scrn->WBorBottom,
IA_Label, NULL,
IA_InBorder, TRUE,
IA_Screen, scrn,
--
NetSurf Browser
7 years, 6 months
toolchains: branch master updated. 241aeaac6d0a63f3f8f81237a31154f4719b7d85
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/toolchains.git/shortlog/241aeaac6d0a63f3f8...
...commit http://git.netsurf-browser.org/toolchains.git/commit/241aeaac6d0a63f3f8f8...
...tree http://git.netsurf-browser.org/toolchains.git/tree/241aeaac6d0a63f3f8f812...
The branch, master has been updated
via 241aeaac6d0a63f3f8f81237a31154f4719b7d85 (commit)
from b9b1084efe62a75c566bc4b72e9d6beac48955bc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=241aeaac6d0a63f3...
commit 241aeaac6d0a63f3f8f81237a31154f4719b7d85
Author: Michael Drake <michael.drake(a)codethink.co.uk>
Commit: Michael Drake <michael.drake(a)codethink.co.uk>
Bump libpng for latest CVEs.
diff --git a/sdk/Makefile b/sdk/Makefile
index f26da00..6da9e44 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -27,7 +27,7 @@ VERSION_ZLIB := 1.2.8
VERSION_LIBICONV := 1.14
VERSION_LIBTRE := 0.8.0
VERSION_OPENSSL := 1.0.1p
-VERSION_LIBPNG := 1.6.17
+VERSION_LIBPNG := 1.6.19
VERSION_LIBJPEG := 8d
VERSION_LIBJPEG_TURBO := 1.4.2
VERSION_LIBCARES := 1.10.0
-----------------------------------------------------------------------
Summary of changes:
sdk/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sdk/Makefile b/sdk/Makefile
index f26da00..6da9e44 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -27,7 +27,7 @@ VERSION_ZLIB := 1.2.8
VERSION_LIBICONV := 1.14
VERSION_LIBTRE := 0.8.0
VERSION_OPENSSL := 1.0.1p
-VERSION_LIBPNG := 1.6.17
+VERSION_LIBPNG := 1.6.19
VERSION_LIBJPEG := 8d
VERSION_LIBJPEG_TURBO := 1.4.2
VERSION_LIBCARES := 1.10.0
--
Cross-compilation toolchains and environments
7 years, 6 months
netsurf: branch master updated. release/3.3-510-g5ad337a
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/5ad337a7b5b4793dfebc8...
...commit http://git.netsurf-browser.org/netsurf.git/commit/5ad337a7b5b4793dfebc8a4...
...tree http://git.netsurf-browser.org/netsurf.git/tree/5ad337a7b5b4793dfebc8a4d3...
The branch, master has been updated
via 5ad337a7b5b4793dfebc8a4d333f8995f6c8877b (commit)
from 6fbe30c617158e40827a055f7c5c1527eb886672 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=5ad337a7b5b4793dfeb...
commit 5ad337a7b5b4793dfebc8a4d333f8995f6c8877b
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Don't translate F8/F9/F10 into printable characters.
diff --git a/amiga/gui.c b/amiga/gui.c
index 4980e8c..edb5220 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -1211,6 +1211,9 @@ int ami_key_to_nskey(ULONG keycode, struct InputEvent *ie)
else nskey = NS_KEY_TAB;
break;
case RAWKEY_F5:
+ case RAWKEY_F8:
+ case RAWKEY_F9:
+ case RAWKEY_F10:
case RAWKEY_HELP:
// don't translate
nskey = keycode;
@@ -2333,6 +2336,7 @@ static void ami_handle_msg(void)
ami_gui_history(gwin, true);
break;
+ /* RawKeys. NB: These are passthrus in ami_key_to_nskey() */
case RAWKEY_F5: // reload
if(browser_window_reload_available(gwin->gw->bw))
browser_window_reload(gwin->gw->bw,false);
-----------------------------------------------------------------------
Summary of changes:
amiga/gui.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/amiga/gui.c b/amiga/gui.c
index 4980e8c..edb5220 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -1211,6 +1211,9 @@ int ami_key_to_nskey(ULONG keycode, struct InputEvent *ie)
else nskey = NS_KEY_TAB;
break;
case RAWKEY_F5:
+ case RAWKEY_F8:
+ case RAWKEY_F9:
+ case RAWKEY_F10:
case RAWKEY_HELP:
// don't translate
nskey = keycode;
@@ -2333,6 +2336,7 @@ static void ami_handle_msg(void)
ami_gui_history(gwin, true);
break;
+ /* RawKeys. NB: These are passthrus in ami_key_to_nskey() */
case RAWKEY_F5: // reload
if(browser_window_reload_available(gwin->gw->bw))
browser_window_reload(gwin->gw->bw,false);
--
NetSurf Browser
7 years, 6 months
netsurf: branch master updated. release/3.3-509-g6fbe30c
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/6fbe30c617158e40827a0...
...commit http://git.netsurf-browser.org/netsurf.git/commit/6fbe30c617158e40827a055...
...tree http://git.netsurf-browser.org/netsurf.git/tree/6fbe30c617158e40827a055f7...
The branch, master has been updated
via 6fbe30c617158e40827a055f7c5c1527eb886672 (commit)
from 045b254c157025a177ae8b7db36462305b1c5c50 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=6fbe30c617158e40827...
commit 6fbe30c617158e40827a055f7c5c1527eb886672
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Improve the position of the status bar gadget at different font sizes
diff --git a/amiga/gui.c b/amiga/gui.c
index 160795e..4980e8c 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -4217,7 +4217,7 @@ gui_window_create(struct browser_window *bw,
GA_ID, GID_STATUS,
GA_Left, scrn->WBorLeft + 2,
#ifdef __amigaos4__
- GA_RelBottom, -((2 + height + scrn->WBorBottom - scrn->RastPort.TxHeight)/2),
+ GA_RelBottom, scrn->WBorBottom - (height/2),
GA_BottomBorder, TRUE,
#else
GA_Top, g->shared->win->Height,
@@ -4236,7 +4236,7 @@ gui_window_create(struct browser_window *bw,
"frameiclass",
IA_Recessed, TRUE,
#endif
- IA_Top, 2 - (scrn->RastPort.TxHeight),
+ IA_Top, - dri->dri_Font->tf_Baseline - 3,
IA_Left, -4,
IA_Height, 1 + height - scrn->WBorBottom,
IA_Label, NULL,
-----------------------------------------------------------------------
Summary of changes:
amiga/gui.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/amiga/gui.c b/amiga/gui.c
index 160795e..4980e8c 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -4217,7 +4217,7 @@ gui_window_create(struct browser_window *bw,
GA_ID, GID_STATUS,
GA_Left, scrn->WBorLeft + 2,
#ifdef __amigaos4__
- GA_RelBottom, -((2 + height + scrn->WBorBottom - scrn->RastPort.TxHeight)/2),
+ GA_RelBottom, scrn->WBorBottom - (height/2),
GA_BottomBorder, TRUE,
#else
GA_Top, g->shared->win->Height,
@@ -4236,7 +4236,7 @@ gui_window_create(struct browser_window *bw,
"frameiclass",
IA_Recessed, TRUE,
#endif
- IA_Top, 2 - (scrn->RastPort.TxHeight),
+ IA_Top, - dri->dri_Font->tf_Baseline - 3,
IA_Left, -4,
IA_Height, 1 + height - scrn->WBorBottom,
IA_Label, NULL,
--
NetSurf Browser
7 years, 6 months
netsurf: branch master updated. release/3.3-508-g045b254
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/045b254c157025a177ae8...
...commit http://git.netsurf-browser.org/netsurf.git/commit/045b254c157025a177ae8b7...
...tree http://git.netsurf-browser.org/netsurf.git/tree/045b254c157025a177ae8b7db...
The branch, master has been updated
via 045b254c157025a177ae8b7db36462305b1c5c50 (commit)
via 0feb291c2e3041004b676ddd56301beaf78851a5 (commit)
via bf6d56c7fe14029ed1a04111bfa1bc53414707c2 (commit)
from 28be6d2d79ba87cc231f28ce25525dd2ae60e5ed (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=045b254c157025a177a...
commit 045b254c157025a177ae8b7db36462305b1c5c50
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Add missing NSOPTS/M command line arg to documentation.
diff --git a/amiga/dist/NetSurf.guide b/amiga/dist/NetSurf.guide
index aa5b66d..7265c6c 100755
--- a/amiga/dist/NetSurf.guide
+++ b/amiga/dist/NetSurf.guide
@@ -109,14 +109,12 @@ This section contains options for exporting to PDF. It is not enabled in curren
@endnode
@node cli "Command line options"
-NetSurf URL/K,FORCE/S
+NetSurf URL/K,FORCE/S,NSOPTS/M
Where:
-
-URL = Address of page to open on startup
-FORCE = Force new instance of NetSurf to open (has some limitations, use for debugging only)
-
-Note that there may be other generic options which can also be specified.
+URL = Address of page to open on startup
+FORCE = Force new instance of NetSurf to open (has some limitations, use for debugging only)
+NSOPTS = Catches everything else and passes it to the NetSurf core command line parser
@endnode
@node options "Options file"
@@ -278,7 +276,7 @@ Items in the "Hotlist menu" folder node, up to a maximum (currently) of 40 items
Items in folders within the Menu folder node will be converted to subitems in the menu.
-Folders more than one level down in the heirarchy will become menu items with no action. Items deeper will not be included in the menu at all.
+Folders more than one level down in the heirarchy will become menu items with no action. Items deeper will not be included in the menu at all (until we switch to using menuclass).
Folders with no items in them will show up disabled in the menu. If they are named "--" they will be displayed as separator bars.
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=0feb291c2e3041004b6...
commit 0feb291c2e3041004b676ddd56301beaf78851a5
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Add F8/F9/F10 as shortcuts to the scale functionality
diff --git a/amiga/dist/NetSurf.guide b/amiga/dist/NetSurf.guide
index 5db267a..aa5b66d 100755
--- a/amiga/dist/NetSurf.guide
+++ b/amiga/dist/NetSurf.guide
@@ -336,7 +336,7 @@ The Installer script will set the MIMETYPE tooltype on basic relevant default fi
This is a list of the keyboard shortcuts used in NetSurf
- RAmiga + R or F5 (reload the current page)
-- PageUp/Down (scroll up/down to one page)
+- PageUp/Down/Space (scroll up/down to one page)
- Home/End (go to top/bottom of the page)
- Left/Right/Up/Down (scroll the page)
- RAmiga + U (activate the URL bar)
@@ -345,26 +345,27 @@ This is a list of the keyboard shortcuts used in NetSurf
Keyboard shortcuts used in NetSurf menu
-- RAmiga + N (open a new window)
-- RAmiga + T (open a new tab)
-- RAmiga + O (open a local file)
-- RAmiga + S (save source page)
-- RAmiga + K (close current tab)
-- RAmiga + P (print a page)
-- RAmiga + ? (about NetSurf)
-- RAmiga + Q (quit NetSurf)
-- RAmiga + X (cut)
-- RAmiga + C (copy)
-- RAmiga + V (paste)
-- RAmiga + A (select all)
-- RAmiga + Z (clear selection)
-- RAmiga + F (find a string/text)
-- RAmiga + - (decrease font)
-- RAmiga + = (normal font)
-- RAmiga + + (increase font)
-- RAmiga + B (add link to bookmark)
-- RAmiga + H (show bookmarks)
-- RAmiga + E (execute script)
+- RAmiga + N (open a new window)
+- RAmiga + T (open a new tab)
+- RAmiga + O (open a local file)
+- RAmiga + S (save source page)
+- RAmiga + K (close current tab)
+- RAmiga + P (print a page)
+- RAmiga + ? (about NetSurf)
+- RAmiga + Q (quit NetSurf)
+- RAmiga + X (cut)
+- RAmiga + C (copy)
+- RAmiga + V (paste)
+- RAmiga + A (select all)
+- RAmiga + Z (undo)
+- RAmiga + Y (redo)
+- RAmiga + F (find a string/text)
+- RAmiga + - or F9 (decrease scale)
+- RAmiga + = or F8 (normal scale)
+- RAmiga + + or F10 (increase scale)
+- RAmiga + B (add link to bookmark)
+- RAmiga + H (show bookmarks)
+- RAmiga + E (execute script)
@endnode
diff --git a/amiga/gui.c b/amiga/gui.c
index 9d5aeb0..160795e 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -2337,6 +2337,18 @@ static void ami_handle_msg(void)
if(browser_window_reload_available(gwin->gw->bw))
browser_window_reload(gwin->gw->bw,false);
break;
+
+ case RAWKEY_F8: // scale 100%
+ ami_gui_set_scale(gwin->gw, 1.0);
+ break;
+
+ case RAWKEY_F9: // decrease scale
+ ami_gui_set_scale(gwin->gw, gwin->gw->scale - 0.1);
+ break;
+
+ case RAWKEY_F10: // increase scale
+ ami_gui_set_scale(gwin->gw, gwin->gw->scale + 0.1);
+ break;
case RAWKEY_HELP: // help
ami_help_open(AMI_HELP_GUI, scrn);
@@ -3334,6 +3346,7 @@ int ami_gui_count_windows(int window, int *tabs)
*/
void ami_gui_set_scale(struct gui_window *gw, float scale)
{
+ if(scale <= 0.0) return;
gw->scale = scale;
browser_window_set_scale(gw->bw, scale, true);
}
diff --git a/amiga/menu.c b/amiga/menu.c
index 25345d0..6d885dc 100644
--- a/amiga/menu.c
+++ b/amiga/menu.c
@@ -379,8 +379,7 @@ HOOKF(void, ami_menu_item_browser_scale_decrease, APTR, window, struct IntuiMess
struct gui_window_2 *gwin;
GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin);
- if(gwin->gw->scale > 0.1)
- ami_gui_set_scale(gwin->gw, gwin->gw->scale - 0.1);
+ ami_gui_set_scale(gwin->gw, gwin->gw->scale - 0.1);
}
HOOKF(void, ami_menu_item_browser_scale_normal, APTR, window, struct IntuiMessage *)
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=bf6d56c7fe14029ed1a...
commit bf6d56c7fe14029ed1a04111bfa1bc53414707c2
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Allow space bar to be used to page down
diff --git a/amiga/gui.c b/amiga/gui.c
index f69b26a..9d5aeb0 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -652,7 +652,7 @@ static void ami_amiupdate(void)
DevNameFromLock(lock, (STRPTR)&filename, 1024L, DN_FULLPATH);
- if(amiupdatefh = FOpen("ENVARC:AppPaths/NetSurf", MODE_NEWFILE, 0)) {
+ if((amiupdatefh = FOpen("ENVARC:AppPaths/NetSurf", MODE_NEWFILE, 0))) {
FPuts(amiupdatefh, (CONST_STRPTR)&filename);
FClose(amiupdatefh);
}
@@ -2301,6 +2301,7 @@ static void ami_handle_msg(void)
break;
case NS_KEY_PAGE_DOWN:
+ case ' ':
ami_gui_scroll_internal(gwin, 0, SCROLL_PAGE_DOWN);
break;
-----------------------------------------------------------------------
Summary of changes:
amiga/dist/NetSurf.guide | 55 +++++++++++++++++++++++-----------------------
amiga/gui.c | 16 +++++++++++++-
amiga/menu.c | 3 +--
3 files changed, 43 insertions(+), 31 deletions(-)
diff --git a/amiga/dist/NetSurf.guide b/amiga/dist/NetSurf.guide
index 5db267a..7265c6c 100755
--- a/amiga/dist/NetSurf.guide
+++ b/amiga/dist/NetSurf.guide
@@ -109,14 +109,12 @@ This section contains options for exporting to PDF. It is not enabled in curren
@endnode
@node cli "Command line options"
-NetSurf URL/K,FORCE/S
+NetSurf URL/K,FORCE/S,NSOPTS/M
Where:
-
-URL = Address of page to open on startup
-FORCE = Force new instance of NetSurf to open (has some limitations, use for debugging only)
-
-Note that there may be other generic options which can also be specified.
+URL = Address of page to open on startup
+FORCE = Force new instance of NetSurf to open (has some limitations, use for debugging only)
+NSOPTS = Catches everything else and passes it to the NetSurf core command line parser
@endnode
@node options "Options file"
@@ -278,7 +276,7 @@ Items in the "Hotlist menu" folder node, up to a maximum (currently) of 40 items
Items in folders within the Menu folder node will be converted to subitems in the menu.
-Folders more than one level down in the heirarchy will become menu items with no action. Items deeper will not be included in the menu at all.
+Folders more than one level down in the heirarchy will become menu items with no action. Items deeper will not be included in the menu at all (until we switch to using menuclass).
Folders with no items in them will show up disabled in the menu. If they are named "--" they will be displayed as separator bars.
@@ -336,7 +334,7 @@ The Installer script will set the MIMETYPE tooltype on basic relevant default fi
This is a list of the keyboard shortcuts used in NetSurf
- RAmiga + R or F5 (reload the current page)
-- PageUp/Down (scroll up/down to one page)
+- PageUp/Down/Space (scroll up/down to one page)
- Home/End (go to top/bottom of the page)
- Left/Right/Up/Down (scroll the page)
- RAmiga + U (activate the URL bar)
@@ -345,26 +343,27 @@ This is a list of the keyboard shortcuts used in NetSurf
Keyboard shortcuts used in NetSurf menu
-- RAmiga + N (open a new window)
-- RAmiga + T (open a new tab)
-- RAmiga + O (open a local file)
-- RAmiga + S (save source page)
-- RAmiga + K (close current tab)
-- RAmiga + P (print a page)
-- RAmiga + ? (about NetSurf)
-- RAmiga + Q (quit NetSurf)
-- RAmiga + X (cut)
-- RAmiga + C (copy)
-- RAmiga + V (paste)
-- RAmiga + A (select all)
-- RAmiga + Z (clear selection)
-- RAmiga + F (find a string/text)
-- RAmiga + - (decrease font)
-- RAmiga + = (normal font)
-- RAmiga + + (increase font)
-- RAmiga + B (add link to bookmark)
-- RAmiga + H (show bookmarks)
-- RAmiga + E (execute script)
+- RAmiga + N (open a new window)
+- RAmiga + T (open a new tab)
+- RAmiga + O (open a local file)
+- RAmiga + S (save source page)
+- RAmiga + K (close current tab)
+- RAmiga + P (print a page)
+- RAmiga + ? (about NetSurf)
+- RAmiga + Q (quit NetSurf)
+- RAmiga + X (cut)
+- RAmiga + C (copy)
+- RAmiga + V (paste)
+- RAmiga + A (select all)
+- RAmiga + Z (undo)
+- RAmiga + Y (redo)
+- RAmiga + F (find a string/text)
+- RAmiga + - or F9 (decrease scale)
+- RAmiga + = or F8 (normal scale)
+- RAmiga + + or F10 (increase scale)
+- RAmiga + B (add link to bookmark)
+- RAmiga + H (show bookmarks)
+- RAmiga + E (execute script)
@endnode
diff --git a/amiga/gui.c b/amiga/gui.c
index f69b26a..160795e 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -652,7 +652,7 @@ static void ami_amiupdate(void)
DevNameFromLock(lock, (STRPTR)&filename, 1024L, DN_FULLPATH);
- if(amiupdatefh = FOpen("ENVARC:AppPaths/NetSurf", MODE_NEWFILE, 0)) {
+ if((amiupdatefh = FOpen("ENVARC:AppPaths/NetSurf", MODE_NEWFILE, 0))) {
FPuts(amiupdatefh, (CONST_STRPTR)&filename);
FClose(amiupdatefh);
}
@@ -2301,6 +2301,7 @@ static void ami_handle_msg(void)
break;
case NS_KEY_PAGE_DOWN:
+ case ' ':
ami_gui_scroll_internal(gwin, 0, SCROLL_PAGE_DOWN);
break;
@@ -2336,6 +2337,18 @@ static void ami_handle_msg(void)
if(browser_window_reload_available(gwin->gw->bw))
browser_window_reload(gwin->gw->bw,false);
break;
+
+ case RAWKEY_F8: // scale 100%
+ ami_gui_set_scale(gwin->gw, 1.0);
+ break;
+
+ case RAWKEY_F9: // decrease scale
+ ami_gui_set_scale(gwin->gw, gwin->gw->scale - 0.1);
+ break;
+
+ case RAWKEY_F10: // increase scale
+ ami_gui_set_scale(gwin->gw, gwin->gw->scale + 0.1);
+ break;
case RAWKEY_HELP: // help
ami_help_open(AMI_HELP_GUI, scrn);
@@ -3333,6 +3346,7 @@ int ami_gui_count_windows(int window, int *tabs)
*/
void ami_gui_set_scale(struct gui_window *gw, float scale)
{
+ if(scale <= 0.0) return;
gw->scale = scale;
browser_window_set_scale(gw->bw, scale, true);
}
diff --git a/amiga/menu.c b/amiga/menu.c
index 25345d0..6d885dc 100644
--- a/amiga/menu.c
+++ b/amiga/menu.c
@@ -379,8 +379,7 @@ HOOKF(void, ami_menu_item_browser_scale_decrease, APTR, window, struct IntuiMess
struct gui_window_2 *gwin;
GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin);
- if(gwin->gw->scale > 0.1)
- ami_gui_set_scale(gwin->gw, gwin->gw->scale - 0.1);
+ ami_gui_set_scale(gwin->gw, gwin->gw->scale - 0.1);
}
HOOKF(void, ami_menu_item_browser_scale_normal, APTR, window, struct IntuiMessage *)
--
NetSurf Browser
7 years, 6 months
netsurf: branch master updated. release/3.3-505-g28be6d2
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/28be6d2d79ba87cc231f2...
...commit http://git.netsurf-browser.org/netsurf.git/commit/28be6d2d79ba87cc231f28c...
...tree http://git.netsurf-browser.org/netsurf.git/tree/28be6d2d79ba87cc231f28ce2...
The branch, master has been updated
via 28be6d2d79ba87cc231f28ce25525dd2ae60e5ed (commit)
from e5a2538b6dcb6404d4404ebb4403e0c58e8ce9b1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=28be6d2d79ba87cc231...
commit 28be6d2d79ba87cc231f28ce25525dd2ae60e5ed
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Don't try to write to an uninitialised file handle.
diff --git a/amiga/gui.c b/amiga/gui.c
index a24942b..f69b26a 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -650,11 +650,13 @@ static void ami_amiupdate(void)
char filename[1024];
BPTR amiupdatefh;
- DevNameFromLock(lock,(STRPTR)&filename,1024L,DN_FULLPATH);
+ DevNameFromLock(lock, (STRPTR)&filename, 1024L, DN_FULLPATH);
+
+ if(amiupdatefh = FOpen("ENVARC:AppPaths/NetSurf", MODE_NEWFILE, 0)) {
+ FPuts(amiupdatefh, (CONST_STRPTR)&filename);
+ FClose(amiupdatefh);
+ }
- amiupdatefh = FOpen("ENVARC:AppPaths/NetSurf",MODE_NEWFILE,0);
- FPuts(amiupdatefh,(CONST_STRPTR)&filename);
- FClose(amiupdatefh);
UnLock(lock);
}
}
-----------------------------------------------------------------------
Summary of changes:
amiga/gui.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/amiga/gui.c b/amiga/gui.c
index a24942b..f69b26a 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -650,11 +650,13 @@ static void ami_amiupdate(void)
char filename[1024];
BPTR amiupdatefh;
- DevNameFromLock(lock,(STRPTR)&filename,1024L,DN_FULLPATH);
+ DevNameFromLock(lock, (STRPTR)&filename, 1024L, DN_FULLPATH);
+
+ if(amiupdatefh = FOpen("ENVARC:AppPaths/NetSurf", MODE_NEWFILE, 0)) {
+ FPuts(amiupdatefh, (CONST_STRPTR)&filename);
+ FClose(amiupdatefh);
+ }
- amiupdatefh = FOpen("ENVARC:AppPaths/NetSurf",MODE_NEWFILE,0);
- FPuts(amiupdatefh,(CONST_STRPTR)&filename);
- FClose(amiupdatefh);
UnLock(lock);
}
}
--
NetSurf Browser
7 years, 6 months
toolchains: branch jmb/openssl-asm updated. 3e4f15d537df461c67e5b7ea1eddb807e3d006fb
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/toolchains.git/shortlog/3e4f15d537df461c67...
...commit http://git.netsurf-browser.org/toolchains.git/commit/3e4f15d537df461c67e5...
...tree http://git.netsurf-browser.org/toolchains.git/tree/3e4f15d537df461c67e5b7...
The branch, jmb/openssl-asm has been updated
via 3e4f15d537df461c67e5b7ea1eddb807e3d006fb (commit)
from f4bcb04ed63489cd5ecc20747a22a507c2b025f7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=3e4f15d537df461c...
commit 3e4f15d537df461c67e5b7ea1eddb807e3d006fb
Author: John-Mark Bell <jmb(a)netsurf-browser.org>
Commit: John-Mark Bell <jmb(a)netsurf-browser.org>
OpenSSL: fix ARMv3 patch for GCM hashing.
I'd misread the code before and missed that some register aliases
map to the same register. Upshot being, we were trampling over all
kinds of things -- it's surprising that the worst outcome was a
TLS handshake failure, and not violent crashes.
diff --git a/sdk/recipes/patches/openssl/arm-unknown-riscos/armv3.p b/sdk/recipes/patches/openssl/arm-unknown-riscos/armv3.p
index 7f4d3bf..d2deb9c 100644
--- a/sdk/recipes/patches/openssl/arm-unknown-riscos/armv3.p
+++ b/sdk/recipes/patches/openssl/arm-unknown-riscos/armv3.p
@@ -52,10 +52,10 @@
+#if __ARM_ARCH__>=4
ldrh $Tll,[sp,$nhi] @ rem_4bit[rem]
+#else
-+ add $len,$nhi,#1
-+ ldrb $len,[sp,$len]
+ ldrb $Tll,[sp,$nhi]
-+ orr $Tll,$Tll,$len,lsl#8
++ add $nhi,$nhi,#1
++ ldrb $nhi,[sp,$nhi]
++ orr $Tll,$Tll,$nhi,lsl#8
+#endif
eor $Zll,$Zll,$Zlh,lsl#28
ldrb $nhi,[$Xi,#14]
@@ -67,10 +67,10 @@
+#if __ARM_ARCH__>=4
ldrh $Tll,[sp,$nlo] @ rem_4bit[rem]
+#else
-+ add $len,$nlo,#1
-+ ldrb $len,[sp,$len]
+ ldrb $Tll,[sp,$nlo]
-+ orr $Tll,$Tll,$len,lsl#8
++ add $Tlh,$nlo,#1
++ ldrb $Tlh,[sp,$Tlh]
++ orr $Tll,$Tll,$Tlh,lsl#8
+#endif
eor $Zhl,$Thl,$Zhl,lsr#4
ldrplb $nlo,[$inp,$cnt]
@@ -79,14 +79,13 @@
ldrplb $Tll,[$Xi,$cnt]
eor $Zll,$Zll,$Zlh,lsl#28
eor $Zlh,$Tlh,$Zlh,lsr#4
-- ldrh $Tlh,[sp,$nhi]
+#if __ARM_ARCH__>=4
-+ ldrh $Tll,[sp,$nhi] @ rem_4bit[rem]
+ ldrh $Tlh,[sp,$nhi]
+#else
-+ add $len,$nhi,#1
-+ ldrb $len,[sp,$len]
-+ ldrb $Tll,[sp,$nhi]
-+ orr $Tll,$Tll,$len,lsl#8
++ ldrb $Tlh,[sp,$nhi]
++ add $nhi,$nhi,#1
++ ldrb $nhi,[sp,$nhi]
++ orr $Tlh,$Tlh,$nhi,lsl#8
+#endif
eor $Zlh,$Zlh,$Zhl,lsl#28
eor $Zhl,$Thl,$Zhl,lsr#4
@@ -98,10 +97,10 @@
+#if __ARM_ARCH__>=4
ldrh $Tll,[$rem_4bit,$nhi] @ rem_4bit[rem]
+#else
-+ add $inp,$nhi,#1
-+ ldrb $inp,[$rem_4bit,$inp]
+ ldrb $Tll,[$rem_4bit,$nhi]
-+ orr $Tll,$Tll,$inp,lsl#8
++ add $nhi,$nhi,#1
++ ldrb $nhi,[$rem_4bit,$nhi]
++ orr $Tll,$Tll,$nhi,lsl#8
+#endif
eor $Zll,$Zll,$Zlh,lsl#28
eor $Zlh,$Tlh,$Zlh,lsr#4
@@ -113,10 +112,10 @@
+#if __ARM_ARCH__>=4
ldrh $Tll,[$rem_4bit,$nlo] @ rem_4bit[rem]
+#else
-+ add $inp,$nlo,#1
-+ ldrb $inp,[$rem_4bit,$inp]
+ ldrb $Tll,[$rem_4bit,$nlo]
-+ orr $Tll,$Tll,$inp,lsl#8
++ add $Tlh,$nlo,#1
++ ldrb $Tlh,[$rem_4bit,$Tlh]
++ orr $Tll,$Tll,$Tlh,lsl#8
+#endif
eor $Zhl,$Thl,$Zhl,lsr#4
ldrplb $nlo,[$Xi,$cnt]
@@ -128,10 +127,10 @@
+#if __ARM_ARCH__>=4
ldrh $Tll,[$rem_4bit,$nhi] @ rem_4bit[rem]
+#else
-+ add $inp,$nhi,#1
-+ ldrb $inp,[$rem_4bit,$inp]
+ ldrb $Tll,[$rem_4bit,$nhi]
-+ orr $Tll,$Tll,$inp,lsl#8
++ add $Tlh,$nhi,#1
++ ldrb $Tlh,[$rem_4bit,$Tlh]
++ orr $Tll,$Tll,$Tlh,lsl#8
+#endif
eor $Zlh,$Zlh,$Zhl,lsl#28
eor $Zhl,$Thl,$Zhl,lsr#4
-----------------------------------------------------------------------
Summary of changes:
.../patches/openssl/arm-unknown-riscos/armv3.p | 41 ++++++++++----------
1 file changed, 20 insertions(+), 21 deletions(-)
diff --git a/sdk/recipes/patches/openssl/arm-unknown-riscos/armv3.p b/sdk/recipes/patches/openssl/arm-unknown-riscos/armv3.p
index 7f4d3bf..d2deb9c 100644
--- a/sdk/recipes/patches/openssl/arm-unknown-riscos/armv3.p
+++ b/sdk/recipes/patches/openssl/arm-unknown-riscos/armv3.p
@@ -52,10 +52,10 @@
+#if __ARM_ARCH__>=4
ldrh $Tll,[sp,$nhi] @ rem_4bit[rem]
+#else
-+ add $len,$nhi,#1
-+ ldrb $len,[sp,$len]
+ ldrb $Tll,[sp,$nhi]
-+ orr $Tll,$Tll,$len,lsl#8
++ add $nhi,$nhi,#1
++ ldrb $nhi,[sp,$nhi]
++ orr $Tll,$Tll,$nhi,lsl#8
+#endif
eor $Zll,$Zll,$Zlh,lsl#28
ldrb $nhi,[$Xi,#14]
@@ -67,10 +67,10 @@
+#if __ARM_ARCH__>=4
ldrh $Tll,[sp,$nlo] @ rem_4bit[rem]
+#else
-+ add $len,$nlo,#1
-+ ldrb $len,[sp,$len]
+ ldrb $Tll,[sp,$nlo]
-+ orr $Tll,$Tll,$len,lsl#8
++ add $Tlh,$nlo,#1
++ ldrb $Tlh,[sp,$Tlh]
++ orr $Tll,$Tll,$Tlh,lsl#8
+#endif
eor $Zhl,$Thl,$Zhl,lsr#4
ldrplb $nlo,[$inp,$cnt]
@@ -79,14 +79,13 @@
ldrplb $Tll,[$Xi,$cnt]
eor $Zll,$Zll,$Zlh,lsl#28
eor $Zlh,$Tlh,$Zlh,lsr#4
-- ldrh $Tlh,[sp,$nhi]
+#if __ARM_ARCH__>=4
-+ ldrh $Tll,[sp,$nhi] @ rem_4bit[rem]
+ ldrh $Tlh,[sp,$nhi]
+#else
-+ add $len,$nhi,#1
-+ ldrb $len,[sp,$len]
-+ ldrb $Tll,[sp,$nhi]
-+ orr $Tll,$Tll,$len,lsl#8
++ ldrb $Tlh,[sp,$nhi]
++ add $nhi,$nhi,#1
++ ldrb $nhi,[sp,$nhi]
++ orr $Tlh,$Tlh,$nhi,lsl#8
+#endif
eor $Zlh,$Zlh,$Zhl,lsl#28
eor $Zhl,$Thl,$Zhl,lsr#4
@@ -98,10 +97,10 @@
+#if __ARM_ARCH__>=4
ldrh $Tll,[$rem_4bit,$nhi] @ rem_4bit[rem]
+#else
-+ add $inp,$nhi,#1
-+ ldrb $inp,[$rem_4bit,$inp]
+ ldrb $Tll,[$rem_4bit,$nhi]
-+ orr $Tll,$Tll,$inp,lsl#8
++ add $nhi,$nhi,#1
++ ldrb $nhi,[$rem_4bit,$nhi]
++ orr $Tll,$Tll,$nhi,lsl#8
+#endif
eor $Zll,$Zll,$Zlh,lsl#28
eor $Zlh,$Tlh,$Zlh,lsr#4
@@ -113,10 +112,10 @@
+#if __ARM_ARCH__>=4
ldrh $Tll,[$rem_4bit,$nlo] @ rem_4bit[rem]
+#else
-+ add $inp,$nlo,#1
-+ ldrb $inp,[$rem_4bit,$inp]
+ ldrb $Tll,[$rem_4bit,$nlo]
-+ orr $Tll,$Tll,$inp,lsl#8
++ add $Tlh,$nlo,#1
++ ldrb $Tlh,[$rem_4bit,$Tlh]
++ orr $Tll,$Tll,$Tlh,lsl#8
+#endif
eor $Zhl,$Thl,$Zhl,lsr#4
ldrplb $nlo,[$Xi,$cnt]
@@ -128,10 +127,10 @@
+#if __ARM_ARCH__>=4
ldrh $Tll,[$rem_4bit,$nhi] @ rem_4bit[rem]
+#else
-+ add $inp,$nhi,#1
-+ ldrb $inp,[$rem_4bit,$inp]
+ ldrb $Tll,[$rem_4bit,$nhi]
-+ orr $Tll,$Tll,$inp,lsl#8
++ add $Tlh,$nhi,#1
++ ldrb $Tlh,[$rem_4bit,$Tlh]
++ orr $Tll,$Tll,$Tlh,lsl#8
+#endif
eor $Zlh,$Zlh,$Zhl,lsl#28
eor $Zhl,$Thl,$Zhl,lsr#4
--
Cross-compilation toolchains and environments
7 years, 6 months
toolchains: branch jmb/openssl-asm created. f4bcb04ed63489cd5ecc20747a22a507c2b025f7
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/toolchains.git/shortlog/f4bcb04ed63489cd5e...
...commit http://git.netsurf-browser.org/toolchains.git/commit/f4bcb04ed63489cd5ecc...
...tree http://git.netsurf-browser.org/toolchains.git/tree/f4bcb04ed63489cd5ecc20...
The branch, jmb/openssl-asm has been created
at f4bcb04ed63489cd5ecc20747a22a507c2b025f7 (commit)
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=f4bcb04ed63489cd...
commit f4bcb04ed63489cd5ecc20747a22a507c2b025f7
Author: John-Mark Bell <jmb(a)netsurf-browser.org>
Commit: John-Mark Bell <jmb(a)netsurf-browser.org>
OpenSSL: enable asm optimisations on RISC OS
diff --git a/sdk/Makefile b/sdk/Makefile
index f1f96ec..112ca85 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -111,6 +111,7 @@ ifeq ($(TARGET),m68k-atari-mint)
SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d $(COMMON_SDK_ITEMS) libjpeg.d libcf.d ldg.d windom.d hermes.d freetype.d)
EXTRAARGS_LIBCARES := --disable-shared
EXTRAARGS_LIBCURL := --enable-optimize --enable-nonblocking --enable-ares --with-random="/dev/urandom" --disable-manual --disable-curldebug --disable-thread --disable-threaded-resolver
+ EXTRAARGS_OPENSSL := $(EXTRAARGS_OPENSSL) no-asm
EXTRAARGS_LIBICONV := --enable-extra-encodings
LIBICONV_ENV := CFLAGS="-DPATH_MAX=1024"
endif
@@ -119,6 +120,7 @@ ifeq ($(TARGET),m5475-atari-mint)
SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d $(COMMON_SDK_ITEMS) libjpeg.d libcf.d ldg.d windom.d hermes.d freetype.d)
EXTRAARGS_LIBCARES := --disable-shared
EXTRAARGS_LIBCURL := --enable-optimize --enable-nonblocking --enable-ares --with-random="/dev/urandom" --disable-manual --disable-curldebug --disable-thread --disable-threaded-resolver
+ EXTRAARGS_OPENSSL := $(EXTRAARGS_OPENSSL) no-asm
EXTRAARGS_LIBICONV := --enable-extra-encodings
LIBICONV_ENV := CFLAGS="-DPATH_MAX=1024"
endif
@@ -127,6 +129,7 @@ ifeq ($(TARGET),ppc-amigaos)
SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libtre.d libpbl.d spidermonkey.d $(COMMON_SDK_ITEMS) libjpeg.d)
EXTRAARGS_LIBCARES := --disable-shared
EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random --enable-threaded-resolver LIBS=-lpthread
+ EXTRAARGS_OPENSSL := $(EXTRAARGS_OPENSSL) no-asm
VERSION_SPIDERMONKEY := 1.7.0
endif
@@ -134,6 +137,7 @@ ifeq ($(TARGET),i686-w64-mingw32)
SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libgnurx.d $(COMMON_SDK_ITEMS) libjpeg.d)
EXTRAARGS_LIBCARES := --disable-shared
EXTRAARGS_LIBCURL := --enable-nonblocking --enable-ares --disable-ldap --without-random
+ EXTRAARGS_OPENSSL := $(EXTRAARGS_OPENSSL) no-asm
LIBCURL_ENV := CFLAGS="-DCARES_STATICLIB" LIBS="-lgdi32"
endif
@@ -141,6 +145,7 @@ ifeq ($(TARGET),m68k-unknown-amigaos)
SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libtre.d libpbl.d $(COMMON_SDK_ITEMS) libjpeg.d)
EXTRAARGS_LIBCARES := --disable-shared --without-random
EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random --disable-threaded-resolver --with-ssl --with-zlib
+ EXTRAARGS_OPENSSL := $(EXTRAARGS_OPENSSL) no-asm
LIBICONV_ENV := CFLAGS="-DPATH_MAX=1024"
LIBJPEG_ENV := LDFLAGS="-lm"
LIBJPEG_TURBO_ENV := LDFLAGS="-lm"
@@ -355,7 +360,7 @@ $(BUILDSTEPS)/openssl.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDST
ifneq ($(realpath $(RECIPES)/patches/openssl/$(TARGET)),)
for p in `ls $(RECIPES)/patches/openssl/$(TARGET)/*.p` ; do $(PATCH) -d $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) -p0 <$$p ; done
endif
- cd $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) && $(env) ./Configure --prefix=$(GCCSDK_INSTALL_ENV) $(TARGET) no-shared no-asm no-threads $(EXTRAARGS_OPENSSL)
+ cd $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) && $(env) ./Configure --prefix=$(GCCSDK_INSTALL_ENV) $(TARGET) no-shared no-threads $(EXTRAARGS_OPENSSL)
cd $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) && $(env) make install
touch $@
diff --git a/sdk/recipes/patches/openssl/Configure.p b/sdk/recipes/patches/openssl/Configure.p
index 9d4ba20..96062db 100644
--- a/sdk/recipes/patches/openssl/Configure.p
+++ b/sdk/recipes/patches/openssl/Configure.p
@@ -4,7 +4,7 @@
"beos-x86-r5", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mcpu=pentium -Wall::-D_REENTRANT:BEOS:-lbe -lnet:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:beos:beos-shared:-fPIC -DPIC:-shared:.so",
"beos-x86-bone", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mcpu=pentium -Wall::-D_REENTRANT:BEOS:-lbe -lbind -lsocket:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:beos:beos-shared:-fPIC:-shared:.so",
-+"arm-unknown-riscos","arm-unknown-riscos-gcc:-DL_ENDIAN -DTERMIOS -DNO_SYS_UN_H -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG DES_RISC1::::::::::::::::::::echo",
++"arm-unknown-riscos","arm-unknown-riscos-gcc:-DL_ENDIAN -DTERMIOS -DNO_SYS_UN_H -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:::::echo",
+"m68k-atari-mint","m68k-atari-mint-gcc:-DB_ENDIAN -DTERMIOS -DNO_SYSLOG -DNO_SYS_UN_H -DOPENSSL_USE_IPV6=0 -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG DES_RISC1::::::::::::::::::::m68k-atari-mint-ranlib",
+"m5475-atari-mint","m5475-atari-mint-gcc:-DB_ENDIAN -DTERMIOS -DNO_SYSLOG -DNO_SYS_UN_H -DOPENSSL_USE_IPV6=0 -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG DES_RISC1::::::::::::::::::::m5475-atari-mint-ranlib",
+"m68k-unknown-amigaos","m68k-unknown-amigaos-gcc:-DB_ENDIAN -DOPENSSL_SYS_AMIGAOS3 -DNO_SYSLOG -DHAVE_FORK=0 -DNO_SYS_PARAM_H -DNO_SYS_UN_H -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-lnet -lm:BN_LLONG DES_RISC1::::::::::::::::::::m68k-unknown-amigaos-ranlib",
diff --git a/sdk/recipes/patches/openssl/arm-unknown-riscos/armv3.p b/sdk/recipes/patches/openssl/arm-unknown-riscos/armv3.p
new file mode 100644
index 0000000..7f4d3bf
--- /dev/null
+++ b/sdk/recipes/patches/openssl/arm-unknown-riscos/armv3.p
@@ -0,0 +1,138 @@
+--- crypto/arm_arch.h 2015-07-09 12:21:24.000000000 +0000
++++ crypto/arm_arch.h 2015-11-13 13:47:02.386910047 +0000
+@@ -31,6 +31,8 @@
+ # define __ARM_ARCH__ 5
+ # elif defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__)
+ # define __ARM_ARCH__ 4
++# elif defined(__ARM_ARCH_3__)
++# define __ARM_ARCH__ 3
+ # else
+ # error "unsupported ARM architecture"
+ # endif
+--- crypto/armcap.c 2015-07-09 12:21:24.000000000 +0000
++++ crypto/armcap.c 2015-11-13 15:12:20.385640267 +0000
+@@ -7,6 +7,8 @@
+
+ #include "arm_arch.h"
+
++extern unsigned int __get_cpu_arch (void);
++
+ unsigned int OPENSSL_armcap_P;
+
+ static sigset_t all_masked;
+@@ -67,13 +69,15 @@
+ sigprocmask(SIG_SETMASK, &ill_act.sa_mask, &oset);
+ sigaction(SIGILL, &ill_act, &ill_oact);
+
+- if (sigsetjmp(ill_jmp, 1) == 0) {
+- _armv7_neon_probe();
+- OPENSSL_armcap_P |= ARMV7_NEON;
+- }
+- if (sigsetjmp(ill_jmp, 1) == 0) {
+- _armv7_tick();
+- OPENSSL_armcap_P |= ARMV7_TICK;
++ if (__get_cpu_arch() == 0) {
++ if (sigsetjmp(ill_jmp, 1) == 0) {
++ _armv7_neon_probe();
++ OPENSSL_armcap_P |= ARMV7_NEON;
++ }
++ if (sigsetjmp(ill_jmp, 1) == 0) {
++ _armv7_tick();
++ OPENSSL_armcap_P |= ARMV7_TICK;
++ }
+ }
+
+ sigaction(SIGILL, &ill_oact, NULL);
+--- crypto/modes/asm/ghash-armv4.pl 2015-07-09 12:21:24.000000000 +0000
++++ crypto/modes/asm/ghash-armv4.pl 2015-11-13 13:44:26.274913291 +0000
+@@ -157,7 +157,14 @@
+ ldmia $Thh,{$Tll-$Thh} @ load Htbl[nhi]
+ add $nhi,$nhi,$nhi
+ eor $Zll,$Tll,$Zll,lsr#4
++#if __ARM_ARCH__>=4
+ ldrh $Tll,[sp,$nhi] @ rem_4bit[rem]
++#else
++ add $len,$nhi,#1
++ ldrb $len,[sp,$len]
++ ldrb $Tll,[sp,$nhi]
++ orr $Tll,$Tll,$len,lsl#8
++#endif
+ eor $Zll,$Zll,$Zlh,lsl#28
+ ldrb $nhi,[$Xi,#14]
+ eor $Zlh,$Tlh,$Zlh,lsr#4
+@@ -180,7 +187,14 @@
+ eor $Zll,$Zll,$Zlh,lsl#28
+ eor $Zlh,$Tlh,$Zlh,lsr#4
+ eor $Zlh,$Zlh,$Zhl,lsl#28
++#if __ARM_ARCH__>=4
+ ldrh $Tll,[sp,$nlo] @ rem_4bit[rem]
++#else
++ add $len,$nlo,#1
++ ldrb $len,[sp,$len]
++ ldrb $Tll,[sp,$nlo]
++ orr $Tll,$Tll,$len,lsl#8
++#endif
+ eor $Zhl,$Thl,$Zhl,lsr#4
+ ldrplb $nlo,[$inp,$cnt]
+ eor $Zhl,$Zhl,$Zhh,lsl#28
+@@ -195,7 +209,14 @@
+ ldrplb $Tll,[$Xi,$cnt]
+ eor $Zll,$Zll,$Zlh,lsl#28
+ eor $Zlh,$Tlh,$Zlh,lsr#4
+- ldrh $Tlh,[sp,$nhi]
++#if __ARM_ARCH__>=4
++ ldrh $Tll,[sp,$nhi] @ rem_4bit[rem]
++#else
++ add $len,$nhi,#1
++ ldrb $len,[sp,$len]
++ ldrb $Tll,[sp,$nhi]
++ orr $Tll,$Tll,$len,lsl#8
++#endif
+ eor $Zlh,$Zlh,$Zhl,lsl#28
+ eor $Zhl,$Thl,$Zhl,lsr#4
+ eor $Zhl,$Zhl,$Zhh,lsl#28
+@@ -245,7 +266,14 @@
+ ldmia $Thh,{$Tll-$Thh} @ load Htbl[nhi]
+ add $nhi,$nhi,$nhi
+ eor $Zll,$Tll,$Zll,lsr#4
++#if __ARM_ARCH__>=4
+ ldrh $Tll,[$rem_4bit,$nhi] @ rem_4bit[rem]
++#else
++ add $inp,$nhi,#1
++ ldrb $inp,[$rem_4bit,$inp]
++ ldrb $Tll,[$rem_4bit,$nhi]
++ orr $Tll,$Tll,$inp,lsl#8
++#endif
+ eor $Zll,$Zll,$Zlh,lsl#28
+ eor $Zlh,$Tlh,$Zlh,lsr#4
+ eor $Zlh,$Zlh,$Zhl,lsl#28
+@@ -266,7 +294,14 @@
+ eor $Zll,$Zll,$Zlh,lsl#28
+ eor $Zlh,$Tlh,$Zlh,lsr#4
+ eor $Zlh,$Zlh,$Zhl,lsl#28
++#if __ARM_ARCH__>=4
+ ldrh $Tll,[$rem_4bit,$nlo] @ rem_4bit[rem]
++#else
++ add $inp,$nlo,#1
++ ldrb $inp,[$rem_4bit,$inp]
++ ldrb $Tll,[$rem_4bit,$nlo]
++ orr $Tll,$Tll,$inp,lsl#8
++#endif
+ eor $Zhl,$Thl,$Zhl,lsr#4
+ ldrplb $nlo,[$Xi,$cnt]
+ eor $Zhl,$Zhl,$Zhh,lsl#28
+@@ -280,7 +315,14 @@
+ eor $Zll,$Tll,$Zll,lsr#4
+ eor $Zll,$Zll,$Zlh,lsl#28
+ eor $Zlh,$Tlh,$Zlh,lsr#4
++#if __ARM_ARCH__>=4
+ ldrh $Tll,[$rem_4bit,$nhi] @ rem_4bit[rem]
++#else
++ add $inp,$nhi,#1
++ ldrb $inp,[$rem_4bit,$inp]
++ ldrb $Tll,[$rem_4bit,$nhi]
++ orr $Tll,$Tll,$inp,lsl#8
++#endif
+ eor $Zlh,$Zlh,$Zhl,lsl#28
+ eor $Zhl,$Thl,$Zhl,lsr#4
+ eor $Zhl,$Zhl,$Zhh,lsl#28
commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=9d545f0add00347d...
commit 9d545f0add00347d1801dd38b86bb3452f140a1f
Author: John-Mark Bell <jmb(a)netsurf-browser.org>
Commit: John-Mark Bell <jmb(a)netsurf-browser.org>
OpenSSL: use more sensible defaults
diff --git a/sdk/Makefile b/sdk/Makefile
index f26da00..f1f96ec 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -88,6 +88,12 @@ FREETYPE_ENV := LIBPNG_CFLAGS=$$($(GCCSDK_INSTALL_ENV)/bin/libpng-config --cflag
# per target environments
LIBJPEG_TURBO_BUILDDIR:=$(BUILDDIR)/libjpegturbo
+# OpenSSL defaults:
+# * Disable IDEA, MCD2, RC5, and zlib
+# * Enable TLS extensions
+# * Disable SSLv2 and SSLv3
+EXTRAARGS_OPENSSL := no-idea no-mdc2 no-rc5 no-zlib enable-tlsext no-ssl2 no-ssl3
+
# Target Specific setup
ifeq ($(TARGET),arm-unknown-riscos)
SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, $(COMMON_SDK_ITEMS) spidermonkey.d libjpeg-turbo.d)
@@ -349,7 +355,7 @@ $(BUILDSTEPS)/openssl.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDST
ifneq ($(realpath $(RECIPES)/patches/openssl/$(TARGET)),)
for p in `ls $(RECIPES)/patches/openssl/$(TARGET)/*.p` ; do $(PATCH) -d $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) -p0 <$$p ; done
endif
- cd $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) && $(env) ./Configure --prefix=$(GCCSDK_INSTALL_ENV) $(TARGET) no-shared no-asm no-threads
+ cd $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) && $(env) ./Configure --prefix=$(GCCSDK_INSTALL_ENV) $(TARGET) no-shared no-asm no-threads $(EXTRAARGS_OPENSSL)
cd $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) && $(env) make install
touch $@
-----------------------------------------------------------------------
--
Cross-compilation toolchains and environments
7 years, 6 months
toolchains: branch master updated. b9b1084efe62a75c566bc4b72e9d6beac48955bc
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/toolchains.git/shortlog/b9b1084efe62a75c56...
...commit http://git.netsurf-browser.org/toolchains.git/commit/b9b1084efe62a75c566b...
...tree http://git.netsurf-browser.org/toolchains.git/tree/b9b1084efe62a75c566bc4...
The branch, master has been updated
via b9b1084efe62a75c566bc4b72e9d6beac48955bc (commit)
from 4b747316f5135ecfcd461ea1ee0abcb92470c58c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=b9b1084efe62a75c...
commit b9b1084efe62a75c566bc4b72e9d6beac48955bc
Author: John-Mark Bell <jmb(a)netsurf-browser.org>
Commit: John-Mark Bell <jmb(a)netsurf-browser.org>
RISC OS: fix up tooling for GCCSDK 4.7.4r2
* Makefile:
Update to reflect upstream tree structure
* recipes/patches/gcc4/binutils-plugins.p,
recipes/patches/gcc4/gmp-force-build.p:
Refresh context
* recipes/patches/gcc4/python2.5.p:
Drop: Python 2.5 is ancient
* recipes/patches/gcc4/riscos.md.p:
Drop: merged upstream
diff --git a/arm-unknown-riscos/Makefile b/arm-unknown-riscos/Makefile
index 78d4814..052a414 100644
--- a/arm-unknown-riscos/Makefile
+++ b/arm-unknown-riscos/Makefile
@@ -111,8 +111,8 @@ $(BUILDSTEPS)/oslib.d: $(BUILDSTEPS)/gcc.d $(SOURCESDIR)/$(UPSTREAM_OSLIB_TARBAL
###
$(BUILDSTEPS)/gcc.d: $(BUILDSTEPS)/gccsdk-srcdir.d
- cd $(BUILDDIR)/gcc4 && make
- cd $(BUILDDIR)/gcc4 && ./install-env
+ cd $(BUILDDIR)/gcc4/gcc4 && make
+ cd $(BUILDDIR)/gcc4/gcc4 && ./install-env
@# Newer GCCSDK adds these trampoline binaries that for us
@# serve no purpose and get in the way.
$(RM) $(PREFIX)/cross/bin/arm-unknown-riscos-gcc-ar $(PREFIX)/cross/bin/arm-unknown-riscos-gcc-nm $(PREFIX)/cross/bin/arm-unknown-riscos-gcc-ranlib
@@ -120,8 +120,8 @@ $(BUILDSTEPS)/gcc.d: $(BUILDSTEPS)/gccsdk-srcdir.d
$(BUILDSTEPS)/gccsdk-srcdir.d: $(BUILDSTEPS)/buildsteps.d $(SOURCESDIR)/$(UPSTREAM_GCCSDK_TARBALL)
cp -r $(SOURCESDIR)/$(UPSTREAM_GCCSDK_TARBALL) $(BUILDDIR)/gcc4
- cp -p $(RECIPES)/files/gcc4/gccsdk-params $(BUILDDIR)/gcc4/gccsdk-params
- sed -i 's#{PREFIX}#$(PREFIX)#' $(BUILDDIR)/gcc4/gccsdk-params
+ cp -p $(RECIPES)/files/gcc4/gccsdk-params $(BUILDDIR)/gcc4/gcc4/gccsdk-params
+ sed -i 's#{PREFIX}#$(PREFIX)#' $(BUILDDIR)/gcc4/gcc4/gccsdk-params
for p in `ls $(RECIPES)/patches/gcc4/*.p` ; do patch -d $(BUILDDIR)/gcc4 -p0 <$$p ; done
touch $@
diff --git a/arm-unknown-riscos/recipes/patches/gcc4/binutils-plugins.p b/arm-unknown-riscos/recipes/patches/gcc4/binutils-plugins.p
index 0dbc257..397a736 100644
--- a/arm-unknown-riscos/recipes/patches/gcc4/binutils-plugins.p
+++ b/arm-unknown-riscos/recipes/patches/gcc4/binutils-plugins.p
@@ -1,8 +1,8 @@
---- Makefile (revision 6747)
-+++ Makefile (working copy)
+--- gcc4/Makefile (revision 6747)
++++ gcc4/Makefile (working copy)
@@ -73,7 +73,7 @@
- --disable-libstdcxx-pch \
- --disable-tls
+ --disable-tls \
+ --enable-__cxa_atexit
# FIXME: for Java support: --without-x --enable-libgcj
-BINUTILS_CONFIG_ARGS :=
+BINUTILS_CONFIG_ARGS := --enable-plugins
diff --git a/arm-unknown-riscos/recipes/patches/gcc4/gmp-force-build.p b/arm-unknown-riscos/recipes/patches/gcc4/gmp-force-build.p
index 5b1ec2b..ae58235 100644
--- a/arm-unknown-riscos/recipes/patches/gcc4/gmp-force-build.p
+++ b/arm-unknown-riscos/recipes/patches/gcc4/gmp-force-build.p
@@ -1,5 +1,5 @@
---- Makefile.orig 2014-12-09 22:08:21.680152640 +0000
-+++ Makefile 2014-12-10 00:21:11.194955257 +0000
+--- gcc4/Makefile.orig 2014-12-09 22:08:21.680152640 +0000
++++ gcc4/Makefile 2014-12-10 00:21:11.194955257 +0000
@@ -163,7 +163,7 @@
RONATIVE_CONFIG_ARGS := --host=$(TARGET) --target=$(TARGET) --prefix=$(PREFIX_RONATIVE)
diff --git a/arm-unknown-riscos/recipes/patches/gcc4/python2.5.p b/arm-unknown-riscos/recipes/patches/gcc4/python2.5.p
deleted file mode 100644
index 457009e..0000000
--- a/arm-unknown-riscos/recipes/patches/gcc4/python2.5.p
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/do-patch-and-copy.old 2012-11-06 23:18:20.000000000 +0000
-+++ scripts/do-patch-and-copy 2012-11-06 23:18:54.000000000 +0000
-@@ -36,7 +36,7 @@
- # lndir has the advantage to be way more quicker and it is also very easy
- # to create relative symbolic links which is nicer when we create a source
- # snapshot for publication.
-- FILESRELTODSTDIR=`python -c "import os.path; print os.path.relpath('${FILESDIR}','${DSTDIR}')"`
-+ FILESRELTODSTDIR=`python -c "import os.path; prefix = os.path.commonprefix([ '${FILESDIR}', '${DSTDIR}' ]); print '/'.join([ '/'.join([ '..' for _ in '${DSTDIR}'[len(prefix):].split('/') ]), '${FILESDIR}'[len(prefix):] ]);"`
- pushd $DSTDIR/.. > /dev/null
- lndir -silent $FILESRELTODSTDIR $DSTDIR
- popd > /dev/null
diff --git a/arm-unknown-riscos/recipes/patches/gcc4/riscos.md.p b/arm-unknown-riscos/recipes/patches/gcc4/riscos.md.p
deleted file mode 100644
index 9c5e9f1..0000000
--- a/arm-unknown-riscos/recipes/patches/gcc4/riscos.md.p
+++ /dev/null
@@ -1,10 +0,0 @@
---- recipe/files/gcc/gcc/config/arm/riscos.md (revision 6894)
-+++ recipe/files/gcc/gcc/config/arm/riscos.md (working copy)
-@@ -127,6 +127,7 @@
- (match_operand 3 "" "")] UNSPEC_STK)
- (clobber (reg:SI 8))
- (clobber (reg:SI SL_REGNUM))
-+ (use (reg:SI 11))
- (clobber (reg:SI IP_REGNUM))
- (clobber (reg:SI LR_REGNUM))
- (clobber (reg:CC CC_REGNUM))]
-----------------------------------------------------------------------
Summary of changes:
arm-unknown-riscos/Makefile | 8 ++++----
arm-unknown-riscos/recipes/patches/gcc4/binutils-plugins.p | 8 ++++----
arm-unknown-riscos/recipes/patches/gcc4/gmp-force-build.p | 4 ++--
arm-unknown-riscos/recipes/patches/gcc4/python2.5.p | 11 -----------
arm-unknown-riscos/recipes/patches/gcc4/riscos.md.p | 10 ----------
5 files changed, 10 insertions(+), 31 deletions(-)
delete mode 100644 arm-unknown-riscos/recipes/patches/gcc4/python2.5.p
delete mode 100644 arm-unknown-riscos/recipes/patches/gcc4/riscos.md.p
diff --git a/arm-unknown-riscos/Makefile b/arm-unknown-riscos/Makefile
index 78d4814..052a414 100644
--- a/arm-unknown-riscos/Makefile
+++ b/arm-unknown-riscos/Makefile
@@ -111,8 +111,8 @@ $(BUILDSTEPS)/oslib.d: $(BUILDSTEPS)/gcc.d $(SOURCESDIR)/$(UPSTREAM_OSLIB_TARBAL
###
$(BUILDSTEPS)/gcc.d: $(BUILDSTEPS)/gccsdk-srcdir.d
- cd $(BUILDDIR)/gcc4 && make
- cd $(BUILDDIR)/gcc4 && ./install-env
+ cd $(BUILDDIR)/gcc4/gcc4 && make
+ cd $(BUILDDIR)/gcc4/gcc4 && ./install-env
@# Newer GCCSDK adds these trampoline binaries that for us
@# serve no purpose and get in the way.
$(RM) $(PREFIX)/cross/bin/arm-unknown-riscos-gcc-ar $(PREFIX)/cross/bin/arm-unknown-riscos-gcc-nm $(PREFIX)/cross/bin/arm-unknown-riscos-gcc-ranlib
@@ -120,8 +120,8 @@ $(BUILDSTEPS)/gcc.d: $(BUILDSTEPS)/gccsdk-srcdir.d
$(BUILDSTEPS)/gccsdk-srcdir.d: $(BUILDSTEPS)/buildsteps.d $(SOURCESDIR)/$(UPSTREAM_GCCSDK_TARBALL)
cp -r $(SOURCESDIR)/$(UPSTREAM_GCCSDK_TARBALL) $(BUILDDIR)/gcc4
- cp -p $(RECIPES)/files/gcc4/gccsdk-params $(BUILDDIR)/gcc4/gccsdk-params
- sed -i 's#{PREFIX}#$(PREFIX)#' $(BUILDDIR)/gcc4/gccsdk-params
+ cp -p $(RECIPES)/files/gcc4/gccsdk-params $(BUILDDIR)/gcc4/gcc4/gccsdk-params
+ sed -i 's#{PREFIX}#$(PREFIX)#' $(BUILDDIR)/gcc4/gcc4/gccsdk-params
for p in `ls $(RECIPES)/patches/gcc4/*.p` ; do patch -d $(BUILDDIR)/gcc4 -p0 <$$p ; done
touch $@
diff --git a/arm-unknown-riscos/recipes/patches/gcc4/binutils-plugins.p b/arm-unknown-riscos/recipes/patches/gcc4/binutils-plugins.p
index 0dbc257..397a736 100644
--- a/arm-unknown-riscos/recipes/patches/gcc4/binutils-plugins.p
+++ b/arm-unknown-riscos/recipes/patches/gcc4/binutils-plugins.p
@@ -1,8 +1,8 @@
---- Makefile (revision 6747)
-+++ Makefile (working copy)
+--- gcc4/Makefile (revision 6747)
++++ gcc4/Makefile (working copy)
@@ -73,7 +73,7 @@
- --disable-libstdcxx-pch \
- --disable-tls
+ --disable-tls \
+ --enable-__cxa_atexit
# FIXME: for Java support: --without-x --enable-libgcj
-BINUTILS_CONFIG_ARGS :=
+BINUTILS_CONFIG_ARGS := --enable-plugins
diff --git a/arm-unknown-riscos/recipes/patches/gcc4/gmp-force-build.p b/arm-unknown-riscos/recipes/patches/gcc4/gmp-force-build.p
index 5b1ec2b..ae58235 100644
--- a/arm-unknown-riscos/recipes/patches/gcc4/gmp-force-build.p
+++ b/arm-unknown-riscos/recipes/patches/gcc4/gmp-force-build.p
@@ -1,5 +1,5 @@
---- Makefile.orig 2014-12-09 22:08:21.680152640 +0000
-+++ Makefile 2014-12-10 00:21:11.194955257 +0000
+--- gcc4/Makefile.orig 2014-12-09 22:08:21.680152640 +0000
++++ gcc4/Makefile 2014-12-10 00:21:11.194955257 +0000
@@ -163,7 +163,7 @@
RONATIVE_CONFIG_ARGS := --host=$(TARGET) --target=$(TARGET) --prefix=$(PREFIX_RONATIVE)
diff --git a/arm-unknown-riscos/recipes/patches/gcc4/python2.5.p b/arm-unknown-riscos/recipes/patches/gcc4/python2.5.p
deleted file mode 100644
index 457009e..0000000
--- a/arm-unknown-riscos/recipes/patches/gcc4/python2.5.p
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/do-patch-and-copy.old 2012-11-06 23:18:20.000000000 +0000
-+++ scripts/do-patch-and-copy 2012-11-06 23:18:54.000000000 +0000
-@@ -36,7 +36,7 @@
- # lndir has the advantage to be way more quicker and it is also very easy
- # to create relative symbolic links which is nicer when we create a source
- # snapshot for publication.
-- FILESRELTODSTDIR=`python -c "import os.path; print os.path.relpath('${FILESDIR}','${DSTDIR}')"`
-+ FILESRELTODSTDIR=`python -c "import os.path; prefix = os.path.commonprefix([ '${FILESDIR}', '${DSTDIR}' ]); print '/'.join([ '/'.join([ '..' for _ in '${DSTDIR}'[len(prefix):].split('/') ]), '${FILESDIR}'[len(prefix):] ]);"`
- pushd $DSTDIR/.. > /dev/null
- lndir -silent $FILESRELTODSTDIR $DSTDIR
- popd > /dev/null
diff --git a/arm-unknown-riscos/recipes/patches/gcc4/riscos.md.p b/arm-unknown-riscos/recipes/patches/gcc4/riscos.md.p
deleted file mode 100644
index 9c5e9f1..0000000
--- a/arm-unknown-riscos/recipes/patches/gcc4/riscos.md.p
+++ /dev/null
@@ -1,10 +0,0 @@
---- recipe/files/gcc/gcc/config/arm/riscos.md (revision 6894)
-+++ recipe/files/gcc/gcc/config/arm/riscos.md (working copy)
-@@ -127,6 +127,7 @@
- (match_operand 3 "" "")] UNSPEC_STK)
- (clobber (reg:SI 8))
- (clobber (reg:SI SL_REGNUM))
-+ (use (reg:SI 11))
- (clobber (reg:SI IP_REGNUM))
- (clobber (reg:SI LR_REGNUM))
- (clobber (reg:CC CC_REGNUM))]
--
Cross-compilation toolchains and environments
7 years, 6 months